From c74615b516cd7e44cc1a4005663eed1a373d0f68 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 18 Mar 2014 05:07:27 +0100 Subject: [PATCH] In the client, different modes of treating linebreaks are avaiable for each window. Re-wrote large parts of draw_wins.c for this. --- TODO | 6 +- confclient/commands | 3 + confclient/interface_conf | 21 +- confclient/single_wins/info | 7 + confclient/single_wins/inventory | 8 + confclient/single_wins/log | 8 + confclient/single_wins/map | 8 + src/client/control.c | 8 +- src/client/draw_wins.c | 445 ++++++++++++++++--------------- src/client/windows.c | 25 ++ src/client/windows.h | 5 +- src/common/err_try_fgets.h | 2 +- 12 files changed, 324 insertions(+), 222 deletions(-) diff --git a/TODO b/TODO index 225a210..db62941 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ BOTH SERVER/CLIENT: - make config files format more readable / self-explanatory +- in startup script, pipe server output to log file instead of stdout + SERVER: - implement field of view / line of sight and obstacles for those on the map @@ -23,6 +25,4 @@ CLIENT: - enable toggling of window borders -- enable toggling of showing "\n" in the window content either as newline breaks - (as currently) or as " / " (without newline break) for more efficent screen - estate use +- make log scrollable diff --git a/confclient/commands b/confclient/commands index cd945de..dddcd7f 100644 --- a/confclient/commands +++ b/confclient/commands @@ -103,6 +103,9 @@ grow window vertically shri_v shrink window vertically % +to_break +toggle line break type +% to_height_t toggle window height type % diff --git a/confclient/interface_conf b/confclient/interface_conf index 561d950..68d2be1 100644 --- a/confclient/interface_conf +++ b/confclient/interface_conf @@ -21,6 +21,7 @@ 95 shri_h 43 grow_v 45 shri_v +98 to_break 121 to_height_t 120 to_width_t % @@ -33,6 +34,7 @@ m % 0 Global keys +0 -13 29 258 g_keys_d @@ -41,6 +43,7 @@ Global keys % 1 Window geometry keys +0 8 29 258 wg_keys_d @@ -49,6 +52,7 @@ Window geometry keys % 2 Window keybinding keys +0 3 29 258 wk_keys_d @@ -57,8 +61,9 @@ Window keybinding keys % c Inventory -5 -33 +2 +4 +30 100 drop 259 inv_u 258 inv_d @@ -67,22 +72,26 @@ Inventory i Info 2 -33 +1 +30 % k Available keys 0 +0 29 % l Log --9 -33 +0 +-7 +30 % m Map 0 --64 +0 +-61 112 pick 58 wait 107 move_8 diff --git a/confclient/single_wins/info b/confclient/single_wins/info index aef1276..0d88c59 100644 --- a/confclient/single_wins/info +++ b/confclient/single_wins/info @@ -46,6 +46,7 @@ i % 0 Global keys +0 -13 29 258 g_keys_d @@ -54,6 +55,7 @@ Global keys % 1 Window geometry keys +0 8 29 258 wg_keys_d @@ -62,6 +64,7 @@ Window geometry keys % 2 Window keybinding keys +0 3 29 258 wk_keys_d @@ -70,6 +73,7 @@ Window keybinding keys % c Inventory +0 5 33 259 inv_u @@ -79,6 +83,7 @@ i Info 0 0 +0 % k Available keys @@ -87,12 +92,14 @@ Available keys % l Log +0 -10 33 % m Map 0 +0 -64 259 map_u 258 map_d diff --git a/confclient/single_wins/inventory b/confclient/single_wins/inventory index d15ff2c..090671d 100644 --- a/confclient/single_wins/inventory +++ b/confclient/single_wins/inventory @@ -46,6 +46,7 @@ c % 0 Global keys +0 -13 29 258 g_keys_d @@ -54,6 +55,7 @@ Global keys % 1 Window geometry keys +0 8 29 258 wg_keys_d @@ -62,6 +64,7 @@ Window geometry keys % 2 Window keybinding keys +0 3 29 258 wk_keys_d @@ -72,27 +75,32 @@ c Inventory 0 0 +0 259 inv_u 258 inv_d % i Info +0 3 33 % k Available keys 0 +0 29 % l Log +0 -10 33 % m Map 0 +0 -64 259 map_u 258 map_d diff --git a/confclient/single_wins/log b/confclient/single_wins/log index c578e38..ebbdbbd 100644 --- a/confclient/single_wins/log +++ b/confclient/single_wins/log @@ -46,6 +46,7 @@ l % 0 Global keys +0 -13 29 258 g_keys_d @@ -54,6 +55,7 @@ Global keys % 1 Window geometry keys +0 8 29 258 wg_keys_d @@ -62,6 +64,7 @@ Window geometry keys % 2 Window keybinding keys +0 3 29 258 wk_keys_d @@ -70,6 +73,7 @@ Window keybinding keys % c Inventory +0 5 33 259 inv_u @@ -77,22 +81,26 @@ Inventory % i Info +0 3 33 % k Available keys 0 +0 29 % l Log 0 0 +0 % m Map 0 +0 -64 259 map_u 258 map_d diff --git a/confclient/single_wins/map b/confclient/single_wins/map index 91bf2f9..2e07176 100644 --- a/confclient/single_wins/map +++ b/confclient/single_wins/map @@ -46,6 +46,7 @@ m % 0 Global keys +0 -13 29 258 g_keys_d @@ -54,6 +55,7 @@ Global keys % 1 Window geometry keys +0 8 29 258 wg_keys_d @@ -62,6 +64,7 @@ Window geometry keys % 2 Window keybinding keys +0 3 29 258 wk_keys_d @@ -70,6 +73,7 @@ Window keybinding keys % c Inventory +0 5 33 259 inv_u @@ -77,16 +81,19 @@ Inventory % i Info +0 3 33 % k Available keys 0 +0 29 % l Log +0 -10 33 % @@ -94,6 +101,7 @@ m Map 0 0 +0 259 map_u 258 map_d 260 map_l diff --git a/src/client/control.c b/src/client/control.c index 745b2ab..69c2570 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -14,7 +14,8 @@ */ #include "windows.h" /* get_win_byid(), shift_active_win(), resize_active_win(), * toggle_win_size_type(), toggle_window(), - * cycle_active_win(), scroll_v_screen() + * cycle_active_win(), scroll_v_screen(), + * toggle_linebreak_type() */ #include "world.h" /* for global world */ @@ -104,6 +105,7 @@ static uint8_t try_client_commands(struct Command * command) || try_1args(command, "shri_h", resize_active_win, '_') || try_1args(command, "grow_v", resize_active_win, '+') || try_1args(command, "shri_v", resize_active_win, '-') + || try_0args(command, "to_break", toggle_linebreak_type) || try_1args(command, "to_height_t", toggle_win_size_type, 'y') || try_1args(command, "to_width_t", toggle_win_size_type, 'x') || try_1args(command, "shift_f", shift_active_win, 'f') @@ -168,11 +170,11 @@ extern uint8_t try_key(uint16_t key) } if (command) { - if (try_server_commands(command)) + if (try_server_commands(command)) { return 1; } - else if (try_client_commands(command)) + else if (try_client_commands(command)) { return 1; } diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 46ef8ed..04927db 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -1,14 +1,16 @@ /* src/client/draw_wins.c */ #include "draw_wins.h" -#include /* attri_t, chtype */ +#include /* typedefs attr_t, chtype, define A_REVERSE */ #include /* NULL */ -#include /* uint8_t, uint16_t, uint32_t, int16_t */ -#include /* for sprintf() */ +#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */ +#include /* sprintf() */ #include /* free() */ -#include /* strlen(), strtok() */ +#include /* memset(), strchr(), strdup/(), strlen() */ +#include "../common/rexit.h" /* exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "keybindings.h" /* struct KeyBinding, get_keyname_to_keycode() */ +#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 "world.h" /* global world */ @@ -22,296 +24,319 @@ static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x); /* In Win "w", write "ch" to coordinate "y"/"x". */ static void set_ch_on_yx(struct Win * w, int y, int x, chtype ch); -/* Add "text" into window "win". Break text at right window edge. Also break at - * newlines. If "text" ends in a newline, ignore it. +/* Add "line" into window "w" with "attri" set on all chars. add_line() selects + * one of the other three functions based on the "win"->linebreak mode. + * + * "wide" writes lines to full width without in-between breaks. "long" breaks + * lines on the right window border. "compact" replaces newlines with printable + * separator characters. "offset" and "last" are only relevant to the "compact" + * mode. "offset" reports the horizontal offset at which the line is drawn from + * the lowest existing winmap line on; it is updated to the next offset after + * the new line, to be used by the next add_line_compact() call. "last" marks + * the line to add as the last in the window, so no further separator is added. */ -static void add_text_with_linebreaks(struct Win * win, char * text); - -/* Add "line" into window "w". Apply ncurses attribute "attri" to all - * characters drawn. If "attri" is non-zero, fill the entire line until the - * right window edge with empty characters, so "attri" applies on those too. - */ -static void add_line(struct Win * w, char * line, attr_t attri); - -/* Write "text" with add_text_with_linebreaks() as not starting from the top but - * from bottom of "win". Draw only what fits in window (avoid scroll hints). +static void add_line(struct Win * win, char * line, attr_t attri, + uint16_t * offset, uint8_t last); +static void add_line_wide(struct Win * win, char * line, attr_t attri); +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); + +/* Add linebreaks-containing "text" to "win", formatted as per "win"->linebreak. + * + * draw_text_from_bottom() prepends empty lines to "text" to push its last line + * to the low frame edge when the frame is of greater height than the winmap + * would be otherwise; else, set "win"->center.y to the winmap's lowest line. */ +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); +static char * get_kb_line(struct KeyBinding * kb, uint8_t linebreak_type); /* Draw from line "start" on config view for keybindings defined at "kb". */ -static void draw_keybinding_config(struct Win * w, struct KeyBindingDB * kb, - uint8_t start); +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 uint16_t draw_titled_keybinding_list(char * title, struct Win * w, - uint16_t start, - struct KeyBindingDB * 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 * w, int new_size_y, int new_size_x) +static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x) { char * f_name = "try_resize_winmap()"; - if (w->winmap_size.y >= new_size_y && w->winmap_size.x >= new_size_x) + if (win->winmap_size.y >= new_size_y && win->winmap_size.x >= new_size_x) { return; } - if (w->winmap_size.y > new_size_y) + if (win->winmap_size.y > new_size_y) { - new_size_y = w->winmap_size.y; + new_size_y = win->winmap_size.y; } - else if (w->winmap_size.x > new_size_x) + else if (win->winmap_size.x > new_size_x) { - new_size_x = w->winmap_size.x; + new_size_x = win->winmap_size.x; } - chtype * old_winmap = w->winmap; + chtype * old_winmap = win->winmap; uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x; - w->winmap = try_malloc(new_size, f_name); + win->winmap = try_malloc(new_size, f_name); uint16_t y, x; for (y = 0; y < new_size_y; y++) { - for (x = 0; y < w->winmap_size.y && x < w->winmap_size.x; x++) + for (x = 0; y < win->winmap_size.y && x < win->winmap_size.x; x++) { - chtype ch = old_winmap[(y * w->winmap_size.x) + x]; - w->winmap[(y * new_size_x) + x] = ch; + chtype ch = old_winmap[(y * win->winmap_size.x) + x]; + win->winmap[(y * new_size_x) + x] = ch; } for (; x < new_size_x; x++) { - w->winmap[(y * new_size_x) + x] = ' '; + win->winmap[(y * new_size_x) + x] = ' '; } } free(old_winmap); - w->winmap_size.y = new_size_y; - w->winmap_size.x = new_size_x; + win->winmap_size.y = new_size_y; + win->winmap_size.x = new_size_x; } -static void set_ch_on_yx(struct Win * w, int y, int x, chtype ch) +static void set_ch_on_yx(struct Win * win, int y, int x, chtype ch) { - w->winmap[(y * w->winmap_size.x) + x] = ch; + win->winmap[(y * win->winmap_size.x) + x] = ch; } -static void add_text_with_linebreaks(struct Win * win, char * text) +static void add_line(struct Win * win, char * line, attr_t attri, + uint16_t * offset, uint8_t last) { - uint16_t x, y; - int16_t z = -1; - for (y = win->winmap_size.y; ; y++) + exit_err(strlen(line) > UINT16_MAX, "Line in add_line() too big."); + if (0 == win->linebreak) { - try_resize_winmap(win, y + 1, win->frame_size.x); - for (x = 0; x < win->frame_size.x; x++) - { - z++; - if ('\n' == text[z]) - { - break; - } - else if ('\0' == text[z]) - { - return; - } - else - { - set_ch_on_yx(win, y, x, text[z]); - } - if ('\n' == text[z+1]) - { - z++; - break; - } - else if ('\0' == text[z+1]) - { - return; - } - } + add_line_long(win, line, attri); + } + else if (1 == win->linebreak) + { + add_line_wide(win, line, attri); + } + else if (2 == win->linebreak) + { + add_line_compact(win, line, attri, offset, last); } } -static void add_line(struct Win * w, char * line, attr_t attri) +static void add_line_wide(struct Win * win, char * line, attr_t attri) { - uint16_t y = w->winmap_size.y; + uint16_t y_start = win->winmap_size.y; uint16_t len_line = strlen(line); - if (attri - && w->winmap_size.x < w->frame_size.x && w->frame_size.x > len_line) - { - try_resize_winmap(w, y + 1, w->frame_size.x); - } - else + try_resize_winmap(win, y_start + 1, win->frame_size.x); + try_resize_winmap(win, y_start + 1, len_line); + uint16_t x; + for (x = 0; x < len_line; x++) { - try_resize_winmap(w, y + 1, strlen(line)); + set_ch_on_yx(win, y_start, x, line[x] | attri); } - uint16_t x = 0; - for (; x < len_line; x++) + if (attri) { - set_ch_on_yx(w, y, x, line[x] | attri); + for (; x < win->frame_size.x; x++) + { + set_ch_on_yx(win, y_start, x, ' ' | attri); + } } - if (attri) +} + + + +static void add_line_long(struct Win * win, char * line, attr_t attri) +{ + uint16_t y_start = win->winmap_size.y; + uint16_t len_line = strlen(line); + try_resize_winmap(win, y_start + 1, win->frame_size.x); + uint16_t x, y, z; + for (z = 0, y = y_start; z < len_line; y++) { - for (; x < w->frame_size.x; x++) + for (x = 0; x < win->winmap_size.x && z < len_line; x++, z++) + { + set_ch_on_yx(win, y, x, line[z] | attri); + } + if (z < len_line) { - set_ch_on_yx(w, y, x, ' ' | attri); + try_resize_winmap(win, y + 1 + 1, win->winmap_size.x); } } } -static void draw_text_from_bottom(struct Win * win, char * text) +static void add_line_compact(struct Win * win, char * line, attr_t attri, + uint16_t * offset, uint8_t last) { - /* Determine number of lines text would have in a window of win's width, - * but infinite height. Treat \n and \0 as control chars for incrementing - * y and stopping the loop. Make sure +they* don't count as cell space. - */ - char toggle = 0; + 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; - int16_t z = -1; - for (y = 0; 0 == toggle; y++) + uint32_t z; + for (z = 0, y = y_start; z < len_line_new; y++) { - for (x = 0; x < win->frame_size.x; x++) + for (x = * offset; x < win->winmap_size.x && z < len_line_new; x++, z++) { - z++; - if ('\n' == text[z]) - { - break; - } - if ('\n' == text[z+1]) - { - z++; - break; - } - else if (0 == text[z+1]) + set_ch_on_yx(win, y, x, line_new[z] | attri); + if (z + 1 == (uint32_t) len_line) { - toggle = 1; - break; + attri = 0; } } + * offset = 0; + if (z < len_line_new) + { + try_resize_winmap(win, y + 1 + 1, win->winmap_size.x); + } } - z = -1; + * offset = x; +} + + + +static void add_text_with_linebreaks(struct Win * win, char * text) +{ + char * limit; + uint16_t offset = 0; + char * text_copy = strdup(text); + char * start = text_copy; + while (NULL != (limit = strchr(start, '\n'))) + { + (* limit) = '\0'; + add_line(win, start, 0, &offset, 0); + start = limit + 1; + } + add_line(win, start, 0, &offset, 1); + free(text_copy); +} + + - /* Depending on what's bigger, determine start point in window or text. */ - uint16_t start_y = 0; - if (y < win->frame_size.y) +static void draw_text_from_bottom(struct Win * win, char * text) +{ + add_text_with_linebreaks(win, text); + if (win->winmap_size.y > win->frame_size.y) { - start_y = win->frame_size.y - y; + win->center.y = win->winmap_size.y - 1; } - else if (y > win->frame_size.y) + else if (win->winmap_size.y < win->frame_size.y) { - uint16_t offset = y - win->frame_size.y; - for (y = 0; y < offset; y++) + uint16_t new_y_start = win->frame_size.y - win->winmap_size.y; + memset(&win->winmap_size, 0, sizeof(struct yx_uint16)); + free(win->winmap); + win->winmap = NULL; + do { - for (x = 0; x < win->frame_size.x; x++) - { - z++; - if ('\n' == text[z]) - { - break; - } - if ('\n' == text[z+1]) - { - z++; - break; - } - } + add_line_wide(win, " ", 0); } - text = text + (sizeof(char) * (z + 1)); + 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. */ + add_line_wide(win, " ", 0); + } + add_text_with_linebreaks(win, text); } - - try_resize_winmap(win, start_y, 1); - add_text_with_linebreaks(win, text); } -static char * get_kb_line(struct KeyBinding * kb) +static char * get_kb_line(struct KeyBinding * kb, uint8_t linebreak_type) { char * f_name = "get_kb_line()"; char * keyname = get_keyname_to_keycode(kb->keycode); - uint16_t size = 9 + 1 + strlen(kb->command->dsc_long) + 1; + 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; char * kb_line = try_malloc(size, f_name); - sprintf(kb_line, "%-9s %s", keyname, kb->command->dsc_long); + sprintf(kb_line, format, keyname, kb->command->dsc_long); free(keyname); return kb_line; } -static void draw_keybinding_config(struct Win * w, struct KeyBindingDB * kbdb, - uint8_t start) +static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb, + uint16_t offset) { if (0 == kbdb->n_of_kbs) { - add_line(w, "(none)", 0); + add_line(win, "(none)", 0, &offset, 0); return; } - uint16_t y, kb_n; - for (y = start, kb_n = 0; kb_n < kbdb->n_of_kbs; y++, kb_n++) + uint16_t kb_n; + for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++) { attr_t attri = 0; - if (y - start == kbdb->select) + if (kb_n == kbdb->select) { attri = A_REVERSE; if (1 == kbdb->edit) { attri = attri | A_BLINK; } + win->center.y = win->winmap_size.y; } - char * kb_line = get_kb_line(&kbdb->kbs[kb_n]); - add_line(w, kb_line, attri); + char * kb_line = get_kb_line(&kbdb->kbs[kb_n], win->linebreak); + add_line(win, kb_line, attri, &offset, (kbdb->n_of_kbs == kb_n + 1)); free(kb_line); } } -static uint16_t draw_titled_keybinding_list(char * title, struct Win * w, - uint16_t start, - struct KeyBindingDB * kbdb) +static void draw_titled_keybinding_list(char * title, struct Win * win, + uint16_t * offset, uint8_t last, + struct KeyBindingDB * kbdb) { - uint16_t y; uint8_t state = 0; uint16_t kb_n = 0; - for (y = start; (0 == state || kb_n < kbdb->n_of_kbs); y++, kb_n++) + for (; (0 == state || kb_n < kbdb->n_of_kbs); kb_n++) { if (0 == state) { - add_line(w, title, 0); - y++; - add_line(w, " ", 0); + 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(w, kb_line, 0); + char * kb_line = get_kb_line(&kbdb->kbs[kb_n], win->linebreak); + add_line(win, kb_line, 0, offset, (last * kbdb->n_of_kbs == kb_n + 1)); free(kb_line); } if (2 == state) { - char * none = "(none)"; - add_line(w, none, 0); - y++; + add_line(win, "(none)", 0, offset, last); } - return y; } extern void draw_win_log(struct Win * win) { - char * log = ""; - if (world.log) + if (!world.log) { - log = world.log; + return; } - draw_text_from_bottom(win, log); + draw_text_from_bottom(win, world.log); } @@ -348,27 +373,29 @@ extern void draw_win_info(struct Win * win) extern void draw_win_inventory(struct Win * win) { - win->center.y = world.player_inventory_select; - char inventory_copy[strlen(world.player_inventory) + 1]; - sprintf(inventory_copy, "%s", world.player_inventory); - char * strtok_target = inventory_copy; + char * limit; + char * text_copy = strdup(world.player_inventory); + char * start = text_copy; uint8_t i = 0; - while (1) + uint8_t found_selection = 0; + uint16_t offset = 0; + while (NULL != (limit = strchr(start, '\n'))) { - char * object = strtok(strtok_target, "\n"); - strtok_target = NULL; - if (NULL == object) - { - return; - } + (* limit) = '\0'; attr_t attri = 0; if (i == world.player_inventory_select) { + found_selection = 1; attri = A_REVERSE; + win->center.y = win->winmap_size.y; } - add_line(win, object, attri); + add_line(win, start, attri, &offset, 0); + start = limit + 1; i++; } + win->center.y = !found_selection ? win->winmap_size.y : win->center.y; + add_line(win, start, !found_selection * A_REVERSE, &offset, 1); + free(text_copy); } @@ -377,27 +404,29 @@ extern void draw_win_available_keybindings(struct Win * win) { char * title = "Active window's keybindings:"; struct KeyBindingDB * kbdb; - struct Win * w = get_win_by_id(world.winDB.active); - if (0 == w->view) + struct Win * win_active = get_win_by_id(world.winDB.active); + if (0 == win_active->view) { - kbdb = &w->kb; + kbdb = &win_active->kb; } - else if (1 == w->view) + else if (1 == win_active->view) { kbdb = &world.kb_wingeom; } - else if (2 == w->view) + else if (2 == win_active->view) { kbdb = &world.kb_winkeys; } - uint16_t offset = draw_titled_keybinding_list(title, win, 0, kbdb); - add_line(win, " ", 0); - draw_titled_keybinding_list("Global keybindings", win, offset + 1, - &world.kb_global); + uint16_t offset = 0; + draw_titled_keybinding_list(title, win, &offset, 0, kbdb); + add_line(win, " ", 0, &offset, 0); + title = "Global keybindings:"; + draw_titled_keybinding_list(title, win, &offset, 1, &world.kb_global); } + extern void draw_win_keybindings_global(struct Win * win) { win->center.y = world.kb_global.select; @@ -425,38 +454,38 @@ extern void draw_win_keybindings_winconf_keybindings(struct Win * win) extern void draw_winconf_keybindings(struct Win * win) { char * title = "Window's keybindings:"; - add_line(win, title, 0); - add_line(win, " ", 0); - draw_keybinding_config(win, &win->kb, 2); - win->center.y = win->kb.select + 2; + uint16_t offset = 0; + add_line(win, title, 0, &offset, 0); + add_line(win, " ", 0, &offset, 0); + draw_keybinding_config(win, &win->kb, offset); } extern void draw_winconf_geometry(struct Win * win) { - char * title = "Window's geometry:\n"; - char * h_d = "\nHeight to save: "; - char * h_pos = " (width in cells)"; - char * h_neg = " (negative diff: cells to screen width)"; - char * w_d = "\n\nWidth to save: "; - char * w_pos = " (height in cells)"; - char * w_neg = " (negative diff: cells to screen height)"; - char * h_t = h_pos; - char * w_t = w_pos; - if (1 == win->target_height_type) - { - h_t = h_neg; - } - if (1 == win->target_width_type) - { - w_t = w_neg; - } - uint16_t maxl = strlen(title) - + strlen(h_t) + strlen(h_d) + 6 /* 6 = n of chars to */ - + strlen(w_t) + strlen(w_d) + 6 + 1; /* write max int16_t */ - char text[maxl + 1]; - sprintf(text, "%s%s%d%s%s%d%s", title, h_d, win->target_height, h_t, - w_d, win->target_width, w_t); + 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); + 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); + 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; + char * breaks_title = "Linebreak type: "; + char * breaks_type = (1 == win->linebreak) ? "wide" : "long"; + breaks_type = (2 == win->linebreak) ? "compact" : breaks_type; + uint16_t text_size = strlen(title) + + 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); add_text_with_linebreaks(win, text); } diff --git a/src/client/windows.c b/src/client/windows.c index a9bea11..6859e08 100644 --- a/src/client/windows.c +++ b/src/client/windows.c @@ -601,6 +601,7 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, "interface config file. "; char * err_id = "Illegal ID(s) selected."; char * err_2 = "Double-initialized window."; + char * err_brk = "Illegal line break type index."; int test_for_end = try_fgetc(file, f_name); if (EOF == test_for_end || '\n' == test_for_end) { @@ -618,6 +619,9 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, win.title = try_malloc(strlen(line), f_name); memcpy(win.title, line, strlen(line) - 1); /* Eliminate newline char */ win.title[strlen(line) - 1] = '\0'; /* char at end of string. */ + err_try_fgets(line, linemax, file, context, "0nsi"); + err_line(atoi(line) > 2, line, context, err_brk); + win.linebreak = atoi(line); err_try_fgets(line, linemax, file, context, "0ni"); win.target_height = atoi(line); win.target_height_type = (0 >= win.target_height); @@ -659,6 +663,8 @@ extern void write_winconf_of_id_to_file(FILE * file, char c) try_fwrite(line, sizeof(char), strlen(line), file, f_name); sprintf(line, "%s\n", wc->title); try_fwrite(line, sizeof(char), strlen(line), file, f_name); + sprintf(line, "%d\n", wc->linebreak); + try_fwrite(line, sizeof(char), strlen(line), file, f_name); sprintf(line, "%d\n", wc->target_height); try_fwrite(line, sizeof(char), strlen(line), file, f_name); sprintf(line, "%d\n", wc->target_width); @@ -877,6 +883,25 @@ extern void toggle_win_size_type(char axis) +extern void toggle_linebreak_type() +{ + struct Win * w = get_win_by_id(world.winDB.active); + if (0 == w->linebreak) + { + w->linebreak = 1; + } + else if (1 == w->linebreak) + { + w->linebreak = 2; + } + else if (2 == w->linebreak) + { + w->linebreak = 0; + } +} + + + extern void resize_active_win(char change) { if (world.winDB.active) diff --git a/src/client/windows.h b/src/client/windows.h index 872fe13..0a46192 100644 --- a/src/client/windows.h +++ b/src/client/windows.h @@ -59,7 +59,8 @@ struct Win char id; /* Win identifier; also maps to default window drawing function. */ uint8_t target_height_type; /* 0: read .height/.width as positive size; */ uint8_t target_width_type; /* 1: as negative diff to v_screen size */ - uint8_t view; /* winde view mode: 0: use default draw function set by .id */ + uint8_t linebreak; /* linebreaking modes: 0: wide; 1: long; 1: compact */ + uint8_t view; /* window view mode: 0: use .id- set default draw function */ }; /* 1/2: use one of the two config view draw function */ @@ -127,6 +128,8 @@ extern void toggle_winconfig(); */ extern void toggle_win_size_type(char axis); +extern void toggle_linebreak_type(); + /* Grow or shrink active window horizontally ("change" = "*"/"_") or vertically * ("change" = "+"/"-") if the new size was at least 1x1, the height at least * one cell smaller than .v_screen's vertical hight (to provide space for the diff --git a/src/common/err_try_fgets.h b/src/common/err_try_fgets.h index deefe98..8ea6368 100644 --- a/src/common/err_try_fgets.h +++ b/src/common/err_try_fgets.h @@ -34,7 +34,7 @@ extern void err_line(uint8_t test, char * line, char * intro, char * msg); * * The available "test" conditions are as follows: * - * '0': check against the line being empty (not even containing a \n char) + * '0': check for "line" not being empty (not even containing a \n char) * 'n': check for "line" ending with an \n char * 'e': check for "line" starting with an \n char * 'f': check for "line" not starting with an \n char -- 2.30.2