Create complete input_event sequence to send within the gesture detection

- do not create the EV_SYN events inside the send_events method so also
  EV_REL events can be send with this method

Author: Robin Müller

src/gesture_detection.c

@@ -116,6 +116,19 @@ static void process_abs_event(struct input_event event,
   }
 }
 
+static void set_syn_event(struct input_event *syn_event) {
+  memset(syn_event, 0, sizeof(struct input_event));
+  syn_event->type = EV_SYN;
+  syn_event->code = SYN_REPORT;
+}
+
+static void set_key_event(struct input_event *key_event, int code, int value) {
+  memset(key_event, 0, sizeof(struct input_event));
+  key_event->type = EV_KEY;
+  key_event->code = code;
+  key_event->value = value;
+}
+
 static input_event_array_t *process_syn_event(struct input_event event,
                                               configuration_t config,
                                               gesture_start_t gesture_start,
@@ -148,11 +161,16 @@ static input_event_array_t *process_syn_event(struct input_event event,
         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);
+            // i is the number of keys to press
+            // therefore i input_events with value 1 + 1 EV_SYN event and i input_events with value 0 + EV_SYN event are needed
+            result = new_input_event_array((i + 1) * 2);
+            set_syn_event(&result->data[i]);
+            set_syn_event(&result->data[result->length - 1]);
           }
-          memset(&result->data[i - 1], 0, sizeof(struct input_event));
-          result->data[i - 1].type = EV_KEY;
-          result->data[i - 1].code = key;
+          // press event
+          set_key_event(&result->data[i - 1], key, 1);
+          // release event
+          set_key_event(&result->data[result->length / 2 + i - 1], key, 0);
         }
       }
       *finger_count = 0;

src/gestures_device.c

@@ -83,64 +83,13 @@ int destroy_uinput(int fd) {
   close(fd);
 }
 
-void send_key(int fd, int key) {
-  struct input_event key_ev, syn_ev;
-
-  memset(&key_ev, 0, sizeof(struct input_event));
-  key_ev.type = EV_KEY;
-  key_ev.code = key;
-  // press the key
-  key_ev.value = 1;
-  if (write(fd, &key_ev, sizeof(struct input_event)) < 0) {
-    die("error: write");
-  }
-
-  memset(&syn_ev, 0, sizeof(struct input_event));
-  syn_ev.type = EV_SYN;
-  syn_ev.code = 0;
-  syn_ev.value = 0;
-  if (write(fd, &syn_ev, sizeof(struct input_event)) < 0) {
-    die("error: write");
-  }
-
-  // release the key
-  key_ev.value = 0;
-  if (write(fd, &key_ev, sizeof(struct input_event)) < 0) {
-    die("error: write");
-  }
-  if (write(fd, &syn_ev, sizeof(struct input_event)) < 0) {
-    die("error: write");
-  }
-}
-
 void send_events(int fd, input_event_array_t *input_events) {
-  struct input_event syn_ev;
   uint8_t i;
   if (input_events->length > 0) {
     for (i = 0; i < input_events->length; i++) {
-      input_events->data[i].value = 1;
       if (write(fd, &input_events->data[i], sizeof(struct input_event)) < 0) {
         die("error: write");
       }
     }
-
-    memset(&syn_ev, 0, sizeof(struct input_event));
-    syn_ev.type = EV_SYN;
-    syn_ev.code = SYN_REPORT;
-    syn_ev.value = 0;
-    if (write(fd, &syn_ev, sizeof(struct input_event)) < 0) {
-      die("error: write");
-    }
-
-    for (i = 0; i < input_events->length; i++) {
-      input_events->data[i].value = 0;
-      if (write(fd, &input_events->data[i], sizeof(struct input_event)) < 0) {
-        die("error: write");
-      }
-    }
-
-    if (write(fd, &syn_ev, sizeof(struct input_event)) < 0) {
-      die("error: write");
-    }
   }
 }

src/gestures_device.h

@@ -30,7 +30,6 @@
 
 int init_uinput(int_array_t *keys);
 int destroy_uinput(int fd);
-void send_key(int fd, int key);
 void send_events(int fd, input_event_array_t *input_events);
 
 #endif // GESTURES_DEVICE_H_