X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwincontrol.c;h=0417852e686be454bdb9a817bdd4dbf3e453c596;hb=9a9f9b13bef8394e1b25dc4d67ff72164dd28cce;hp=4ebf9ef666a308d9fb6c5c5c94b3be8f9cfd7eee;hpb=f6aaf0667ee0f1ab62342ff7becca2beb6cabc9c;p=plomrogue
diff --git a/src/wincontrol.c b/src/wincontrol.c
index 4ebf9ef..0417852 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -5,62 +5,92 @@
#include /* for strlen() */
#include /* 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 struct Win init_win_from_file(struct World * world, char * w_name,
- void (* f) (struct Win *))
+extern void reload_win_config(struct World * world)
{
- char * err = "Trouble in init_win_from_file() with malloc().";
- char * prefix = "config/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);
+}
+
+
+
+extern struct Win * init_win_from_file(struct World * world, char * w_name,
+ void (* f) (struct Win *))
+{
+ 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));
+ 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);
int16_t width = atoi(line);
free(line);
err = "Trouble in init_win_from_file() with fclose().";
exit_err(fclose(file), world, err);
-
struct WinMeta * wmeta = world->wins.meta;
- return init_win(wmeta, w_name, 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 wp;
}
extern void sorted_wintoggle(struct World * world)
{
- char * err = "Trouble in sorted_wintoggle() with fopen() on file "
- "'config/toggle_win_order'.";
- FILE * file = fopen("config/toggle_win_order", "r");
+ 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;
@@ -143,4 +173,3 @@ extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change)
}
return 0;
}
-