X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=e84d652554c74ba12face4114501818193f500ad;hb=169b8dda5f4c4373300b5be5edc113a376799737;hp=b0734dc5cca71989e1b7bc9137b0a5dd33f62952;hpb=6f98f0b029c3e84f1df0f2f3642f88e91b17cf33;p=plomrogue

diff --git a/src/client/windows.c b/src/client/windows.c
index b0734dc..e84d652 100644
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -1,21 +1,23 @@
 /* src/client/windows.c */
 
+#define _POSIX_C_SOURCE 200809L /* strnlen() */
 #include "windows.h"
 #include <ncurses.h> /* chtype, getmaxx(), getmaxy(), erase(), werase(),
                       * endwin(), delwin(), wnoutrefresh(), pnoutrefresh(),
                       * doupdate(), refresh(), delwin(), newpad(), mvwaddch(),
-                      * mvwaddstr(), wresize()
+                      * mvwaddstr()
                       */
 #include <stddef.h> /* NULL */
-#include <stdlib.h> /* free(), atoi() */
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
 #include <stdio.h> /* sprintf() */
+#include <stdlib.h> /* free(), atoi() */
 #include <string.h> /* memcpy(), strlen(), strnlen(), strchr(), memset() */
 #include "../common/err_try_fgets.h" /* err_try_fgets(), err_line() */
 #include "../common/readwrite.h" /* try_fputc(), try_write(), try_fgetc() */
 #include "../common/rexit.h" /* exit_trouble(), exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/yx_uint16.h" /* struct yx_uint16 */
+#include "array_append.h" /* array_append() */
 #include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(),
                         * draw_win_inventory(), draw_win_info(), draw_win_log(),
                         * draw_win_available_keybindings(), draw_win_map(),
@@ -23,21 +25,14 @@
                         * draw_win_keybindings_winconf_geometry(),
                         * draw_win_keybindings_global()
                         */
-#include "keybindings.h" /* free_keybindings(), write_keybidings_to_file(),
+#include "keybindings.h" /* write_keybidings_to_file(),
                           * read_keybindings_from_file()
                           */
-#include "misc.h" /* array_append() */
+#include "wincontrol.h" /* toggle_window() */
 #include "world.h" /* global world */
 
 
 
-/* Get position of id "c" in world.winDB.order or return Win before/after (or
- * NULL if there is no window before/after).
- */
-static uint8_t get_pos_in_order(char c);
-static struct Win * get_win_after(char c);
-static struct Win * get_win_before(char c);
-
 /* Calculate "id"'s window's size from v_screen size and .target_(height/width).
  * A .target_width == 0 makes the window as wide as .t_screen. .target_height ==
  * 0 sets the maximum allowed height: one cell smaller than that of .v_screen.
@@ -51,23 +46,11 @@ static void init_win_size_from_winconf_and_v_screen_size(char id);
  * match_func() is just a little helper to it.
  */
 static uint8_t match_func(char c, void (** f) (), char c_m, void (* f_m) ());
-static void * get_drawfunc_by_char(char c);
-
-/* Write "win"'s size back to .target_(height/width) as per .target_*_type. */
-static void set_win_target_size(struct Win * win);
+static void (* get_drawfunc_by_char(char c)) ();
 
 /* Iterate over chars of world.winDB.ids array / string. Restart after \0.*/
 static char get_next_win_id();
 
-/* Make .v_screen just wide enough to contain all visible windows. */
-static void refit_v_screen();
-
-/* Update geometry (sizes, positions) of window "w" and its successors in the
- * window chain. Use place_win() for the positioning algorithm.
- */
-static void update_wins(struct Win * w);
-static void place_win(struct Win * w);
-
 /* Draw scroll hint (a line saying that there are "dist" more elements of "unit"
  * further into the direction symbolized by "dir") into .v_screen, onto an
  * appropriate edge of a window or .v_screen; the left/right edge if "dir" is
@@ -92,42 +75,6 @@ static void draw_wins_bordercorners(struct Win * w);
 /* Draw contents of all windows in window chain from window "w" onwards. */
 static void draw_wins(struct Win * w);
 
