X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=b73d8015bd65cdb3abb2ef6ea6ec47670110a18a;hb=739a39530d192f97828fa21f3eed062d66a193e1;hp=906cf290dfaa0a1f1b56da5466f8c898f367eea9;hpb=f118d194b29320b6fbebd254207514aba1241b08;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 906cf29..b73d801 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -12,11 +12,10 @@ #include "misc.h" /* reload_interface_conf(), save_interface_conf(), * nav_inventory() */ -#include "wincontrol.h" /* struct WinConf, toggle_window(), toggle_winconfig(), - * scroll_pad(), get_winconf_by_win(), - * growshrink_active_window(), toggle_win_size_type() - */ -#include "windows.h" /* for cycle_active_win(), shift_active_win() */ +#include "windows.h" /* get_win_byid(), shift_active_win(), resize_active_win(), + * toggle_win_size_type(), toggle_window(), + * cycle_active_win(), scroll_v_screen() + */ #include "world.h" /* for global world */ @@ -81,12 +80,17 @@ static uint8_t try_2args(struct Command * command, char * match, static uint8_t try_client_commands(struct Command * command) { - return ( try_0args(command, "winconf", toggle_winconfig) - || try_0args(command, "reload_conf", reload_interface_conf) - || try_0args(command, "save_conf", save_interface_conf) - || try_0args(command, "map_c", map_center) - || try_1args(command, "scrl_r", scroll_pad, '+') - || try_1args(command, "scrl_l", scroll_pad, '-') + return ( try_0args(command, "map_c", map_center) + || try_1args(command, "map_u", map_scroll, 'N') + || try_1args(command, "map_d", map_scroll, 'S') + || try_1args(command, "map_r", map_scroll, 'E') + || try_1args(command, "map_l", map_scroll, 'W') + || try_1args(command, "inv_u", nav_inventory, 'u') + || try_1args(command, "inv_d", nav_inventory, 'd') + || try_1args(command, "cyc_win_f", cycle_active_win, 'f') + || 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_g_keywin", toggle_window, '0') || try_1args(command, "to_wg_keywin", toggle_window, '1') @@ -95,34 +99,29 @@ static uint8_t try_client_commands(struct Command * command) || try_1args(command, "to_infowin", toggle_window, 'i') || try_1args(command, "to_inv", toggle_window, 'c') || try_1args(command, "to_logwin", toggle_window, 'l') - || try_1args(command, "cyc_win_f", cycle_active_win, 'f') - || try_1args(command, "cyc_win_b", cycle_active_win, 'b') - || try_1args(command, "inv_u", nav_inventory, 'u') - || try_1args(command, "inv_d", nav_inventory, 'd') - || try_1args(command, "map_u", map_scroll, 'N') - || try_1args(command, "map_d", map_scroll, 'S') - || try_1args(command, "map_r", map_scroll, 'E') - || try_1args(command, "map_l", map_scroll, 'W') + || try_0args(command, "winconf", toggle_winconfig) + || try_1args(command, "grow_h", resize_active_win, '*') + || 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_1args(command, "to_height_t", toggle_win_size_type, 'y') || try_1args(command, "to_width_t", toggle_win_size_type, 'x') - || try_1args(command, "grow_h", growshrink_active_window, '*') - || try_1args(command, "shri_h", growshrink_active_window, '_') - || try_1args(command, "grow_v", growshrink_active_window, '+') - || try_1args(command, "shri_v", growshrink_active_window, '-') || try_1args(command, "shift_f", shift_active_win, 'f') || try_1args(command, "shift_b", shift_active_win, 'b') + || try_0args(command, "reload_conf", reload_interface_conf) + || try_0args(command, "save_conf", save_interface_conf) || try_1args(command, "g_keys_m", mod_selected_keyb, 'G') - || try_1args(command, "wg_keys_m", mod_selected_keyb, 'g') - || try_1args(command, "wk_keys_m", mod_selected_keyb, 'k') + || try_2args(command, "g_keys_u", move_keyb_selection, 'G', 'u') + || try_2args(command, "g_keys_d", move_keyb_selection, 'G', 'd') || try_1args(command, "w_keys_m", mod_selected_keyb, 'w') + || try_2args(command, "w_keys_u", move_keyb_selection, 'w', 'u') + || try_2args(command, "w_keys_d", move_keyb_selection, 'w', 'd') + || try_1args(command, "wg_keys_m", mod_selected_keyb, 'g') || try_2args(command, "wg_keys_u", move_keyb_selection, 'g', 'u') || try_2args(command, "wg_keys_d", move_keyb_selection, 'g', 'd') + || try_1args(command, "wk_keys_m", mod_selected_keyb, 'k') || try_2args(command, "wk_keys_u", move_keyb_selection, 'k', 'u') - || try_2args(command, "wk_keys_d", move_keyb_selection, 'k', 'd') - || try_2args(command, "w_keys_u", move_keyb_selection, 'w', 'u') - || try_2args(command, "w_keys_d", move_keyb_selection, 'w', 'd') - || try_2args(command, "g_keys_u", move_keyb_selection, 'G', 'u') - || try_2args(command, "g_keys_d", move_keyb_selection, 'G', 'd')); + || try_2args(command, "wk_keys_d", move_keyb_selection, 'k', 'd')); } @@ -151,35 +150,35 @@ static uint8_t try_server_commands(struct Command * command) extern uint8_t try_key(uint16_t key) { struct Command * command = get_command_to_keycode(world.kb_global.kbs, key); - if (!command) + if (!command && world.winDB.active) { - struct WinConf * wc = get_winconf_by_win(world.wmeta.active); - if (0 == wc->view) + struct Win * w = get_win_by_id(world.winDB.active); + if (0 == w->view) { - command = get_command_to_keycode(wc->kb.kbs, key); + command = get_command_to_keycode(w->kb.kbs, key); } - else if (1 == wc->view) + else if (1 == w->view) { command = get_command_to_keycode(world.kb_wingeom.kbs, key); } - else if (2 == wc->view) + else if (2 == w->view) { command = get_command_to_keycode(world.kb_winkeys.kbs, key); } } if (command) { - if (try_client_commands(command)) + if (try_server_commands(command)) { return 1; } - else if (!strcmp("quit", command->dsc_short)) + else if (try_client_commands(command)) { - return 2; + return 1; } - else if (try_server_commands(command)) + else if (!strcmp("quit", command->dsc_short)) { - return 1; + return 2; } } return 0;