X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=b4a8640809ff484fb252f8a7648a770351e4a7ce;hb=2f0b15e05b0df7e10a2d0bb04ce4648455d980a8;hp=f20f37a09366e40c505888cf87341288e37f7409;hpb=db346802082f53faf4d49f234c0ba2cf86221d1e;p=plomrogue

diff --git a/src/wincontrol.c b/src/wincontrol.c
index f20f37a..b4a8640 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -4,6 +4,8 @@
 #include <stdlib.h> /* for malloc(), free() */
 #include <string.h> /* for strlen() */
 #include <stdint.h> /* for uint8_t, uint16_t */
+#include <stdio.h> /* for fopen(), fclose(), 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(),
                       * structs Win, WinMeta
@@ -19,57 +21,110 @@
 
 
 
+/* Return string "prefix" + "id"; malloc()'s string, remember to call free()! */
+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 *));
+
 /* Initialize Winconf of "id" from appropriate config file.*/
 static void init_winconf_from_file(struct World * world, char id);
 
-/* Wrapper around init_win() called with values from appropriate Winconf. */
+/* 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. */
+static void save_win_config(struct World * world, char id);
 
 
-static void init_winconf_from_file(struct World * world, char id)
+
+/* Write size of a window to its WinConf, as positive or negative values
+ * (dependent on state ofWinConf->height_type / WinConf->width_type).
+ */
+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);
+
+
+
+static char * string_prefixed_id(struct World * world, char * prefix, char id)
 {
-    char * err_m = "Trouble in init_win_from_file() with malloc().";
-    char * prefix = "config/windows/Win_";
+    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_m);
+    exit_err(NULL == path, world, err);
     sprintf(path, "%s_", prefix);
     path[size - 2] = id;
-    char * err = "Trouble in init_win_from_file() with fopen().";
+    return path;
+}
+
+
+
+static void create_winconf(char id, struct WinConf * wcp,
+                           void (* f) (struct Win *))
+{
+    wcp->id = id;
+    wcp->draw = f;
+    wcp->view = 0;
+    wcp->height_type = 0;
+    wcp->width_type = 0;
+}
+
+
+
+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 * path = string_prefixed_id(world, "config/windows/Win_", id);
     FILE * file = fopen(path, "r");
-    exit_err(NULL == file, world, err);
+    exit_err(NULL == file, world, err_o);
     free(path);
 
-    struct WinConf * winconf = get_winconf_by_id(world, id);
     uint16_t linemax;
-    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);
-    winconf->title = malloc(strlen(line));
-    exit_err(NULL == winconf->title, world, err_m);
+    exit_err(textfile_sizes(file, &linemax, NULL), world, err_s);
+    char line[linemax];
+
+    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);
     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);
+    exit_err(NULL == fgets(line, linemax, file), world, err_g);
     winconf->height = atoi(line);
-    exit_err(NULL == fgets(line, linemax, file), world, err);
+    if (0 >= winconf->height)
+    {
+        winconf->height_type = 1;
+    }
+    exit_err(NULL == fgets(line, linemax, file), world, err_g);
     winconf->width = atoi(line);
+    if (0 >= winconf->width)
+    {
+        winconf->width_type = 1;
+    }
 
-    free(line);
-    err = "Trouble in init_win_from_file() with fclose().";
-    exit_err(fclose(file), world, err);
+    exit_err(fclose(file), world, err_c);
 }
 
 
 
 static void init_win_from_winconf(struct World * world, char id)
 {
-    struct WinConf * winconf = get_winconf_by_id(world, id);
     char * err = "Trouble in init_win_from_file() with init_win().";
+    struct WinConf * winconf = get_winconf_by_id(world, id);
     exit_err(init_win(world->wmeta, &winconf->win, winconf->title,
                       winconf->height, winconf->width, world, winconf->draw),
              world, err);
@@ -77,26 +132,125 @@ static void init_win_from_winconf(struct World * world, char id)
 
 
 
-extern void create_winconfs(struct World * world)
+extern void save_win_config(struct World * world, char id)
 {
-    char * err = "Trouble with malloc() in init_winconfs().";
-    struct WinConf * winconfs = malloc(4 * sizeof(struct WinConf));
-    exit_err(NULL == winconfs, world, err);
-    winconfs[0].id = 'i';
-    winconfs[0].draw = draw_info_win;
-    winconfs[1].id = 'k';
-    winconfs[1].draw = draw_keys_win;
-    winconfs[2].id = 'l';
-    winconfs[2].draw = draw_log_win;
-    winconfs[3].id = 'm';
-    winconfs[3].draw = draw_map_win;
-    world->winconfs = winconfs;
+    char * err_o = "Trouble in save_win_config() with fopen().";
+    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 * path_tmp = string_prefixed_id(world, "config/windows/Win_tmp_", id);
+    FILE * file = fopen(path_tmp, "w");
+    exit_err(NULL == file, world, err_o);
+
+    struct WinConf * wc = get_winconf_by_id(world, id);
+    uint8_t size = strlen(wc->title) + 2;
+    if (size < 7)
+    {
+        size = 7;
+    }
+    char line[size];
+    sprintf(line, "%s\n", wc->title);
+    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);
+    free(path);
+    free(path_tmp);
+}
+
+
+
+static void set_winconf(struct World * world, char id)
+{
+    struct WinConf * wcp = get_winconf_by_id(world, id);
+    if      (0 == wcp->height_type)
+    {
+        wcp->height = wcp->win->frame.size.y;
+    }
+    else if (1 == wcp->height_type)
+    {
+        wcp->height = wcp->win->frame.size.y - world->wmeta->padframe.size.y
+                      + 1;
+    }
+    if      (0 == wcp->width_type)
+    {
+        wcp->width = wcp->win->frame.size.x;
+    }
+    else if (1 == wcp->width_type)
+    {
+        wcp->width = wcp->win->frame.size.x - world->wmeta->padframe.size.x;
+    }
+}
+
+
+
+static struct WinConf * get_winconf_by_id(struct World * world, char id)
+{
+    uint8_t i = 0;
+    while (1)
+    {
+        if (id == world->winconfs[i].id)
+        {
+            return &world->winconfs[i];
+        }
+        i++;
+    }
+}
+
+
+
+static char get_id_by_win(struct World * world, struct Win * win)
+{
+    struct WinConf * wc = get_winconf_by_win(world, win);
+    return wc->id;
+}
+
+
+
+extern struct WinConf * get_winconf_by_win(struct World * world,
+                                           struct Win * win)
+{
+    uint8_t i = 0;
+    while (1)
+    {
+        if (win == world->winconfs[i].win)
+        {
+            return &world->winconfs[i];
+        }
+        i++;
+    }
+}
+
+
+
+extern struct Win * get_win_by_id(struct World * world, char id)
+{
+    struct WinConf * wc = get_winconf_by_id(world, id);
+    return wc->win;
 }
 
 
 
 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);
