summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Lefebvre <[email protected]>2015-09-03 13:42:48 +0100
committerClement Lefebvre <[email protected]>2015-09-03 13:42:48 +0100
commitf113d3892ea59540b5145b0346111e815a5eeb3e (patch)
tree0494f8bc1a04f0a0cda7823d38b6734e3b3be4e5
parent7a7d30815eab10d6a81d38bdbcc6088470984a67 (diff)
downloadmate-settings-daemon-f113d3892ea59540b5145b0346111e815a5eeb3e.tar.bz2
mate-settings-daemon-f113d3892ea59540b5145b0346111e815a5eeb3e.tar.xz
Touchpad support: Added support for two and three finger clicks
Diffstat
-rw-r--r--data/org.mate.peripherals-touchpad.gschema.xml.in.in10
-rw-r--r--plugins/mouse/msd-mouse-manager.c66
2 files changed, 70 insertions, 6 deletions
diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in.in b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
index e79cf5d..a97e576 100644
--- a/data/org.mate.peripherals-touchpad.gschema.xml.in.in
+++ b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
@@ -25,6 +25,16 @@
<_summary>Enable touchpad</_summary>
<_description>Set this to TRUE to enable all touchpads.</_description>
</key>
+ <key name="two-finger-click" type="i">
+ <default>3</default>
+ <_summary>Enabled two-finger button-click emulation</_summary>
+ <_description>0 thru 3, 0 is inactive, 1-3 is button for two-finger click to emulate</_description>
+ </key>
+ <key name="three-finger-click" type="i">
+ <default>2</default>
+ <_summary>Enable three-finger button-click emulation</_summary>
+ <_description>0 thru 3, 0 is inactive, 1-3 is button for two-finger click to emulate</_description>
+ </key>
<key name="tap-button-one-finger" type="i">
<default>1</default>
<_summary>One finger tap button</_summary>
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index ca60db0..7c95978 100644
--- a/plugins/mouse/msd-mouse-manager.c
+++ b/plugins/mouse/msd-mouse-manager.c
@@ -62,6 +62,10 @@
#define MATE_TOUCHPAD_SCHEMA "org.mate.peripherals-touchpad"
#define KEY_TOUCHPAD_DISABLE_W_TYPING "disable-while-typing"
#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
+
+#define KEY_TWO_FINGER_CLICK "two-finger-click"
+#define KEY_THREE_FINGER_CLICK "three-finger-click"
+
#define KEY_TOUCHPAD_TAP_TO_CLICK "tap-to-click"
#define KEY_TOUCHPAD_ONE_FINGER_TAP "tap-button-one-finger"
#define KEY_TOUCHPAD_TWO_FINGER_TAP "tap-button-two-finger"
@@ -96,6 +100,7 @@ static void msd_mouse_manager_finalize (GObject *object);
static void set_mouse_settings (MsdMouseManager *manager);
#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
static int set_tap_to_click (gboolean state, gboolean left_handed);
+static void set_click_actions (gboolean enable_two_finger_click, gboolean enable_three_finger_click);
#endif
G_DEFINE_TYPE (MsdMouseManager, msd_mouse_manager, G_TYPE_OBJECT)
@@ -646,12 +651,12 @@ set_tap_to_click (gboolean state, gboolean left_handed)
gint two_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_TWO_FINGER_TAP);
gint three_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_THREE_FINGER_TAP);
if (one_finger_tap > 3 || one_finger_tap < 1)
- one_finger_tap = 1;
- if (two_finger_tap > 3 || two_finger_tap < 1)
- two_finger_tap = 2;
- if (three_finger_tap > 3 || three_finger_tap < 1)
- three_finger_tap = 3;
- g_object_unref (settings);
+ one_finger_tap = 1;
+ if (two_finger_tap > 3 || two_finger_tap < 1)
+ two_finger_tap = 2;
+ if (three_finger_tap > 3 || three_finger_tap < 1)
+ three_finger_tap = 3;
+ g_object_unref (settings);
if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7)
{
@@ -677,6 +682,51 @@ set_tap_to_click (gboolean state, gboolean left_handed)
return 0;
}
+ static void
+set_click_actions (gint enable_two_finger_click,
+ gint enable_three_finger_click)
+{
+ int numdevices, i, format, rc;
+ unsigned long nitems, bytes_after;
+ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &numdevices);
+ XDevice * device;
+ unsigned char* data;
+ Atom prop, type;
+
+ if (devicelist == NULL)
+ return 0;
+
+ prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Click Action", False);
+ if (!prop)
+ return;
+
+ for (i = 0; i < numdevices; i++) {
+ if ((device = device_is_touchpad (devicelist[i]))) {
+ g_debug ("setting click action to click on %s", devicelist[i].name);
+ gdk_error_trap_push ();
+ rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, 0, 2,
+ False, XA_INTEGER, &type, &format, &nitems,
+ &bytes_after, &data);
+
+ if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 3) {
+ data[0] = 1;
+ data[1] = enable_two_finger_click;
+ data[2] = enable_three_finger_click;
+ XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, XA_INTEGER, 8, PropModeReplace, data, nitems);
+ }
+
+ if (rc == Success)
+ XFree (data);
+ XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
+ if (gdk_error_trap_pop ()) {
+ g_warning ("Error in setting click actions on \"%s\"", devicelist[i].name);
+ continue;
+ }
+ }
+ }
+ XFreeDeviceList (devicelist);
+}
+
static int
set_horiz_scroll (gboolean state)
{
@@ -954,6 +1004,7 @@ set_mouse_settings (MsdMouseManager *manager)
set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->settings_touchpad, KEY_TOUCHPAD_DISABLE_W_TYPING));
#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
set_tap_to_click (g_settings_get_boolean (manager->priv->settings_touchpad, KEY_TOUCHPAD_TAP_TO_CLICK), left_handed);
+ set_click_actions (g_settings_get_int (manager->priv->settings_touchpad, KEY_TWO_FINGER_CLICK), g_settings_get_int (manager->priv->settings_touchpad, KEY_THREE_FINGER_CLICK));
set_edge_scroll (g_settings_get_int (manager->priv->settings_touchpad, KEY_TOUCHPAD_SCROLL_METHOD));
set_horiz_scroll (g_settings_get_boolean (manager->priv->settings_touchpad, KEY_TOUCHPAD_PAD_HORIZ_SCROLL));
set_touchpad_enabled (g_settings_get_boolean (manager->priv->settings_touchpad, KEY_TOUCHPAD_ENABLED));
@@ -979,6 +1030,9 @@ mouse_callback (GSettings *settings,
} else if (g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0) {
set_tap_to_click (g_settings_get_boolean (settings, key),
g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
+ } else if (g_str_equal (key, KEY_TWO_FINGER_CLICK) || g_str_equal (key, KEY_THREE_FINGER_CLICK)) {
+ set_click_actions(g_settings_get_int (settings, KEY_TWO_FINGER_CLICK),
+ g_settings_get_int (settings, KEY_THREE_FINGER_CLICK));
} else if (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0) {
set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-01 04:15:37 +0000