-/* Append/suspend window "w" to/from chain of visible windows. Appended windows
- * will become active. Suspended active windows will move the active window
- * selection to their successor in the window chain or, failing that, their
- * predecessor, or, failing that, to 0 (no window active).
- */
-static void append_win(struct Win * w);
-static void suspend_win(struct Win * w);
-
-
-
-static uint8_t get_pos_in_order(char c)
-{
-    uint8_t i;
-    for (i = 0; c != world.winDB.order[i]; i++);
-    return i;
-}
-
-
-
-static struct Win * get_win_after(char c)
-{
-    return get_win_by_id(world.winDB.order[get_pos_in_order(c) + 1]);
-}
-
-
-
-static struct Win * get_win_before(char c)
-{
-    uint8_t i = get_pos_in_order(c);
-    if (i > 0)
-    {
-        return get_win_by_id(world.winDB.order[i - 1]);
-    }
-    return NULL;
-}
-
 
 
 static void init_win_size_from_winconf_and_v_screen_size(char id)
@@ -170,7 +117,7 @@ static uint8_t match_func(char c, void (** f) (), char c_m, void (* f_m) ())
 
 
 
-static void * get_drawfunc_by_char(char c)
+static void (* get_drawfunc_by_char(char c)) ()
 {
     void (* f) (struct Win *) = NULL;
     if (   match_func(c, &f, 'c', draw_win_inventory)
@@ -180,30 +127,11 @@ static void * get_drawfunc_by_char(char c)
         || match_func(c, &f, 'm', draw_win_map)
         || match_func(c, &f, '0', draw_win_keybindings_global)
         || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry)
-        || match_func(c, &f, '2', draw_win_keybindings_winconf_keybindings));
-    return f;
-}
-
-
-
-static void set_win_target_size(struct Win * wcp)
-{
-    if      (0 == wcp->target_height_type)
-    {
-        wcp->target_height = wcp->frame_size.y;
-    }
-    else if (1 == wcp->target_height_type)
+        || match_func(c, &f, '2', draw_win_keybindings_winconf_keybindings))
     {
-        wcp->target_height = wcp->frame_size.y - world.winDB.v_screen_size.y +1;
-    }
-    if      (0 == wcp->target_width_type)
-    {
-        wcp->target_width = wcp->frame_size.x;
-    }
-    else if (1 == wcp->target_width_type)
-    {
-        wcp->target_width = wcp->frame_size.x - world.winDB.v_screen_size.x;
+        ;
     }
+    return f;
 }
 
 
@@ -223,104 +151,6 @@ static char get_next_win_id()
 
 
 
