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

[Gustavo Luiz Duarte]

[Mohamed IKBEL Boulabiar (boulabiar)]

Thanks Gustavo !

review: Approve

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

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

=== modified file 'etc/wishes.xml'
--- etc/wishes.xml	2010-10-22 14:23:47 +0000
+++ etc/wishes.xml	2010-10-26 05:24:47 +0000
@@ -1,53 +1,53 @@
 <ginn>
   <global>
     <wish gesture="Tap" fingers="4">
-      <action name="action1">
+      <action name="action1" when="update">
         <trigger prop="tap time" min="20" max="400"/>
         <key modifier1="Super_L">E</key>
       </action>
     </wish>
     <wish gesture="Pinch" fingers="2">
-      <action name="action1">
+      <action name="action1" when="update">
         <trigger prop="radius delta" min="20" max="200"/>
         <trigger prop="radial velocity" min="-1" max="1000"/>
         <key>KP_Add</key>
       </action>
     </wish>
     <wish gesture="Pinch" fingers="2">
-      <action name="action2">
+      <action name="action2" when="update">
         <trigger prop="radius delta" min="-200" max="-20"/>
         <key>KP_Subtract</key>
       </action>
     </wish>
     <wish gesture="Drag" fingers="4">
-      <action name="action3">
-        <trigger prop="delta x" min="40" max="60"/>
+      <action name="action3" when="finish">
+        <trigger prop="delta x" min="40" max="600"/>
         <key modifier1="Control_L" modifier2="Alt_L">Right</key>
       </action>
     </wish>
     <wish gesture="Drag" fingers="4">
-      <action name="action4">
-        <trigger prop="delta x" min="-60" max="-40"/>
+      <action name="action4" when="finish">
+        <trigger prop="delta x" min="-600" max="-40"/>
         <key modifier1="Control_L" modifier2="Alt_L">Left</key>
       </action>
     </wish>
     <wish gesture="Drag" fingers="2">
-      <action name="action5">
-        <trigger prop="delta y" min="40" max="80"/>
+      <action name="action5" when="update">
+        <trigger prop="delta y" min="20" max="80"/>
+        <key>Down</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action6" when="update">
+        <trigger prop="delta y" min="-80" max="-20"/>
         <key>Up</key>
       </action>
     </wish>
-    <wish gesture="Drag" fingers="2">
-      <action name="action6">
-        <trigger prop="delta y" min="-80" max="-40"/>
-        <key>Down</key>
-      </action>
-    </wish>
   </global>
   <applications>
     <application name="Inkscape">
       <wish gesture="Pinch" fingers="3">
-        <action name="action2">
+        <action name="action2" when="update">
           <trigger prop="radius delta" min="30" max="1000"/>
           <key>KP_Subtract</key>
         </action>

=== modified file 'src/config.c'
--- src/config.c	2010-10-22 08:37:17 +0000
+++ src/config.c	2010-10-26 05:24:47 +0000
@@ -51,6 +51,23 @@
 	}
 }
 
+static int ginn_str2state(const char *str){
+	if (str == NULL) return -1;
+	if (strcmp(str, "start") == 0) return GINN_START;
+	if (strcmp(str, "update") == 0) return GINN_UPDATE;
+	if (strcmp(str, "finish") == 0) return GINN_FINISH;
+	fprintf(stderr, "ERROR: Undefined state: %s\n", str);
+	return -2;
+}
+
+static int ginn_str2bool(const char *str){
+	if (str == NULL) return -1;
+	if (strcmp(str, "true") == 0) return 1;
+	if (strcmp(str, "false") == 0) return 0;
+	fprintf(stderr, "ERROR: Ivalid value for boolean attribute: %s\n", str);
+	return -2;
+}
+
 void parse_node(const xmlNode *root, int depth, struct wish *wp)
 {
 	xmlNode *node, *tnode;
@@ -76,10 +93,18 @@
 		  	wp->config_attr[1].val      = atoi(xmlGetProp(node, "fingers"));
 		  	wp->config_attr[1].valMax   = atoi(xmlGetProp(node, "fingers"));
 		     }
