New command: type Z to reload default window configuration from window config files.

[plomrogue] / src / wincontrol.c

diff --git a/src/wincontrol.c b/src/wincontrol.c
index 715aebb4d5d856964e12071630c5bd2ffb0bd10c..0417852e686be454bdb9a817bdd4dbf3e453c596 100644 (file)
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -5,20 +5,35 @@
 #include <string.h> /* for strlen() */
 #include <stdint.h> /* for uint8_t, uint16_t */
 #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
-                      * resize_active_win(), init_win(), structs Win, WinMeta
+                      * resize_active_win(), init_win(), free_win(),
+                      * structs Win, WinMeta
                       */
 #include "yx_uint16.h" /* for yx_uint16 struct */
 #include "main.h" /* for Wins struct */
 #include "misc.h" /* for textfile_sizes() */
 #include "rexit.h" /* for exit_err() */
 #include "main.h" /* for World, Wins structs */
+#include "draw_wins.h" /* for draw_keys_win(), draw_info_win(), draw_log_win(),
+                        * draw_map_win
+                        */
 
 
 
-extern void free_win(struct Win * win)
+extern void reload_win_config(struct World * world)
 {
-    free(win->_title);
-    free(win);
+    while (0 != world->wins.meta->active)
+    {
+        suspend_win(world->wins.meta, world->wins.meta->active);
+    }
+    free_win(world->wins.info);
+    free_win(world->wins.keys);
+    free_win(world->wins.map);
+    free_win(world->wins.log);
+    world->wins.keys = init_win_from_file(world, "Keys", draw_keys_win);
+    world->wins.info = init_win_from_file(world, "Info", draw_info_win);
+    world->wins.log  = init_win_from_file(world, "Log", draw_log_win);
+    world->wins.map  = init_win_from_file(world, "Map", draw_map_win);
+    sorted_wintoggle(world);
 }
 
 
@@ -26,24 +41,27 @@ extern void free_win(struct Win * win)
 extern struct Win * init_win_from_file(struct World * world, char * w_name,
                                        void (* f) (struct Win *))
 {
-    char * err = "Trouble in init_win_from_file() with malloc().";
+    char * err_m = "Trouble in init_win_from_file() with malloc().";
     char * prefix = "config/windows/";
     uint8_t size = strlen(prefix) + strlen(w_name) + 1;
     char * path = malloc(size);
-    exit_err(NULL == path, world, err);
+    exit_err(NULL == path, world, err_m);
     sprintf(path, "%s%s", prefix, w_name);
-
-    err = "Trouble in init_win_from_file() with fopen().";
+    char * err = "Trouble in init_win_from_file() with fopen().";
     FILE * file = fopen(path, "r");
     free(path);
     exit_err(NULL == file, world, err);
     uint16_t linemax;
-    textfile_sizes(file, &linemax, NULL);
+    err = "Trouble in init_win_from_file() with textfile_sizes().";
+    exit_err(textfile_sizes(file, &linemax, NULL), world, err);
     char * line = malloc(linemax);
+    exit_err(NULL == line, world, err_m);
     err = "Trouble in init_win_from_file() with fgets().";
     exit_err(NULL == fgets(line, linemax, file), world, err);
     char * title = malloc(strlen(line));
-    memcpy(title, line, strlen(line) - 1);
+    exit_err(NULL == title, world, err_m);
+    memcpy(title, line, strlen(line) - 1);   /* Eliminate newline char at end */
+    title[strlen(line) - 1] = '\0';          /* of string.                    */
     exit_err(NULL == fgets(line, linemax, file), world, err);
     int16_t height = atoi(line);
     exit_err(NULL == fgets(line, linemax, file), world, err);
@@ -51,30 +69,28 @@ extern struct Win * init_win_from_file(struct World * world, char * w_name,
     free(line);
     err = "Trouble in init_win_from_file() with fclose().";
     exit_err(fclose(file), world, err);
-
     struct WinMeta * wmeta = world->wins.meta;
-    struct Win * w = malloc(sizeof(struct Win));
-    init_win(wmeta, w, title, height, width, world, f);
+    struct Win * wp;
+    err = "Trouble in init_win_from_file() with init_win().";
+    exit_err(init_win(wmeta, &wp, title, height, width, world, f), world, err);
     free(title);
-    return w;
+    return wp;
 }
 
 
 
 extern void sorted_wintoggle(struct World * world)
 {
-    char * err = "Trouble in sorted_wintoggle() with fopen() on file "
-                 "'config/toggle_win_order'.";
+    char * err = "Trouble in sorted_wintoggle() with fopen().";
     FILE * file = fopen("config/windows/toggle_order", "r");
     exit_err(NULL == file, world, err);
     uint16_t linemax;
-    textfile_sizes(file, &linemax, NULL);
+    err = "Trouble in sorted_wintoggle() with textfile_sizes().";
+    exit_err(textfile_sizes(file, &linemax, NULL), world, err);
     char win_order[linemax];
-    err = "Trouble in sorted_wintoggle() with fgets() on file "
-          "'config/toggle_win_order'.";
+    err = "Trouble in sorted_wintoggle() with fgets().";
     exit_err(NULL == fgets(win_order, linemax, file), world, err);
-    err = "Trouble in sorted_wintoggle() with fclose() on file "
-          "'toggle_win_order'.";
+    err = "Trouble in sorted_wintoggle() with fclose().";
     exit_err(fclose(file), world, err);
 
     char c;
@@ -157,4 +173,3 @@ extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change)
     }
     return 0;
 }
-