client: Interleave accepting new button presses & re-sends

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 352b84c4be8ec35987beb68ad6a4581332b62064..cd1324145e220b097578b0b67e613ca973778bd8 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,13 +7,18 @@
 #include "config.h"
 #include "net.h"
 
 #include "config.h"
 #include "net.h"
 

-enum event_type { BUTTONPRESS };
+enum event_type { BUTTONPRESS, SEND };

 typedef struct {
   enum event_type type;
   union {
     struct {
       uint32_t timestamp;
     } buttonpress;
 typedef struct {
   enum event_type type;
   union {
     struct {
       uint32_t timestamp;
     } buttonpress;

+    struct {
+      uint32_t timestamp;
+      u16_t seq;
+      u8_t send_count;
+    } send;

   };
 } event_t;
 
   };
 } event_t;
 


@@ -66,16 +71,25 @@ int main() {
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {

-    case BUTTONPRESS:
-      seq++;
-      for (int i = 0; i < config_resend_count; i++) {
-        uint32_t now = time_s();
-        uint32_t ago = now - e.buttonpress.timestamp;
-        send_report(seq, ago);
-        signal(i == 0 ? 2 : 1, 100);
-        sleep_ms(config_resend_interval_ms);
-      }
-      break;
+    case BUTTONPRESS: {
+      event_t send_e;
+      send_e.type = SEND;
+      send_e.send.timestamp = e.buttonpress.timestamp;
+      send_e.send.seq = seq++;
+      send_e.send.send_count = 0;
+      queue_try_add_ignoring_errors(&queue, &send_e);
+    } break;
+    case SEND: {
+      uint32_t now = time_s();
+      uint32_t ago = now - e.send.timestamp;
+      send_report(e.send.seq, ago);
+      e.send.send_count++;
+      if (e.send.send_count < config_resend_count)
+        queue_try_add_ignoring_errors(&queue, &e);
+      /* TODO: Sleep elsewhere. */
+      signal(e.send.send_count == 1 ? 2 : 1, 100);
+      sleep_ms(config_resend_interval_ms);
+    } break;

     default:
       signal_error_by_blinking();
     }
     default:
       signal_error_by_blinking();
     }