X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=2b04ff4e93f6f2a6c4a7e8915e284305f9fe20b6;hb=8e38bb5605a46afd6398b69c63c935aa5dc83660;hp=f0397d9fa90fa02da4ae01836163d6f0ab6ad9ca;hpb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;p=plomrogue

diff --git a/src/draw_wins.c b/src/draw_wins.c
index f0397d9..2b04ff4 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -6,9 +6,9 @@
 #include <string.h>      /* for strlen() */
 #include <ncurses.h>     /* for mvwaddch() */
 #include "windows.h"     /* for structs Win, Frame, for draw_scroll_hint() */
-#include "misc.h"        /* for center_offset() */
+#include "misc.h"        /* for center_offset(), try_malloc() */
 #include "keybindings.h" /* for struct KeyBinding, for get_name_to_keycode() */
-#include "map_objects.h" /* for structs MapObj, Player */
+#include "map_objects.h" /* for structs MapObj, Player, get_map_object_def() */
 #include "map.h"         /* for Map struct */
 #include "main.h"        /* for World struct */
 #include "rexit.h"       /* for err_exit() */
@@ -17,10 +17,19 @@
 
 
 
-/* Write "text" into window "win" as far as possible. Start on row "start_y". */
+/* Write "text" into window "win" as far as possible. Start on row "start_y".
+ * Break lines at newlines.
+ */
 static void draw_with_linebreaks(struct Win * win, char * text,
                                  uint16_t start_y);
 
+/* Write "line" into window "win" at line "y" as far as it fits into it; apply
+ * ncurses attribute "attri" to all characters drawn; if "fill" is non-zero,
+ * fill the entire line with empty characters ("attri" also applied on these).
+ */
+static void draw_line(struct Win * win, uint16_t y, char * line, attr_t attri,
+                      uint8_t fill);
+
 /* Write "text" not starting from the top but from the bottom of "win". */
 static void draw_text_from_bottom(struct Win * win, char * text);
 
@@ -28,10 +37,25 @@ static void draw_text_from_bottom(struct Win * win, char * text);
 static void draw_map_objects(struct World * world, 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);
+
 /* Draw from line "start" on config view for keybindings defined at "kb". */
 static void draw_kb_view(struct World * world, struct Win * win,
                          char * f_name, struct KeyBiData * kb, uint8_t start);
 
+/* Draw into window "win" 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,
+                                            struct Win * win, uint16_t start,
+                                            char * title,
+                                            struct KeyBinding * kb_p);
+
+
+
+
 
 
 static void draw_with_linebreaks(struct Win * win, char * text,
@@ -78,6 +102,25 @@ static void draw_with_linebreaks(struct Win * win, char * text,
 
 
 
+static void draw_line(struct Win * win, uint16_t y, char * line, attr_t attri,
+                      uint8_t fill)
+{
+    uint16_t x = 0;
+    for (; x < win->frame.size.x && x < strlen(line); x++)
+    {
+        mvwaddch(win->frame.curses_win, y, x, line[x] | attri);
+    }
+    if (0 != fill)
+    {
+        for (; x < win->frame.size.x; x++)
+        {
+            mvwaddch(win->frame.curses_win, y, x, ' ' | attri);
+        }
+    }
+}
+
+
+
 static void draw_text_from_bottom (struct Win * win, char * text)
 {
     /* Determine number of lines text would have in a window of win's width,
@@ -152,12 +195,12 @@ static void draw_map_objects(struct World * world, struct MapObj * start,
     for (o = start; o != 0; o = o->next)
     {
         if (   o->pos.y >= map->offset.y
-            && o->pos.y < map->offset.y + win->frame.size.y
+            && o->pos.y <  map->offset.y + win->frame.size.y
             && o->pos.x >= map->offset.x
-            && o->pos.x < map->offset.x + win->frame.size.x)
+            && o->pos.x <  map->offset.x + win->frame.size.x)
         {
-            d = get_map_obj_def (world, o->type);
-            c = d->mapchar;
+            d = get_map_object_def(world, o->type);
+            c = d->char_on_map;
             mvwaddch(win->frame.curses_win,
                      o->pos.y - map->offset.y, o->pos.x - map->offset.x, c);
         }
@@ -166,20 +209,38 @@ 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)
+{
+    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);
+    uint16_t size = 9 + 1 + strlen(cmd_dsc) + 1;
+    char * line = try_malloc(size, world, f_name);
+    sprintf(line, "%-9s %s", keyname, cmd_dsc);
+    free(keyname);
+    * kb_pp = kb_p->next;
+    return line;
+}
+
+
+
 static void draw_kb_view(struct World * world, struct Win * win,
                          char * f_name, struct KeyBiData * kb, uint8_t start)
 {
+    if (0 == kb->kbs)
+    {
+        draw_line(win, start, "(none)", 0, 0);
+    }
     char * err_hint = trouble_msg(world, f_name, "draw_scroll_hint()");
     uint16_t kb_max = get_n_of_keybs(kb->kbs) - 1;
-    uint16_t y, x, offset;
+    uint16_t y, offset;
     offset = center_offset(kb->select, kb_max, win->frame.size.y - 1 - start);
-    uint8_t keydescwidth = 9 + 1;  /* get_name_to_keycode()'s max length + \0 */
-    char keydesc[keydescwidth];
-    uint16_t nav_max = kb_max + start;
     uint16_t y_border = win->frame.size.y + offset - 1 - start;
