mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
feat: add configurable touchscreen gestures (#940)
This commit is contained in:
1 parent
fd74819c50
commit
fe7b75318a
55 files changed
+7404
-14
No files matched your search
@@ -0,0 +1,111 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: GPL-3.0
|
||||
* Modified for DroidDeck on 2026-10-15.
|
||||
*/
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
object GestureKeys {
|
||||
val codes: Map<String, Int> = linkedMapOf(
|
||||
"ESC" to 1,
|
||||
"1" to 2,
|
||||
"2" to 3,
|
||||
"3" to 4,
|
||||
"4" to 5,
|
||||
"5" to 6,
|
||||
"6" to 7,
|
||||
"7" to 8,
|
||||
"8" to 9,
|
||||
"9" to 10,
|
||||
"0" to 11,
|
||||
"MINUS" to 12,
|
||||
"EQUAL" to 13,
|
||||
"BKSP" to 14,
|
||||
"TAB" to 15,
|
||||
"Q" to 16,
|
||||
"W" to 17,
|
||||
"E" to 18,
|
||||
"R" to 19,
|
||||
"T" to 20,
|
||||
"Y" to 21,
|
||||
"U" to 22,
|
||||
"I" to 23,
|
||||
"O" to 24,
|
||||
"P" to 25,
|
||||
"BRACKET_LEFT" to 26,
|
||||
"BRACKET_RIGHT" to 27,
|
||||
"ENTER" to 28,
|
||||
"CTRL_L" to 29,
|
||||
"A" to 30,
|
||||
"S" to 31,
|
||||
"D" to 32,
|
||||
"F" to 33,
|
||||
"G" to 34,
|
||||
"H" to 35,
|
||||
"J" to 36,
|
||||
"K" to 37,
|
||||
"L" to 38,
|
||||
"SEMICOLON" to 39,
|
||||
"APOSTROPHE" to 40,
|
||||
"GRAVE" to 41,
|
||||
"SHIFT_L" to 42,
|
||||
"BACKSLASH" to 43,
|
||||
"Z" to 44,
|
||||
"X" to 45,
|
||||
"C" to 46,
|
||||
"V" to 47,
|
||||
"B" to 48,
|
||||
"N" to 49,
|
||||
"M" to 50,
|
||||
"COMMA" to 51,
|
||||
"PERIOD" to 52,
|
||||
"SLASH" to 53,
|
||||
"SHIFT_R" to 54,
|
||||
"KP_MULTIPLY" to 55,
|
||||
"ALT_L" to 56,
|
||||
"SPACE" to 57,
|
||||
"CAPS_LOCK" to 58,
|
||||
"F1" to 59,
|
||||
"F2" to 60,
|
||||
"F3" to 61,
|
||||
"F4" to 62,
|
||||
"F5" to 63,
|
||||
"F6" to 64,
|
||||
"F7" to 65,
|
||||
"F8" to 66,
|
||||
"F9" to 67,
|
||||
"F10" to 68,
|
||||
"NUM_LOCK" to 69,
|
||||
"SCROLL_LOCK" to 70,
|
||||
"KP_7" to 71,
|
||||
"KP_8" to 72,
|
||||
"KP_9" to 73,
|
||||
"KP_SUBTRACT" to 74,
|
||||
"KP_4" to 75,
|
||||
"KP_5" to 76,
|
||||
"KP_6" to 77,
|
||||
"KP_ADD" to 78,
|
||||
"KP_1" to 79,
|
||||
"KP_2" to 80,
|
||||
"KP_3" to 81,
|
||||
"KP_0" to 82,
|
||||
"KP_DEL" to 83,
|
||||
"F11" to 87,
|
||||
"F12" to 88,
|
||||
"KP_ENTER" to 96,
|
||||
"CTRL_R" to 97,
|
||||
"KP_DIVIDE" to 98,
|
||||
"PRTSCN" to 99,
|
||||
"ALT_R" to 100,
|
||||
"HOME" to 102,
|
||||
"UP" to 103,
|
||||
"PRIOR" to 104,
|
||||
"LEFT" to 105,
|
||||
"RIGHT" to 106,
|
||||
"END" to 107,
|
||||
"DOWN" to 108,
|
||||
"NEXT" to 109,
|
||||
"INSERT" to 110,
|
||||
"DEL" to 111,
|
||||
)
|
||||
@JvmStatic fun code(name: String): Int? = codes[name]
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.content.Context
|
||||
|
||||
/** Global defaults with optional overrides for the currently focused game. */
|
||||
object GesturePrefs {
|
||||
private fun prefs(context: Context) = context.getSharedPreferences("touch_gestures", Context.MODE_PRIVATE)
|
||||
|
||||
fun hasOverride(context: Context, game: String): Boolean = prefs(context).contains("game.$game")
|
||||
|
||||
fun read(context: Context, game: String? = null): TouchGestureConfig {
|
||||
val p = prefs(context)
|
||||
val json = game?.let { p.getString("game.$it", null) } ?: p.getString("default", null)
|
||||
return if (json == null) TouchGestureConfig() else TouchGestureConfig.fromJson(json)
|
||||
}
|
||||
|
||||
fun save(context: Context, game: String?, config: TouchGestureConfig) {
|
||||
prefs(context).edit().putString(game?.let { "game.$it" } ?: "default", config.toJson()).apply()
|
||||
}
|
||||
|
||||
fun clear(context: Context, game: String?) {
|
||||
prefs(context).edit().remove(game?.let { "game.$it" } ?: "default").apply()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,226 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: GPL-3.0
|
||||
* Modified for DroidDeck on 2026-10-15.
|
||||
*/
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import org.json.JSONObject
|
||||
|
||||
data class TouchGestureConfig(
|
||||
val tapEnabled: Boolean = true,
|
||||
val tapAction: String = ACTION_LEFT_CLICK,
|
||||
val dragEnabled: Boolean = true,
|
||||
val dragAction: String = PAN_LEFT_CLICK_DRAG,
|
||||
val longPressEnabled: Boolean = false,
|
||||
val longPressAction: String = ACTION_RIGHT_CLICK,
|
||||
val longPressMouseBehavior: String = MOUSE_BEHAVIOR_HOLD,
|
||||
val longPressDelay: Int = DEFAULT_DELAY_MS,
|
||||
val doubleTapEnabled: Boolean = true,
|
||||
val doubleTapDelay: Int = DEFAULT_DELAY_MS,
|
||||
val twoFingerDragEnabled: Boolean = true,
|
||||
val twoFingerDragAction: String = PAN_ARROW_KEYS,
|
||||
val pinchEnabled: Boolean = true,
|
||||
val pinchAction: String = ZOOM_SCROLL_WHEEL,
|
||||
val twoFingerTapEnabled: Boolean = true,
|
||||
val twoFingerTapAction: String = ACTION_RIGHT_CLICK,
|
||||
val twoFingerHoldEnabled: Boolean = true,
|
||||
val twoFingerHoldAction: String = ACTION_MIDDLE_CLICK,
|
||||
val twoFingerHoldMouseBehavior: String = MOUSE_BEHAVIOR_HOLD,
|
||||
val twoFingerHoldDelay: Int = DEFAULT_DELAY_MS,
|
||||
val threeFingerTapEnabled: Boolean = true,
|
||||
val threeFingerTapAction: String = ACTION_SHOW_KEYBOARD,
|
||||
val threeFingerDragEnabled: Boolean = false,
|
||||
val threeFingerDragAction: String = PAN_ARROW_KEYS,
|
||||
val threeFingerHoldEnabled: Boolean = true,
|
||||
val threeFingerHoldAction: String = ACTION_KEY_ESC,
|
||||
val threeFingerHoldMouseBehavior: String = MOUSE_BEHAVIOR_HOLD,
|
||||
val threeFingerHoldDelay: Int = DEFAULT_DELAY_MS,
|
||||
val showGestureDebugOverlay: Boolean = false,
|
||||
val gestureThreshold: Int = DEFAULT_GESTURE_THRESHOLD,
|
||||
val mouseDragMovementMode: String = MOUSE_DRAG_MOVEMENT_DIRECT,
|
||||
) {
|
||||
|
||||
fun toJson(): String {
|
||||
return JSONObject().apply {
|
||||
put(KEY_TAP_ENABLED, tapEnabled)
|
||||
put(KEY_TAP_ACTION, tapAction)
|
||||
put(KEY_DRAG_ENABLED, dragEnabled)
|
||||
put(KEY_DRAG_ACTION, dragAction)
|
||||
put(KEY_LONG_PRESS_ENABLED, longPressEnabled)
|
||||
put(KEY_LONG_PRESS_ACTION, longPressAction)
|
||||
put(KEY_LONG_PRESS_MOUSE_BEHAVIOR, longPressMouseBehavior)
|
||||
put(KEY_LONG_PRESS_DELAY, longPressDelay)
|
||||
put(KEY_DOUBLE_TAP_ENABLED, doubleTapEnabled)
|
||||
put(KEY_DOUBLE_TAP_DELAY, doubleTapDelay)
|
||||
put(KEY_TWO_FINGER_DRAG_ENABLED, twoFingerDragEnabled)
|
||||
put(KEY_TWO_FINGER_DRAG_ACTION, twoFingerDragAction)
|
||||
put(KEY_PINCH_ENABLED, pinchEnabled)
|
||||
put(KEY_PINCH_ACTION, pinchAction)
|
||||
put(KEY_TWO_FINGER_TAP_ENABLED, twoFingerTapEnabled)
|
||||
put(KEY_TWO_FINGER_TAP_ACTION, twoFingerTapAction)
|
||||
put(KEY_TWO_FINGER_HOLD_ENABLED, twoFingerHoldEnabled)
|
||||
put(KEY_TWO_FINGER_HOLD_ACTION, twoFingerHoldAction)
|
||||
put(KEY_TWO_FINGER_HOLD_MOUSE_BEHAVIOR, twoFingerHoldMouseBehavior)
|
||||
put(KEY_TWO_FINGER_HOLD_DELAY, twoFingerHoldDelay)
|
||||
put(KEY_THREE_FINGER_TAP_ENABLED, threeFingerTapEnabled)
|
||||
put(KEY_THREE_FINGER_TAP_ACTION, threeFingerTapAction)
|
||||
put(KEY_THREE_FINGER_DRAG_ENABLED, threeFingerDragEnabled)
|
||||
put(KEY_THREE_FINGER_DRAG_ACTION, threeFingerDragAction)
|
||||
put(KEY_THREE_FINGER_HOLD_ENABLED, threeFingerHoldEnabled)
|
||||
put(KEY_THREE_FINGER_HOLD_ACTION, threeFingerHoldAction)
|
||||
put(KEY_THREE_FINGER_HOLD_MOUSE_BEHAVIOR, threeFingerHoldMouseBehavior)
|
||||
put(KEY_THREE_FINGER_HOLD_DELAY, threeFingerHoldDelay)
|
||||
put(KEY_SHOW_GESTURE_DEBUG_OVERLAY, showGestureDebugOverlay)
|
||||
put(KEY_GESTURE_THRESHOLD, gestureThreshold)
|
||||
put(KEY_MOUSE_DRAG_MOVEMENT_MODE, mouseDragMovementMode)
|
||||
}.toString()
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val DEFAULT_DELAY_MS = 300
|
||||
const val DEFAULT_GESTURE_THRESHOLD = 40
|
||||
const val ACTION_LEFT_CLICK = "left_click"
|
||||
const val ACTION_RIGHT_CLICK = "right_click"
|
||||
const val ACTION_MIDDLE_CLICK = "middle_click"
|
||||
|
||||
const val MOUSE_BEHAVIOR_HOLD = "hold"
|
||||
const val MOUSE_BEHAVIOR_CLICK = "click"
|
||||
|
||||
const val MOUSE_DRAG_MOVEMENT_DIRECT = "direct"
|
||||
const val MOUSE_DRAG_MOVEMENT_RELATIVE = "relative"
|
||||
const val ACTION_SHOW_KEYBOARD = "show_keyboard"
|
||||
const val ACTION_KEY_ESC = "key_ESC"
|
||||
const val ACTION_KEY_TILDE = "key_TILDE"
|
||||
const val PAN_WASD = "wasd"
|
||||
const val PAN_INVERTED_WASD = "inverted_wasd"
|
||||
const val PAN_ARROW_KEYS = "arrow_keys"
|
||||
const val PAN_INVERTED_ARROW_KEYS = "inverted_arrow_keys"
|
||||
const val PAN_MIDDLE_MOUSE = "middle_mouse_pan"
|
||||
const val PAN_INVERTED_MIDDLE_MOUSE = "inverted_middle_mouse_pan"
|
||||
const val PAN_LEFT_CLICK_DRAG = "left_click_drag"
|
||||
const val PAN_RIGHT_CLICK_DRAG = "right_click_drag"
|
||||
const val ZOOM_SCROLL_WHEEL = "scroll_wheel"
|
||||
const val ZOOM_PLUS_MINUS = "plus_minus"
|
||||
const val ZOOM_PAGE_UP_DOWN = "page_up_down"
|
||||
private const val KEY_TAP_ENABLED = "tapEnabled"
|
||||
private const val KEY_TAP_ACTION = "tapAction"
|
||||
private const val KEY_DRAG_ENABLED = "dragEnabled"
|
||||
private const val KEY_DRAG_ACTION = "dragAction"
|
||||
private const val KEY_LONG_PRESS_ENABLED = "longPressEnabled"
|
||||
private const val KEY_LONG_PRESS_ACTION = "longPressAction"
|
||||
private const val KEY_LONG_PRESS_MOUSE_BEHAVIOR = "longPressMouseBehavior"
|
||||
private const val KEY_LONG_PRESS_DELAY = "longPressDelay"
|
||||
private const val KEY_DOUBLE_TAP_ENABLED = "doubleTapEnabled"
|
||||
private const val KEY_DOUBLE_TAP_DELAY = "doubleTapDelay"
|
||||
private const val KEY_TWO_FINGER_DRAG_ENABLED = "twoFingerDragEnabled"
|
||||
private const val KEY_TWO_FINGER_DRAG_ACTION = "twoFingerDragAction"
|
||||
private const val KEY_PINCH_ENABLED = "pinchEnabled"
|
||||
private const val KEY_PINCH_ACTION = "pinchAction"
|
||||
private const val KEY_TWO_FINGER_TAP_ENABLED = "twoFingerTapEnabled"
|
||||
private const val KEY_TWO_FINGER_TAP_ACTION = "twoFingerTapAction"
|
||||
private const val KEY_TWO_FINGER_HOLD_ENABLED = "twoFingerHoldEnabled"
|
||||
private const val KEY_TWO_FINGER_HOLD_ACTION = "twoFingerHoldAction"
|
||||
private const val KEY_TWO_FINGER_HOLD_MOUSE_BEHAVIOR = "twoFingerHoldMouseBehavior"
|
||||
private const val KEY_TWO_FINGER_HOLD_DELAY = "twoFingerHoldDelay"
|
||||
private const val KEY_THREE_FINGER_TAP_ENABLED = "threeFingerTapEnabled"
|
||||
private const val KEY_THREE_FINGER_TAP_ACTION = "threeFingerTapAction"
|
||||
private const val KEY_THREE_FINGER_DRAG_ENABLED = "threeFingerDragEnabled"
|
||||
private const val KEY_THREE_FINGER_DRAG_ACTION = "threeFingerDragAction"
|
||||
private const val KEY_THREE_FINGER_HOLD_ENABLED = "threeFingerHoldEnabled"
|
||||
private const val KEY_THREE_FINGER_HOLD_ACTION = "threeFingerHoldAction"
|
||||
private const val KEY_THREE_FINGER_HOLD_MOUSE_BEHAVIOR = "threeFingerHoldMouseBehavior"
|
||||
private const val KEY_THREE_FINGER_HOLD_DELAY = "threeFingerHoldDelay"
|
||||
private const val KEY_SHOW_GESTURE_DEBUG_OVERLAY = "showGestureDebugOverlay"
|
||||
private const val KEY_GESTURE_THRESHOLD = "gestureThreshold"
|
||||
private const val KEY_MOUSE_DRAG_MOVEMENT_MODE = "mouseDragMovementMode"
|
||||
|
||||
private fun fallbackDefaults(): TouchGestureConfig = TouchGestureConfig(
|
||||
twoFingerHoldEnabled = false,
|
||||
threeFingerTapEnabled = false,
|
||||
threeFingerHoldEnabled = false,
|
||||
)
|
||||
|
||||
fun fromJson(json: String?): TouchGestureConfig {
|
||||
if (json.isNullOrBlank()) return fallbackDefaults()
|
||||
return try {
|
||||
val obj = JSONObject(json)
|
||||
TouchGestureConfig(
|
||||
tapEnabled = obj.optBoolean(KEY_TAP_ENABLED, true),
|
||||
tapAction = obj.optString(KEY_TAP_ACTION, ACTION_LEFT_CLICK),
|
||||
dragEnabled = obj.optBoolean(KEY_DRAG_ENABLED, true),
|
||||
dragAction = obj.optString(KEY_DRAG_ACTION, PAN_LEFT_CLICK_DRAG),
|
||||
longPressEnabled = obj.optBoolean(KEY_LONG_PRESS_ENABLED, false),
|
||||
longPressAction = obj.optString(KEY_LONG_PRESS_ACTION, ACTION_RIGHT_CLICK),
|
||||
longPressMouseBehavior = normalizeMouseBehavior(
|
||||
obj.optString(KEY_LONG_PRESS_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD)
|
||||
),
|
||||
longPressDelay = obj.optInt(KEY_LONG_PRESS_DELAY, DEFAULT_DELAY_MS),
|
||||
doubleTapEnabled = obj.optBoolean(KEY_DOUBLE_TAP_ENABLED, true),
|
||||
doubleTapDelay = obj.optInt(KEY_DOUBLE_TAP_DELAY, DEFAULT_DELAY_MS),
|
||||
twoFingerDragEnabled = obj.optBoolean(KEY_TWO_FINGER_DRAG_ENABLED, true),
|
||||
twoFingerDragAction = obj.optString(KEY_TWO_FINGER_DRAG_ACTION, PAN_ARROW_KEYS),
|
||||
pinchEnabled = obj.optBoolean(KEY_PINCH_ENABLED, true),
|
||||
pinchAction = obj.optString(KEY_PINCH_ACTION, ZOOM_SCROLL_WHEEL),
|
||||
twoFingerTapEnabled = obj.optBoolean(KEY_TWO_FINGER_TAP_ENABLED, true),
|
||||
twoFingerTapAction = obj.optString(KEY_TWO_FINGER_TAP_ACTION, ACTION_RIGHT_CLICK),
|
||||
twoFingerHoldEnabled = obj.optBoolean(KEY_TWO_FINGER_HOLD_ENABLED, false),
|
||||
twoFingerHoldAction = obj.optString(KEY_TWO_FINGER_HOLD_ACTION, ACTION_MIDDLE_CLICK),
|
||||
twoFingerHoldMouseBehavior = normalizeMouseBehavior(
|
||||
obj.optString(KEY_TWO_FINGER_HOLD_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD)
|
||||
),
|
||||
twoFingerHoldDelay = obj.optInt(KEY_TWO_FINGER_HOLD_DELAY, DEFAULT_DELAY_MS),
|
||||
threeFingerTapEnabled = obj.optBoolean(KEY_THREE_FINGER_TAP_ENABLED, false),
|
||||
threeFingerTapAction = obj.optString(KEY_THREE_FINGER_TAP_ACTION, ACTION_SHOW_KEYBOARD),
|
||||
threeFingerDragEnabled = obj.optBoolean(KEY_THREE_FINGER_DRAG_ENABLED, false),
|
||||
threeFingerDragAction = obj.optString(KEY_THREE_FINGER_DRAG_ACTION, PAN_ARROW_KEYS),
|
||||
threeFingerHoldEnabled = obj.optBoolean(KEY_THREE_FINGER_HOLD_ENABLED, false),
|
||||
threeFingerHoldAction = obj.optString(KEY_THREE_FINGER_HOLD_ACTION, ACTION_KEY_ESC),
|
||||
threeFingerHoldMouseBehavior = normalizeMouseBehavior(
|
||||
obj.optString(KEY_THREE_FINGER_HOLD_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD)
|
||||
),
|
||||
threeFingerHoldDelay = obj.optInt(KEY_THREE_FINGER_HOLD_DELAY, DEFAULT_DELAY_MS),
|
||||
showGestureDebugOverlay = obj.optBoolean(KEY_SHOW_GESTURE_DEBUG_OVERLAY, false),
|
||||
gestureThreshold = obj.optInt(KEY_GESTURE_THRESHOLD, DEFAULT_GESTURE_THRESHOLD),
|
||||
mouseDragMovementMode = normalizeMouseDragMovementMode(
|
||||
obj.optString(KEY_MOUSE_DRAG_MOVEMENT_MODE, MOUSE_DRAG_MOVEMENT_DIRECT),
|
||||
),
|
||||
)
|
||||
} catch (_: Exception) {
|
||||
fallbackDefaults()
|
||||
}
|
||||
}
|
||||
|
||||
private fun normalizeMouseBehavior(value: String): String {
|
||||
return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD
|
||||
}
|
||||
|
||||
private fun normalizeMouseDragMovementMode(mode: String?): String {
|
||||
return if (mode == MOUSE_DRAG_MOVEMENT_RELATIVE) {
|
||||
MOUSE_DRAG_MOVEMENT_RELATIVE
|
||||
} else {
|
||||
MOUSE_DRAG_MOVEMENT_DIRECT
|
||||
}
|
||||
}
|
||||
|
||||
val PAN_ACTIONS = listOf(
|
||||
PAN_ARROW_KEYS,
|
||||
PAN_INVERTED_ARROW_KEYS,
|
||||
PAN_WASD,
|
||||
PAN_INVERTED_WASD,
|
||||
PAN_MIDDLE_MOUSE,
|
||||
PAN_INVERTED_MIDDLE_MOUSE,
|
||||
PAN_LEFT_CLICK_DRAG,
|
||||
PAN_RIGHT_CLICK_DRAG,
|
||||
)
|
||||
|
||||
val ZOOM_ACTIONS = listOf(
|
||||
ZOOM_SCROLL_WHEEL,
|
||||
ZOOM_PLUS_MINUS,
|
||||
ZOOM_PAGE_UP_DOWN,
|
||||
)
|
||||
|
||||
@JvmStatic
|
||||
fun isMouseButtonAction(action: String?): Boolean =
|
||||
action == ACTION_LEFT_CLICK || action == ACTION_RIGHT_CLICK || action == ACTION_MIDDLE_CLICK
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user