X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=45a1de7ae6fe17d5c4973c172a8c453b6319adf4;hb=258e57c1621533e206610453047d829cc8aa13fe;hp=6b55de932d5e179931405d1b57f77f656a569b70;hpb=72f3dbee9e1c9c2a832b13b057f004fe023d0e11;p=plomrogue

diff --git a/src/client/io.c b/src/client/io.c
index 6b55de9..45a1de7 100644
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -10,7 +10,7 @@
 #include <limits.h> /* PIPE_BUF */
 #include <ncurses.h> /* halfdelay(), getch() */
 #include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
 #include <stdio.h> /* FILE, sprintf(), fseek(), fflush() */
 #include <string.h> /* strcmp(), strlen(), memcpy() */
 #include <stdlib.h> /* free(), atoi() */
@@ -80,6 +80,9 @@ static uint8_t read_worldstate();
  */
 static void test_and_poll_server();
 
+/* If "string", append \n-prefixed "append", else write "append" as "string". */
+static void nl_append_string(char * append, char ** string);
+
 /* Read messages from queue, act on them. */
 static uint8_t read_queue();
 
@@ -230,35 +233,72 @@ static void test_and_poll_server()
 
 
 
+static void nl_append_string(char * append, char ** string)
+{
+    char * err = "too large sizes";
+    exit_trouble(UINT32_MAX < strlen(append), __func__, err);
+    uint32_t new_size = strlen(append);
+    uint32_t old_size = 0;
+    uint8_t add_nl = 0;
+    if (*string)
+    {
+        exit_trouble(UINT32_MAX < new_size + strlen(*string), __func__, err);
+        old_size = strlen(*string);
+        add_nl = 1;
+    }
+    char * new_string = try_malloc(old_size + add_nl + new_size + 1, __func__);
+    memcpy(new_string, *string, old_size);
+    char * pattern = add_nl ? "\n%s" : "%s";
+    int test = sprintf(new_string + old_size, pattern, append);
+    exit_trouble(test < 0, __func__, "sprintf");
+    free(*string);
+    *string = new_string;
+}
+
+
+
 static uint8_t read_queue()
 {
+    static uint8_t things_here_parsing = 0;
     uint8_t ret = 0;
     char * msg;
     while (NULL != (msg = get_message_from_queue(&world.queue)))
     {
         char * log_prefix = "LOG ";
-        if (!strcmp(msg, "NEW_WORLD"))
+        if      (!strcmp(msg, "THINGS_HERE START"))
         {
             ret = 1;
-            free(world.log);
-            world.log = NULL;
+            things_here_parsing = 1;
+            free(world.things_here);
+            world.things_here = NULL;
         }
-        else if (!strncmp(msg, log_prefix, strlen(log_prefix)))
+        else if (!strcmp(msg, "THINGS_HERE END"))
         {
-            ret = 1;
-            char * log_msg = msg + strlen(log_prefix);
-            int old_size = 0;
-            if (world.log)
+            things_here_parsing = 0;
+            if (!world.things_here)
             {
-                old_size = strlen(world.log);
+                nl_append_string("(none known)", &world.things_here);
             }
-            int new_size = strlen(log_msg);
-            char * new_log = try_malloc(old_size + 1 + new_size + 1, __func__);
-            memcpy(new_log, world.log, old_size);
-            int test = sprintf(new_log + old_size, "\n%s", log_msg);
-            exit_trouble(test < 0, __func__, "sprintf");
+        }
+        else if (things_here_parsing)
+        {
+            ret = 1;
+            nl_append_string(msg, &world.things_here);
+        }
+        else if (!strncmp(msg, log_prefix, strlen(log_prefix)))
+        {
+            ret = 1;
+            nl_append_string(msg + strlen(log_prefix), &world.log);
+        }
+        else if (!strcmp(msg, "NEW_WORLD"))
+        {
+            ret = 1;
             free(world.log);
-            world.log = new_log;
+            world.log = NULL;
+        }
+        else if (!strcmp(msg, "WORLD_UPDATED"))
+        {
+            query_mapcell();
         }
         free(msg);
     }
@@ -296,7 +336,7 @@ extern char * io_loop()
         }
         if (change_in_client || read_worldstate() || read_queue())
         {
-            if (world.turn != last_focused_turn && world.focus_each_turn)
+            if (world.turn != last_focused_turn && world.autofocus)
             {
                 last_focused_turn = world.turn;
                 map_center();