[gnome-settings-daemon] mouse: Move "has touchpad" function to common/

[Bastien Nocera <hadess src gnome org>]

commit f6dcba4e954f3e910854f3c92fb69b157683267d
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Oct 27 12:49:42 2010 +0100

    mouse: Move "has touchpad" function to common/
    
    So it can be reused. This also fixes a memory leak in the function.
    We were leaking the device list.

 plugins/common/Makefile.am        |    8 ++-
 plugins/common/gsd-input-helper.c |  109 +++++++++++++++++++++++++++++++++++++
 plugins/common/gsd-input-helper.h |   35 ++++++++++++
 plugins/mouse/Makefile.am         |    8 ++-
 plugins/mouse/gsd-mouse-manager.c |   58 +-------------------
 5 files changed, 156 insertions(+), 62 deletions(-)
---
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 447d02d..e2367cb 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -6,6 +6,8 @@ libcommon_la_SOURCES = \
 	eggaccelerators.h	\
 	gsd-keygrab.c		\
 	gsd-keygrab.h		\
+	gsd-input-helper.c	\
+	gsd-input-helper.h	\
 	gsd-osd-window.c	\
 	gsd-osd-window.h
 
@@ -14,10 +16,12 @@ libcommon_la_CPPFLAGS = \
 
 libcommon_la_CFLAGS = \
 	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(XINPUT_CFLAGS)		\
 	$(AM_CFLAGS)
 
 libcommon_la_LDFLAGS = \
-	$(GSD_PLUGIN_LDFLAGS) $(X11_LIBS)
+	$(GSD_PLUGIN_LDFLAGS) $(XINPUT_LIBS) $(X11_LIBS)
 
 libcommon_la_LIBADD  = \
-	$(SETTINGS_PLUGIN_LIBS)
+	$(SETTINGS_PLUGIN_LIBS)		\
+	$(XINPUT_LIBS)
diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
new file mode 100644
index 0000000..ee56431
--- /dev/null
+++ b/plugins/common/gsd-input-helper.c
@@ -0,0 +1,109 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#include <sys/types.h>
+#include <X11/Xatom.h>
+
+#include "gsd-input-helper.h"
+
+static gboolean
+supports_xinput_devices (void)
+{
+        gint op_code, event, error;
+
+        return XQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                "XInputExtension",
+                                &op_code,
+                                &event,
+                                &error);
+}
+
+XDevice*
+device_is_touchpad (XDeviceInfo deviceinfo)
+{
+        XDevice *device;
+        Atom realtype, prop;
+        int realformat;
+        unsigned long nitems, bytes_after;
+        unsigned char *data;
+
+        if (deviceinfo.type != XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_TOUCHPAD, False))
+                return NULL;
+
+        prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Off", False);
+        if (!prop)
+                return NULL;
+
+        gdk_error_trap_push ();
+        device = XOpenDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), deviceinfo.id);
+        if (gdk_error_trap_pop () || (device == NULL))
+                return NULL;
+
+        gdk_error_trap_push ();
+        if ((XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, 0, 1, False,
+                                XA_INTEGER, &realtype, &realformat, &nitems,
+                                &bytes_after, &data) == Success) && (realtype != None)) {
+                gdk_error_trap_pop ();
+                XFree (data);
+                return device;
+        }
+        gdk_error_trap_pop ();
+
+        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
+        return NULL;
+}
+
+gboolean
+touchpad_is_present (void)
+{
+        XDeviceInfo *device_info;
+        gint n_devices;
+        guint i;
+        gboolean retval;
+
+        if (supports_xinput_devices () == FALSE)
+                return TRUE;
+
+        retval = FALSE;
+
+        device_info = XListInputDevices (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &n_devices);
+        if (device_info == NULL)
+                return FALSE;
+
+        for (i = 0; i < n_devices; i++) {
+                XDevice *device;
+
+                device = device_is_touchpad (device_info[i]);
+                if (device != NULL) {
+                        retval = TRUE;
+                        break;
+                }
+        }
+        if (device_info != NULL)
+                XFreeDeviceList (device_info);
+
+        return retval;
+}
+
diff --git a/plugins/common/gsd-input-helper.h b/plugins/common/gsd-input-helper.h
new file mode 100644
index 0000000..90c7310
--- /dev/null
+++ b/plugins/common/gsd-input-helper.h
@@ -0,0 +1,35 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GSD_INPUT_HELPER_H
+#define __GSD_INPUT_HELPER_H
+
+G_BEGIN_DECLS
+
+#include <glib.h>
+
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XIproto.h>
+
+XDevice * device_is_touchpad  (XDeviceInfo deviceinfo);
+gboolean  touchpad_is_present (void);
+
+G_END_DECLS
+
+#endif /* __GSD_INPUT_HELPER_H */
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 832d00e..3c62254 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -8,6 +8,7 @@ libmouse_la_SOURCES = 		\
 
 libmouse_la_CPPFLAGS = \
 	-I$(top_srcdir)/gnome-settings-daemon		\
