diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt
index 609521f..acd301f 100644
--- a/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt
+++ b/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt
@@ -73,6 +73,8 @@ class Dispatcher(private val activity: VncActivity) {
private val swipe2Action = selectSwipeAction(gesturePref.swipe2)
private val dragAction = selectSwipeAction(gesturePref.drag)
+ private val mouseBackAction = selectPointAction(viewModel.pref.input.mouseBack)
+
private fun selectPointAction(actionName: String): (PointF) -> Unit {
return when (actionName) {
"left-click" -> { p -> defaultMode.doClick(PointerButton.Left, p) }
@@ -130,6 +132,7 @@ class Dispatcher(private val activity: VncActivity) {
fun onMouseButtonUp(button: PointerButton, p: PointF) = directMode.doButtonUp(button, p)
fun onMouseMove(p: PointF) = directMode.doMovePointer(p, 0f, 0f)
fun onMouseScroll(p: PointF, hs: Float, vs: Float) = directMode.doRemoteScrollFromMouse(p, hs, vs)
+ fun onMouseBack(p: PointF) = mouseBackAction(p)
fun onStylusTap(p: PointF) = directMode.doClick(PointerButton.Left, p)
fun onStylusDoubleTap(p: PointF) = directMode.doDoubleClick(PointerButton.Left, p)
diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt
index 6a252be..cad3fe7 100644
--- a/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt
+++ b/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt
@@ -44,8 +44,7 @@ class TouchHandler(private val viewModel: VncViewModel, private val dispatcher:
fun onHoverEvent(event: MotionEvent): Boolean {
if (event.actionMasked == MotionEvent.ACTION_HOVER_MOVE) {
- lastHoverPoint = event.point()
- dispatcher.onMouseMove(lastHoverPoint)
+ dispatcher.onMouseMove(event.point())
return true
}
return false
@@ -59,24 +58,9 @@ class TouchHandler(private val viewModel: VncViewModel, private val dispatcher:
}
}
- //Temporary workaround for emulating mouse right-click until
- //pointer-position is implemented in VncClient
- private var lastHoverPoint = PointF()
- private var mouseBack = viewModel.pref.input.mouseBack
- fun fakeMouseClick(isDown: Boolean): Boolean {
- if (mouseBack == "default")
- return false
-
- var buttonToMap = PointerButton.Right;
- when (mouseBack) {
- "right" -> buttonToMap = PointerButton.Right
- "middle" -> buttonToMap = PointerButton.Middle
- }
-
- if (isDown) dispatcher.onMouseButtonDown(buttonToMap, lastHoverPoint)
- else dispatcher.onMouseButtonUp(buttonToMap, lastHoverPoint)
-
- return true
+ fun onMouseBack() {
+ val p = PointF(viewModel.client.pointerX.toFloat(), viewModel.client.pointerY.toFloat())
+ dispatcher.onMouseBack(p)
}
/****************************************************************************************
diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt
index 719a110..9d83377 100644
--- a/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt
+++ b/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt
@@ -322,12 +322,12 @@ class VncActivity : AppCompatActivity() {
//giving apps a chance to handle it. For better or worse, they set the 'source'
//for such key events to Mouse, enabling the following workarounds.
if (keyEvent.keyCode == KeyEvent.KEYCODE_BACK &&
- InputDevice.getDevice(keyEvent.deviceId).supportsSource(InputDevice.SOURCE_MOUSE)) {
-
- val isDown = keyEvent.action == KeyEvent.ACTION_DOWN
- return touchHandler.fakeMouseClick(isDown)
+ InputDevice.getDevice(keyEvent.deviceId).supportsSource(InputDevice.SOURCE_MOUSE) &&
+ viewModel.pref.input.interceptMouseBack) {
+ if (keyEvent.action == KeyEvent.ACTION_DOWN)
+ touchHandler.onMouseBack()
+ return true
}
-
return false
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gaurav/avnc/util/AppPreferences.kt b/app/src/main/java/com/gaurav/avnc/util/AppPreferences.kt
index b9c0abc..64d1b86 100644
--- a/app/src/main/java/com/gaurav/avnc/util/AppPreferences.kt
+++ b/app/src/main/java/com/gaurav/avnc/util/AppPreferences.kt
@@ -56,7 +56,8 @@ class AppPreferences(context: Context) {
val mousePassthrough; get() = prefs.getBoolean("mouse_passthrough", true)
val hideLocalCursor; get() = prefs.getBoolean("hide_local_cursor", false)
val hideRemoteCursor; get() = prefs.getBoolean("hide_remote_cursor", false)
- val mouseBack; get() = prefs.getString("mouse_back", "right")!!
+ val mouseBack; get() = prefs.getString("mouse_back", "right-click")!!
+ val interceptMouseBack; get() = mouseBack != "default"
val kmLanguageSwitchToSuper; get() = prefs.getBoolean("km_language_switch_to_super", false)
val kmRightAltToSuper; get() = prefs.getBoolean("km_right_alt_to_super", false)
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 178392f..5bb5187 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -103,12 +103,12 @@
- @string/pref_mouse_back_action_default
- - @string/pref_mouse_back_action_right
- - @string/pref_mouse_back_action_middle
+ - @string/pref_gesture_action_middle_click
+ - @string/pref_gesture_action_right_click
- default
- - right
- - middle
+ - middle-click
+ - right-click
\ No newline at end of file