X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=624a240970cfb141b81ff1c58a3a79d8f17ad801;hb=93e3207a51c7ba4a31e3fb192e41b4421a906506;hp=ac48bdc53977655ed7f863c5e6b6417eda7d2e9f;hpb=9544dd88fb74d3de9d966ef88d2f4a2f853e3faf;p=plomrogue

diff --git a/src/draw_wins.c b/src/draw_wins.c
index ac48bdc..624a240 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>      /* for free() */
 #include <stdint.h>      /* for uint16_t */
 #include <string.h>      /* for strlen() */
-#include <ncurses.h>     /* for attri_t, chtype, mvwaddch(), wresize() */
+#include <ncurses.h>     /* for attri_t, chtype */
 #include "windows.h"     /* for struct Win */
 #include "misc.h"        /* for try_malloc() */
 #include "keybindings.h" /* for struct KeyBinding, for get_name_to_keycode() */
@@ -12,75 +12,108 @@
                           * get_player()
                           */
 #include "map.h"         /* for Map struct */
-#include "main.h"        /* for World struct */
+#include "main.h"        /* for world global */
 #include "command_db.h"  /* for get_command_longdesc() */
 #include "wincontrol.h"  /* for WinConf struct, get_winconf_by_win() */
 
 
 
-/* Widen the ncurses window below "win" to "minx" if it is below that. */
-static void rewiden_if_less_than(struct Win * win, uint16_t minx);
+/* Apply to the winmap of Win "w" the new sizes "new_size_y" and "new_size_x"
+ * to the degree that they extend it. Re-shape the window content accordingly.
+ */
+static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x);
+
+/* In Win "w", write "ch" to coordinate "y"/"x". */
+static void set_ch_on_yx(struct Win * w, int y, int x, chtype ch);
 
-/* Write "text" into window "win". Start on row "start_y". Break text at
- * right window edge. Also break at newlines.
+/* Add "text" into window "win". Break text at right window edge. Also break at
+ * newlines.
  */
-static void draw_with_linebreaks(struct Win * win, char * text,
-                                 uint16_t start_y);
+static void add_text_with_linebreaks(struct Win * win, char * text);
 
-/* Write "line" into window "w" at line "y"; apply ncurses attribute
- * "attri" to all characters drawn; if "fill" is non-zero, fill the
- * entire line until the right window edge with empty characters
- * ("attri" also applied on these).
+/* Add "line" into window "w". Apply ncurses attribute "attri" to all
+ * characters drawn. If "fill" is non-zero, fill the entire line until the
+ * right window edge with empty characters ("attri" also applied on these).
  */
-static void draw_line(struct Win * w, uint16_t y, char * line, attr_t attri,
-                      uint8_t fill);
+static void add_line(struct Win * w, char * line, attr_t attri, uint8_t fill);
 
-/* Write "text" with draw_with_linebreaks() as not starting from the top but
+/* Write "text" with add_text_with_linebreaks() as not starting from the top but
  * from bottom of "win". Draw only what fits in window (avoid scroll hints).
  */
 static void draw_text_from_bottom(struct Win * win, char * text);
 
 /* Draw onto "map" in "win" the objects in the chain at "start". */
-static void draw_map_objects(struct World * world, struct MapObj * start,
-                             struct Map * map, struct Win * win);
+static void draw_map_objects(struct MapObj * start, struct Map * map,
+                             struct Win * win);
 
 /* Return keybinding list line via "kb_pp", iterate pointer pointed to by it. */
-static char * get_kb_line_and_iterate(struct World * world,
-                                      struct KeyBinding ** kb_pp);
+static char * get_kb_line_and_iterate(struct KeyBinding ** kb_pp);
 
 /* Draw from line "start" on config view for keybindings defined at "kb". */
-static void draw_kb_view(struct World * world, struct Win * w,
-                         struct KeyBiData * kb, uint8_t start);
+static void draw_kb_view(struct Win * w, struct KeyBiData * kb, uint8_t start);
 
 /* Draw into window "w" from line "start" on a "title" followed by an empty
  * line followed by a list of all keybindings starting at kb_p.
  */
