Bring in line with dependency changes

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

4 files changed, 34 insertions, 31 deletions

diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c
index 3c62ba8..35f2d9b 100644
--- a/src/fruits/cmc/cmc.c
+++ b/src/fruits/cmc/cmc.c
@@ -1,8 +1,11 @@
-#include <aki/common.h>
-#include <aki/event_loop.h>
+#include <nnwt/common.h>
+#include <nnwt/event_loop.h>
+#include <nnwt/packet.h>
 
 #include "../../portal/src/packet_ext.h"
-#include "../../server/common.c"
+#include "../../server/common.h"
+
+#include "../common.h"
 
 #include "cmc.h"
 
@@ -23,16 +26,16 @@ static struct cmc_search *get_search_by_id(struct cmc *c, s32 id)
     return NULL;
 }
 
-static void parse_user_state(struct cmc *c, struct aki_packet *packet)
+static void parse_user_state(struct cmc *c, struct nn_packet *packet)
 {
-    u32 size = aki_packet_read_u32(packet);
+    u32 size = nn_packet_read_u32(packet);
     for (u32 i = 0; i < size; i++) {
         struct cmc_search *search = al_alloc_object(struct cmc_search);
-        search->id = aki_packet_read_s32(packet);
+        search->id = nn_packet_read_s32(packet);
         str s;
-        aki_packet_read_str(packet, &s);
+        nn_packet_read_str(packet, &s);
         al_str_clone(&search->module, &s);
-        aki_packet_read_str(packet, &s);
+        nn_packet_read_str(packet, &s);
         al_str_clone(&search->query, &s);
         al_array_init(search->pages);
         al_array_push(c->searches, search);
@@ -44,12 +47,12 @@ static void client_callback(void *userdata, u8 op, void *opaque)
     struct cmc *c = (struct cmc *)userdata;
     switch (op) {
     case CAMU_CLIENT_LOGIN: {
-        struct aki_packet *packet = (struct aki_packet *)opaque;
+        struct nn_packet *packet = (struct nn_packet *)opaque;
         switch (c->command) {
         case CLI_OPEN_UI:
             parse_user_state(c, packet);
             if (!cmc_ui_init(&c->ui, &c->loop, c)) {
-                aki_event_loop_break_one(&c->loop);
+                nn_event_loop_break_one(&c->loop);
             }
             break;
         case CLI_ADD: {
@@ -82,22 +85,22 @@ static void client_callback(void *userdata, u8 op, void *opaque)
         break;
     }
     case CAMU_CLIENT_PAGE_RESULTS: {
-        struct aki_packet *packet = (struct aki_packet *)opaque;
-        s32 id = aki_packet_read_s32(packet);
+        struct nn_packet *packet = (struct nn_packet *)opaque;
+        s32 id = nn_packet_read_s32(packet);
         struct cmc_search *search = get_search_by_id(c, id);
         if (!search) return;
         struct cmc_search_page *page = al_alloc_object(struct cmc_search_page);
-        page->num = aki_packet_read_u32(packet);
-        u32 posts = aki_packet_read_u32(packet);
+        page->num = nn_packet_read_u32(packet);
+        u32 posts = nn_packet_read_u32(packet);
         for (u32 i = 0; i < posts; i++) {
             struct camu_post post;
-            aki_packet_read_post(packet, &post);
+            nn_packet_read_post(packet, &post);
             camu_post_cache_push(&c->cache, &post);
         }
-        u32 ids = aki_packet_read_u32(packet);
+        u32 ids = nn_packet_read_u32(packet);
         for (u32 i = 0; i < ids; i++) {
             str unique_id;
-            aki_packet_read_str(packet, &unique_id);
+            nn_packet_read_str(packet, &unique_id);
             str s;
             al_str_clone(&s, &unique_id);
             al_array_push(page->list, s);
@@ -154,9 +157,9 @@ s32 main(s32 argc, char *argv[])
 s32 wmain(s32 argc, wchar_t **argv)
 #endif
 {
-    if (!aki_common_init()) return EXIT_FAILURE;
+    if (!nn_common_init()) return EXIT_FAILURE;
 
-    aki_event_loop_init(&c.loop);
+    nn_event_loop_init(&c.loop);
 
     al_array_init(c.args);
     if (!parse_cmd(argc, argv)) return EXIT_FAILURE;
@@ -166,11 +169,11 @@ s32 wmain(s32 argc, wchar_t **argv)
 
     c.client.callback = client_callback;
     c.client.userdata = &c;
-    if (!camu_client_login(&c.client, &c.loop, CAMU_LOCAL_TYPE, CAMU_LOCAL_ADDR, CAMU_PORT, al_str_c("andrew"))) {
+    if (!camu_client_login(&c.client, &c.loop, CAMU_TEST_TYPE, CAMU_TEST_ADDR, CAMU_PORT, al_str_c("andrew"))) {
         return EXIT_FAILURE;
     }
 
-    aki_event_loop_run(&c.loop);
+    nn_event_loop_run(&c.loop);
 
     cmc_ui_close(&c.ui);
 
diff --git a/src/fruits/cmc/cmc.h b/src/fruits/cmc/cmc.h
index 353bd87..96de27b 100644
--- a/src/fruits/cmc/cmc.h
+++ b/src/fruits/cmc/cmc.h
@@ -22,7 +22,7 @@ struct cmc_search {
 };
 
 struct cmc {
-    struct aki_event_loop loop;
+    struct nn_event_loop loop;
     u8 command;
     array(str) args;
     struct camu_client client;
diff --git a/src/fruits/cmc/ui/ui.c b/src/fruits/cmc/ui/ui.c
index 58d630f..b4c196d 100644
--- a/src/fruits/cmc/ui/ui.c
+++ b/src/fruits/cmc/ui/ui.c
@@ -27,7 +27,7 @@ static void input_poll_callback(void *userdata, s32 revents)
         if (input.evtype == NCTYPE_PRESS || input.evtype == NCTYPE_UNKNOWN) {
             switch (input.id) {
             case 'q':
-                aki_event_loop_break_one(ui->loop);
+                nn_event_loop_break_one(ui->loop);
                 break;
             }
         }
@@ -44,7 +44,7 @@ static void input_poll_callback(void *userdata, s32 revents)
     } while (1);
 }
 
-bool cmc_ui_init(struct cmc_ui *ui, struct aki_event_loop *loop, struct cmc *c)
+bool cmc_ui_init(struct cmc_ui *ui, struct nn_event_loop *loop, struct cmc *c)
 {
     al_memset(ui, 0, sizeof(struct cmc_ui));
     ui->c = c;
@@ -57,9 +57,9 @@ bool cmc_ui_init(struct cmc_ui *ui, struct aki_event_loop *loop, struct cmc *c)
     struct ncplane *stdplane = notcurses_stdplane(ui->nc);
     ncplane_set_resizecb(stdplane, resize_cb);
     ncplane_set_userptr(stdplane, ui);
-    aki_poll_init(&ui->input_poll, input_poll_callback, ui);
-    aki_poll_set(&ui->input_poll, notcurses_inputready_fd(ui->nc), AKI_POLL_READ);
-    aki_poll_start(&ui->input_poll, ui->loop);
+    nn_poll_init(&ui->input_poll, input_poll_callback, ui);
+    nn_poll_set(&ui->input_poll, notcurses_inputready_fd(ui->nc), NNWT_POLL_READ);
+    nn_poll_start(&ui->input_poll, ui->loop);
     ui->pane = CMC_PANE_SEARCH;
     return true;
 }
diff --git a/src/fruits/cmc/ui/ui.h b/src/fruits/cmc/ui/ui.h
index 1a49985..1c3b9d9 100644
--- a/src/fruits/cmc/ui/ui.h
+++ b/src/fruits/cmc/ui/ui.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <al/types.h>
-#include <aki/event_loop.h>
+#include <nnwt/event_loop.h>
 #include <notcurses/notcurses.h>
 
 enum {
@@ -11,11 +11,11 @@ enum {
 struct cmc;
 struct cmc_ui {
     struct notcurses *nc;
-    struct aki_event_loop *loop;
+    struct nn_event_loop *loop;
     u32 term_cols;
     u32 term_rows;
     bool pending_layout;
-    struct aki_poll input_poll;
+    struct nn_poll input_poll;
     u8 pane;
     struct {
         struct ncplane *n;
@@ -24,7 +24,7 @@ struct cmc_ui {
     struct cmc *c;
 };
 
-bool cmc_ui_init(struct cmc_ui *ui, struct aki_event_loop *loop, struct cmc *c);
+bool cmc_ui_init(struct cmc_ui *ui, struct nn_event_loop *loop, struct cmc *c);
 void cmc_ui_close(struct cmc_ui *ui);
 
 void cmc_sp_init(struct cmc_ui *ui);