Use a static array for the swipe_keys

- using the int_array_t does not work for array with more than 1 element
- the length for the keys array is defined by MAX_KEYS_PER_GESTURE

Author: Robin Müller

src/configuraion.c

@@ -27,10 +27,12 @@
 #include "configuraion.h"
 
 void clean_config(configuration_t *config) {
-  int32_t i, j;
+  int32_t i, j, k;
   for (i = 0; i < MAX_FINGERS; i++) {
     for (j = 0; j < DIRECTIONS_COUNT; j++) {
-      config->swipe_keys[i][j].length = 0;
+      for (k = 0; k < MAX_KEYS_PER_GESTURE; k++) {
+        config->swipe_keys[i][j].keys[k] = -1;
+      }
     }
   }
 }

src/configuraion.h

@@ -31,18 +31,22 @@
 
 #include "int_array.h"
 
-#define MAX_FINGERS       5
-#define DIRECTIONS_COUNT  4
+#define MAX_FINGERS           5
+#define DIRECTIONS_COUNT      4
+#define MAX_KEYS_PER_GESTURE  5
 
-struct configuration {
+typedef struct keys_array {
+  int keys[MAX_KEYS_PER_GESTURE];
+} keys_array_t;
+
+typedef struct configuration {
   bool vert_scroll;
   bool horz_scroll;
   uint8_t vert_threshold_percentage;
   uint8_t horz_threshold_percentage;
-  int_array_t swipe_keys[MAX_FINGERS][DIRECTIONS_COUNT];
-};
+  keys_array_t swipe_keys[MAX_FINGERS][DIRECTIONS_COUNT];
+} configuration_t;
 
-typedef struct configuration configuration_t;
 
 void clean_config(configuration_t *config);
 

src/gesture_detection.c

@@ -142,7 +142,14 @@ 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);
+      uint8_t i;
+      for (i = 0; i < MAX_KEYS_PER_GESTURE; i++) {
+        int key = config.swipe_keys[*finger_count][direction].keys[i];
+        if (key > 0) {
+          printf("%d ", key);
+        }
+      }
+      printf("\n");
       *finger_count = 0;
     }
   }

src/main.c

@@ -55,6 +55,8 @@ int main(int argc, char *argv[]) {
     clean_config(&config);
     config.horz_threshold_percentage = 15;
     config.vert_threshold_percentage = 15;
+    config.swipe_keys[3][0].keys[0] = KEY_D;
+    config.swipe_keys[3][0].keys[1] = KEY_A;
     process_events(fd, config);
     close(fd);
   }