r942 - trunk/oe/packages/tslib/tslib-1.0

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-02-10 13:30:06 +0100 (Sat, 10 Feb 2007)
New Revision: 942

Modified:
   trunk/oe/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
Log:
* only grab the device once rather than trying to grab it all the time
* un-grab it at exit time


Modified: trunk/oe/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
===================================================================
--- trunk/oe/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch	2007-02-10 10:52:36 UTC (rev 941)
+++ trunk/oe/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch	2007-02-10 12:30:06 UTC (rev 942)
@@ -19,29 +19,56 @@
  
  #include <stdlib.h>
  #ifdef HAVE_UNISTD_H
-@@ -42,6 +43,7 @@
+@@ -33,6 +34,9 @@
  
+ #include "tslib-private.h"
+ 
++#define GRAB_EVENTS_WANTED	1
++#define GRAB_EVENTS_ACTIVE	2
++
+ struct tslib_input {
+ 	struct tslib_module_info module;
+ 
+@@ -42,6 +46,7 @@
+ 
  	int	sane_fd;
  	int	using_syn;
 +	int	grab_events;
  };
  
  static int check_fd(struct tslib_input *i)
-@@ -64,6 +66,13 @@
+@@ -64,6 +69,14 @@
  
  	if (bit & (1 << EV_SYN))
  		i->using_syn = 1;
 +	
-+	if (i->grab_events) {
++	if (i->grab_events == GRAB_EVENTS_WANTED) {
 +		if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) {
 +			fprintf(stderr, "Unable to grab selected input device\n");
 +			return -1;
 +		}
++		i->grab_events = GRAB_EVENTS_ACTIVE;
 +	}
  
  	return 0;
  }
-@@ -231,6 +240,35 @@
+@@ -222,6 +235,15 @@
+ 
+ static int ts_input_fini(struct tslib_module_info *inf)
+ {
++	struct tslib_input *i = (struct tslib_input *)inf;
++	struct tsdev *ts = inf->dev;
++
++	if (i->grab_events == GRAB_EVENTS_ACTIVE) {
++		if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) {
++			fprintf(stderr, "Unable to un-grab selected input device\n");
++		}
++	}
++
+ 	free(inf);
+ 	return 0;
+ }
+@@ -231,6 +253,36 @@
  	.fini	= ts_input_fini,
  };
  
@@ -59,7 +86,8 @@
 +	errno = err;
 +	switch ((int)data) {
 +	case 1:
-+		i->grab_events = v;
++		if (v)
++			i->grab_events = GRAB_EVENTS_WANTED;
 +		break;
 +	default:
 +		return -1;
@@ -77,7 +105,7 @@
  TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params)
  {
  	struct tslib_input *i;
-@@ -245,5 +283,12 @@
+@@ -245,5 +297,12 @@
  	i->current_p = 0;
  	i->sane_fd = 0;
  	i->using_syn = 0;