diff options
author | monsta <[email protected]> | 2017-01-03 21:20:15 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2017-01-20 11:31:59 +0300 |
commit | 678aa95188f518c05169084d04aa31e49035ee6b (patch) | |
tree | cb06949817bfe7385c1fb561529e550b964218b7 | |
parent | e8d39ba75e525b6945567c5a187076d70f83b2c8 (diff) | |
download | mate-control-center-678aa95188f518c05169084d04aa31e49035ee6b.tar.bz2 mate-control-center-678aa95188f518c05169084d04aa31e49035ee6b.tar.xz |
mouse: add input helper from m-s-d
same as done upstream:
https://git.gnome.org/browse/gnome-control-center/commit/?id=741723eaf86d9e68ae979b960eb2da3cf4b331d1
-rw-r--r-- | capplets/mouse/Makefile.am | 4 | ||||
-rw-r--r-- | capplets/mouse/msd-input-helper.c | 121 | ||||
-rw-r--r-- | capplets/mouse/msd-input-helper.h | 36 |
3 files changed, 160 insertions, 1 deletions
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 72d10297..1e413215 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -5,7 +5,9 @@ bin_PROGRAMS = mate-mouse-properties mate_mouse_properties_LDADD = $(MATECC_CAPPLETS_LIBS) mate_mouse_properties_SOURCES = \ - mate-mouse-properties.c + mate-mouse-properties.c \ + msd-input-helper.c \ + msd-input-helper.h @INTLTOOL_DESKTOP_RULE@ diff --git a/capplets/mouse/msd-input-helper.c b/capplets/mouse/msd-input-helper.c new file mode 100644 index 00000000..ae64b0d2 --- /dev/null +++ b/capplets/mouse/msd-input-helper.c @@ -0,0 +1,121 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2010 Bastien Nocera <[email protected]> + * + * 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 "msd-input-helper.h" + +gboolean +supports_xinput_devices (void) +{ + gint op_code, event, error; + + return XQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), + "XInputExtension", + &op_code, + &event, + &error); +} + +static gboolean +device_has_property (XDevice *device, + const char *property_name) +{ + Atom realtype, prop; + int realformat; + unsigned long nitems, bytes_after; + unsigned char *data; + + prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), property_name, True); + if (!prop) + return FALSE; + + 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_ignored (); + XFree (data); + return TRUE; + } + + gdk_error_trap_pop_ignored (); + return FALSE; +} + +XDevice* +device_is_touchpad (XDeviceInfo *deviceinfo) +{ + XDevice *device; + + if (deviceinfo->type != XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XI_TOUCHPAD, True)) + 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; + + if (device_has_property (device, "libinput Tapping Enabled") || + device_has_property (device, "Synaptics Off")) { + return device; + } + + 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/capplets/mouse/msd-input-helper.h b/capplets/mouse/msd-input-helper.h new file mode 100644 index 00000000..e46c97e1 --- /dev/null +++ b/capplets/mouse/msd-input-helper.h @@ -0,0 +1,36 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2010 Bastien Nocera <[email protected]> + * + * 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 __MSD_INPUT_HELPER_H +#define __MSD_INPUT_HELPER_H + +G_BEGIN_DECLS + +#include <glib.h> + +#include <X11/extensions/XInput.h> +#include <X11/extensions/XIproto.h> + +gboolean supports_xinput_devices (void); +XDevice *device_is_touchpad (XDeviceInfo *deviceinfo); +gboolean touchpad_is_present (void); + +G_END_DECLS + +#endif /* __MSD_INPUT_HELPER_H */ |