X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=dacc26bf23351d48e70d6e41cb0d3c0400bbf053;hb=d4693165cda2814c544e05b219c2cf3798e31857;hp=b15e1742d75aab610c6e29e97c34159c28a0f4ba;hpb=58f0067336c9239750009b3f35d18031bec8f7b5;p=plomrogue
diff --git a/src/draw_wins.c b/src/draw_wins.c
index b15e174..dacc26b 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -1,7 +1,7 @@
/* draw_wins.c */
#include "draw_wins.h"
-#include /* for malloc(), free() */
+#include /* for free() */
#include /* for uint16_t */
#include /* for strlen() */
#include /* for mvwaddch() */
@@ -13,6 +13,7 @@
#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() */
@@ -213,13 +214,12 @@ extern void draw_info_win(struct Win * win)
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 = malloc(maxl + 1);
+ 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);
- free(text);
}
@@ -231,7 +231,8 @@ 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;
@@ -262,7 +263,7 @@ 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,
@@ -285,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);
}