-static void refit_v_screen()
-{
-    /* Determine rightmost window column. */
-    uint32_t lastwcol = 0;
-    struct Win * wp = get_win_by_id(world.winDB.order[0]);
-    while (wp != 0)
-    {
-        if ((uint32_t) wp->start.x + (uint32_t) wp->frame_size.x > lastwcol + 1)
-        {
-            lastwcol = (uint32_t) wp->start.x + (uint32_t) wp->frame_size.x - 1;
-        }
-        wp = get_win_after(wp->id);
-    }
-
-    /* Only resize .v_screen if the rightmost window column has changed. */
-    char * err_s = "refit_v_screen() grows virtual screen beyond legal sizes.";
-    char * err_m = "refit_v_screen() triggers memory alloc error in wresize().";
-    if (getmaxx(world.winDB.v_screen) + 1 != lastwcol)
-    {
-        uint8_t t = (lastwcol + 2 > UINT16_MAX);
-        exit_err(t, err_s);
-        t = wresize(world.winDB.v_screen, getmaxy(world.winDB.v_screen),
-                    lastwcol + 2);
-        exit_err(t, err_m);
-    }
-}
-
-
-
-static void update_wins(struct Win * w)
-{
-    place_win(w);
-    refit_v_screen();
-    struct Win * next = get_win_after(w->id);
-    if (next)
-    {
-        update_wins(next);
-    }
-}
-
-
-
-static void place_win(struct Win * w)
-{
-    /* If w is first window, it goes into the top left corner. */
-    w->start.x = 0;
-    w->start.y = 1;                             /* Leave space for title bar. */
-    struct Win * w_prev = get_win_before(w->id);
-    if (w_prev)
-    {
-
-        /* If not, fit w's top left to top right of last top predecessor. */
-        struct Win * w_top = w_prev;
-        for (;
-             w_top->start.y != 1;
-             w_top = get_win_before(w_top->id));
-        w->start.x = w_top->start.x + w_top->frame_size.x + 1;
-
-        /* Fit w's top left to bottom left of its ->prev if enough space. */
-        uint16_t w_prev_maxy = w_prev->start.y + w_prev->frame_size.y;
-        if (   w->frame_size.x <= w_prev->frame_size.x
-            && w->frame_size.y <  world.winDB.v_screen_size.y - w_prev_maxy)
-        {
-            w->start.x = w_prev->start.x;
-            w->start.y = w_prev_maxy + 1;
-            return;
-        }
-
-        /* Failing that, try to fit w' top left to the top right of the last
-         * predecessor w_test 1) not followed by windows with a left corner
-         * further rightwards than its own 2) with enough space rightwards for w
-         * until the bottom right of w_thr directly throning over it 3) and with
-         * this same space extending far enough to the bottom for fitting in w.
-         */
-        struct Win * w_test = w_prev;
-        struct Win * w_thr;
-        while (w_test != w_top)
-        {
-            for (w_thr = get_win_before(w_test->id);
-                 w_test->start.y <= w_thr->start.y;
-                 w_thr = get_win_before(w_thr->id));
-            uint16_t w_thr_bottom = w_thr->start.y + w_thr->frame_size.y;
-            uint16_t free_width =   (w_thr->start.x + w_thr->frame_size.x)
-                                  - (w_test->start.x + w_test->frame_size.x);
-            if (   w->frame_size.y < world.winDB.v_screen_size.y - w_thr_bottom
-                && w->frame_size.x < free_width)
-            {
-                w->start.x = w_test->start.x + w_test->frame_size.x + 1;
-                w->start.y = w_thr_bottom + 1;
-                break;
-            }
-            w_test = w_thr;
-        }
-    }
-}
-
-
-
 static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist,
                         char * unit, struct yx_uint16 start)
 {
@@ -502,57 +332,30 @@ static void draw_wins(struct Win * w)
     struct Win * next = get_win_after(w->id);
     if (next)
     {
-        return draw_wins(next);
+        draw_wins(next);
     }
 }
 
 
 
-static void append_win(struct Win * w)
+extern uint8_t get_win_pos_in_order(char c)
 {
-    char * f_name = "append_win()";
-    uint8_t old_size = strlen(world.winDB.order) + 1;
-    char * new_order = try_malloc(old_size + 1, f_name);
-    memcpy(new_order, world.winDB.order, old_size - 1);
-    new_order[old_size - 1] = w->id;
-    new_order[old_size] = '\0';
-    free(world.winDB.order);
-    world.winDB.order = new_order;
-    world.winDB.active = w->id;
-    update_wins(w);
+    uint8_t i;
+    for (i = 0; c != world.winDB.order[i]; i++);
+    return i;
 }
 
 
 
-static void suspend_win(struct Win * w)
+extern struct Win * get_win_after(char c)
 {
-    char * f_name = "suspend_win()";
-    uint8_t new_size = strlen(world.winDB.order);
-    char * new_order = try_malloc(new_size, f_name);
-    uint8_t i = get_pos_in_order(w->id);
-    char next_char = world.winDB.order[i + 1];
-    world.winDB.order[i] = '\0';
-    char * second_part = &world.winDB.order[i + 1];
-    sprintf(new_order, "%s%s", world.winDB.order, second_part);
-    free(world.winDB.order);
-    world.winDB.order = new_order;
-    world.winDB.active = world.winDB.order[i];
-    if (!world.winDB.order[i] && 0 < i)
-    {
-        world.winDB.active = world.winDB.order[i - 1];
-    }
-    if (world.winDB.order[i])
-    {
-        update_wins(get_win_by_id(next_char)); /* Already calls               */
-        return;                                /* refit_v_screen(), so leave. */
-    }
-    refit_v_screen();
+    return get_win_by_id(world.winDB.order[get_win_pos_in_order(c) + 1]);
 }
 
 
 