-static uint16_t draw_titled_keybinding_list(struct World * world, char * title,
-                                            struct Win * w, uint16_t start,
+static uint16_t draw_titled_keybinding_list(char * title, struct Win * w,
+                                            uint16_t start,
                                             struct KeyBinding * kb_p);
 
 
 
-static void rewiden_if_less_than(struct Win * win, uint16_t minx)
+static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x)
 {
-    if (minx > getmaxx(win->frame.curses_win))
+    char * f_name = "try_resize_winmap()";
+    if (w->winmapsize.y >= new_size_y && w->winmapsize.x >= new_size_x)
+    {
+        return;
+    }
+    if      (w->winmapsize.y > new_size_y)
     {
-        wresize(win->frame.curses_win, getmaxy(win->frame.curses_win), minx);
+        new_size_y = w->winmapsize.y;
     }
+    else if (w->winmapsize.x > new_size_x)
+    {
+        new_size_x = w->winmapsize.x;
+    }
+    chtype * old_winmap = w->winmap;
+    uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x;
+    w->winmap = try_malloc(new_size, f_name);
+    uint16_t y, x;
+    for (y = 0; y < new_size_y; y++)
+    {
+        for (x = 0; y < w->winmapsize.y && x < w->winmapsize.x; x++)
+        {
+            chtype ch = old_winmap[(y * w->winmapsize.x) + x];
+            w->winmap[(y * new_size_x) + x] = ch;
+        }
+        for (; x < new_size_x; x++)
+        {
+            w->winmap[(y * new_size_x) + x] = ' ';
+        }
+    }
+    free(old_winmap);
+    w->winmapsize.y = new_size_y;
+    w->winmapsize.x = new_size_x;
 }
 
 
 
