X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=f6ac7e293cb2ba9d5a415209878efc8800336416;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=590d8c53cd49aa90afbc531c499fd05033a7d851;hpb=29dd705d21a373c5bd011abfa6f55243b0d8d8a1;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 590d8c5..f6ac7e2 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -1,5 +1,6 @@ /* src/client/draw_wins.c */ +#define _POSIX_C_SOURCE 200809L /* strdup() */ #include "draw_wins.h" #include /* typedefs attr_t, chtype, define A_REVERSE */ #include /* NULL */ @@ -7,11 +8,10 @@ #include /* sprintf() */ #include /* free() */ #include /* memset(), strchr(), strdup/(), strlen() */ -#include "../common/rexit.h" /* exit_err() */ +#include "../common/rexit.h" /* exit_err(), exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "../common/yx_uint16.h" /* struct yx_uint16 */ #include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */ -#include "windows.h" /* struct Win, get_win_by_id() */ +#include "windows.h" /* yx_uint16, Win, get_win_by_id() */ #include "world.h" /* global world */ @@ -52,7 +52,7 @@ static void add_text_with_linebreaks(struct Win * win, char * text); static void draw_text_from_bottom(struct Win * win, char * text); /* Return a properly formatted keybinding list line for "kb". */ -static char * get_kb_line(struct KeyBinding * kb, uint8_t linebreak_type); +static char * get_kb_line(struct KeyBinding * kb); /* Draw from line "start" on config view for keybindings defined at "kb". */ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, @@ -178,14 +178,17 @@ static void add_line_long(struct Win * win, char * line, attr_t attri) static void add_line_compact(struct Win * win, char * line, attr_t attri, uint16_t * offset, uint8_t last) { + char * f_name = "add_line_compact()"; uint16_t y_start = win->winmap_size.y - (win->winmap_size.y > 0); try_resize_winmap(win, y_start + 1, win->frame_size.x); uint16_t len_line = strlen(line); char * separator = last ? "" : " / "; uint32_t len_line_new = len_line + strlen(separator); - char line_new[len_line_new]; - sprintf(line_new, "%s%s", line, separator); - uint16_t x, y; + char * line_new = try_malloc(len_line_new, f_name); + int test = sprintf(line_new, "%s%s", line, separator); + exit_trouble(test < 0, f_name, "sprintf()"); + uint16_t x = 0; + uint16_t y; uint32_t z; for (z = 0, y = y_start; z < len_line_new; y++) { @@ -203,7 +206,8 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri, try_resize_winmap(win, y + 1 + 1, win->winmap_size.x); } } - * offset = x; + free(line_new); + *offset = x; } @@ -254,20 +258,14 @@ static void draw_text_from_bottom(struct Win * win, char * text) -static char * get_kb_line(struct KeyBinding * kb, uint8_t linebreak_type) +static char * get_kb_line(struct KeyBinding * kb) { char * f_name = "get_kb_line()"; char * keyname = get_keyname_to_keycode(kb->keycode); - char * format = "%-9s %s"; - uint16_t first_size = 9; - if (1 != linebreak_type) - { - format = "%s: %s"; - first_size = strlen(keyname) + 1; - } - uint16_t size = first_size + 1 + strlen(kb->command->dsc_long) + 1; + uint16_t size = strlen(keyname) + 3 + strlen(kb->command->dsc_long) + 1; char * kb_line = try_malloc(size, f_name); - sprintf(kb_line, format, keyname, kb->command->dsc_long); + int test = sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long); + exit_trouble(test < 0, f_name, "sprintf()"); free(keyname); return kb_line; } @@ -282,7 +280,7 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, add_line(win, "(none)", 0, &offset, 0); return; } - uint16_t kb_n; + uint8_t kb_n; for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++) { attr_t attri = 0; @@ -295,7 +293,7 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, } win->center.y = win->winmap_size.y; } - char * kb_line = get_kb_line(&kbdb->kbs[kb_n], win->linebreak); + char * kb_line = get_kb_line(&kbdb->kbs[kb_n]); add_line(win, kb_line, attri, &offset, (kbdb->n_of_kbs == kb_n + 1)); free(kb_line); } @@ -308,7 +306,7 @@ static void draw_titled_keybinding_list(char * title, struct Win * win, struct KeyBindingDB * kbdb) { uint8_t state = 0; - uint16_t kb_n = 0; + uint8_t kb_n = 0; while (0 == state || kb_n < kbdb->n_of_kbs) { if (0 == state) @@ -318,7 +316,7 @@ static void draw_titled_keybinding_list(char * title, struct Win * win, state = 1 + (0 == kbdb->n_of_kbs); continue; } - char * kb_line = get_kb_line(&kbdb->kbs[kb_n], win->linebreak); + char * kb_line = get_kb_line(&kbdb->kbs[kb_n]); add_line(win, kb_line, 0, offset, (last * kbdb->n_of_kbs == kb_n + 1)); free(kb_line); kb_n++; @@ -344,14 +342,14 @@ extern void draw_win_log(struct Win * win) extern void draw_win_map(struct Win * win) { - try_resize_winmap(win, world.map.size.y, world.map.size.x); + try_resize_winmap(win, world.map.length, world.map.length * 2); uint16_t z = 0; uint16_t x, y; - for (y = 0; y < world.map.size.y; y++) + for (y = 0; y < world.map.length; y++) { - for (x = 0; x < world.map.size.x; x++) + for (x = 0; x < world.map.length; x++) { - set_ch_on_yx(win, y, x, world.map.cells[z]); + set_ch_on_yx(win, y, x * 2 + (y % 2), world.map.cells[z]); z++; } } @@ -361,13 +359,16 @@ extern void draw_win_map(struct Win * win) extern void draw_win_info(struct Win * win) { + char * f_name = "draw_win_info()"; char * dsc_turn = "Turn: "; char * dsc_hitpoints = "\nHitpoints: "; uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3; - char text[maxl + 1]; - sprintf(text, "%s%d%s%d", - dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints); + char * text = try_malloc(maxl + 1, f_name); + int test = sprintf(text, "%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, + world.player_lifepoints); + exit_trouble(test < 0, f_name, "sprintf()"); add_text_with_linebreaks(win, text); + free(text); } @@ -403,14 +404,10 @@ extern void draw_win_inventory(struct Win * win) extern void draw_win_available_keybindings(struct Win * win) { - char * title = "Active window's keybindings:"; - struct KeyBindingDB * kbdb; + char * title = "Active window's keys:"; struct Win * win_active = get_win_by_id(world.winDB.active); - if (0 == win_active->view) - { - kbdb = &win_active->kb; - } - else if (1 == win_active->view) + struct KeyBindingDB * kbdb = &win_active->kb; + if (1 == win_active->view) { kbdb = &world.kb_wingeom; } @@ -421,7 +418,7 @@ extern void draw_win_available_keybindings(struct Win * win) uint16_t offset = 0; draw_titled_keybinding_list(title, win, &offset, 0, kbdb); add_line(win, " ", 0, &offset, 0); - title = "Global keybindings:"; + title = "Global keys:"; draw_titled_keybinding_list(title, win, &offset, 1, &world.kb_global); } @@ -454,7 +451,7 @@ extern void draw_win_keybindings_winconf_keybindings(struct Win * win) extern void draw_winconf_keybindings(struct Win * win) { - char * title = "Window's keybindings:"; + char * title = "Window's keys:"; uint16_t offset = 0; add_line(win, title, 0, &offset, 0); add_line(win, " ", 0, &offset, 0); @@ -465,16 +462,19 @@ extern void draw_winconf_keybindings(struct Win * win) extern void draw_winconf_geometry(struct Win * win) { + char * f_name = "draw_winconf_geometry()"; char * title = "Window's geometry:\n\n"; char * h_title = "Height to save: "; char h_value[6 + 1]; /* 6: int16_t value max strlen */ - sprintf(h_value, "%d", win->target_height); + int test = sprintf(h_value, "%d", win->target_height); + exit_trouble(test < 0, f_name, "sprintf()"); char * h_plus = " (width in cells)\n\n"; char * h_minus = " (negative diff: cells to screen width)\n\n"; char * h_type = (1 == win->target_height_type) ? h_minus : h_plus; char * w_title = "Width to save: "; char w_value[6 + 1]; - sprintf(w_value, "%d", win->target_width); + test = sprintf(w_value, "%d", win->target_width); + exit_trouble(test < 0, f_name, "sprintf()"); char * w_plus = "(height in cells)\n\n"; char * w_minus = " (negative diff: cells to screen height)\n\n"; char * w_type = (1 == win->target_width_type) ? w_minus : w_plus; @@ -485,8 +485,10 @@ extern void draw_winconf_geometry(struct Win * win) + strlen(h_title) + strlen(h_value) + strlen(h_type) + strlen(w_title) + strlen(w_value) + strlen(w_type) + strlen(breaks_title) + strlen(breaks_type); - char text[text_size + 1]; - sprintf(text, "%s%s%s%s%s%s%s%s%s", title, h_title, h_value, h_type, - w_title, w_value, w_type, breaks_title, breaks_type); + char * text = try_malloc(text_size + 1, f_name); + test = sprintf(text, "%s%s%s%s%s%s%s%s%s", title, h_title, h_value, h_type, + w_title, w_value, w_type, breaks_title, breaks_type); + exit_trouble(test < 0, f_name, "sprintf()"); add_text_with_linebreaks(win, text); + free(text); }