X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=c21a971383e430861f61a99138fa41f944e46c3a;hb=c25e2499bcfcdc43202f7a59ab97ce802d418a6c;hp=d5e7bf82665f4cbdc8344e2c1299a78d0789c910;hpb=c4b3fff9eea2223cea9feb7ce22a6b584822ebe1;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index d5e7bf8..c21a971 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() */ @@ -67,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) @@ -81,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; } @@ -247,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); @@ -327,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); @@ -342,6 +353,28 @@ 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 = 1; + } + } + 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++); + /* TODO: This should only be done with "long" line break style. */ + do_realloc_winmap = 0; + draw_text_from_bottom(win, world.log); + do_realloc_winmap = 1; + return; + } draw_text_from_bottom(win, world.log); } @@ -350,30 +383,151 @@ 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_mem = COLOR_PAIR(2); - attr_t attr_sha = COLOR_PAIR(1); + init_pair(1, COLOR_WHITE, COLOR_WHITE); // + init_pair(2, COLOR_BLUE, COLOR_WHITE); // + init_pair(3, COLOR_RED, COLOR_WHITE); // + init_pair(4, COLOR_WHITE, COLOR_BLUE); // + init_pair(5, COLOR_BLUE, COLOR_RED); // + init_pair(6, COLOR_BLACK, COLOR_RED); // + init_pair(7, COLOR_BLUE, COLOR_GREEN); // + init_pair(8, COLOR_BLUE, COLOR_YELLOW); // + init_pair(9, COLOR_BLACK, COLOR_MAGENTA); // + init_pair(18, COLOR_WHITE, COLOR_CYAN); // + init_pair(10, COLOR_BLACK, COLOR_CYAN); // + init_pair(11, COLOR_WHITE, COLOR_BLACK); // + init_pair(12, COLOR_BLUE, COLOR_BLACK); // + init_pair(13, COLOR_RED, COLOR_BLACK); // + init_pair(14, COLOR_GREEN, COLOR_BLACK); // + init_pair(15, COLOR_YELLOW, COLOR_BLACK); // + init_pair(16, COLOR_CYAN, COLOR_BLACK); // + init_pair(17, COLOR_MAGENTA, COLOR_BLACK); // + // attr_t attr_mem = COLOR_PAIR(12); + // attr_t attr_sha = COLOR_PAIR(1); + attr_t col_unknown = COLOR_PAIR(1); // + attr_t col_mem = COLOR_PAIR(4); // + attr_t col_mem_obstacle = COLOR_PAIR(2); // + attr_t col_mem_altar = COLOR_PAIR(18); // 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_m = world.mem_map[y * world.map.length + x]; // + attr_t a = col_mem; // + if (c_m == ' ') // + { // + a = col_unknown; // + } // + else if (c_m == 'X' || c_m == '|') // + { // + a = col_mem_obstacle; // + } // + else if (c_m == '_') + { // + a = col_mem_altar; // + } // + // 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); + chtype depth = ' ' | a; // + if (world.meta_map_0[y * world.map.length + x] == '2') // + { // + depth = '+' | col_mem; // + } // + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, depth); } } + attr_t col_plant = COLOR_PAIR(11); // + attr_t col_altar = COLOR_PAIR(10); // + attr_t col_tool = COLOR_PAIR(16); // + attr_t col_corpse = COLOR_PAIR(17); // + attr_t col_unkraut = COLOR_PAIR(14); // + attr_t col_animal = COLOR_PAIR(6); // + attr_t col_player = COLOR_PAIR(3); // + attr_t col_ground = COLOR_PAIR(15); // + attr_t col_obstacle = COLOR_PAIR(9); // + attr_t col_health_good = COLOR_PAIR(7); // + attr_t col_health_middle = COLOR_PAIR(8); // + attr_t col_health_bad = COLOR_PAIR(5); // + attr_t col_lumber = COLOR_PAIR(13); // + attr_t col_water = COLOR_PAIR(12); // + attr_t col_stack = COLOR_PAIR(11); // for (y = 0; y < world.map.length; y++) { for (x = 0; x < world.map.length; x++) { - if (' ' != world.map.cells[y*world.map.length + x]) + char c = world.map.cells[y*world.map.length + x]; // + if (' ' != c) // + // if (' ' != world.map.cells[y*world.map.length + x]) { - 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, ' '); + attr_t a = col_water; // + if ('.' == c || ':' == c) // + { // + a = col_ground; // + } // + else if ('@' == c) // + { // + a = col_player; // + } // + else if ('a' == c || 'd' == c || 'b' == c) // + { // + a = col_animal; // + } // + else if ('#' == c) // + { // + a = col_unkraut; // + } // + else if ('$' == c || '%' == c || ';' == c || '&' == c) // + { // + a = col_corpse; // + } // + else if ('/' == c || '-' == c) // + { // + a = col_tool; // + } // + else if ('X' == c || '|' == c) // + { // + a = col_obstacle; // + } // + else if ('_' == c) // + { // + a = col_altar; // + } // + else if (']' == c || '*' == c) // + { // + a = col_plant; // + } // + else if ('=' == c) // + { // + a = col_lumber; // + } // + // char c = world.map.cells[y*world.map.length + x]; + set_ch_on_yx(win, y, x * 2 + (y % 2), c | a); // + chtype meta = ' ' | a; // + char metamap0val = world.meta_map_0[y*world.map.length+x]; // + if (metamap0val == '2') // + { // + meta = '+' | col_stack; // + } // + else if (metamap0val != '0' && metamap0val != '1') // + { // + char c = world.meta_map_1[y*world.map.length+x]; + if (metamap0val == 'a') // + { // + meta = c | col_health_bad; // + } // + else if (metamap0val == 'b') // + { // + meta = c | col_health_middle; // + } // + else if (metamap0val == 'c') // + { // + meta = c | col_health_good; // + } // + } // + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, meta); // + // set_ch_on_yx(win, y, x * 2 + (y % 2), c); + // set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' '); } } } @@ -384,7 +538,7 @@ extern void draw_win_map(struct Win * win) 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); + set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, '?' | A_REVERSE); } } @@ -392,12 +546,19 @@ extern void draw_win_map(struct Win * win) 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_turn = "T:"; + char * dsc_hitpoints = " | H:"; + char * dsc_satiation = " S:"; + // char * dsc_godsmood = "\nGod's mood: "; // 7DRL + char * dsc_godsfavor = " G:"; // 7DRL + uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3 // + + strlen(dsc_satiation) + 6 + /*strlen(dsc_godsmood) + 6*/ // + + strlen(dsc_godsfavor) + 6; // 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%s%d", dsc_turn, world.turn, + dsc_hitpoints, world.player_lifepoints, dsc_satiation, + world.player_satiation, /*dsc_godsmood, world.godsmood,*/ // + dsc_godsfavor, world.godsfavor); // exit_trouble(test < 0, __func__, "sprintf"); add_text_with_linebreaks(win, text); free(text); @@ -436,9 +597,10 @@ extern void draw_win_inventory(struct Win * win) extern void draw_win_terrain_stack(struct Win * win) { - char * wait_response = "(waiting for server response)"; + char * wait_response = "(polling)"; char * text = world.things_here ? world.things_here : wait_response; add_text_with_linebreaks(win, text); + win->center.y = world.things_here_scroll + (win->frame_size.y / 2); // }