-static void draw_with_linebreaks(struct Win * win, char * text,
-                                 uint16_t start_y)
+static void set_ch_on_yx(struct Win * w, int y, int x, chtype ch)
+{
+    w->winmap[(y * w->winmapsize.x) + x] = ch;
+}
+
+
+
+static void add_text_with_linebreaks(struct Win * win, char * text)
 {
     uint16_t x, y;
     int16_t z = -1;
-    rewiden_if_less_than(win, win->frame.size.x);
-    for (y = start_y; ; y++)
+    for (y = win->winmapsize.y; ; y++)
     {
-        wresize(win->frame.curses_win, y + 1, getmaxx(win->frame.curses_win));
-        for (x = 0; x < win->frame.size.x; x++)
+        try_resize_winmap(win, y + 1, win->framesize.x);
+        for (x = 0; x < win->framesize.x; x++)
         {
             z++;
             if ('\n' == text[z])
@@ -89,7 +122,7 @@ static void draw_with_linebreaks(struct Win * win, char * text,
             }
             else
             {
-                mvwaddch(win->frame.curses_win, y, x, text[z]);
+                set_ch_on_yx(win, y, x, text[z]);
             }
             if ('\n' == text[z+1])
             {
@@ -106,21 +139,29 @@ static void draw_with_linebreaks(struct Win * win, char * text,
 
 
 
-static void draw_line(struct Win * w, uint16_t y, char * line, attr_t attri,
-                      uint8_t fill)
+static void add_line(struct Win * w, char * line, attr_t attri, uint8_t fill)
 {
+    uint16_t y = w->winmapsize.y;
+    uint16_t len_line = strlen(line);
+    if (0 != fill
+        && w->winmapsize.x < w->framesize.x && w->framesize.x > len_line)
+    {
+        try_resize_winmap(w, y + 1, w->framesize.x);
+    }
+    else
+    {
+        try_resize_winmap(w, y + 1, strlen(line));
+    }
     uint16_t x = 0;
-    for (; x < strlen(line); x++)
+    for (; x < len_line; x++)
     {
-        rewiden_if_less_than(w, x + 1);
-        mvwaddch(w->frame.curses_win, y, x, line[x] | attri);
+        set_ch_on_yx(w, y, x, line[x] | attri);
     }
     if (0 != fill)
     {
-        for (; x < w->frame.size.x; x++)
+        for (; x < w->framesize.x; x++)
         {
-            rewiden_if_less_than(w, x + 1);
-            mvwaddch(w->frame.curses_win, y, x, ' ' | attri);
+            set_ch_on_yx(w, y, x, ' ' | attri);
         }
     }
 }
@@ -134,11 +175,11 @@ static void draw_text_from_bottom(struct Win * win, char * text)
      * y and stopping the loop. Make sure +they* don't count as cell space.
      */
     char toggle = 0;
-    uint16_t x, y, offset;
+    uint16_t x, y;
     int16_t z = -1;
     for (y = 0; 0 == toggle; y++)
     {
-        for (x = 0; x < win->frame.size.x; x++)
+        for (x = 0; x < win->framesize.x; x++)
         {
             z++;
             if ('\n' == text[z])
@@ -161,16 +202,16 @@ static void draw_text_from_bottom(struct Win * win, char * text)
 
     /* Depending on what's bigger, determine start point in window or text. */
     uint16_t start_y = 0;
-    if (y < win->frame.size.y)
+    if (y < win->framesize.y)
     {
-        start_y = win->frame.size.y - y;
+        start_y = win->framesize.y - y;
     }
-    else if (y > win->frame.size.y)
+    else if (y > win->framesize.y)
     {
-        offset = y - win->frame.size.y;
+        uint16_t offset = y - win->framesize.y;
         for (y = 0; y < offset; y++)
         {
-            for (x = 0; x < win->frame.size.x; x++)
+            for (x = 0; x < win->framesize.x; x++)
             {
                 z++;
                 if ('\n' == text[z])
@@ -187,13 +228,14 @@ static void draw_text_from_bottom(struct Win * win, char * text)
         text = text + (sizeof(char) * (z + 1));
     }
 
-    draw_with_linebreaks(win, text, start_y);
+    try_resize_winmap(win, start_y, 1);
+    add_text_with_linebreaks(win, text);
 }
 
 
 
-static void draw_map_objects(struct World * world, struct MapObj * start,
-                             struct Map * map, struct Win * win)
+static void draw_map_objects(struct MapObj * start, struct Map * map,
+                             struct Win * win)
 {
     struct MapObj * o;
     struct MapObjDef * d;
@@ -206,9 +248,9 @@ static void draw_map_objects(struct World * world, struct MapObj * start,
             if ((   (0 == i && 0 == o->lifepoints)         /* Draw in-animate */
                  || (1 == i && 0 < o->lifepoints)))        /* objects first.  */
             {
-                d = get_map_object_def(world, o->type);
+                d = get_map_object_def(o->type);
                 c = d->char_on_map;
-                mvwaddch(win->frame.curses_win, o->pos.y, o->pos.x, c);
+                set_ch_on_yx(win, o->pos.y, o->pos.x, c);
             }
         }
     }
@@ -216,15 +258,14 @@ static void draw_map_objects(struct World * world, struct MapObj * start,
 
 
 
-static char * get_kb_line_and_iterate(struct World * world,
-                                      struct KeyBinding ** kb_pp)
+static char * get_kb_line_and_iterate(struct KeyBinding ** kb_pp)
 {
     char * f_name = "get_kb_line_and_iterate()";
     struct KeyBinding * kb_p = * kb_pp;
-    char * keyname = get_name_to_keycode(world, kb_p->key);
-    char * cmd_dsc = get_command_longdsc(world, kb_p->name);
+    char * keyname = get_name_to_keycode(kb_p->key);
+    char * cmd_dsc = get_command_longdsc(kb_p->name);
     uint16_t size = 9 + 1 + strlen(cmd_dsc) + 1;
-    char * line = try_malloc(size, world, f_name);
+    char * line = try_malloc(size, f_name);
     sprintf(line, "%-9s %s", keyname, cmd_dsc);
     free(keyname);
     * kb_pp = kb_p->next;
@@ -233,20 +274,17 @@ static char * get_kb_line_and_iterate(struct World * world,
 
 
 
-static void draw_kb_view(struct World * world, struct Win * w,
-                         struct KeyBiData * kb, uint8_t start)
+static void draw_kb_view(struct Win * w, struct KeyBiData * kb, uint8_t start)
 {
     if (0 == kb->kbs)
     {
-        wresize(w->frame.curses_win, start + 1, getmaxx(w->frame.curses_win));
-        draw_line(w, start, "(none)", 0, 0);
+        add_line(w, "(none)", 0, 0);
         return;
     }
     struct KeyBinding * kb_p = kb->kbs;
     uint16_t y;
     for (y = start; 0 != kb_p; y++)
     {
-        wresize(w->frame.curses_win, y + 1, getmaxx(w->frame.curses_win));
         attr_t attri = 0;
         if (y - start == kb->select)
         {
@@ -256,61 +294,38 @@ static void draw_kb_view(struct World * world, struct Win * w,
                 attri = attri | A_BLINK;
             }
         }
-        char * kb_line = get_kb_line_and_iterate(world, &kb_p);
-        draw_line(w, y, kb_line, attri, 1);
+        char * kb_line = get_kb_line_and_iterate(&kb_p);
+        add_line(w, kb_line, attri, 1);
         free(kb_line);
     }
 }
 
 
 
-static uint16_t draw_titled_keybinding_list(struct World * world, char * title,
-                                            struct Win * w, uint16_t start,
+static uint16_t draw_titled_keybinding_list(char * title, struct Win * w,
+                                            uint16_t start,
                                             struct KeyBinding * kb_p)
 {
-    uint16_t x, y;
-    uint16_t i = 0;
+    uint16_t y;
     uint8_t state = 0;
     for (y = start; (0 == state || 0 != kb_p); y++)
     {
-        wresize(w->frame.curses_win, y + 1, getmaxx(w->frame.curses_win));
         if (0 == state)
         {
-            for (x = 0; ; x++)
-            {
-                if (i == strlen(title))
-                {
-                    y++;
-                    state = 1 + (0 == kb_p);
-                    i = 0;
-                    break;
-                }
-                rewiden_if_less_than(w, x + 1);
-                mvwaddch(w->frame.curses_win, y, x, title[i]);
-                i++;
-            }
+            add_line(w, title, 0, 0);
+            y++;
+            add_line(w, " ", 0, 0);
+            state = 1 + (0 == kb_p);
             continue;
         }
-        char * kb_line = get_kb_line_and_iterate(world, &kb_p);
-        if (strlen(kb_line) > getmaxx(w->frame.curses_win))
-        {
-            wresize(w->frame.curses_win, y + 1, strlen(kb_line));
-        }
-        draw_line(w, y, kb_line, 0, 0);
+        char * kb_line = get_kb_line_and_iterate(&kb_p);
+        add_line(w, kb_line, 0, 0);
         free(kb_line);
     }
     if (2 == state)
     {
         char * none = "(none)";
-        if (strlen(none) > getmaxx(w->frame.curses_win))
-        {
-            wresize(w->frame.curses_win, y + 1, strlen(none));
-        }
-        else
-        {
-            wresize(w->frame.curses_win, y + 1, getmaxx(w->frame.curses_win));
-        }
-        draw_line(w, y, none, 0, 0);
+        add_line(w, none, 0, 0);
         y++;
     }
     return y;
@@ -320,73 +335,69 @@ static uint16_t draw_titled_keybinding_list(struct World * world, char * title,
 
 extern void draw_win_log(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    draw_text_from_bottom(win, world->log);
+    draw_text_from_bottom(win, world.log);
 }
 
 
 
 extern void draw_win_map(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    struct Map * map = world->map;
+    struct Map * map = world.map;
     char * cells = map->cells;
-    wresize(win->frame.curses_win, map->size.y, map->size.x);
-    uint16_t x, y, z;
+    try_resize_winmap(win, map->size.y, map->size.x);
+    uint16_t z = 0;
+    uint16_t x, y;
     for (y = 0; y < map->size.y; y++)
     {
         for (x = 0; x < map->size.x; x++)
         {
-            mvwaddch(win->frame.curses_win, y, x, cells[z]);
+            set_ch_on_yx(win, y, x, cells[z]);
             z++;
         }
     }
-    draw_map_objects(world, world->map_objs, map, win);
+    draw_map_objects(world.map_objs, map, win);
 }
 
 
 
 extern void draw_win_info(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
     char * dsc_turn      = "Turn: ";
     char * dsc_hitpoints = "\nHitpoints: ";
     char * dsc_score     = "\nScore: ";
     uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score)
                     + 10 + 5 + 10;       /* max strlens of numbers to be used */
     char text[maxl + 1];
-    struct MapObj * player = get_player(world);
+    struct MapObj * player = get_player();
     sprintf(text, "%s%d%s%d%s%d",
-            dsc_turn, world->turn,
+            dsc_turn, world.turn,
             dsc_hitpoints, player->lifepoints,
-            dsc_score, world->score);
-    draw_with_linebreaks(win, text, 0);
+            dsc_score, world.score);
+    add_text_with_linebreaks(win, text);
 }
 
 
 
 extern void draw_win_inventory(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    struct MapObj * player = get_player(world);
+    struct MapObj * player = get_player();
     if (NULL == player->owns)
     {
-        draw_line(win, 0, "(none)", 0, 0);
+        add_line(win, "(none)", 0, 0);
         return;
     }
-    win->center.y = world->inventory_select;
+    win->center.y = world.inventory_select;
     struct MapObj * owned = player->owns;
     uint8_t y;
     for (y = 0; NULL != owned; y++)
     {
-        wresize(win->frame.curses_win, y + 1, getmaxx(win->frame.curses_win));
         attr_t attri = 0;
-        if (y == world->inventory_select)
+        if (y == world.inventory_select)
         {
             attri = A_REVERSE;
         }
-        struct MapObjDef * mod = get_map_object_def(world, owned->type);
-        draw_line(win, y, mod->name, attri, 0);
+        struct MapObjDef * mod = get_map_object_def(owned->type);
+        add_line(win, mod->name, attri, 0);
         owned = owned->next;
     }
 }
@@ -395,63 +406,60 @@ extern void draw_win_inventory(struct Win * win)
 
 extern void draw_win_available_keybindings(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
     char * title = "Active window's keybindings:";
     struct KeyBinding * kb_p;
-    struct WinConf * wc = get_winconf_by_win(world, world->wmeta->active);
+    struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
     if     (0 == wc->view)
     {
         kb_p = wc->kb.kbs;
     }
     else if (1 == wc->view)
     {
-        kb_p = world->kb_wingeom.kbs;
+        kb_p = world.kb_wingeom.kbs;
     }
     else if (2 == wc->view)
     {
-        kb_p = world->kb_winkeys.kbs;
+        kb_p = world.kb_winkeys.kbs;
     }
-    uint16_t offset = draw_titled_keybinding_list(world, title, win, 0, kb_p);
-    draw_titled_keybinding_list(world, "Global keybindings", win, offset + 1,
-                                world->kb_global.kbs);
+    uint16_t offset = draw_titled_keybinding_list(title, win, 0, kb_p);
+    add_line(win, " ", 0, 0);
+    struct KeyBinding * kbs_glo = world.kb_global.kbs;
+    draw_titled_keybinding_list("Global keybindings", win, offset + 1, kbs_glo);
 }
 
 
 
 extern void draw_win_keybindings_global(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    win->center.y = world->kb_global.select;
-    draw_kb_view(world, win, &world->kb_global, 0);
+    win->center.y = world.kb_global.select;
+    draw_kb_view(win, &world.kb_global, 0);
 }
 
 
 
 extern void draw_win_keybindings_winconf_geometry(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    win->center.y = world->kb_wingeom.select;
-    draw_kb_view(world, win, &world->kb_wingeom, 0);
+    win->center.y = world.kb_wingeom.select;
+    draw_kb_view(win, &world.kb_wingeom, 0);
 }
 
 
 
 extern void draw_win_keybindings_winconf_keybindings(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    win->center.y = world->kb_winkeys.select;
-    draw_kb_view(world, win, &world->kb_winkeys, 0);
+    win->center.y = world.kb_winkeys.select;
+    draw_kb_view(win, &world.kb_winkeys, 0);
 }
 
 
 
 extern void draw_winconf_keybindings(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    struct WinConf * wc = get_winconf_by_win(world, win);
+    struct WinConf * wc = get_winconf_by_win(win);
     char * title = "Window's keybindings:";
-    draw_line(win, 0, title, 0, 0);
-    draw_kb_view(world, win, &wc->kb, 2);
+    add_line(win, title, 0, 0);
+    add_line(win, " ", 0, 0);
+    draw_kb_view(win, &wc->kb, 2);
     win->center.y = wc->kb.select + 2;
 }
 
@@ -459,15 +467,14 @@ extern void draw_winconf_keybindings(struct Win * win)
 
 extern void draw_winconf_geometry(struct Win * win)
 {
-    struct World * world = (struct World *) win->data;
-    struct WinConf * wcp = get_winconf_by_win(world, win);
+    struct WinConf * wcp = get_winconf_by_win(/*&world, */win);
     char * title = "Window's geometry:\n";
     char * h_d   = "\nHeight to save: ";
     char * h_pos = " (width in cells)";
-    char * h_neg = " (negative diff: cells to maximum width)";
+    char * h_neg = " (negative diff: cells to screen width)";
     char * w_d   = "\n\nWidth to save: ";
     char * w_pos = " (height in cells)";
-    char * w_neg = " (negative diff: cells to maximum height)";
+    char * w_neg = " (negative diff: cells to screen height)";
     char * h_t = h_pos;
     char * w_t = w_pos;
     if      (1 == wcp->height_type)
@@ -484,5 +491,5 @@ extern void draw_winconf_geometry(struct Win * win)
     char text[maxl + 1];
     sprintf(text, "%s%s%d%s%s%d%s", title, h_d, wcp->height, h_t,
                                            w_d, wcp->width,  w_t);
-    draw_with_linebreaks(win, text, 0);
+    add_text_with_linebreaks(win, text);
 }