X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmisc.c;h=fcb53ecf1e6f4423c89ebeeb64cbe6a74578c568;hb=eb96a1dfe83cef7f3d1c0c73e03b915caca09db8;hp=a8cf0532e21c3aa767033e99124a3b8a2134b391;hpb=a053b626309d3d9c51caecf35a018b6e1df5ecb5;p=plomrogue

diff --git a/src/client/misc.c b/src/client/misc.c
index a8cf053..fcb53ec 100644
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -1,22 +1,24 @@
 /* src/client/misc.c */
 
 #include "misc.h"
-#include <stdlib.h> /* exit() */
 #include <ncurses.h> /* delwin() */
-#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint32_t */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strlen() */
+#include <stdio.h> /* FILE, sprintf() */
+#include <stdlib.h> /* free(), exit() */
+#include <string.h> /* memcpy(), strlen() */
 #include <unistd.h> /* global optarg, getopt() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
+#include "../common/err_try_fgets.h" /* reset_err_try_fgets_counter() */
+#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_width(),
                                   * try_fclose_unlink_rename(),
                                   */
+#include "../common/rexit.h" /* exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
 #include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(),
                           * write_keybindings_to_file()
                           */
-#include "map_window.h" /* map_center() */
-#include "windows.h" /* for free_winDB(), make_v_screen_and_init_win_sizes(),
+#include "map.h" /* map_center() */
+#include "windows.h" /* free_winDB(), make_v_screen_and_init_win_sizes(),
                       * read_winconf_from_file(), write_winconf_of_id_to_file(),
                       * toggle_window()
                       */
@@ -31,7 +33,7 @@ extern void obey_argv(int argc, char * argv[])
     {
         if      ('i' == opt)
         {
-            world.path_interface_conf = optarg;
+            world.path_interface = optarg;
         }
         else
         {
@@ -45,19 +47,18 @@ extern void obey_argv(int argc, char * argv[])
 extern void save_interface_conf()
 {
     char * f_name = "save_interface_conf()";
-    char * path = world.path_interface_conf;
+    char * path = world.path_interface;
     char path_tmp[strlen(path) + 4 + 1];
     sprintf(path_tmp, "%s_tmp", path);
     FILE * file = try_fopen(path_tmp, "w", f_name);
-    char * delim = "%\n";
-    write_keybindings_to_file(file, &world.kb_global, delim);
-    write_keybindings_to_file(file, &world.kb_wingeom, delim);
-    write_keybindings_to_file(file, &world.kb_winkeys, delim);
-    write_order_wins_visible_active(file, delim);
+    write_keybindings_to_file(file, &world.kb_global);
+    write_keybindings_to_file(file, &world.kb_wingeom);
+    write_keybindings_to_file(file, &world.kb_winkeys);
+    write_order_wins_visible_active(file);
     uint8_t i;
     for (i = 0; i < strlen(world.winDB.ids); i++)
     {
-        write_winconf_of_id_to_file(file, world.winDB.ids[i], delim);
+        write_winconf_of_id_to_file(file, world.winDB.ids[i]);
     }
     try_fclose_unlink_rename(file, path_tmp, path, f_name);
 }
@@ -69,23 +70,35 @@ extern void load_interface_conf()
     char * f_name = "load_interface_conf()";
 
     /* Read keybindings and WincConf DB from interface config file. */
-    FILE * file = try_fopen(world.path_interface_conf, "r", f_name);
-    uint32_t linemax = textfile_sizes(file, NULL);
+    reset_err_try_fgets_counter();
+    FILE * file = try_fopen(world.path_interface, "r", f_name);
+    uint32_t linemax = textfile_width(file);
     char line[linemax + 1];
     read_keybindings_from_file(line, linemax, file, &world.kb_global);
     read_keybindings_from_file(line, linemax, file, &world.kb_wingeom);
     read_keybindings_from_file(line, linemax, file, &world.kb_winkeys);
-    read_order_wins_visible_active(line, linemax, file);
+    char active_tmp;
+    char * order_tmp;
+    read_order_wins_visible_active(line, linemax, file, &order_tmp, &active_tmp);
     while (read_winconf_from_file(line, linemax, file));
     try_fclose(file, f_name);
 
+    /* Check that windows of all legal IDs have been initalized. The validity of
+     * this test relies on read_winconf_from_file() failing on duplicates. Only
+     * on success initialize the windows as visible, to enable safe cleaning up.
+     */
+    char * err = "Failed to initialize all expected windows.";
+    exit_err(strlen(world.winDB.legal_ids) != strlen(world.winDB.ids), err);
+    world.winDB.active = active_tmp;
+    world.winDB.order = order_tmp;
+
     /* Build windows as defined by read interface data and toggle them on. */
     make_v_screen_and_init_win_sizes();
-    uint8_t i;
     char tmp_active = world.winDB.active;
     char tmp_order[strlen(world.winDB.order) + 1];
     sprintf(tmp_order, "%s", world.winDB.order);
     world.winDB.order[0] = '\0';
+    uint8_t i;
     for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
     world.winDB.active = tmp_active;
 
@@ -115,6 +128,7 @@ extern void reload_interface_conf()
     unload_interface_conf();
     load_interface_conf();
     map_center();
+    world.winDB.v_screen_offset = 0;
 }
 
 
@@ -136,3 +150,18 @@ extern void nav_inventory(char dir)
     world.player_inventory_select = world.player_inventory_select
                                     + (world.player_inventory_select < n_elems);
 }
+
+
+
+extern void array_append(uint32_t old_n, size_t region_size, void * new_region,
+                        void ** ptr_old_array)
+{
+    char * f_name = "array_append()";
+    uint32_t old_size = old_n * region_size;
+    uint32_t new_size = old_size + region_size;
+    void * new_array = try_malloc(new_size, f_name);
+    memcpy(new_array, * ptr_old_array, old_size);
+    memcpy(new_array + (old_n * region_size), new_region, region_size);
+    free(* ptr_old_array);
+    * ptr_old_array = new_array;
+}