X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=9857af522565dee13086b9deeaa3250c7065a826;hb=3fb2cb493ae564f8b14ddb4143b6c1f5bf16f16a;hp=a8477bd79875ee4a81555f1f5fcb3d74ad832f40;hpb=c71e88db87903bf5d58dbb3a1db4b05371fa7c31;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index a8477bd..9857af5 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -9,14 +9,14 @@ #include "draw_wins.h" #include /* attr_t, chtype, init_pair(), A_REVERSE, COLOR_PAIR() */ #include /* NULL */ -#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */ +#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX, UINT32_MAX */ #include /* sprintf() */ #include /* free() */ -#include /* memset(), strchr(), strdup/(), strlen() */ +#include /* memset(), strcmp(), strchr(), strdup/(), strlen() */ #include "../common/rexit.h" /* exit_err(), exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */ -#include "windows.h" /* yx_uint16, Win, get_win_by_id() */ +#include "windows.h" /* yx_uint16, Win */ #include "world.h" /* global world */ @@ -56,9 +56,6 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri, 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); - /* Draw from line "start" on config view for keybindings defined at "kb". */ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, uint16_t offset); @@ -70,6 +67,14 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep, +/* try_resize_winmap() only realloc's Win->winmap if this is set. Use this to + * skip inflationary malloc's by successive try_resize_winmap() calls when the + * memory needed can be pre-calculated. + */ +static uint8_t do_realloc_winmap = 1; + + + static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x) { if (win->winmap_size.y >= new_size_y && win->winmap_size.x >= new_size_x) @@ -84,23 +89,26 @@ static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x) { new_size_x = win->winmap_size.x; } - chtype * old_winmap = win->winmap; - uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x; - win->winmap = try_malloc(new_size, __func__); - uint16_t y, x; - for (y = 0; y < new_size_y; y++) + if (do_realloc_winmap) { - for (x = 0; y < win->winmap_size.y && x < win->winmap_size.x; x++) - { - chtype ch = old_winmap[(y * win->winmap_size.x) + x]; - win->winmap[(y * new_size_x) + x] = ch; - } - for (; x < new_size_x; x++) + chtype * old_winmap = win->winmap; + uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x; + win->winmap = try_malloc(new_size, __func__); + uint16_t y, x; + for (y = 0; y < new_size_y; y++) { - win->winmap[(y * new_size_x) + x] = ' '; + for (x = 0; y < win->winmap_size.y && x < win->winmap_size.x; x++) + { + chtype ch = old_winmap[(y * win->winmap_size.x) + x]; + win->winmap[(y * new_size_x) + x] = ch; + } + for (; x < new_size_x; x++) + { + win->winmap[(y * new_size_x) + x] = ' '; + } } + free(old_winmap); } - free(old_winmap); win->winmap_size.y = new_size_y; win->winmap_size.x = new_size_x; } @@ -250,7 +258,7 @@ static void draw_text_from_bottom(struct Win * win, char * text) } while (new_y_start > win->winmap_size.y); if (2 == win->linebreak) /* add_text_with_linebreaks() will start not */ - { /* not after, but within the last line then. */ + { /* after, but within the last line then. */ add_line_wide(win, " ", 0); } add_text_with_linebreaks(win, text); @@ -259,19 +267,6 @@ static void draw_text_from_bottom(struct Win * win, char * text) -static char * get_kb_line(struct KeyBinding * kb) -{ - char * keyname = get_keyname_to_keycode(kb->keycode); - uint16_t size = strlen(keyname) + 3 + strlen(kb->command->dsc_long) + 1; - char * kb_line = try_malloc(size, __func__); - int test = sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long); - exit_trouble(test < 0, __func__, "sprintf"); - free(keyname); - return kb_line; -} - - - static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, uint16_t offset) { @@ -293,7 +288,13 @@ 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]); + struct KeyBinding kb = kbdb->kbs[kb_n]; + char * keyname = get_keyname_to_keycode(kb.keycode); + uint16_t size = strlen(keyname) + 3 + strlen(kb.command->dsc_long) + 1; + char * kb_line = try_malloc(size, __func__); + int test = sprintf(kb_line, "%s - %s", keyname, kb.command->dsc_long); + exit_trouble(test < 0, __func__, "sprintf"); + free(keyname); add_line(win, kb_line, attri, &offset, (kbdb->n_of_kbs == kb_n + 1)); free(kb_line); } @@ -335,9 +336,9 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep, } char * p11 = ")"; uint8_t size = strlen(p0) + strlen(p1) + strlen(p2) + strlen(sep) - + strlen(p4) + strlen(sep) + strlen(p6) + strlen(value_prefix) + + strlen(p4) + strlen(sep) + strlen(p6) +strlen(value_prefix) + strlen(p8) + strlen(p9) + strlen(p10) + strlen(p11) - + strlen(newlines); + + strlen(newlines) + 1; char * msg = try_malloc(size, __func__); sprintf(msg, "%s%s%s%s%s%s%s%s%s%s%s%s%s", p0, p1, p2, sep, p4, sep, p6, value_prefix, p8, p9, p10, p11, newlines); @@ -352,6 +353,27 @@ extern void draw_win_log(struct Win * win) { return; } + uint32_t x, i, n_postbreak_lines; + for (i = 0, x = 0, n_postbreak_lines = 1; i < strlen(world.log); i++) + { + exit_err(i == UINT32_MAX, "Log too large."); + x++; + if (x > win->frame_size.x || '\n' == world.log[i]) + { + n_postbreak_lines++; + x = 0; + } + } + if (n_postbreak_lines > win->frame_size.y) + { + uint32_t size = n_postbreak_lines * (win->frame_size.x + 1); + win->winmap = try_malloc(sizeof(chtype) * size, __func__); + for (i = 0; i < size; win->winmap[i] = ' ', i++); + do_realloc_winmap = 0; + draw_text_from_bottom(win, world.log); + do_realloc_winmap = 1; + return; + } draw_text_from_bottom(win, world.log); } @@ -359,43 +381,43 @@ extern void draw_win_log(struct Win * win) extern void draw_win_map(struct Win * win) { + uint16_t x, y; init_pair(1, COLOR_WHITE, COLOR_BLUE); init_pair(2, COLOR_BLUE, COLOR_BLACK); - attr_t attr_fov = 0; attr_t attr_mem = COLOR_PAIR(2); attr_t attr_sha = COLOR_PAIR(1); - try_resize_winmap(win, world.map.length, world.map.length * 2); - uint16_t x, y, z; - for (y = 0, z = 0; y < world.map.length; y++) + try_resize_winmap(win, world.map.length, world.map.length * 2 + 1); + for (y = 0; y < world.map.length; y++) { for (x = 0; x < world.map.length; x++) { - attr_t attr_c = ' ' == world.mem_map[z] ? attr_sha : attr_mem; - chtype c = world.mem_map[z] | attr_c; - set_ch_on_yx(win, y, x * 2 + (y % 2), c); - if (x + (y % 2) < world.map.length) - { - set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | attr_c); - } - z++; + attr_t a=' '==world.mem_map[y*world.map.length+x]?attr_sha:attr_mem; + char c = world.mem_map[y*world.map.length + x]; + set_ch_on_yx(win, y, x * 2 + (y % 2), c | a); + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); } } - for (y = 0, z = 0; y < world.map.length; y++) + for (y = 0; y < world.map.length; y++) { for (x = 0; x < world.map.length; x++) { - if (' ' != world.map.cells[z]) + if (' ' != world.map.cells[y*world.map.length + x]) { - chtype c = world.map.cells[z] | attr_fov; - set_ch_on_yx(win, y, x * 2 + (y % 2), c); - if (x + (y % 2) < world.map.length) - { - set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | attr_fov); - } + char c = world.map.cells[y*world.map.length + x]; + set_ch_on_yx(win, y, x * 2 + (y % 2), c); + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' '); } - z++; } } + if (world.look) + { + y = world.look_pos.y; + x = world.look_pos.x; + char c = world.map.cells[y * world.map.length + x]; + c = ' ' == c ? world.mem_map[y * world.map.length + x] : c; + set_ch_on_yx(win, y, x * 2 + (y % 2), c | A_REVERSE); + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | A_REVERSE); + } } @@ -404,10 +426,13 @@ extern void draw_win_info(struct Win * win) { char * dsc_turn = "Turn: "; char * dsc_hitpoints = "\nHitpoints: "; - uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3; + char * dsc_satiation = "\nSatiation: "; + uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + + strlen(dsc_satiation) + 6 + 3; char * text = try_malloc(maxl + 1, __func__); - int test = sprintf(text, "%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, - world.player_lifepoints); + int test = sprintf(text, "%s%d%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, + world.player_lifepoints, dsc_satiation, + world.player_satiation); exit_trouble(test < 0, __func__, "sprintf"); add_text_with_linebreaks(win, text); free(text); @@ -444,32 +469,11 @@ extern void draw_win_inventory(struct Win * win) -extern void draw_win_active_windows_keys(struct Win * win) +extern void draw_win_terrain_stack(struct Win * win) { - struct Win * win_active = get_win_by_id(world.winDB.active); - struct KeyBindingDB * kbdb = &win_active->kb; - if (1 == win_active->view) - { - kbdb = &world.kb_wingeom; - } - else if (2 == win_active->view) - { - kbdb = &world.kb_winkeys; - } - uint16_t offset = 0; - if (0 == kbdb->n_of_kbs) - { - add_line(win, "(none)", 0, &offset, 0); - return; - } - uint8_t kb_n; - for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++) - { - char * kb_line = get_kb_line(&kbdb->kbs[kb_n]); - add_line(win, kb_line, 0, &offset, (0 == kb_n + 1)); - free(kb_line); - } - + char * wait_response = "(polling)"; + char * text = world.things_here ? world.things_here : wait_response; + add_text_with_linebreaks(win, text); }