Added functionality to read the keys from the configuration file

Author: Robin Müller

src/Makefile.am

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

src/configuraion.c

@@ -28,6 +28,10 @@
 
 #include "configuraion.h"
 #include "common.h"
+#include "keys.h"
+
+
+char *directions[4] = { "up", "down", "left", "right" };
 
 static void clean_config(configuration_t *config) {
   int32_t i, j, k;
@@ -40,6 +44,27 @@ static void clean_config(configuration_t *config) {
   }
 }
 
+static void fill_keys_array(int (*keys_array)[MAX_KEYS_PER_GESTURE], char *keys) {
+  if (keys) {
+    char *ptr = strtok(keys, "+");
+    uint8_t i = 0;
+    while (ptr) {
+      if (i >= MAX_KEYS_PER_GESTURE) {
+        fprintf(stderr, "error: for each gesture only %d keystrokes are allowed\n", MAX_KEYS_PER_GESTURE);
+        exit(EXIT_FAILURE);
+      }
+      int key_code = get_key_code(ptr);
+      if (key_code < 0) {
+        fprintf(stderr, "error: wrong key name '%s'\n", ptr);
+        exit(EXIT_FAILURE);
+      }
+      (*keys_array)[i] = key_code;
+      ptr = strtok(NULL, "+");
+      i++;
+    }
+  }
+}
+
 configuration_t read_config(const char *filename) {
   configuration_t result;
   clean_config(&result);
@@ -55,8 +80,18 @@ configuration_t read_config(const char *filename) {
   }
   result.vert_scroll = iniparser_getboolean(ini, "scroll:vertical", false);
   result.horz_scroll = iniparser_getboolean(ini, "scroll:horizontal", false);
-  result.vert_threshold_percentage = iniparser_getint(ini, "thresholds:vertical", 15),
-  result.horz_threshold_percentage = iniparser_getint(ini, "thresholds:horizontal", 15),
+  result.vert_threshold_percentage = iniparser_getint(ini, "thresholds:vertical", 15);
+  result.horz_threshold_percentage = iniparser_getint(ini, "thresholds:horizontal", 15);
+
+  uint8_t i, j;
+  for (i = 0; i < MAX_FINGERS; i++) {
+    for (j = 0; j < DIRECTIONS_COUNT; j++) {
+      char ini_key[15];
+      sprintf(ini_key, "%d-fingers:%s", INDEX_TO_FINGER(i), directions[j]);
+      fill_keys_array(&result.swipe_keys[i][j].keys, iniparser_getstring(ini, ini_key, NULL));
+    }
+  }
+  
   iniparser_freedict(ini);
   return result;
 }

src/configuraion.h

@@ -52,4 +52,7 @@ typedef enum direction { UP, DOWN, LEFT, RIGHT, NONE } direction_t;
 
 configuration_t read_config(const char *filename);
 
+#define FINGER_TO_INDEX(finger) (finger - 1)
+#define INDEX_TO_FINGER(index) (index + 1)
+
 #endif // CONFIGURATION_H_

src/gesture_detection.c

@@ -145,7 +145,7 @@ static input_event_array_t *process_syn_event(struct input_event event,
     if (direction != NONE) {
       uint8_t i;
       for (i = MAX_KEYS_PER_GESTURE; i > 0; i--) {
-        int key = config.swipe_keys[*finger_count][direction].keys[i - 1];
+        int key = config.swipe_keys[FINGER_TO_INDEX(*finger_count)][direction].keys[i - 1];
         if (key > 0) {
           if (!result) {
             result = new_input_event_array(i);

src/main.c

@@ -56,12 +56,6 @@ int main(int argc, char *argv[]) {
     if (fd < 0) {
       die("error: open");
     }
-    config.swipe_keys[3][UP].keys[0] = KEY_LEFTCTRL;
-    config.swipe_keys[3][UP].keys[1] = KEY_LEFTALT;
-    config.swipe_keys[3][UP].keys[2] = KEY_DOWN;
-    config.swipe_keys[3][DOWN].keys[0] = KEY_LEFTCTRL;
-    config.swipe_keys[3][DOWN].keys[1] = KEY_LEFTALT;
-    config.swipe_keys[3][DOWN].keys[2] = KEY_UP;
     process_events(fd, config, &execute_events);
     close(fd);
   }