Client: Drop now redundant map centering systems.

[plomrogue] / src / client / io.c

diff --git a/src/client/io.c b/src/client/io.c
index 6b55de932d5e179931405d1b57f77f656a569b70..d1fffc05296d930f39dce3187492191ac231d134 100644 (file)
--- 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() */
@@ -25,9 +25,12 @@
                                   * read_file_into_queue(),
                                   * get_message_from_queue(),
                                   */
+#include "../common/yx_uint8.h" /* yx_uint8 */
 #include "control.h" /* try_key() */
-#include "map.h" /* map_center() */
-#include "windows.h" /* reset_windows_on_winch(), draw_all_wins() */
+#include "map.h" /* query_mapcell() */
+#include "windows.h" /* Win, reset_windows_on_winch(), draw_all_wins(),
+                      * get_win_by_id()
+                      */
 #include "world.h" /* world global */
 
 
@@ -69,9 +72,6 @@ static FILE * changed_worldstate_file(char * path);
  * world in a hard-coded serialization format. Returns 1 on success, or 0 if the
  * out file wasn't read for supposedly not having changed since a last
  * read_worldstate() call.
- *
- * map_center() is triggered by either, the first successful read_worldstate()
- * (thus on client start), or on turn 1 (thus on world start).
  */
 static uint8_t read_worldstate();
 
@@ -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();
 
@@ -175,7 +178,6 @@ static uint8_t read_worldstate()
 {
     char * path = "server/worldstate";
     char * quit_msg = "No worldstate file found to read. Server may be down.";
-    static uint8_t first_read = 1;
     exit_err(access(path, F_OK), quit_msg);
     FILE * file = changed_worldstate_file(path);
     if (!file)
@@ -189,11 +191,6 @@ static uint8_t read_worldstate()
     read_inventory(read_buf, linemax, file);
     world.player_pos.y = read_value_from_line(read_buf, linemax, file);
     world.player_pos.x = read_value_from_line(read_buf, linemax, file);
-    if (1 == world.turn || first_read)
-    {
-        map_center();
-        first_read = 0;
-    }
     world.map.length = read_value_from_line(read_buf, linemax, file);
     read_map_cells(file, &world.map.cells);
     read_map_cells(file, &world.mem_map);
@@ -230,35 +227,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);
     }
@@ -284,7 +318,6 @@ extern char * io_loop()
     world.halfdelay = 1;             /* Ensure server is polled only 10 times */
     halfdelay(world.halfdelay);      /* a second during user inactivity.      */
     uint8_t change_in_client = 0;
-    uint16_t last_focused_turn = world.turn;
     while (1)
     {
         test_and_poll_server();
@@ -296,11 +329,10 @@ extern char * io_loop()
         }
         if (change_in_client || read_worldstate() || read_queue())
         {
-            if (world.turn != last_focused_turn && world.focus_each_turn)
-            {
-                last_focused_turn = world.turn;
-                map_center();
-            }
+            struct Win * win_map = get_win_by_id('m');
+            struct yx_uint8 pos = world.look? world.look_pos : world.player_pos;
+            win_map->center.y = pos.y;
+            win_map->center.x = pos.x * 2 + (pos.y % 2);
             draw_all_wins();
         }
         change_in_client = 0;