-extern uint16_t center_offset(uint16_t position, uint16_t mapsize,
-                              uint16_t frame_size)
+extern uint16_t center_offset(uint16_t position, uint32_t mapsize,
+                              uint32_t frame_size)
 {
     uint16_t offset = 0;
     if (mapsize > frame_size)
@@ -598,6 +401,7 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax,
                      "interface config file. ";
     char * err_id  = "Illegal ID(s) selected.";
     char * err_2   = "Double-initialized window.";
+    char * err_brk = "Illegal line break type index.";
     int test_for_end = try_fgetc(file, f_name);
     if (EOF == test_for_end || '\n' == test_for_end)
     {
@@ -615,6 +419,9 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax,
     win.title = try_malloc(strlen(line), f_name);
     memcpy(win.title, line, strlen(line) - 1);      /* Eliminate newline char */
     win.title[strlen(line) - 1] = '\0';             /* char at end of string. */
+    err_try_fgets(line, linemax, file, context, "0nsi");
+    err_line(atoi(line) > 2, line, context, err_brk);
+    win.linebreak = atoi(line);
     err_try_fgets(line, linemax, file, context, "0ni");
     win.target_height = atoi(line);
     win.target_height_type = (0 >= win.target_height);
@@ -656,6 +463,8 @@ extern void write_winconf_of_id_to_file(FILE * file, char c)
     try_fwrite(line, sizeof(char), strlen(line), file, f_name);
     sprintf(line, "%s\n", wc->title);
     try_fwrite(line, sizeof(char), strlen(line), file, f_name);
+    sprintf(line, "%d\n", wc->linebreak);
+    try_fwrite(line, sizeof(char), strlen(line), file, f_name);
     sprintf(line, "%d\n", wc->target_height);
     try_fwrite(line, sizeof(char), strlen(line), file, f_name);
     sprintf(line, "%d\n", wc->target_width);
@@ -739,17 +548,18 @@ extern void free_winDB()
     {
         struct Win * wc = get_win_by_id(id);
         free(wc->title);
-        free_keybindings(wc->kb.kbs);
+        free(wc->kb.kbs);
+        wc->kb.kbs = NULL;
     }
-    free(world.winDB.ids);  /* NULL this too since add_win_to_winDB() checks  */
-    world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/
+    free(world.winDB.ids); /* NULL this since read_winconf_from_file() checks */
+    world.winDB.ids = NULL;/* for it to detect its first post-DB-purge round. */
     free(world.winDB.wins);
     free(world.winDB.order);
 }
 
 
 
-extern void winch_called(int signal)
+extern void winch_called()
 {
     world.winch = 1;
 }
@@ -815,177 +625,3 @@ extern void draw_all_wins()
     /* Only at the end write accumulated changes to .t_screen. */
     doupdate();
 }
