From 29ca097054e3e03654d960702f01df2c244fb9d0 Mon Sep 17 00:00:00 2001
From: Piyush Aggarwal <piyushaggarwal002@gmail.com>
Date: Fri, 16 Jul 2021 05:55:31 +0530
Subject: [PATCH] mousepadplugin: allow selecting which click to send for left
 click

---
 res/values/strings.xml                         |  3 +++
 res/xml/mousepadplugin_preferences.xml         |  9 +++++++++
 .../MousePadPlugin/MousePadActivity.java       | 18 ++++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad85e7e1..b4f4f7eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -59,10 +59,12 @@
     <string name="remotekeyboard_multiple_connections" translatable="true">There is more than one remote keyboard connection, select the device to configure</string>
     <string name="open_mousepad">Remote input</string>
     <string name="mousepad_info">Move a finger on the screen to move the mouse cursor. Tap for a click, and use two/three fingers for right and middle buttons. Use 2 fingers to scroll. Use a long press to drag\'n drop.</string>
+    <string name="mousepad_single_tap_settings_title">Set one finger tap action</string>
     <string name="mousepad_double_tap_settings_title">Set two finger tap action</string>
     <string name="mousepad_triple_tap_settings_title">Set three finger tap action</string>
     <string name="mousepad_sensitivity_settings_title">Set touchpad sensitivity</string>
     <string name="mousepad_acceleration_profile_settings_title">Set pointer acceleration</string>
+    <string name="mousepad_single_tap_key" translatable="false">mousepad_single_tap_key</string>
     <string name="mousepad_double_tap_key" translatable="false">mousepad_double_tap_key</string>
     <string name="mousepad_triple_tap_key" translatable="false">mousepad_triple_tap_key</string>
     <string name="mousepad_sensitivity_key" translatable="false">mousepad_sensitivity_key</string>
@@ -75,6 +77,7 @@
         <item>Middle click</item>
         <item>Nothing</item>
     </string-array>
+    <string name="mousepad_default_single" translatable="false">left</string>
     <string name="mousepad_default_double" translatable="false">right</string>
     <string name="mousepad_default_triple" translatable="false">middle</string>
     <string name="mousepad_default_sensitivity" translatable="false">default</string>
diff --git a/res/xml/mousepadplugin_preferences.xml b/res/xml/mousepadplugin_preferences.xml
index b5a61478..f931d9df 100644
--- a/res/xml/mousepadplugin_preferences.xml
+++ b/res/xml/mousepadplugin_preferences.xml
@@ -5,6 +5,15 @@
     android:layout_height="match_parent"
     tools:keep="@xml/mousepadplugin_preferences">
 
+    <ListPreference
+        android:id="@+id/mousepad_single_tap_preference"
+        android:defaultValue="@string/mousepad_default_single"
+        android:entries="@array/mousepad_tap_entries"
+        android:entryValues="@array/mousepad_tap_values"
+        android:key="@string/mousepad_single_tap_key"
+        android:summary="%s"
+        android:title="@string/mousepad_single_tap_settings_title" />
+
     <ListPreference
         android:id="@+id/mousepad_double_tap_preference"
         android:defaultValue="@string/mousepad_default_double"
diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
index 0035deaa..504389a6 100644
--- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
@@ -71,7 +71,7 @@ public class MousePadActivity extends AppCompatActivity implements GestureDetect
         }
     }
 
-    private ClickType doubleTapAction, tripleTapAction;
+    private ClickType singleTapAction, doubleTapAction, tripleTapAction;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -101,6 +101,8 @@ public class MousePadActivity extends AppCompatActivity implements GestureDetect
         } else {
             scrollDirection = 1;
         }
+        String singleTapSetting = prefs.getString(getString(R.string.mousepad_single_tap_key),
+                getString(R.string.mousepad_default_single));
         String doubleTapSetting = prefs.getString(getString(R.string.mousepad_double_tap_key),
                 getString(R.string.mousepad_default_double));
         String tripleTapSetting = prefs.getString(getString(R.string.mousepad_triple_tap_key),
@@ -113,6 +115,7 @@ public class MousePadActivity extends AppCompatActivity implements GestureDetect
 
         mPointerAccelerationProfile = PointerAccelerationProfileFactory.getProfileWithName(accelerationProfileName);
 
+        singleTapAction = ClickType.fromString(singleTapSetting);
         doubleTapAction = ClickType.fromString(doubleTapSetting);
         tripleTapAction = ClickType.fromString(tripleTapSetting);
 
@@ -304,7 +307,18 @@ public class MousePadActivity extends AppCompatActivity implements GestureDetect
 
     @Override
     public boolean onSingleTapConfirmed(MotionEvent e) {
-        BackgroundService.RunWithPlugin(this, deviceId, MousePadPlugin.class, MousePadPlugin::sendLeftClick);
+        switch (singleTapAction) {
+            case LEFT:
+                sendLeftClick();
+                break;
+            case RIGHT:
+                sendRightClick();
+                break;
+            case MIDDLE:
+                sendMiddleClick();
+                break;
+            default:
+        }
         return true;
     }