Synced list reference 1

This marks a point where the list behavior is at least moderately robust
for the skip operation. It includes fixes for multiple deep-rooted
issues found by testing with input simulation.

Signed-off-by: Andrew Opalach <andrew@akon.city>

4 files changed, 85 insertions, 3 deletions

diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c
index d39d639..724a489 100644
--- a/src/fruits/cmc/cmc.c
+++ b/src/fruits/cmc/cmc.c
@@ -8,8 +8,11 @@
 
 #include "cmc.h"
 
+#include "ui/ui.h"
+
 enum {
-    CLI_ADD = 0
+    CLI_OPEN_UI = 0,
+    CLI_ADD
 };
 
 struct cmc {
@@ -19,6 +22,8 @@ struct cmc {
     struct camu_client client;
     struct camu_post_cache cache;
     array(struct cmc_search *) searches;
+    struct cmc_ui ui;
+    struct aki_poll input_poll;
 };
 
 static struct cmc_search *get_search_by_id(struct cmc *c, s32 id)
@@ -30,12 +35,37 @@ static struct cmc_search *get_search_by_id(struct cmc *c, s32 id)
     return NULL;
 }
 
+static void input_poll_callback(void *userdata, s32 revents)
+{
+    struct cmc *c = (struct cmc *)userdata;
+    (void)revents;
+    struct ncinput input;
+    do {
+        if (!cmc_ui_read_input(&c->ui, &input)) break;
+        if (input.evtype == NCTYPE_PRESS || input.evtype == NCTYPE_UNKNOWN) {
+            switch (input.id) {
+            case 'q':
+                aki_event_loop_break_one(&c->loop);
+                break;
+            }
+        }
+    } while (1);
+}
+
 static void client_callback(void *userdata, u8 op, void *opaque)
 {
     struct cmc *c = (struct cmc *)userdata;
     switch (op) {
     case CAMU_CLIENT_LOGIN: {
         switch (c->command) {
+        case CLI_OPEN_UI:
+            if (!cmc_ui_init(&c->ui)) {
+                aki_event_loop_break_one(&c->loop);
+            }
+            aki_poll_init(&c->input_poll, input_poll_callback, c);
+            aki_poll_set(&c->input_poll, cmc_ui_get_input_fd(&c->ui), AKI_POLL_READ);
+            aki_poll_start(&c->input_poll, &c->loop);
+            break;
         case CLI_ADD: {
             str *arg;
             al_array_foreach_ptr(c->args, i, arg) {
@@ -91,7 +121,10 @@ static bool parse_cmd(s32 argc, char *argv[])
 static bool parse_cmd(s32 argc, wchar_t **argv)
 #endif
 {
-    if (argc < 2) return false;
+    if (argc < 2) {
+        c.command = CLI_OPEN_UI;
+        return true;
+    }
     if (al_str_eq(al_str_cr(argv[1]), al_str_c("add"))) {
         if (argc < 3) return false;
         c.command = CLI_ADD;
@@ -133,5 +166,7 @@ s32 wmain(s32 argc, wchar_t **argv)
 
     aki_event_loop_run(&c.loop);
 
+    cmc_ui_close(&c.ui);
+
     return EXIT_SUCCESS;
 }
diff --git a/src/fruits/cmc/meson.build b/src/fruits/cmc/meson.build
index 4737c61..627391e 100644
--- a/src/fruits/cmc/meson.build
+++ b/src/fruits/cmc/meson.build
@@ -8,7 +8,7 @@ endif
 
 use_tui = true
 if use_tui
-  #cmc_src += ['ui.c']
+  cmc_src += ['ui/ui.c']
   cmc_deps += [dependency('notcurses')]
 endif
 
diff --git a/src/fruits/cmc/ui/ui.c b/src/fruits/cmc/ui/ui.c
new file mode 100644
index 0000000..a838f96
--- /dev/null
+++ b/src/fruits/cmc/ui/ui.c
@@ -0,0 +1,29 @@
+#include <al/lib.h>
+
+#include "ui.h"
+
+bool cmc_ui_init(struct cmc_ui *ui)
+{
+    al_memset(ui, 0, sizeof(struct cmc_ui));
+    if (!(ui->nc = notcurses_init(NULL, stdin))) {
+        return false;
+    }
+    return true;
+}
+
+s32 cmc_ui_get_input_fd(struct cmc_ui *ui)
+{
+    return notcurses_inputready_fd(ui->nc);
+}
+
+bool cmc_ui_read_input(struct cmc_ui *ui, struct ncinput *input)
+{
+    al_memset(input, 0, sizeof(struct ncinput));
+    u32 ret = notcurses_get_nblock(ui->nc, input);
+    return !(ret == (u32)-1 || ret == 0);
+}
+
+void cmc_ui_close(struct cmc_ui *ui)
+{
+    notcurses_stop(ui->nc);
+}
diff --git a/src/fruits/cmc/ui/ui.h b/src/fruits/cmc/ui/ui.h
new file mode 100644
index 0000000..4af222e
--- /dev/null
+++ b/src/fruits/cmc/ui/ui.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <al/types.h>
+#include <notcurses/notcurses.h>
+
+struct cmc_ui {
+    struct notcurses *nc;
+    u32 term_cols;
+    u32 term_rows;
+    bool pending_layout;
+};
+
+bool cmc_ui_init(struct cmc_ui *ui);
+
+s32 cmc_ui_get_input_fd(struct cmc_ui *ui);
+bool cmc_ui_read_input(struct cmc_ui *ui, struct ncinput *input);
+
+void cmc_ui_close(struct cmc_ui *ui);