[gentoo-commits] gentoo-x86 commit in x11-drivers/synaptics/files: synaptics-fixeventgrab.diff digest-synaptics-0.14.6-r1

[Rene Nussbaumer (killerfox)]

killerfox    08/01/11 19:57:48

  Added:                synaptics-fixeventgrab.diff
                        digest-synaptics-0.14.6-r1
  Log:
  Revision bump fixing event device grabbing.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  x11-drivers/synaptics/files/synaptics-fixeventgrab.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/synaptics/files/synaptics-fixeventgrab.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/synaptics/files/synaptics-fixeventgrab.diff?rev=1.1&content-type=text/plain

Index: synaptics-fixeventgrab.diff
===================================================================
diff -urN synaptics-0.14.6.orig/eventcomm.c synaptics-0.14.6/eventcomm.c
--- synaptics-0.14.6.orig/eventcomm.c	2006-07-15 17:54:29.000000000 +0200
+++ synaptics-0.14.6/eventcomm.c	2008-01-06 23:44:09.000000000 +0100
@@ -40,16 +40,24 @@
  *	Function Definitions
  ****************************************************************************/
 
-static void
+static Bool
+grab_event_device(int fd)
+{
+    int ret;
+    SYSCALL(ret = ioctl(fd, EVIOCGRAB, (pointer)1));
+    return !(ret < 0);
+}
+
+static Bool
 EventDeviceOnHook(LocalDevicePtr local)
 {
     /* Try to grab the event device so that data don't leak to /dev/input/mice */
-    int ret;
-    SYSCALL(ret = ioctl(local->fd, EVIOCGRAB, (pointer)1));
-    if (ret < 0) {
+    if(!grab_event_device(local->fd)) {
 	xf86Msg(X_WARNING, "%s can't grab event device, errno=%d\n",
 		local->name, errno);
+	return FALSE;
     }
+    return TRUE;
 }
 
 static void
@@ -247,6 +255,7 @@
 	char fname[64];
 	int fd = -1;
 	Bool is_touchpad;
+	Bool is_grabbable;
 
 	sprintf(fname, "%s/%s%d", DEV_INPUT_EVENT, EVENT_DEV_NAME, i);
 	SYSCALL(fd = open(fname, O_RDONLY));
@@ -263,8 +272,16 @@
 	noent_cnt = 0;
 	have_evdev = TRUE;
 	is_touchpad = event_query_is_touchpad(fd);
+	/** 
+	 * Check whether device can be grabbed. This means there is a race 
+	 * condition with EventDeviceOnHook, which can't be solved cleanly
+	 * the way things are done with the current design. One possible 
+	 * solution would be to keep the file descriptor open.
+	 */
+	is_grabbable = grab_event_device(fd);
+
 	SYSCALL(close(fd));
-	if (is_touchpad) {
+	if (is_touchpad && is_grabbable) {
 	    xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
 		    local->name, fname);
 	    xf86ReplaceStrOption(local->options, "Device", fname);
diff -urN synaptics-0.14.6.orig/synaptics.c synaptics-0.14.6/synaptics.c
--- synaptics-0.14.6.orig/synaptics.c	2006-07-15 17:54:29.000000000 +0200
+++ synaptics-0.14.6/synaptics.c	2008-01-06 23:03:26.000000000 +0100
@@ -543,7 +543,8 @@
 	return !Success;
     }
 
-    priv->proto_ops->DeviceOnHook(local);
+    if(!priv->proto_ops->DeviceOnHook(local))
+        return !Success;
 
     priv->comm.buffer = XisbNew(local->fd, 64);
     if (!priv->comm.buffer) {
diff -urN synaptics-0.14.6.orig/synproto.h synaptics-0.14.6/synproto.h
--- synaptics-0.14.6.orig/synproto.h	2006-07-09 18:53:02.000000000 +0200
+++ synaptics-0.14.6/synproto.h	2008-01-06 22:31:19.000000000 +0100
@@ -76,7 +76,7 @@
 struct CommData;
 
 struct SynapticsProtocolOperations {
-    void (*DeviceOnHook)(LocalDevicePtr local);
+    Bool (*DeviceOnHook)(LocalDevicePtr local);
     void (*DeviceOffHook)(LocalDevicePtr local);
     Bool (*QueryHardware)(LocalDevicePtr local, struct SynapticsHwInfo *synhw);
     Bool (*ReadHwState)(LocalDevicePtr local, struct SynapticsHwInfo *synhw,



1.1                  x11-drivers/synaptics/files/digest-synaptics-0.14.6-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/synaptics/files/digest-synaptics-0.14.6-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/synaptics/files/digest-synaptics-0.14.6-r1?rev=1.1&content-type=text/plain

Index: digest-synaptics-0.14.6-r1
===================================================================
MD5 1102cd575045640a064ab6f9b1e391af synaptics-0.14.6.tar.bz2 126833
RMD160 7a8b103aa314eb13dc512c663c501108cc24a574 synaptics-0.14.6.tar.bz2 126833
SHA256 f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 synaptics-0.14.6.tar.bz2 126833



-- 
gentoo-commits@l.g.o mailing list