From: Christian Heller Date: Fri, 7 Nov 2014 11:40:52 +0000 (+0100) Subject: Client: Simplify display of available keybindings. X-Git-Tag: tce~619 X-Git-Url: https://plomlompom.com/repos/te"st.html?a=commitdiff_plain;h=9ee3279f2caf89f2fdade2839840d2a07e86d50d;p=plomrogue Client: Simplify display of available keybindings. --- diff --git a/confclient/commands b/confclient/commands index c5f94d1..ffa618a 100644 --- a/confclient/commands +++ b/confclient/commands @@ -161,8 +161,11 @@ DESCRIPTION 'map right' COMMAND map_c DESCRIPTION 'map center player' -COMMAND to_a_keywin -DESCRIPTION 'window available keys' +COMMAND to_A_keywin +DESCRIPTION 'window keys of active window' + +COMMAND to_G_keywin +DESCRIPTION 'window global keys' COMMAND to_inv DESCRIPTION 'window inventory' diff --git a/confclient/interface_conf b/confclient/interface_conf index 9b97af3..40f998d 100644 --- a/confclient/interface_conf +++ b/confclient/interface_conf @@ -8,7 +8,6 @@ KEY 262 scrl_l KEY 360 scrl_r KEY 82 reload_conf KEY 67 save_conf -KEY 265 to_a_keywin KEY 266 to_mapwin KEY 267 to_infowin KEY 268 to_inv @@ -16,6 +15,8 @@ KEY 269 to_logwin KEY 270 to_g_keywin KEY 271 to_wg_keywin KEY 272 to_wk_keywin +KEY 273 to_A_keywin +KEY 274 to_G_keywin KEYBINDINGS 'wingeom' KEY 258 shift_f @@ -33,20 +34,20 @@ KEY 258 w_keys_d KEY 259 w_keys_u KEY 10 w_keys_m -WIN_ORDER 'kmicl' +WIN_ORDER 'gamicl' WIN_FOCUS 'm' WINDOW 1 -NAME 'Window geometry keys' +NAME 'Set window geometry keys' BREAK 0 WIDTH 29 -HEIGHT 8 +HEIGHT 9 KEY 258 wg_keys_d KEY 259 wg_keys_u KEY 10 wg_keys_m WINDOW 2 -NAME 'Window keybinding keys' +NAME 'Set window keybinding keys' BREAK 0 WIDTH 29 HEIGHT 3 @@ -70,12 +71,6 @@ BREAK 0 WIDTH 13 HEIGHT 2 -WINDOW k -NAME 'Available keys' -BREAK 0 -WIDTH 27 -HEIGHT 0 - WINDOW l NAME 'Log' BREAK 0 @@ -104,10 +99,22 @@ KEY 46 map_c KEY 70 to_autofocus WINDOW 0 -NAME 'Global keys' +NAME 'Set global keys' BREAK 0 WIDTH 29 HEIGHT -13 KEY 258 g_keys_d KEY 259 g_keys_u KEY 10 g_keys_m + +WINDOW a +NAME 'Active window`s keys' +BREAK 0 +WIDTH 27 +HEIGHT -19 + +WINDOW g +NAME 'Global keys' +BREAK 0 +WIDTH 27 +HEIGHT 18 diff --git a/confclient/single_wins/info b/confclient/single_wins/info index 636f5fa..b18d3f8 100644 --- a/confclient/single_wins/info +++ b/confclient/single_wins/info @@ -1,6 +1,5 @@ KEYBINDINGS 'global' KEY 81 quit -KEY 265 to_a_keywin KEY 266 to_mapwin KEY 267 to_infowin KEY 268 to_inv @@ -8,6 +7,8 @@ KEY 269 to_logwin KEY 270 to_g_keywin KEY 271 to_wg_keywin KEY 272 to_wk_keywin +KEY 273 to_A_keywin +KEY 274 to_G_keywin KEY 87 winconf KEY 62 cyc_win_f KEY 60 cyc_win_b @@ -49,7 +50,7 @@ WIN_ORDER 'i' WIN_FOCUS 'i' WINDOW 1 -NAME 'Window geometry keys' +NAME 'Set window geometry keys' BREAK 0 WIDTH 29 HEIGHT 8 @@ -58,7 +59,7 @@ KEY 259 wg_keys_u KEY 10 wg_keys_m WINDOW 2 -NAME 'Window keybinding keys' +NAME 'Set window keybinding keys' BREAK 0 WIDTH 29 HEIGHT 3 @@ -80,12 +81,6 @@ BREAK 2 WIDTH 0 HEIGHT 0 -WINDOW k -NAME 'Available keys' -BREAK 1 -WIDTH 29 -HEIGHT 0 - WINDOW l NAME 'Log' BREAK 0 @@ -103,10 +98,22 @@ KEY 260 map_l KEY 261 map_r WINDOW 0 -NAME 'Global keys' +NAME 'Set global keys' BREAK 0 WIDTH 29 HEIGHT -13 KEY 258 g_keys_d KEY 259 g_keys_u KEY 10 g_keys_m + +WINDOW a +NAME 'Active window´s keys' +BREAK 0 +WIDTH 27 +HEIGHT -19 + +WINDOW g +NAME 'Global keys' +BREAK 0 +WIDTH 27 +HEIGHT 18 diff --git a/confclient/single_wins/inventory b/confclient/single_wins/inventory index c664b3e..070b46b 100644 --- a/confclient/single_wins/inventory +++ b/confclient/single_wins/inventory @@ -1,6 +1,5 @@ KEYBINDINGS 'global' KEY 81 quit -KEY 265 to_a_keywin KEY 266 to_mapwin KEY 267 to_infowin KEY 268 to_inv @@ -8,6 +7,8 @@ KEY 269 to_logwin KEY 270 to_g_keywin KEY 271 to_wg_keywin KEY 272 to_wk_keywin +KEY 273 to_A_keywin +KEY 274 to_G_keywin KEY 87 winconf KEY 62 cyc_win_f KEY 60 cyc_win_b @@ -49,7 +50,7 @@ WIN_ORDER 'c' WIN_FOCUS 'c' WINDOW 1 -NAME 'Window geometry keys' +NAME 'Set window geometry keys' BREAK 0 WIDTH 29 HEIGHT 8 @@ -58,7 +59,7 @@ KEY 259 wg_keys_u KEY 10 wg_keys_m WINDOW 2 -NAME 'Window keybinding keys' +NAME 'Set window keybinding keys' BREAK 0 WIDTH 29 HEIGHT 3 @@ -80,12 +81,6 @@ BREAK 2 WIDTH 28 HEIGHT 1 -WINDOW k -NAME 'Available keys' -BREAK 1 -WIDTH 29 -HEIGHT 0 - WINDOW l NAME 'Log' BREAK 0 @@ -103,10 +98,22 @@ KEY 260 map_l KEY 261 map_r WINDOW 0 -NAME 'Global keys' +NAME 'Set global keys' BREAK 0 WIDTH 29 HEIGHT -13 KEY 258 g_keys_d KEY 259 g_keys_u KEY 10 g_keys_m + +WINDOW a +NAME 'Active window´s keys' +BREAK 0 +WIDTH 27 +HEIGHT -19 + +WINDOW g +NAME 'Global keys' +BREAK 0 +WIDTH 27 +HEIGHT 18 diff --git a/confclient/single_wins/log b/confclient/single_wins/log index be5408c..fba95a9 100644 --- a/confclient/single_wins/log +++ b/confclient/single_wins/log @@ -1,6 +1,5 @@ KEYBINDINGS 'global' KEY 81 quit -KEY 265 to_a_keywin KEY 266 to_mapwin KEY 267 to_infowin KEY 268 to_inv @@ -8,6 +7,8 @@ KEY 269 to_logwin KEY 270 to_g_keywin KEY 271 to_wg_keywin KEY 272 to_wk_keywin +KEY 273 to_A_keywin +KEY 274 to_G_keywin KEY 87 winconf KEY 62 cyc_win_f KEY 60 cyc_win_b @@ -49,7 +50,7 @@ WIN_ORDER 'l' WIN_FOCUS 'l' WINDOW 1 -NAME 'Window geometry keys' +NAME 'Set window geometry keys' BREAK 0 WIDTH 29 HEIGHT 8 @@ -58,7 +59,7 @@ KEY 259 wg_keys_u KEY 10 wg_keys_m WINDOW 2 -NAME 'Window keybinding keys' +NAME 'Set window keybinding keys' BREAK 0 WIDTH 29 HEIGHT 3 @@ -80,12 +81,6 @@ BREAK 2 WIDTH 28 HEIGHT 1 -WINDOW k -NAME 'Available keys' -BREAK 1 -WIDTH 29 -HEIGHT 0 - WINDOW l NAME 'Log' BREAK 0 @@ -103,10 +98,23 @@ KEY 260 map_l KEY 261 map_r WINDOW 0 -NAME 'Global keys' +NAME 'Set global keys' BREAK 0 WIDTH 29 HEIGHT -13 KEY 258 g_keys_d KEY 259 g_keys_u KEY 10 g_keys_m + +WINDOW a +NAME 'Active window´s keys' +BREAK 0 +WIDTH 27 +HEIGHT -19 + +WINDOW g +NAME 'Global keys' +BREAK 0 +WIDTH 27 +HEIGHT 18 + diff --git a/confclient/single_wins/map b/confclient/single_wins/map index e9283d9..4435fa1 100644 --- a/confclient/single_wins/map +++ b/confclient/single_wins/map @@ -1,6 +1,5 @@ KEYBINDINGS 'global' KEY 81 quit -KEY 265 to_a_keywin KEY 266 to_mapwin KEY 267 to_infowin KEY 268 to_inv @@ -8,6 +7,8 @@ KEY 269 to_logwin KEY 270 to_g_keywin KEY 271 to_wg_keywin KEY 272 to_wk_keywin +KEY 273 to_A_keywin +KEY 274 to_G_keywin KEY 87 winconf KEY 62 cyc_win_f KEY 60 cyc_win_b @@ -49,7 +50,7 @@ WIN_ORDER 'm' WIN_FOCUS 'm' WINDOW 1 -NAME 'Window geometry keys' +NAME 'Set window geometry keys' BREAK 0 WIDTH 29 HEIGHT 8 @@ -58,7 +59,7 @@ KEY 259 wg_keys_u KEY 10 wg_keys_m WINDOW 2 -NAME 'Window keybinding keys' +NAME 'Set window keybinding keys' BREAK 0 WIDTH 29 HEIGHT 3 @@ -80,12 +81,6 @@ BREAK 2 WIDTH 28 HEIGHT 1 -WINDOW k -NAME 'Available keys' -BREAK 1 -WIDTH 29 -HEIGHT 0 - WINDOW l NAME 'Log' BREAK 0 @@ -103,10 +98,23 @@ KEY 260 map_l KEY 261 map_r WINDOW 0 -NAME 'Global keys' +NAME 'Set global keys' BREAK 0 WIDTH 29 HEIGHT -13 KEY 258 g_keys_d KEY 259 g_keys_u KEY 10 g_keys_m + +WINDOW a +NAME 'Active window´s keys' +BREAK 0 +WIDTH 27 +HEIGHT -19 + +WINDOW g +NAME 'Global keys' +BREAK 0 +WIDTH 27 +HEIGHT 18 + diff --git a/src/client/control.c b/src/client/control.c index 692d4aa..f05d6cf 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -133,7 +133,8 @@ static uint8_t try_client_commands(struct Command * command) || try_1args(command, "cyc_win_b", cycle_active_win, 'b') || try_1args(command, "scrl_r", scroll_v_screen, '+') || try_1args(command, "scrl_l", scroll_v_screen, '-') - || try_1args(command, "to_a_keywin", toggle_window, 'k') + || try_1args(command, "to_A_keywin", toggle_window, 'a') + || try_1args(command, "to_G_keywin", toggle_window, 'g') || try_1args(command, "to_g_keywin", toggle_window, '0') || try_1args(command, "to_wg_keywin", toggle_window, '1') || try_1args(command, "to_wk_keywin", toggle_window, '2') diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 7e8ca5a..1dbd8a8 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -63,11 +63,8 @@ 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, +/* Draw into window "w" list of all the keybindings that start at "kbdb". */ +static void draw_titled_keybinding_list(struct Win * win, struct KeyBindingDB * kbdb); @@ -303,29 +300,21 @@ 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, +static void draw_titled_keybinding_list(struct Win * win, struct KeyBindingDB * kbdb) { - uint8_t state = 0; - uint8_t kb_n = 0; - while (0 == state || kb_n < kbdb->n_of_kbs) + uint16_t offset = 0; + if (0 == 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++; + add_line(win, "(none)", 0, &offset, 0); + return; } - if (2 == state) + uint8_t kb_n; + for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++) { - add_line(win, "(none)", 0, offset, last); + char * kb_line = get_kb_line(&kbdb->kbs[kb_n]); + add_line(win, kb_line, 0, &offset, (0 == kb_n + 1)); + free(kb_line); } } @@ -429,9 +418,15 @@ extern void draw_win_inventory(struct Win * win) -extern void draw_win_available_keybindings(struct Win * win) +extern void draw_win_global_keys(struct Win * win) +{ + draw_titled_keybinding_list(win, &world.kb_global); +} + + + +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) @@ -442,16 +437,11 @@ 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); + draw_titled_keybinding_list(win, kbdb); } - extern void draw_win_keybindings_global(struct Win * win) { win->center.y = world.kb_global.select; @@ -501,7 +491,7 @@ extern void draw_winconf_geometry(struct Win * win) 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_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: "; diff --git a/src/client/draw_wins.h b/src/client/draw_wins.h index b45cf81..8210daa 100644 --- a/src/client/draw_wins.h +++ b/src/client/draw_wins.h @@ -19,7 +19,8 @@ extern void draw_win_log(struct Win * win); extern void draw_win_map(struct Win * win); extern void draw_win_info(struct Win * win); extern void draw_win_inventory(struct Win * win); -extern void draw_win_available_keybindings(struct Win * win); +extern void draw_win_global_keys(struct Win * win); +extern void draw_win_active_windows_keys(struct Win * win); extern void draw_win_keybindings_global(struct Win * win); extern void draw_win_keybindings_winconf_geometry(struct Win * win); extern void draw_win_keybindings_winconf_keybindings(struct Win * win); diff --git a/src/client/main.c b/src/client/main.c index 7b2e0f9..5039201 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -33,7 +33,7 @@ int main(int argc, char * argv[]) /* Declare hard-coded paths and values here. */ world.path_commands = "confclient/commands"; world.path_interface = "confclient/interface_conf"; - world.winDB.legal_ids = "012ciklm"; + world.winDB.legal_ids = "012cilmag"; char * path_server_in = "server/in"; char * path_server_out = "server/out"; diff --git a/src/client/windows.c b/src/client/windows.c index 9a944ee..49af3ec 100644 --- a/src/client/windows.c +++ b/src/client/windows.c @@ -21,10 +21,10 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(), * draw_win_inventory(), draw_win_info(), draw_win_log(), - * draw_win_available_keybindings(), draw_win_map(), + * draw_win_global_keys(),draw_win_active_windows_keys(), * draw_win_keybindings_winconf_keybindings(), * draw_win_keybindings_winconf_geometry(), - * draw_win_keybindings_global() + * draw_win_keybindings_global(), draw_win_map() */ #include "wincontrol.h" /* toggle_window() */ #include "world.h" /* world */ @@ -121,7 +121,8 @@ static void (* get_drawfunc_by_char(char c)) () if ( match_func(c, &f, 'c', draw_win_inventory) || match_func(c, &f, 'i', draw_win_info) || match_func(c, &f, 'l', draw_win_log) - || match_func(c, &f, 'k', draw_win_available_keybindings) + || match_func(c, &f, 'g', draw_win_global_keys) + || match_func(c, &f, 'a', draw_win_active_windows_keys) || match_func(c, &f, 'm', draw_win_map) || match_func(c, &f, '0', draw_win_keybindings_global) || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry)