Merge lp:~gustavold/ginn/ginn.gustavo into lp:ginn

[Gustavo Luiz Duarte]

It provides necessary code for injecting pointer clicks (e.g. for scrolling) and gesture matching based on the gesture state (update vs finish).

[Stephen M. Webb (bregma)]

Hmm, mid-air collision!

Could you please bzr pull and resolve conflicts, then resubmit?

review: Needs Fixing

[Gustavo Luiz Duarte (gustavold)]

Sorry for that. Conflicts resolved. Please let me know if you have any other consideration.

[lp:~gustavold/ginn/ginn.gustavo]

29. By Mohamed IKBEL Boulabiar on 2010-10-18

Fixes the structure of configuration to support having the minimum and the max values.

30. By Mohamed IKBEL Boulabiar on 2010-10-18

Modify the order of storing gesture parameters.

31. By Mohamed IKBEL Boulabiar on 2010-10-18

Adds function to check inside intervall.
Make the verification of properties generic (can use up to all properties for matching)
Optimise the verification of gesture properties : only one traversal (or less)

[Mohamed IKBEL Boulabiar (boulabiar)]

Thanks Gustavo !
Sorry for the collision, can you just resubmit the xt.c file changes ?

review: Needs Fixing

[lp:~gustavold/ginn/ginn.gustavo]

32. By Mohamed IKBEL Boulabiar on 2010-10-18

Merge code from Gustavo to support modifiers in injected keystrokes.

33. By Mohamed IKBEL Boulabiar on 2010-10-19

Adding file to show possible keys to be used in Ginn wishes.

34. By Mohamed IKBEL Boulabiar on 2010-10-20

Adding a full structure to exchange the wish gesture information

35. By Mohamed IKBEL Boulabiar on 2010-10-20

Using the new structure to exchange wish information.
Moving from static to dynamic loading of wishes.
Preparing functions to handle more than 1 wish.

36. By Mohamed IKBEL Boulabiar on 2010-10-20

Add more wishes to be parsed in the config. file.

37. By Mohamed IKBEL Boulabiar on 2010-10-20

Parsing more than 1 wish and storing it in dynamic allocated structures => done.

38. By Mohamed IKBEL Boulabiar on 2010-10-21

Ginn now parses many wishes and react according to them.

39. By Mohamed IKBEL Boulabiar on 2010-10-21

Removing some useless code from the wish/gesture matching function.

40. By Mohamed IKBEL Boulabiar on 2010-10-21

Add somes wishes to be used with Evince.

41. By Mohamed IKBEL Boulabiar on 2010-10-21

Add the support of Modifiers inside the wish xml file.
Added 2 cases to be used with inkscape.

42. By Mohamed IKBEL Boulabiar on 2010-10-21

Add support for Modifiers in the parsing of the wishes and in sending events.

43. By Mohamed IKBEL Boulabiar on 2010-10-21

Merging Stephen's additions :
  Stephen M. Webb 2010-10-21 Added default wishes.xml to the distributed files.
    Stephen M. Webb 2010-10-21 Added a search for the default wishes file.

44. By Mohamed IKBEL Boulabiar on 2010-10-22

Added a wish for Tap-4 gesture to test a compiz effect.

45. By Mohamed IKBEL Boulabiar on 2010-10-22

Modify Ginn to not subscribe to 1-finger gestures.
There are to be used with other applications.

46. By Mohamed IKBEL Boulabiar on 2010-10-22

Adding file to know the number of mouse buttons.
This support may be added later to Ginn.

47. By Mohamed IKBEL Boulabiar on 2010-10-22

Passes the key to be injected through the new stucture.

48. By Mohamed IKBEL Boulabiar on 2010-10-22

Add 2 gestures where more than 1 modifier key is used.

49. By Mohamed IKBEL Boulabiar on 2010-10-22

Modify Ginn to support wishes up to 4 Modifiers keys.

50. By Mohamed IKBEL Boulabiar on 2010-10-22

Corrected a small bug of not comparing number of fingers.

51. By Mohamed IKBEL Boulabiar on 2010-10-29

Add some gestures wishes.
Merge Gustavo modifications and bugfixes:
  Gustavo Luiz Duarte 2010-10-26 Support for accumulated gesture values and state aware action configuration
    Gustavo Luiz Duarte 2010-10-26 Bugfix: Ginn was discarding the last configured trigger when there was more than one

52. By Mohamed IKBEL Boulabiar on 2010-11-01

Adding a ToDo file

53. By Mohamed IKBEL Boulabiar on 2010-11-03

Split the wishes parsing function for clarity.

54. By Mohamed IKBEL Boulabiar on 2010-11-05

Clean the logic of parsing wishes : Move to recursive handling
Remove a previous hack.

55. By Mohamed IKBEL Boulabiar on 2010-11-05

Small code cleanups and factorizations.