+	-I$(top_srcdir)/plugins/common/			\
 	-I$(top_srcdir)/data/				\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	-DLIBEXECDIR=\""$(libexecdir)"\" \
@@ -20,9 +21,10 @@ libmouse_la_CFLAGS = \
 libmouse_la_LDFLAGS = 		\
 	$(GSD_PLUGIN_LDFLAGS)
 
-libmouse_la_LIBADD  = 		\
-	$(SETTINGS_PLUGIN_LIBS)	\
-	$(X11_LIBS)		\
+libmouse_la_LIBADD  =							\
+	$(top_builddir)/plugins/common/libcommon.la			\
+	$(SETTINGS_PLUGIN_LIBS)						\
+	$(X11_LIBS)							\
 	$(XINPUT_LIBS)
 
 plugin_in_files = mouse.gnome-settings-plugin.in
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 79b1c80..c62d2cd 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -46,6 +46,7 @@
 
 #include "gnome-settings-profile.h"
 #include "gsd-mouse-manager.h"
+#include "gsd-input-helper.h"
 #include "gsd-enums.h"
 
 #define GSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerPrivate))
@@ -90,7 +91,6 @@ static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manag
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
 static int      set_tap_to_click              (gboolean state, gboolean left_handed);
-static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
 
@@ -488,62 +488,6 @@ set_motion_threshold (GsdMouseManager *manager,
                                0, 0, motion_threshold);
 }
 
-static XDevice*
-device_is_touchpad (XDeviceInfo deviceinfo)
-{
-        XDevice *device;
-        Atom realtype, prop;
-        int realformat;
-        unsigned long nitems, bytes_after;
-        unsigned char *data;
-
-        if (deviceinfo.type != XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_TOUCHPAD, False))
-                return NULL;
-
-        prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Off", False);
-        if (!prop)
-                return NULL;
-
-        gdk_error_trap_push ();
-        device = XOpenDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), deviceinfo.id);
-        if (gdk_error_trap_pop () || (device == NULL))
-                return NULL;
-
-        gdk_error_trap_push ();
-        if ((XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, 0, 1, False,
-                                XA_INTEGER, &realtype, &realformat, &nitems,
-                                &bytes_after, &data) == Success) && (realtype != None)) {
-                gdk_error_trap_pop ();
-                XFree (data);
-                return device;
-        }
-        gdk_error_trap_pop ();
-
-        XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
-        return NULL;
-}
-
-static gboolean
-touchpad_is_present (void)
-{
-        gboolean touchpad_present = FALSE;
-        int numdevices, i;
-        XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &numdevices);
-        XDevice *device;
-
-        if (devicelist == NULL)
-                return 0;
-
-        for (i = 0; i < numdevices; i++) {
-                if ((device = device_is_touchpad (devicelist[i]))) {
-                        touchpad_present = TRUE;
-                        break;
-                }
-        }
-
-        return touchpad_present;
-}
-
 static int
 set_disable_w_typing (GsdMouseManager *manager, gboolean state)
 {