Merge lp:~jpakkane/frame/xi2-accept-reject into lp:frame

[Jussi Pakkanen]

This branch adds the functionality to reject or accept touches via the XInput2 protocol.

This is a very "just try out something" thing and probably should not be merged outright. Think of it more as a suggestion to get things going.

[lp:~jpakkane/frame/xi2-accept-reject]

37. By Jussi Pakkanen on 2011-05-06

Comment clarification.

38. By Jussi Pakkanen on 2011-05-06

Comment clarification v2.

Unmerged revisions

38. By Jussi Pakkanen on 2011-05-06

Comment clarification v2.

37. By Jussi Pakkanen on 2011-05-06

Comment clarification.

36. By Jussi Pakkanen on 2011-05-06

Log failed accept/release attempts.

35. By Jussi Pakkanen on 2011-05-06

Renamed function parameters.

34. By Jussi Pakkanen on 2011-05-06

Tentative implementation to reject and accept touches.

=== modified file 'include/utouch/frame-xi2.h'
--- include/utouch/frame-xi2.h	2011-02-15 14:01:51 +0000
+++ include/utouch/frame-xi2.h	2011-05-06 15:06:45 +0000
@@ -42,6 +42,10 @@
 const struct utouch_frame *
 utouch_frame_pump_xi2(utouch_frame_handle fh, const XIDeviceEvent *ev);
 
+void utouch_frame_set_follow_status_xi2(Display *display, const XIDeviceInfo *dev,
+		int num_accepted, struct utouch_contact **accepted_touches,
+		int num_rejected, struct utouch_contact **rejected_touces);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'src/frame-xi2.c'
--- src/frame-xi2.c	2011-04-13 20:01:01 +0000
+++ src/frame-xi2.c	2011-05-06 15:06:45 +0000
@@ -325,3 +325,35 @@
 
 	return 0;
 }
+
+/**
+ * Reject and accept the given touches. Note that you may receive
+ * update events on rejected touches after this call returns.
+ */
+
+void utouch_frame_set_follow_status_xi2(Display *display, const XIDeviceInfo *dev,
+		int num_accepted, struct utouch_contact **accepted_touches,
+		int num_rejected, struct utouch_contact **rejected_touches)
+{
+	int i;
+	for (i=0; i< num_accepted; i++) {
+		/*
+		 * XIAllowTouchEvents takes the ID as an unsigned long, but it is given
+		 * as an int in XIDeviceEvent. This is a mismatch in the API.
+		*/
+		if(!XIAllowTouchEvents(display, dev->deviceid,
+				accepted_touches[i]->id, XITouchOwnerAccept)) {
+			fprintf(stderr, "ERROR: Utouch-frame could not accept touch %d.\n",
+				accepted_touches[i]->id);
+		}
+	}
+
+	for (i=0; i< num_rejected; i++) {
+		if(!XIAllowTouchEvents(display, dev->deviceid,
+				rejected_touches[i]->id, XITouchOwnerRejectEnd)) {
+			fprintf(stderr, "ERROR: Utouch-frame could not reject touch %d.\n",
+				rejected_touches[i]->id);
+		}
+	}
+}
+