X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=9857af522565dee13086b9deeaa3250c7065a826;hb=3fb2cb493ae564f8b14ddb4143b6c1f5bf16f16a;hp=594b70763f4963ffae1efd31622807623e17e5dc;hpb=258e57c1621533e206610453047d829cc8aa13fe;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 594b707..9857af5 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -9,7 +9,7 @@ #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(), strcmp(), strchr(), strdup/(), strlen() */ @@ -65,8 +65,13 @@ static char * get_keyname_to_command(char * command_name); static char * winconf_geom_helper(struct Win * win, char axis, char * sep, char * newlines, char * value_prefix); -/* Draw map cell "c" into win "w" at position "y"/"x" with attribute "a". */ -static void draw_mapcell(struct Win * w, char c, uint8_t y, uint8_t x,attr_t a); + + +/* 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; @@ -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 * 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++) { - 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] = ' '; + 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); @@ -330,7 +338,7 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep, uint8_t size = strlen(p0) + strlen(p1) + strlen(p2) + strlen(sep) + 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); @@ -339,23 +347,33 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep, -static void draw_mapcell(struct Win * w, char c, uint8_t y, uint8_t x, attr_t a) -{ - set_ch_on_yx(w, y, x * 2 + (y % 2), c | a); - if (x + (y % 2) < world.map.length) - { - set_ch_on_yx(w, y, x * 2 + (y % 2) + 1, ' ' | a); - } -} - - - extern void draw_win_log(struct Win * win) { if (!world.log) { 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); } @@ -368,14 +386,15 @@ extern void draw_win_map(struct Win * win) init_pair(2, COLOR_BLUE, COLOR_BLACK); 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); + 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 a=' '==world.mem_map[y*world.map.length+x]?attr_sha:attr_mem; char c = world.mem_map[y*world.map.length + x]; - draw_mapcell(win, c, y, x, a); + 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; y < world.map.length; y++) @@ -385,7 +404,8 @@ extern void draw_win_map(struct Win * win) if (' ' != world.map.cells[y*world.map.length + x]) { char c = world.map.cells[y*world.map.length + x]; - draw_mapcell(win, c, y, x, 0); + set_ch_on_yx(win, y, x * 2 + (y % 2), c); + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' '); } } } @@ -395,7 +415,8 @@ extern void draw_win_map(struct Win * win) 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; - draw_mapcell(win, c, y, x, A_REVERSE); + 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); } } @@ -405,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); @@ -447,10 +471,9 @@ extern void draw_win_inventory(struct Win * win) extern void draw_win_terrain_stack(struct Win * win) { - if (world.things_here) - { - add_text_with_linebreaks(win, world.things_here); - } + char * wait_response = "(polling)"; + char * text = world.things_here ? world.things_here : wait_response; + add_text_with_linebreaks(win, text); }