X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=f99f2c77204a9add681a8f5ab8690d6b4e94122a;hb=e095f19be589e1c128e9121eec25ea82ec64ee64;hp=bb86bb95ffd161a999d03acf2d36ecb364ecb16c;hpb=1cb57a35a3b3cc4ec8870531ca254a655c0bdda2;p=plomrogue diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index bb86bb9..f99f2c7 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -1,8 +1,13 @@ -/* src/client/draw_wins.c */ +/* src/client/draw_wins.c + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * see the file NOTICE in the root directory of the PlomRogue source package. + */ #define _POSIX_C_SOURCE 200809L /* strdup() */ #include "draw_wins.h" -#include /* typedefs attr_t, chtype, define A_REVERSE */ +#include /* attr_t, chtype, init_pair(), A_REVERSE, COLOR_PAIR() */ #include /* NULL */ #include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */ #include /* sprintf() */ @@ -58,13 +63,6 @@ static char * get_kb_line(struct KeyBinding * kb); static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, uint16_t offset); -/* Draw into window "w" from line "start" on a "title" followed by an empty - * line followed by a list of all keybindings starting in "kbdb". - */ -static void draw_titled_keybinding_list(char * title, struct Win * win, - uint16_t * offset, uint8_t last, - struct KeyBindingDB * kbdb); - static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x) @@ -182,7 +180,7 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri, uint16_t len_line = strlen(line); char * separator = last ? "" : " / "; uint32_t len_line_new = len_line + strlen(separator); - char * line_new = try_malloc(len_line_new, __func__); + char * line_new = try_malloc(len_line_new + 1, __func__); int test = sprintf(line_new, "%s%s", line, separator); exit_trouble(test < 0, __func__, "sprintf"); uint16_t x = 0; @@ -298,34 +296,6 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, -static void draw_titled_keybinding_list(char * title, struct Win * win, - uint16_t * offset, uint8_t last, - struct KeyBindingDB * kbdb) -{ - uint8_t state = 0; - uint8_t kb_n = 0; - while (0 == state || kb_n < kbdb->n_of_kbs) - { - if (0 == state) - { - add_line(win, title, 0, offset, 0); - add_line(win, " ", 0, offset, 0); - state = 1 + (0 == kbdb->n_of_kbs); - continue; - } - 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++; - } - if (2 == state) - { - add_line(win, "(none)", 0, offset, last); - } -} - - - extern void draw_win_log(struct Win * win) { if (!world.log) @@ -339,14 +309,40 @@ extern void draw_win_log(struct Win * win) extern void draw_win_map(struct Win * win) { + 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 z = 0; - uint16_t x, y; - for (y = 0; y < world.map.length; y++) + uint16_t x, y, z; + for (y = 0, z = 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++; + } + } + for (y = 0, z = 0; y < world.map.length; y++) { for (x = 0; x < world.map.length; x++) { - set_ch_on_yx(win, y, x * 2 + (y % 2), world.map.cells[z]); + if (' ' != world.map.cells[z]) + { + 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); + } + } z++; } } @@ -398,9 +394,8 @@ extern void draw_win_inventory(struct Win * win) -extern void draw_win_available_keybindings(struct Win * win) +extern void draw_win_active_windows_keys(struct Win * win) { - char * title = "Active window's keys:"; struct Win * win_active = get_win_by_id(world.winDB.active); struct KeyBindingDB * kbdb = &win_active->kb; if (1 == win_active->view) @@ -412,12 +407,20 @@ extern void draw_win_available_keybindings(struct Win * win) kbdb = &world.kb_winkeys; } uint16_t offset = 0; - draw_titled_keybinding_list(title, win, &offset, 0, kbdb); - add_line(win, " ", 0, &offset, 0); - title = "Global keys:"; - draw_titled_keybinding_list(title, win, &offset, 1, &world.kb_global); -} + 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); + } +} @@ -463,15 +466,15 @@ extern void draw_winconf_geometry(struct Win * win) char h_value[6 + 1]; /* 6: int16_t value max strlen */ int test = sprintf(h_value, "%d", win->target_height); exit_trouble(test < 0, __func__, "sprintf"); - char * h_plus = " (width in cells)\n\n"; - char * h_minus = " (negative diff: cells to screen width)\n\n"; + char * h_plus = " (height in cells)\n\n"; + char * h_minus = " (non-positive diff: cells to screen height)\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]; test = sprintf(w_value, "%d", win->target_width); exit_trouble(test < 0, __func__, "sprintf"); - char * w_plus = "(height in cells)\n\n"; - char * w_minus = " (negative diff: cells to screen height)\n\n"; + char * w_plus = " (width in cells)\n\n"; + char * w_minus = " (non-positive diff: cells to screen width)\n\n"; char * w_type = (1 == win->target_width_type) ? w_minus : w_plus; char * breaks_title = "Linebreak type: "; char * breaks_type = (1 == win->linebreak) ? "wide" : "long";