/* 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() */
#include "windows.h" /* for structs Win, Frame, for draw_scroll_hint() */
#include "misc.h" /* for center_offset() */
-#include "keybindings.h" /* for struct KeyBinding, for get_keyname() */
+#include "keybindings.h" /* for struct KeyBinding, for get_name_to_keycode() */
#include "map_objects.h" /* for structs MapObj, Player */
#include "map.h" /* for Map struct */
#include "main.h" /* for World struct */
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);
}
extern void draw_keys_win(struct Win * win)
{
- struct World * world = (struct World *) win->data;
- uint16_t offset, y, x;
- 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 * 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++)
+ struct World * world = (struct World *) win->data;
+ uint16_t n_keybs = get_n_of_keybs(world);
+ uint16_t offset = center_offset(world->keyswindata->select, n_keybs - 1,
+ win->frame.size.y - 1);
+
+ uint8_t keydescwidth = 9 + 1; /* get_name_to_keycode()'s max length + \0 */
+ char keydesc[keydescwidth];
+
+ uint16_t y, x;
+ for (y = 0; y <= n_keybs - 1 && y < win->frame.size.y; y++)
{
+
if (0 == y && offset > 0)
{
exit_err(draw_scroll_hint(&win->frame, y, offset + 1, '^'),
continue;
}
else if (win->frame.size.y == y + 1
- && 0 < world->keyswindata->max
+ && 0 < (n_keybs - 1)
- (win->frame.size.y + offset - 1))
{
exit_err(draw_scroll_hint(&win->frame, y,
- world->keyswindata->max
- - (offset + win->frame.size.y) + 2, 'v'),
+ (n_keybs - 1)
+ - (offset + win->frame.size.y) + 2,
+ 'v'),
world, err_hint);
continue;
}
- attri = 0;
+
+ attr_t attri = 0;
if (y == world->keyswindata->select - offset)
{
attri = A_REVERSE;
attri = attri | A_BLINK;
}
}
- keyname = get_keyname(world->keybindings[y + offset].key);
+
+ struct KeyBinding * kb_p = get_keyb_of_n(world, y + offset);
+ char * keyname = get_name_to_keycode(world, kb_p->key);
snprintf(keydesc, keydescwidth, "%-9s", keyname);
free(keyname);
- cmd_dsc = get_command_longdsc(world,
- world->keybindings[y + offset].name);
+ char * cmd_dsc = get_command_longdsc(world, kb_p->name);
for (x = 0; x < win->frame.size.x; x++)
{
if (x < strlen(keydesc))
}
}
}
- free(keydesc);
}
struct World * world = (struct World *) win->data;
struct WinConf * wcp = get_winconf_by_win(world, win);
char * title = "Window configuration:\n";
- char * h_t_d = "\nWill save height as: ";
- char * h_pos = "height in positive cells";
- char * h_neg = "negative diff to maximum height";
- char * h_d = "\nHeight to be saved: ";
- char * w_t_d = "\n\nWill save width as: ";
- char * w_pos = "width in positive cells";
- char * w_neg = "negative diff to maximum width";
- char * w_d = "\nWidth to be saved: ";
+ 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)
w_t = w_neg;
}
uint16_t maxl = strlen(title)
- + strlen(h_t_d) + strlen(h_t) + strlen(h_d) + 6
- + strlen(w_t_d) + strlen(w_t) + strlen(w_d) + 6 + 1;
- char * text = malloc(maxl + 1);
- sprintf(text, "%s%s%s%s%d%s%s%s%d", title, h_t_d, h_t, h_d, wcp->height,
- w_t_d, w_t, w_d, wcp->width);
+ + 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);
- free(text);
}
projects / plomrogue / blobdiff