-
-
-
-extern void toggle_window(char id)
-{
-    struct Win * win = get_win_by_id(id);
-    if (NULL == strchr(world.winDB.order, id))
-    {
-        append_win(win);
-        return;
-    }
-    suspend_win(win);
-}
-
-
-
-extern void toggle_winconfig()
-{
-    if (!world.winDB.active)
-    {
-        return;
-    }
-    struct Win * w = get_win_by_id(world.winDB.active);
-    if      (0 == w->view)
-    {
-        w->view          = 1;
-        w->target_center = w->center;
-        memset(&w->center, 0, sizeof(struct yx_uint16));
-        return;
-    }
-    else if (1 == w->view)
-    {
-        w->view          = 2;
-        w->center.x      = 0;
-        return;
-    }
-    w->view          = 0;
-    w->center        = w->target_center;
-}
-
-
-
-extern void toggle_win_size_type(char axis)
-{
-    struct Win * w = get_win_by_id(world.winDB.active);
-    if ('y' == axis)
-    {
-        w->target_height_type = (0 == w->target_height_type);
-        set_win_target_size(w);
-        return;
-    }
-    w->target_width_type = (   0 == w->target_width_type
-                            && w->frame_size.x <= world.winDB.v_screen_size.x);
-    set_win_target_size(w);
-}
-
-
-
-extern void resize_active_win(char change)
-{
-    if (world.winDB.active)
-    {
-        struct Win * w = get_win_by_id(world.winDB.active);
-        if      (change == '-' && w->frame_size.y > 1)
-        {
-            w->frame_size.y--;
-        }
-        else if (change == '_' && w->frame_size.y > 1)
-        {
-            w->frame_size.x--;
-        }
-        else if (   change == '+'
-                 && w->frame_size.y < world.winDB.v_screen_size.y - 1)
-        {
-            w->frame_size.y++;
-        }
-        else if (change == '*' && w->frame_size.y < UINT16_MAX)
-        {
-            w->frame_size.x++;
-        }
-        if (   1 == w->target_width_type
-            && w->frame_size.x > world.winDB.v_screen_size.x)
-        {
-            w->target_width_type = 0;
-        }
-        set_win_target_size(w);
-        update_wins(w);
-    }
-}
-
-
-
-extern void shift_active_win(char dir)
-{
-    uint8_t len_order = strlen(world.winDB.order);
-    if (1 < len_order)
-    {
-        char tmp[len_order + 1];
-        tmp[len_order] = '\0';
-        uint8_t pos = get_pos_in_order(world.winDB.active);
-        if ('f' == dir)
-        {
-            if (pos == len_order - 1)
-            {
-                memcpy(tmp + 1, world.winDB.order, len_order - 1);
-                tmp[0] = world.winDB.active;
-                memcpy(world.winDB.order, tmp, len_order + 1);
-            }
-            else
-            {
-                world.winDB.order[pos] = world.winDB.order[pos + 1];
-                world.winDB.order[pos + 1] = world.winDB.active;
-            }
-        }
-        else
-        {
-            if (pos == 0)
-            {
-                memcpy(tmp, world.winDB.order + 1, len_order - 1);
-                tmp[len_order - 1] = world.winDB.active;
-                memcpy(world.winDB.order, tmp, len_order + 1);
-            }
-            else
-            {
-                world.winDB.order[pos] = world.winDB.order[pos - 1];
-                world.winDB.order[pos - 1] = world.winDB.active;
-            }
-        }
-        update_wins(get_win_by_id(world.winDB.order[0]));
-    }
-}
-
-
-
-extern void scroll_v_screen(char dir)
-{
-    if      (   '+' == dir
-             &&   world.winDB.v_screen_offset + world.winDB.v_screen_size.x + 1
-                < getmaxx(world.winDB.v_screen))
-    {
-        world.winDB.v_screen_offset++;
-    }
-    else if (   '-' == dir
-             && world.winDB.v_screen_offset > 0)
-    {
-        world.winDB.v_screen_offset--;
-    }
-}
-
-
-
-extern void cycle_active_win(char dir)
-{
-    uint8_t len_order = strlen(world.winDB.order);
-    if (1 < len_order)
-    {
-        uint8_t pos = get_pos_in_order(world.winDB.active);
-        if ('f' == dir)
-        {
-            world.winDB.active = world.winDB.order[pos + 1];
-            if ('\0' == world.winDB.active)
-            {
-                world.winDB.active = world.winDB.order[0];
-            }
-            return;
-        }
-        if (pos > 0)
-        {
-            world.winDB.active = world.winDB.order[pos - 1];
-            return;
-        }
-        world.winDB.active = world.winDB.order[len_order - 1];
-    }
-}