+		     if (0==strcmp(node->name, "action")) {
+			     wp->when = ginn_str2state(xmlGetProp(node, "when"));
+			     if (wp->when < 0)
+				     fprintf(stderr, "ERROR: you must provide property 'when' to the action: %s\n", xmlGetProp(node, "name"));
+		     }
 		     while (0==strcmp(node->name, "trigger")) {
 			wp->config_attr[position].attrName = xmlGetProp(node, "prop");
 		  	wp->config_attr[position].val = atoi(xmlGetProp(node, "min"));
 		  	wp->config_attr[position].valMax = atoi(xmlGetProp(node, "max"));
+		  	int acc = ginn_str2bool(xmlGetProp(node, "accumulate"));
+			wp->config_attr[position].accumulate = acc == -1 ? GINN_DEFAULT_ACCUMULATE : acc;
+			wp->config_attr[position].accumVal = 0;
 			position++;
 			if (node->next) 
 				node = (node->next);

=== modified file 'src/config.h'
--- src/config.h	2010-10-22 08:37:17 +0000
+++ src/config.h	2010-10-26 05:24:47 +0000
@@ -1,6 +1,12 @@
 #include <libxml/tree.h>
 #include <string.h>
 
+#define GINN_START	0
+#define GINN_UPDATE	1
+#define GINN_FINISH	2
+
+#define GINN_DEFAULT_ACCUMULATE		1
+
 typedef struct ginn_config {
         xmlDocPtr doc;
 	xmlNodePtr root;
@@ -10,6 +16,8 @@
 	char * attrName ;
 	int val ;
 	int valMax;
+	int accumulate;
+	int accumVal;
 } att;
 
 typedef struct wish {
@@ -17,4 +25,5 @@
 	char * key;
 	char * modifiers[4];
 	struct wish* next;
+	int when;
 } wish;

=== modified file 'src/ginn.c'
--- src/ginn.c	2010-10-22 14:23:47 +0000
+++ src/ginn.c	2010-10-26 05:24:47 +0000
@@ -32,10 +32,6 @@
 #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 } };
 
 wish w1 = { 	.config_attr = { [0 ... 24] = {.attrName="", .val=0, .valMax=0 } },
@@ -62,6 +58,14 @@
   }
 }
 
+static void clear_accum_attrs(att *attrs){
+	int i = 0;
+	while (strcmp(attrs[i].attrName, "") != 0){
+		if (attrs[i].accumulate) attrs[i].accumVal = 0;
+		i++;
+	}
+}
+
 static void
 gesture_match(  GeisGestureType    gesture_type,
                 GeisGestureId      gesture_id,
@@ -85,13 +89,20 @@
 				printf("DEBUG -- comparing %s %s : ", attrs[attrsI].name, wp->config_attr[cAttrI].attrName);
 				printf("%d %d %d \n", (int)attrs[attrsI].float_val, wp->config_attr[cAttrI].val, wp->config_attr[cAttrI].valMax);
 				printf("%i \n", inside((int)attrs[attrsI].float_val, wp->config_attr[cAttrI].val, wp->config_attr[cAttrI].valMax));
-				valid = valid && inside((int)attrs[attrsI].float_val, wp->config_attr[cAttrI].val, wp->config_attr[cAttrI].valMax);
+				if (wp->config_attr[cAttrI].accumulate){
+					wp->config_attr[cAttrI].accumVal += (int)attrs[attrsI].float_val;	
+					valid = valid && inside(wp->config_attr[cAttrI].accumVal, wp->config_attr[cAttrI].val, wp->config_attr[cAttrI].valMax);
+				}
+				else valid = valid && inside((int)attrs[attrsI].float_val, wp->config_attr[cAttrI].val, wp->config_attr[cAttrI].valMax);
 				attrsI++;  cAttrI++;
 			} else attrsI++;
-		   } while ( (0!=strcmp(wp->config_attr[cAttrI+1].attrName,"")) && attrsI<18 && valid );
-			if (valid)
+		   } while ( (0!=strcmp(wp->config_attr[cAttrI].attrName,"")) && attrsI<18 );
+		   if (valid && wp->when == state){
 			  injKey(XStringToKeysym(wp->key), wp->modifiers);
+			  clear_accum_attrs(wp->config_attr);
+		   }
 	}
+	if (state == GINN_FINISH) clear_accum_attrs(wp->config_attr);
 	wp=wp->next;
   }
   wp=topw;
@@ -206,7 +217,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);
+  gesture_match(gesture_type, gesture_id, attr_count, attrs, GINN_FINISH);
 }