X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=a9f8017f6a3ffb5fc2b75d08b888d37437105994;hb=6f9c0f49233065ed1ce0bae8862902e3cead639e;hp=d1a03042f71ca48d9c6e72b5b19979f6199a2bd7;hpb=b97faa0009abc699ab7bff7bcc3221b8b3104e12;p=plomrogue

diff --git a/src/wincontrol.c b/src/wincontrol.c
index d1a0304..a9f8017 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -1,10 +1,10 @@
 /* wincontrol.c */
 
 #include "wincontrol.h"
-#include <stdlib.h> /* for malloc(), free() */
-#include <string.h> /* for strlen() */
+#include <stdlib.h> /* for free() */
+#include <string.h> /* for strlen(), strchr(), strstr() */
 #include <stdint.h> /* for uint8_t, uint16_t */
-#include <stdio.h> /* for fopen(), fclose(), fwrite() */
+#include <stdio.h> /* for fwrite() */
 #include <unistd.h> /* for access(), unlink() */
 #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
                       * resize_active_win(), init_win(), free_win(),
@@ -12,12 +12,17 @@
                       */
 #include "yx_uint16.h" /* for yx_uint16 struct */
 #include "main.h" /* for Wins struct */
-#include "misc.h" /* for textfile_sizes() */
+#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
+                        * try_fgets(), try_fclose_unlink_rename()
+                        */
 #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
                         */
+#include "misc.h" /* for try_malloc() */
+#include "dirent.h" /* for opendir(), closedir(), readdir() */
+#include "errno.h" /* for errno */
 
 
 
@@ -26,11 +31,8 @@ static char * string_prefixed_id(struct World * world, char * prefix, char id);
 
 
 
-/* Create Winconf, initialize ->iew/height_type/width_type to 0, ->id to "id"
- * and ->draw to f.
- */
-static void create_winconf(char id, struct WinConf * wcp,
-                           void (* f) (struct Win *));
+/* Create Winconf, init ->view/height_type/width_type to 0, ->id to "id". */
+static void create_winconf(char id, struct WinConf * wcp);
 
 /* Initialize Winconf of "id" from appropriate config file.*/
 static void init_winconf_from_file(struct World * world, char id);
@@ -38,7 +40,7 @@ static void init_winconf_from_file(struct World * world, char id);
 /* Wrapper around init_win() called with values from Winconf of "id". */
 static void init_win_from_winconf(struct World * world, char id);
 
-/* Save title, size of window identified by "id" to its configuration file. */
+/* Save title, draw function, size of window identified by "id" to conffile. */
 static void save_win_config(struct World * world, char id);
 
 
@@ -52,16 +54,19 @@ static void set_winconf(struct World * world, char id);
 
 /* Get WinConf by "id"; get id of WinConf mothering "win". */
 static struct WinConf * get_winconf_by_id(struct World * world, char id);
