Merge lp:~gerardo-santana/gnome-settings-daemon/gnome-settings-daemon into lp:gnome-settings-daemon

[Gerardo Santana]

Enablas natural scrolling by changing buttons mapping

[Gerardo Santana (gerardo-santana)]

This is related to a merge proposal for gnome-control-center:

https://code.launchpad.net/~gerardo-santana/gnome-control-center/gnome-control-center/+merge/109335

[Sebastien Bacher (seb128)]

Thank you for taking the time to report this bug and helping to make Ubuntu better. The issue you are reporting is an upstream one and it would be nice if somebody having it could send the bug to the developers of the software by following the instructions at https://wiki.ubuntu.com/Bugs/Upstream/GNOME. If you have done so, please tell us the number of the upstream bug (or the link), so we can add a bugwatch that will inform us about its status. Thanks in advance.

Unmerged revisions

3021. By Gerardo Santana on 2012-06-09

Enables natural scrolling

=== modified file 'plugins/mouse/gsd-mouse-manager.c'
--- plugins/mouse/gsd-mouse-manager.c	2012-05-25 17:47:26 +0000
+++ plugins/mouse/gsd-mouse-manager.c	2012-06-09 05:12:19 +0000
@@ -65,6 +65,7 @@
 /* Touchpad settings */
 #define KEY_TOUCHPAD_DISABLE_W_TYPING    "disable-while-typing"
 #define KEY_PAD_HORIZ_SCROLL             "horiz-scroll-enabled"
+#define KEY_PAD_NATURAL_SCROLL           "natural-scroll-enabled"
 #define KEY_SCROLL_METHOD                "scroll-method"
 #define KEY_TAP_TO_CLICK                 "tap-to-click"
 #define KEY_TOUCHPAD_ENABLED             "touchpad-enabled"
@@ -723,6 +724,49 @@
 }
 
 static void
+set_natural_scroll (GdkDevice *device,
+                  gboolean   state)
+{
+        XDevice *xdevice;
+        unsigned char *map;
+
+        xdevice = open_gdk_device (device);
+        if (xdevice == NULL)
+                return;
+
+        if (!device_is_touchpad (xdevice)) {
+                XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+                return;
+        }
+
+	g_debug ("setting natural scroll on %s", gdk_device_get_name (device));
+
+        gdk_error_trap_push ();
+
+        map = (unsigned char *) malloc(sizeof(unsigned char) * 7);
+        XGetDeviceButtonMapping(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, map, 7);
+
+        if (state) {
+                map[3] = 5;
+                map[4] = 4;
+                map[5] = 7;
+                map[6] = 6;
+        }
+        else {
+                map[3] = 4;
+                map[4] = 5;
+                map[5] = 6;
+                map[6] = 7;
+        }
+        XSetDeviceButtonMapping(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, map, 7);
+
+        if (gdk_error_trap_pop ())
+                g_warning ("Error in setting natural scroll on \"%s\"", gdk_device_get_name (device));
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice);
+}
+
+static void
 set_edge_scroll (GdkDevice               *device,
                  GsdTouchpadScrollMethod  method)
 {
@@ -949,6 +993,7 @@
         set_tap_to_click (device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TAP_TO_CLICK), touchpad_left_handed);
         set_edge_scroll (device, g_settings_get_enum (manager->priv->touchpad_settings, KEY_SCROLL_METHOD));
         set_horiz_scroll (device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_PAD_HORIZ_SCROLL));
+        set_natural_scroll (device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_PAD_NATURAL_SCROLL));
         if (g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_ENABLED) == FALSE)
                 set_touchpad_disabled (device);
 }
@@ -1019,8 +1064,11 @@
                 } else if (g_str_equal (key, KEY_SCROLL_METHOD)) {
                         set_edge_scroll (device, g_settings_get_enum (settings, key));
                         set_horiz_scroll (device, g_settings_get_boolean (settings, KEY_PAD_HORIZ_SCROLL));
+                        set_natural_scroll (device, g_settings_get_boolean (settings, KEY_PAD_NATURAL_SCROLL));
                 } else if (g_str_equal (key, KEY_PAD_HORIZ_SCROLL)) {
                         set_horiz_scroll (device, g_settings_get_boolean (settings, key));
+                } else if (g_str_equal (key, KEY_PAD_NATURAL_SCROLL)) {
+                        set_natural_scroll (device, g_settings_get_boolean (settings, key));
                 } else if (g_str_equal (key, KEY_TOUCHPAD_ENABLED)) {
                         if (g_settings_get_boolean (settings, key) == FALSE)
                                 set_touchpad_disabled (device);