-    for (y = start; y <= nav_max && y < win->frame.size.y; y++)
+    struct KeyBinding * kb_p = get_keyb_of_n(kb->kbs, offset + (offset > 0));
+    for (y = start; 0 != kb_p && y < win->frame.size.y; y++)
     {
-
         if (start == y && offset > 0)
         {
             uint8_t test = draw_scroll_hint(&win->frame, y, offset + 1, '^');
@@ -193,7 +254,6 @@ static void draw_kb_view(struct World * world, struct Win * win,
             exit_err(test, world, err_hint);
             continue;
         }
-
         attr_t attri = 0;
         if (y - start == kb->select - offset)
         {
@@ -203,32 +263,51 @@ static void draw_kb_view(struct World * world, struct Win * win,
                 attri = attri | A_BLINK;
             }
         }
+        char * kb_line = get_kb_line_and_iterate(world, &kb_p);
+        draw_line(win, y, kb_line, attri, 1);
+        free(kb_line);
+    }
+    free(err_hint);
+}
 
-        struct KeyBinding * kb_p;
-        kb_p = get_keyb_of_n(kb->kbs, (y - start) + offset);
-        char * keyname = get_name_to_keycode(world, kb_p->key);
-        snprintf(keydesc, keydescwidth, "%-9s", keyname);
-        free(keyname);
-        char * cmd_dsc = get_command_longdsc(world, kb_p->name);
-        uint8_t dsclen = strlen(keydesc);
-        for (x = 0; x < win->frame.size.x; x++)
+
+
+static uint16_t draw_titled_keybinding_list(struct World * world,
+                                            struct Win * win, uint16_t start,
+                                            char * title,
+                                            struct KeyBinding * kb_p)
+{
+    uint16_t x, y;
+    uint16_t i = 0;
+    uint8_t state = 0;
+    for (y = start; y < win->frame.size.y && (0 == state || 0 != kb_p); y++)
+    {
+        if (0 == state)
         {
-            if (x < dsclen)
-            {
-                mvwaddch(win->frame.curses_win, y, x, keydesc[x] | attri);
-                continue;
-            }
-            else if (dsclen < x && x < strlen(cmd_dsc) + strlen(keydesc) + 1)
+            for (x = 0; x < win->frame.size.x; x++)
             {
-                chtype ch = cmd_dsc[x - strlen(keydesc) - 1] | attri;
-                mvwaddch(win->frame.curses_win, y, x, ch);
-                continue;
+                if (i == strlen(title))
+                {
+                    y++;
+                    state = 1 + (0 == kb_p);
+                    i = 0;
+                    break;
+                }
+                mvwaddch(win->frame.curses_win, y, x, title[i]);
+                i++;
             }
-            mvwaddch(win->frame.curses_win, y, x, ' ' | attri);
+            continue;
         }
-
+        char * kb_line = get_kb_line_and_iterate(world, &kb_p);
+        draw_line(win, y, kb_line, 0, 0);
+        free(kb_line);
     }
-    free(err_hint);
+    if (2 == state)
+    {
+        draw_line(win, y, "(none)", 0, 0);
+        y++;
+    }
+    return y;
 }
 
 
@@ -262,12 +341,11 @@ extern void draw_win_map(struct Win * win)
             }
         }
     }
-    draw_map_objects (world, (struct MapObj *) world->item, map, win);
-    draw_map_objects (world, (struct MapObj *) world->monster, map, win);
+    draw_map_objects(world, world->map_objs, map, win);
     if (   player->pos.y >= map->offset.y
-        && player->pos.y < map->offset.y + win->frame.size.y
+        && player->pos.y <  map->offset.y + win->frame.size.y
         && player->pos.x >= map->offset.x
-        && player->pos.x < map->offset.x + win->frame.size.x)
+        && player->pos.x <  map->offset.x + win->frame.size.x)
     {
         mvwaddch(win->frame.curses_win,
                  player->pos.y - map->offset.y, player->pos.x - map->offset.x,
@@ -295,6 +373,38 @@ extern void draw_win_info(struct Win * win)
 
 
 
+extern void draw_win_inventory(struct Win * win)
+{
+    mvwaddstr(win->frame.curses_win, 0, 0, "(empty)");
+}
+
+
+
+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);
+    if     (0 == wc->view)
+    {
+        kb_p = wc->kb.kbs;
+    }
+    else if (1 == wc->view)
+    {
+        kb_p = world->kb_wingeom.kbs;
+    }
+    else if (2 == wc->view)
+    {
+        kb_p = world->kb_winkeys.kbs;
+    }
+    uint16_t offset = draw_titled_keybinding_list(world, win, 0, title, kb_p);
+    draw_titled_keybinding_list(world, win, offset + 1, "Global keybindings:",
+                                world->kb_global.kbs);
+}
+
+
+
 extern void draw_win_keybindings_global(struct Win * win)
 {
     char * f_name = "draw_win_keybindings_global()";
@@ -329,7 +439,7 @@ extern void draw_winconf_keybindings(struct Win * win)
     struct WinConf * wc = get_winconf_by_win(world, win);
     char * title = "Window's keybindings:";
     uint8_t title_space = strlen(title) / win->frame.size.x + 2;
-    mvwaddstr(win->frame.curses_win, 0, 0, "Window's keybindings:");
+    mvwaddstr(win->frame.curses_win, 0, 0, title);
     draw_kb_view(world, win, f_name, &wc->kb, title_space);
 }