-static char get_id_by_win(struct World * world, struct Win * win);
+
+/* Get (Win->draw) function identified by "c"; NULL if c not mapped to one. */
+static void * get_drawfunc_by_char(char c);
+
+/* Iterate over bytes of world->winconf_ids array. Re-start after null byte. */
+static char get_next_winconf_id(struct World * world);
 
 
 
 static char * string_prefixed_id(struct World * world, char * prefix, char id)
 {
-    char * err = "Trouble in string_prefixed_id() with malloc().";
     uint8_t size = strlen(prefix) + 2;
-    char * path = malloc(size);
-    exit_err(NULL == path, world, err);
+    char * path = try_malloc(size, world, "string_prefixed_id()");
     sprintf(path, "%s_", prefix);
     path[size - 2] = id;
     return path;
@@ -69,11 +74,9 @@ static char * string_prefixed_id(struct World * world, char * prefix, char id)
 
 
 
-static void create_winconf(char id, struct WinConf * wcp,
-                           void (* f) (struct Win *))
+static void create_winconf(char id, struct WinConf * wcp)
 {
     wcp->id = id;
-    wcp->draw = f;
     wcp->view = 0;
     wcp->height_type = 0;
     wcp->width_type = 0;
@@ -83,68 +86,69 @@ static void create_winconf(char id, struct WinConf * wcp,
 
 static void init_winconf_from_file(struct World * world, char id)
 {
-    char * err_o = "Trouble in init_win_from_file() with fopen().";
-    char * err_m = "Trouble in init_win_from_file() with malloc().";
-    char * err_s = "Trouble in init_win_from_file() with textfile_sizes().";
-    char * err_g = "Trouble in init_win_from_file() with fgets().";
-    char * err_c = "Trouble in init_win_from_file() with fclose().";
+    char * tmp = "init_winconf_from_file() on window id '_'";
+    char * context = try_malloc(strlen(tmp) + 1, world,
+                               "init_winconf_from_file()");
+    memcpy(context, tmp, strlen(tmp) + 1);
+    context[strlen(tmp) - 2] = id;
 
     char * path = string_prefixed_id(world, "config/windows/Win_", id);
-    FILE * file = fopen(path, "r");
-    exit_err(NULL == file, world, err_o);
+    FILE * file = try_fopen(path, "r", world, context);
     free(path);
-
-    uint16_t linemax;
-    exit_err(textfile_sizes(file, &linemax, NULL), world, err_s);
-    char * line = malloc(linemax);
-    exit_err(NULL == line, world, err_m);
+    uint16_t linemax = get_linemax(file, world, context);
+    char line[linemax + 1];
 
     struct WinConf * winconf = get_winconf_by_id(world, id);
-    exit_err(NULL == fgets(line, linemax, file), world, err_g);
-    exit_err(NULL == (winconf->title = malloc(strlen(line))), world, err_m);
+    try_fgets(line, linemax + 1, file, world, context);
+    winconf->title = try_malloc(strlen(line), world, context);
     memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */
     winconf->title[strlen(line) - 1] = '\0';        /* char at end of string. */
-    exit_err(NULL == fgets(line, linemax, file), world, err_g);
+
+    try_fgets(line, linemax + 1, file, world, context);
+    winconf->draw = line[0];
+
+    try_fgets(line, linemax + 1, file, world, context);
     winconf->height = atoi(line);
     if (0 >= winconf->height)
     {
         winconf->height_type = 1;
     }
-    exit_err(NULL == fgets(line, linemax, file), world, err_g);
+    try_fgets(line, linemax + 1, file, world, context);
     winconf->width = atoi(line);
     if (0 >= winconf->width)
     {
         winconf->width_type = 1;
     }
 
-    free(line);
-    exit_err(fclose(file), world, err_c);
+    try_fclose(file, world, context);
+    free(context);
 }
 
 
 
 static void init_win_from_winconf(struct World * world, char id)
 {
-    char * err = "Trouble in init_win_from_file() with init_win().";
+    char * tmp = "Trouble in init_win_from_file() with init_win() (win id: _).";
+    char * err = try_malloc(strlen(tmp) + 1, world, "init_win_from_file()");
+    memcpy(err, tmp, strlen(tmp) + 1);
+    err[strlen(tmp) - 3] = id;
     struct WinConf * winconf = get_winconf_by_id(world, id);
+    void * f = get_drawfunc_by_char(winconf->draw);
+    exit_err(NULL == f, world, err);
     exit_err(init_win(world->wmeta, &winconf->win, winconf->title,
-                      winconf->height, winconf->width, world, winconf->draw),
+                      winconf->height, winconf->width, world, f),
              world, err);
+    free(err);
 }
 
 
 
 extern void save_win_config(struct World * world, char id)
 {
-    char * err_o = "Trouble in save_win_config() with fopen().";
-    char * err_m = "Trouble in save_win_config() with malloc().";
-    char * err_c = "Trouble in save_win_config() with fclose().";
-    char * err_u = "Trouble in save_win_config() with unlink().";
-    char * err_r = "Trouble in save_win_config() with rename().";
+    char * f_name = "save_win_config()";
 
     char * path_tmp = string_prefixed_id(world, "config/windows/Win_tmp_", id);
-    FILE * file = fopen(path_tmp, "w");
-    exit_err(NULL == file, world, err_o);
+    FILE * file = try_fopen(path_tmp, "w", world, f_name);
 
     struct WinConf * wc = get_winconf_by_id(world, id);
     uint8_t size = strlen(wc->title) + 2;
@@ -152,22 +156,18 @@ extern void save_win_config(struct World * world, char id)
     {
         size = 7;
     }
-    char * line = malloc(size);
-    exit_err(NULL == line, world, err_m);
+    char line[size];
     sprintf(line, "%s\n", wc->title);
     fwrite(line, sizeof(char), strlen(line), file);
+    sprintf(line, "%c\n", wc->draw);
+    fwrite(line, sizeof(char), strlen(line), file);
     sprintf(line, "%d\n", wc->height);
     fwrite(line, sizeof(char), strlen(line), file);
     sprintf(line, "%d\n", wc->width);
     fwrite(line, sizeof(char), strlen(line), file);
 
-    exit_err(fclose(file), world, err_c);
     char * path = string_prefixed_id(world, "config/windows/Win_", id);
-    if (!access(path, F_OK))
-    {
-        exit_err(unlink(path), world, err_u);
-    }
-    exit_err(rename(path_tmp, path), world, err_r);
+    try_fclose_unlink_rename(file, path_tmp, path, world, f_name);
     free(path);
     free(path_tmp);
 }
@@ -213,10 +213,42 @@ static struct WinConf * get_winconf_by_id(struct World * world, char id)
 
 
 
-static char get_id_by_win(struct World * world, struct Win * win)
+static void * get_drawfunc_by_char(char c)
+{
+    if      ('i' == c)
+    {
+        return draw_info_win;
+    }
+    else if ('k' == c)
+    {
+        return draw_keys_win;
+    }
+    else if ('l' == c)
+    {
+        return draw_log_win;
+    }
+    else if ('m' == c)
+    {
+        return draw_map_win;
+    }
+    return NULL;
+}
+
+
+
+static char get_next_winconf_id(struct World * world)
 {
-    struct WinConf * wc = get_winconf_by_win(world, win);
-    return wc->id;
+    static uint8_t i = 0;
+    char c = world->winconf_ids[i];
+    if (0 == c)
+    {
+        i = 0;
+    }
+    else
+    {
+        i++;
+    }
+    return c;
 }
 
 
@@ -247,18 +279,50 @@ extern struct Win * get_win_by_id(struct World * world, char id)
 
 extern void init_winconfs(struct World * world)
 {
-    char * err = "Trouble with malloc() in init_winconfs().";
-    struct WinConf * winconfs = malloc(4 * sizeof(struct WinConf));
-    exit_err(NULL == winconfs, world, err);
-    create_winconf('i', &winconfs[0], draw_info_win);
-    create_winconf('k', &winconfs[1], draw_keys_win);
-    create_winconf('l', &winconfs[2], draw_log_win);
-    create_winconf('m', &winconfs[3], draw_map_win);
+    char * f_name = "init_winconfs()";
+    char * err_o = "Trouble in init_winconfs() with opendir().";
+    char * err_r = "Trouble in init_winconfs() with readdir().";
+    char * err_c = "Trouble in init_winconfs() with closedir().";
+
+    DIR * dp = opendir("config/windows");
+    exit_err(NULL == dp, world, err_o);
+    struct dirent * fn;
+    errno = 0;
+    char * winconf_ids = try_malloc(256, world, f_name);
+    uint8_t i = 0;
+    char id;
+    while (NULL != (fn = readdir(dp)))
+    {
+        if (   5 == strlen(fn->d_name)
+            && fn->d_name == strstr(fn->d_name, "Win_"))
+        {
+            id = fn->d_name[4];
+            winconf_ids[i] = id;
+            i++;
+        }
+    }
+    winconf_ids[i] = '\0';
+    exit_err(errno, world, err_r);
+    exit_err(closedir(dp), world, err_c);
+    world->winconf_ids = try_malloc(strlen(winconf_ids) + 1, world, f_name);
+    memcpy(world->winconf_ids, winconf_ids, strlen(winconf_ids) + 1);
+    free(winconf_ids);
+
+    struct WinConf * winconfs;
+    winconfs = try_malloc(strlen(world->winconf_ids) * sizeof(struct WinConf),
+                                 world, f_name);
+    i = 0;
+    while (0 != (id = get_next_winconf_id(world)))
+    {
+        create_winconf(id, &winconfs[i]);
+        i++;
+    }
     world->winconfs = winconfs;
-    init_winconf_from_file(world, 'i');
-    init_winconf_from_file(world, 'k');
-    init_winconf_from_file(world, 'l');
-    init_winconf_from_file(world, 'm');
+    while (0 != (id = get_next_winconf_id(world)))
+    {
+        init_winconf_from_file(world, id);
+        i++;
+    }
 }
 
 
@@ -273,10 +337,12 @@ extern void free_winconf(struct World * world, char id)
 
 extern void free_winconfs(struct World * world)
 {
-    free_winconf(world, 'i');
-    free_winconf(world, 'k');
-    free_winconf(world, 'l');
-    free_winconf(world, 'm');
+    char id;
+    while (0 != (id = get_next_winconf_id(world)))
+    {
+        free_winconf(world, id);
+    }
+    free(world->winconf_ids);
     free(world->winconfs);
 }
 
@@ -284,45 +350,42 @@ extern void free_winconfs(struct World * world)
 
 extern void init_wins(struct World * world)
 {
-    init_win_from_winconf(world, 'i');
-    init_win_from_winconf(world, 'k');
-    init_win_from_winconf(world, 'l');
-    init_win_from_winconf(world, 'm');
+    char id;
+    while (0 != (id = get_next_winconf_id(world)))
+    {
+        init_win_from_winconf(world, id);
+    }
 }
 
 
 
 extern void free_wins(struct World * world)
 {
-    free_win(get_win_by_id(world, 'i'));
-    free_win(get_win_by_id(world, 'k'));
-    free_win(get_win_by_id(world, 'l'));
-    free_win(get_win_by_id(world, 'm'));
+    char id;
+    while (0 != (id = get_next_winconf_id(world)))
+    {
+        free_win(get_win_by_id(world, id));
+    }
 }
 
 
 
 extern void sorted_wintoggle(struct World * world)
 {
-    char * err_o = "Trouble in sorted_wintoggle() with fopen().";
-    char * err_s = "Trouble in sorted_wintoggle() with textfile_sizes().";
-    char * err_g = "Trouble in sorted_wintoggle() with fgets().";
-    char * err_c = "Trouble in sorted_wintoggle() with fclose().";
-
+    char * f_name = "sorted_wintoggle()";
     char * path = "config/windows/toggle_order";
-    FILE * file = fopen(path, "r");
-    exit_err(NULL == file, world, err_o);
-
-    uint16_t linemax;
-    exit_err(textfile_sizes(file, &linemax, NULL), world, err_s);
-
-    char win_order[linemax];
-    exit_err(NULL == fgets(win_order, linemax, file), world, err_g);
-    exit_err(fclose(file), world, err_c);
-
+    FILE * file = try_fopen(path, "r", world, f_name);
+    uint16_t linemax = get_linemax(file, world, f_name);
+    char win_order[linemax + 1];
+    try_fgets(win_order, linemax + 1, file, world, f_name);
+    try_fclose(file, world, f_name);
     uint8_t i = 0;
-    for (; i < linemax - 2; i++)
+    for (; i < linemax - 1; i++)
     {
+        if (NULL == strchr(world->winconf_ids, win_order[i]))
+        {
+            continue;
+        }
         toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
     }
 }
@@ -346,41 +409,32 @@ extern void reload_win_config(struct World * world)
 
 extern void save_win_configs(struct World * world)
 {
-    save_win_config(world, 'i');
-    save_win_config(world, 'k');
-    save_win_config(world, 'l');
-    save_win_config(world, 'm');
+    char * f_name = "save_win_configs()";
 
-    char * err_o = "Trouble in save_win_configs() with fopen().";
-    char * err_m = "Trouble in save_win_configs() with calloc().";
-    char * err_c = "Trouble in save_win_configs() with fclose().";
-    char * err_u = "Trouble in save_win_configs() with unlink().";
-    char * err_r = "Trouble in save_win_configs() with rename().";
+    char id;
+    while (0 != (id = get_next_winconf_id(world)))
+    {
+        save_win_config(world, id);
+    }
 
     char * path     = "config/windows/toggle_order";
     char * path_tmp = "config/windows/toggle_order_tmp";
-    FILE * file = fopen(path_tmp, "w");
-    exit_err(NULL == file, world, err_o);
+    FILE * file = try_fopen(path_tmp, "w", world, f_name);
 
-    char * line = calloc(6, sizeof(char));
-    exit_err(NULL == line, world, err_m);
-    struct Win * w_p = world->wmeta->_chain_start;
+    char line[6];
+    struct Win * w_p = world->wmeta->chain_start;
     uint8_t i = 0;
     while (0 != w_p)
     {
-        line[i] = get_id_by_win(world, w_p);
-        w_p = w_p->_next;
+        struct WinConf * wc = get_winconf_by_win(world, w_p);
+        line[i] = wc->id;
+        w_p = w_p->next;
         i++;
     }
     line[i] = '\n';
     fwrite(line, sizeof(char), strlen(line), file);
 
-    exit_err(fclose(file), world, err_c);
-    if (!access(path, F_OK))
-    {
-        exit_err(unlink(path), world, err_u);
-    }
-    exit_err(rename(path_tmp, path), world, err_r);
+    try_fclose_unlink_rename(file, path_tmp, path, world, f_name);
 }
 
 
@@ -404,12 +458,12 @@ extern void toggle_winconfig(struct World * world, struct Win * win)
     struct WinConf * wcp = get_winconf_by_win(world, win);
     if (0 == wcp->view)
     {
-        win->_draw = draw_winconf;
+        win->draw = draw_winconf;
         wcp->view = 1;
     }
     else
     {
-        win->_draw = wcp->draw;
+        win->draw = get_drawfunc_by_char(wcp->draw);
         wcp->view = 0;
     }
 }