Added a struct for storing the configuration

Author: Robin Müller

src/Makefile.am

@@ -1,2 +1,2 @@
 bin_PROGRAMS = touch_gestures
-touch_gestures_SOURCES = main.c int_array.c gestures_device.c gesture_detection.c
+touch_gestures_SOURCES = main.c int_array.c gestures_device.c gesture_detection.c configuraion.c

src/configuraion.c

@@ -0,0 +1,36 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Robin Müller.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+
+#include "configuraion.h"
+
+void clean_config(configuration_t *config) {
+  int32_t i, j;
+  for (i = 0; i < MAX_FINGERS; i++) {
+    for (j = 0; j < DIRECTIONS_COUNT; j++) {
+      config->swipe_keys[i][j].length = 0;
+    }
+  }
+}

src/configuraion.h

@@ -0,0 +1,46 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Robin Müller.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef CONFIGURATION_H_
+#define CONFIGURATION_H_
+
+#include <stddef.h>
+#include <stdbool.h>
+
+#include "int_array.h"
+
+#define MAX_FINGERS       5
+#define DIRECTIONS_COUNT  4
+
+struct configuration {
+  bool vert_scroll;
+  bool horz_scroll;
+  int_array_t swipe_keys[MAX_FINGERS][DIRECTIONS_COUNT];
+};
+
+typedef struct configuration configuration_t;
+
+void clean_config(configuration_t *config);
+
+#endif // CONFIGURATION_H_

src/gesture_detection.c

@@ -46,7 +46,7 @@ struct gesture_start_t {
   uint32_t distance;
 };
 
-enum direction_t { NONE, UP, DOWN, LEFT, RIGHT };
+enum direction_t { UP, DOWN, LEFT, RIGHT, NONE };
 
 static int test_grab(int fd) {
   int rc;
@@ -116,6 +116,7 @@ static void process_abs_event(struct input_event event,
 }
 
 static void process_syn_event(struct input_event event,
+                              configuration_t config,
                               struct gesture_start_t gesture_start,
                               struct point_t slot_points[2],
                               struct point_t thresholds,
@@ -141,6 +142,7 @@ static void process_syn_event(struct input_event event,
     }
     if (direction != NONE) {
       printf("fingers: %d, direction: %d\n", *finger_count, direction);
+      printf("%d\n", config.swipe_keys[*finger_count][direction].length);
       *finger_count = 0;
     }
   }
@@ -154,7 +156,7 @@ static int32_t get_axix_threshold(int fd, int axis, uint8_t percentage) {
   return (absinfo.maximum - absinfo.minimum) * percentage / 100;
 }
 
-void print_events(int fd) {
+void process_events(int fd, configuration_t config) {
   struct input_event ev[64];
   int i, rd;
   uint8_t finger_count;
@@ -193,7 +195,7 @@ void print_events(int fd) {
           process_abs_event(ev[i], &mt_slots);
           break;
         case EV_SYN:
-          process_syn_event(ev[i], gesture_start, mt_slots.points, thresholds, &finger_count);
+          process_syn_event(ev[i], config, gesture_start, mt_slots.points, thresholds, &finger_count);
           break;
       }
     }

src/gesture_detection.h

@@ -25,6 +25,8 @@
 #ifndef GESTURE_DETECTION_H_
 #define GESTURE_DETECTION_H_
 
-void print_events(int fd);
+#include "configuraion.h"
+
+void process_events(int fd, configuration_t config);
 
 #endif // GESTURE_DETECTION_H_

src/gestures_device.c

@@ -34,7 +34,7 @@
 #include "common.h"
 #include "gestures_device.h"
 
-int init_uinput(int_array keys) {
+int init_uinput(int_array_t keys) {
   int fd = open("/dev/uinput", O_WRONLY | O_NONBLOCK);
   if(fd < 0) {
       die("error: open");

src/gestures_device.h

@@ -27,7 +27,7 @@
 
 #include "int_array.h"
 
-int init_uinput(int_array keys);
+int init_uinput(int_array_t keys);
 int destroy_uinput(int fd);
 void send_key(int fd, int key);
 

src/int_array.c

@@ -26,12 +26,12 @@
 
 #include "int_array.h"
 
-int_array *new_int_array(size_t length) {
-  int_array *array;
+int_array_t *new_int_array(size_t length) {
+  int_array_t *array;
   /* we're allocating the size of basic t_int_array 
      (which already contains space for one int)
      and additional space for length-1 ints */
-  array = malloc(sizeof(int_array) + sizeof(int) * (length - 1));
+  array = malloc(sizeof(int_array_t) + sizeof(int) * (length - 1));
   if(!array) {
     return 0;
   }

src/int_array.h

@@ -27,11 +27,13 @@
 
 #include <stddef.h>
 
-typedef struct t_int_array {
+struct int_array {
   size_t length;
   int data[1];
-} int_array;
+};
 
-int_array * new_int_array(size_t length);
+typedef struct int_array int_array_t;
+
+int_array_t * new_int_array(size_t length);
 
 #endif // INTEGER_ARRAY_H_

src/main.c

@@ -37,7 +37,7 @@
 
 
 int main(int argc, char *argv[]) {
-  int_array *keys = new_int_array(1);
+  int_array_t *keys = new_int_array(1);
   keys->data[0] = KEY_D;
   int uinput_fd = init_uinput(*keys);
   free(keys);
@@ -51,7 +51,9 @@ int main(int argc, char *argv[]) {
     if (fd < 0) {
       die("error: open");
     }
-    print_events(fd);
+    configuration_t config;
+    clean_config(&config);
+    process_events(fd, config);
     close(fd);
   }
   return 0;