56. By Mohamed IKBEL Boulabiar on 2010-11-06

Add wishes for Inkscape and Evince

57. By Mohamed IKBEL Boulabiar on 2010-11-06

Add support for Application wishes parsing.

58. By Mohamed IKBEL Boulabiar on 2010-11-09

Add support for modifiers in injecting Buttons.

59. By Mohamed IKBEL Boulabiar on 2010-11-09

Add support for parsing and storing buttons from the wishes.

60. By Mohamed IKBEL Boulabiar on 2010-11-09

Support injecting mouse Buttons.

61. By Gustavo Luiz Duarte on 2010-11-12

Opens connection to X only once at startup and reuses it during execution

Unmerged revisions

=== modified file 'src/ginn.c'
--- src/ginn.c	2010-10-18 20:50:21 +0000
+++ src/ginn.c	2010-10-18 22:06:01 +0000
@@ -30,6 +30,10 @@
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
+#define GINN_START	0
+#define GINN_UPDATE	1
+#define GINN_FINISH	2
+
 att config_attr[25] = { [0 ... 24] = {.attrName="", .val=0, .valMax=0 } };
 
 static int
@@ -41,7 +45,8 @@
 gesture_match(  GeisGestureType    gesture_type,
                 GeisGestureId      gesture_id,
                 GeisSize           attr_count,
-                GeisGestureAttr   *attrs)
+                GeisGestureAttr   *attrs,
+		int state)
 {
   int i = 0;
   int valid=1;
@@ -50,15 +55,15 @@
 	//Drag
     case  0: if (gesture_type==config_attr[1].val) {
 		if (attrs[9].float_val > config_attr[2].val) 
-		  injTest(XStringToKeysym(config_attr[0].attrName));
+		  injTest(XStringToKeysym(config_attr[0].attrName), NULL);
 	     }
       break;
 	//Pinch/Zoom
     case  1: if (gesture_type==config_attr[1].val) {
 	/*	if (attrs[9].float_val > config_attr[2].val) 
-		  injTest(XStringToKeysym(config_attr[0].attrName));
+		  injTest(XStringToKeysym(config_attr[0].attrName), NULL);
 		else if (attrs[9].float_val < -config_attr[2].val)  
-		  injTest(XK_KP_Subtract);
+		  injTest(XK_KP_Subtract, NULL);
 	*/	
 	   int attrsI=9, cAttrI=3;
 	   do {
@@ -71,13 +76,13 @@
 		} else attrsI++;
 	   } while ( (0!=strcmp(config_attr[cAttrI+1].attrName,"")) && attrsI<18 && valid );
 		if (valid)
-		  injTest(XStringToKeysym(config_attr[0].attrName));
+		  injTest(XStringToKeysym(config_attr[0].attrName), NULL);
  	}
       break;
 	//Rotate
     case  2:  if (gesture_type==config_attr[1].val) {
 		if (attrs[9].float_val > config_attr[2].val) 
-		  injTest(XStringToKeysym(config_attr[0].attrName));
+		  injTest(XStringToKeysym(config_attr[0].attrName), NULL);
 	     }
       break;
 	//Tap
@@ -184,7 +189,7 @@
   fprintf(stdout, "Gesture type %d updated\n", gesture_type);
   for (i = 0; i < attr_count; ++i)
     print_attr(&attrs[i]);
-  gesture_match(gesture_type, gesture_id, attr_count, attrs);
+  gesture_match(gesture_type, gesture_id, attr_count, attrs, GINN_UPDATE);
 }
 
 static void
@@ -198,6 +203,7 @@
   fprintf(stdout, "Gesture type %d finished\n", gesture_type);
   for (i = 0; i < attr_count; ++i)
     print_attr(&attrs[i]);
+  gesture_match(gesture_type, gesture_id, attr_count, attrs, GINN_FINISH);
 }
 
 

=== modified file 'src/xt.c'
--- src/xt.c	2010-10-08 12:12:10 +0000
+++ src/xt.c	2010-10-18 22:06:01 +0000
@@ -22,11 +22,22 @@
 #include <X11/keysym.h>
 
 void
-injTest(KeySym ks)
+injTest(KeySym ks, KeySym modifier)
 {
         Display* disp = XOpenDisplay(NULL);
+	if (modifier != NULL) XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, modifier),  True, CurrentTime);
          XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks),  True, CurrentTime);
          XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, ks), False, CurrentTime);
+	if (modifier != NULL) XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, modifier),  False, CurrentTime);
+        XCloseDisplay(disp);
+}
+
+void
+injButton(int btn, KeySym modifier)
+{
+        Display* disp = XOpenDisplay(NULL);
+        XTestFakeButtonEvent(disp, btn, True, CurrentTime);
+        XTestFakeButtonEvent(disp, btn, False, CurrentTime);
         XCloseDisplay(disp);
 }