Silently ignore characters in config/windows/toggle_order to which no window exists.

[plomrogue] / src / draw_wins.c

diff --git a/src/draw_wins.c b/src/draw_wins.c
index 7747757b82d957de7ae54d2ab26126636210f3bf..dacc26bf23351d48e70d6e41cb0d3c0400bbf053 100644 (file)
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -1,7 +1,7 @@
 /* draw_wins.c */
 
 #include "draw_wins.h"
-#include <stdlib.h>      /* for malloc(), free() */
+#include <stdlib.h>      /* for free() */
 #include <stdint.h>      /* for uint16_t */
 #include <string.h>      /* for strlen() */
 #include <ncurses.h>     /* for mvwaddch() */
@@ -12,6 +12,8 @@
 #include "map.h"         /* for Map struct */
 #include "main.h"        /* for World struct */
 #include "rexit.h"       /* for err_exit() */
+#include "command_db.h"  /* for get_command_longdesc() */
+#include "wincontrol.h"  /* for WinConf struct, get_winconf_by_win() */
 
 
 
@@ -207,10 +209,16 @@ extern void draw_map_win(struct Win * win)
 extern void draw_info_win(struct Win * win)
 {
     struct World * world = (struct World *) win->data;
-    char text[100];
-    snprintf(text, 100,
-             "Turn: %d\nHitpoints: %d\nScore: %d",
-             world->turn, world->player->hitpoints, world->score);
+    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];
+    sprintf(text, "%s%d%s%d%s%d",
+            dsc_turn, world->turn,
+            dsc_hitpoints, world->player->hitpoints,
+            dsc_score, world->score);
     draw_with_linebreaks(win, text, 0);
 }
 
@@ -223,9 +231,11 @@ extern void draw_keys_win(struct Win * win)
     offset = center_offset(world->keyswindata->select, world->keyswindata->max,
                            win->frame.size.y - 1);
     uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */
-    char * keydesc = malloc(keydescwidth), * keyname;
+    char keydesc[keydescwidth];
+    char * keyname;
     char * err_hint = "Trouble with draw_scroll_hint() in draw_keys_win().";
     attr_t attri;
+    char * cmd_dsc;
     for (y = 0; y <= world->keyswindata->max && y < win->frame.size.y; y++)
     {
         if (0 == y && offset > 0)
@@ -253,22 +263,22 @@ extern void draw_keys_win(struct Win * win)
                 attri = attri | A_BLINK;
             }
         }
-        keyname = get_keyname(world->keybindings[y + offset].key);
+        keyname = get_keyname(world, world->keybindings[y + offset].key);
         snprintf(keydesc, keydescwidth, "%-9s", keyname);
         free(keyname);
+        cmd_dsc = get_command_longdsc(world,
+                                      world->keybindings[y + offset].name);
         for (x = 0; x < win->frame.size.x; x++)
         {
             if (x < strlen(keydesc))
             {
                 mvwaddch(win->frame.curses_win, y, x, keydesc[x] | attri);
             }
-            else if (strlen(keydesc) < x
-                     && x < strlen(world->keybindings[y + offset].name)
-                            + strlen(keydesc) + 1)
+            else if (   strlen(keydesc) < x
+                     && x < strlen(cmd_dsc) + strlen(keydesc) + 1)
             {
                 mvwaddch(win->frame.curses_win, y, x,
-                         world->keybindings[y + offset]
-                         .name[x - strlen(keydesc) - 1] | attri);
+                         cmd_dsc[x - strlen(keydesc) - 1] | attri);
             }
             else
             {
@@ -276,5 +286,36 @@ extern void draw_keys_win(struct Win * win)
             }
         }
     }
-    free(keydesc);
+}
+
+
+
+extern void draw_winconf(struct Win * win)
+{
+    struct World * world = (struct World *) win->data;
+    struct WinConf * wcp = get_winconf_by_win(world, win);
+    char * title = "Window configuration:\n";
+    char * h_d   = "\nWidth to save: ";
+    char * h_pos = " (height in cells)";
+    char * h_neg = " (negative diff: cells to maximum height)";
+    char * w_d   = "\n\nHeight to save: ";
+    char * w_pos = " (width in cells)";
+    char * w_neg = " (negative diff: cells to maximum width)";
+    char * h_t = h_pos;
+    char * w_t = w_pos;
+    if      (1 == wcp->height_type)
+    {
+        h_t = h_neg;
+    }
+    if     (1 == wcp->width_type)
+    {
+        w_t = w_neg;
+    }
+    uint16_t maxl = strlen(title)
+                    + strlen(h_t) + strlen(h_d) + 6
+                    + strlen(w_t) + strlen(w_d) + 6 + 1;
+    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);
 }