mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
fix(input): mouse right click no longer acts as Back in REDMAGIC cast mode
REDMAGIC's cast mode replaces a mouse's right button with a Back key that names no device and lacks the virtual-hard-key flag that the navigation bar and back gesture set. During a session, a Back from a mouse, or that injected form while a mouse is connected, now presses the guest's right button. The navigation bar, back gesture and controller Back still act as Back, and so does a right click while a DroidDeck menu is open. A mouse's Back and Forward buttons no longer also send a left click; Android delivers them as key events.
This commit is contained in:
1 parent
bae4ecd867
commit
57b3623a9a
3 files changed
+172
-17
No files matched your search
@@ -0,0 +1,107 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.view.InputDevice
|
||||
import android.view.KeyCharacterMap
|
||||
import android.view.KeyEvent
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [34], manifest = Config.NONE)
|
||||
class MouseBackInputTest {
|
||||
private val presses = mutableListOf<Boolean>()
|
||||
private var mouse = true
|
||||
private val input = MouseBackInput(presses::add) { mouse }
|
||||
|
||||
private fun key(action: Int, source: Int = InputDevice.SOURCE_MOUSE, device: Int = 7, repeat: Int = 0,
|
||||
code: Int = KeyEvent.KEYCODE_BACK, flags: Int = 0) =
|
||||
KeyEvent(0L, 0L, action, code, repeat, 0, device, 0, flags, source)
|
||||
|
||||
/** What REDMAGIC's cast mode sends for a right click, as logged on an NX789J. */
|
||||
private fun injected(action: Int, repeat: Int = 0) = key(action, source = InputDevice.SOURCE_KEYBOARD,
|
||||
device = KeyCharacterMap.VIRTUAL_KEYBOARD, repeat = repeat, flags = KeyEvent.FLAG_FROM_SYSTEM)
|
||||
|
||||
/** What the navigation bar and back gesture send, as logged on the same phone. */
|
||||
private fun navigationBar(action: Int) = key(action, source = InputDevice.SOURCE_KEYBOARD,
|
||||
device = KeyCharacterMap.VIRTUAL_KEYBOARD, flags = KeyEvent.FLAG_FROM_SYSTEM or KeyEvent.FLAG_VIRTUAL_HARD_KEY)
|
||||
|
||||
@Test fun mouseBackBecomesTheRightButton() {
|
||||
assertTrue(input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = true))
|
||||
assertTrue(input.onKeyEvent(key(KeyEvent.ACTION_UP), toGuest = true))
|
||||
assertEquals(listOf(true, false), presses)
|
||||
}
|
||||
|
||||
@Test fun holdingTheButtonSwallowsRepeatsWithoutPressingAgain() {
|
||||
input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = true)
|
||||
repeat(3) { assertTrue(input.onKeyEvent(key(KeyEvent.ACTION_DOWN, repeat = it + 1), toGuest = true)) }
|
||||
input.onKeyEvent(key(KeyEvent.ACTION_UP), toGuest = true)
|
||||
assertEquals(listOf(true, false), presses)
|
||||
}
|
||||
|
||||
@Test fun relativeMouseBackAlsoBecomesTheRightButton() {
|
||||
assertTrue(input.onKeyEvent(key(KeyEvent.ACTION_DOWN, source = InputDevice.SOURCE_MOUSE_RELATIVE), toGuest = true))
|
||||
assertEquals(listOf(true), presses)
|
||||
}
|
||||
|
||||
@Test fun injectedBackBecomesTheRightButtonWhileAMouseIsConnected() {
|
||||
assertTrue(input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true))
|
||||
assertTrue(input.onKeyEvent(injected(KeyEvent.ACTION_DOWN, repeat = 1), toGuest = true))
|
||||
assertTrue(input.onKeyEvent(injected(KeyEvent.ACTION_UP), toGuest = true))
|
||||
assertEquals(listOf(true, false), presses)
|
||||
}
|
||||
|
||||
@Test fun injectedBackStaysBackWithoutAMouse() {
|
||||
mouse = false
|
||||
assertFalse(input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true))
|
||||
assertFalse(input.onKeyEvent(injected(KeyEvent.ACTION_UP), toGuest = true))
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
|
||||
@Test fun navigationBarBackStaysBackEvenWithAMouse() {
|
||||
for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) {
|
||||
assertFalse(input.onKeyEvent(navigationBar(action), toGuest = true))
|
||||
}
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
|
||||
@Test fun controllerBackStaysBack() {
|
||||
val source = InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_KEYBOARD
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_DOWN, source = source), toGuest = true))
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_UP, source = source), toGuest = true))
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
|
||||
@Test fun otherMouseKeysAreLeftAlone() {
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_DOWN, code = KeyEvent.KEYCODE_FORWARD), toGuest = true))
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
|
||||
@Test fun mouseBackStaysBackWhileAMenuIsOpen() {
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = false))
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_DOWN, repeat = 1), toGuest = false))
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_UP), toGuest = false))
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
|
||||
@Test fun aMenuOpeningMidPressStillReleasesTheButton() {
|
||||
input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = true)
|
||||
assertTrue(input.onKeyEvent(key(KeyEvent.ACTION_UP), toGuest = false))
|
||||
assertEquals(listOf(true, false), presses)
|
||||
}
|
||||
|
||||
@Test fun theMouseDisconnectingMidPressStillReleasesTheButton() {
|
||||
input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true)
|
||||
mouse = false
|
||||
assertTrue(input.onKeyEvent(injected(KeyEvent.ACTION_UP), toGuest = true))
|
||||
assertEquals(listOf(true, false), presses)
|
||||
}
|
||||
|
||||
@Test fun aMenuClosingMidPressLeavesTheReleaseToTheMenu() {
|
||||
input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = false)
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_UP), toGuest = true))
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user