+    world->winconfs = winconfs;
     init_winconf_from_file(world, 'i');
     init_winconf_from_file(world, 'k');
     init_winconf_from_file(world, 'l');
@@ -144,6 +298,33 @@ extern void free_wins(struct World * world)
 
 
 
+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 * 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);
+
+    uint8_t i = 0;
+    for (; i < linemax - 2; i++)
+    {
+        toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
+    }
+}
+
+
+
 extern void reload_win_config(struct World * world)
 {
     while (0 != world->wmeta->active)
@@ -152,7 +333,6 @@ extern void reload_win_config(struct World * world)
     }
     free_wins(world);
     free_winconfs(world);
-    create_winconfs(world);
     init_winconfs(world);
     init_wins(world);
     sorted_wintoggle(world);
@@ -160,62 +340,105 @@ extern void reload_win_config(struct World * world)
 
 
 
-extern struct WinConf * get_winconf_by_id(struct World * world, char id)
+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 * err_o = "Trouble in save_win_configs() with fopen().";
+    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 * 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);
+
+    char line[6];
+    struct Win * w_p = world->wmeta->_chain_start;
     uint8_t i = 0;
-    while (1)
+    while (0 != w_p)
     {
-        if (id == world->winconfs[i].id)
-        {
-            return &world->winconfs[i];
-        }
+        line[i] = get_id_by_win(world, w_p);
+        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);
 }
 
 
 
-extern struct Win * get_win_by_id(struct World * world, char id)
+extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
 {
-    struct WinConf * wc = get_winconf_by_id(world, id);
-    return wc->win;
+    if (0 != win->frame.curses_win)
+    {
+        return suspend_win(win_meta, win);
+    }
+    else
+    {
+        return append_win(win_meta, win);
+    }
 }
 
 
 
-extern void sorted_wintoggle(struct World * world)
+extern void toggle_winconfig(struct World * world, struct Win * win)
 {
-    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;
-    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().";
-    exit_err(NULL == fgets(win_order, linemax, file), world, err);
-    err = "Trouble in sorted_wintoggle() with fclose().";
-    exit_err(fclose(file), world, err);
-    uint8_t i = 0;
-    for (; i < linemax - 2; i++)
+    struct WinConf * wcp = get_winconf_by_win(world, win);
+    if (0 == wcp->view)
     {
-        toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
+        win->_draw = draw_winconf;
+        wcp->view = 1;
+    }
+    else
+    {
+        win->_draw = wcp->draw;
+        wcp->view = 0;
     }
 }
 
 
 
+extern void toggle_win_height_type(struct World * world, struct Win * win)
+{
+    struct WinConf * wcp = get_winconf_by_win(world, win);
+    if (0 == wcp->height_type)
+    {
+        wcp->height_type = 1;
+    }
+    else
+    {
+        wcp->height_type = 0;
+    }
+    set_winconf(world, wcp->id);
+}
+
+
 
-extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
+extern void toggle_win_width_type(struct World * world, struct Win * win)
 {
-    if (0 != win->frame.curses_win)
+    struct WinConf * wcp = get_winconf_by_win(world, win);
+    if (   0 == wcp->width_type
+        && win->frame.size.x <= world->wmeta->padframe.size.x)
     {
-        return suspend_win(win_meta, win);
+        wcp->width_type = 1;
     }
     else
     {
-        return append_win(win_meta, win);
+        wcp->width_type = 0;
     }
+    set_winconf(world, wcp->id);
 }
 
 
@@ -234,11 +457,11 @@ extern void scroll_pad(struct WinMeta * win_meta, char dir)
 
 
 
-extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change)
+extern uint8_t growshrink_active_window(struct World * world, char change)
 {
-    if (0 != win_meta->active)
+    if (0 != world->wmeta->active)
     {
-        struct yx_uint16 size = win_meta->active->frame.size;
+        struct yx_uint16 size = world->wmeta->active->frame.size;
         if      (change == '-')
         {
             size.y--;
@@ -255,7 +478,16 @@ extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change)
         {
             size.x++;
         }
-        return resize_active_win (win_meta, size);
+        uint8_t x = resize_active_win(world->wmeta, size);
+        struct WinConf * wcp = get_winconf_by_win(world, world->wmeta->active);
+        if (   1 == wcp->width_type
+            && world->wmeta->active->frame.size.x
+               > world->wmeta->padframe.size.x)
+        {
+            wcp->width_type = 0;
+        }
+        set_winconf(world, wcp->id);
+        return x;
     }
     return 0;
 }