X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=5d9091992762878f271637cdf125e62542d5b655;hb=81630285494cf6d9e5ddd845e4e55702d87029b0;hp=17a76320e48c7ad70c3535ef5f754c26156829d6;hpb=891ba8fbca53d920f6b3704827fa6b8aee737de4;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 17a7632..5d90919 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -1,10 +1,15 @@ -/* src/client/control.c */ +/* src/client/control.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. + */ #include "control.h" #include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */ #include /* free() */ #include /* sprintf() */ -#include /* strlen() */ +#include /* strlen(), strcmp(), strncmp() */ #include "../common/rexit.h" /* exit_err(), exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "interface_conf.h" /* reload_interface_conf(), save_interface_conf() */ @@ -32,8 +37,12 @@ static void nav_inventory(char dir); static uint8_t try_0args(struct Command * command, char * match, void (* f) ()); static uint8_t try_1args(struct Command * command, char * match, void (* f) (char), char c); -static uint8_t try_2args(struct Command * command, char * match, - void (* f) (char, char), char c1, char c2); + +/* If "command" fits pattern "keyb_XY" with Y a proper keybinding list ID char + * and X one of "u" (for "up"), "d" (for "down") or "m" (for "modify"), move up + * or down or modify entry in the selected keybinding list. + */ +static uint8_t try_kb_manip(char * command); /* Try if "command" matches a hard-coded list of client-only commands and, if * successful, execute the match and return 1. Else, return 0. @@ -88,6 +97,8 @@ static uint8_t try_0args(struct Command * command, char * match, void (* f) ()) return 0; } + + static uint8_t try_1args(struct Command * command, char * match, void (* f) (char), char c) { @@ -101,12 +112,19 @@ static uint8_t try_1args(struct Command * command, char * match, -static uint8_t try_2args(struct Command * command, char * match, - void (* f) (char, char), char c1, char c2) +static uint8_t try_kb_manip(char * command) { - if (!strcmp(command->dsc_short, match)) + char * cmp = "keyb_"; + if (strlen(command) == strlen(cmp)+2 && !strncmp(command, cmp, strlen(cmp))) { - f(c1, c2); + if ('m' == command[strlen(cmp)]) + { + mod_selected_keyb(command[strlen(cmp) + 1]); + } + else if ('u' == command[strlen(cmp)] || 'd' == command[strlen(cmp)]) + { + move_keyb_selection(command[strlen(cmp) + 1], command[strlen(cmp)]); + } return 1; } return 0; @@ -128,7 +146,6 @@ 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_g_keywin", toggle_window, '0') || try_1args(command, "to_wg_keywin", toggle_window, '1') || try_1args(command, "to_wk_keywin", toggle_window, '2') @@ -136,6 +153,7 @@ 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, "to_terrain", toggle_window, 's') || try_0args(command, "winconf", toggle_winconfig) || try_1args(command, "grow_h", resize_active_win, '*') || try_1args(command, "shri_h", resize_active_win, '_') @@ -148,18 +166,7 @@ static uint8_t try_client_commands(struct Command * command) || 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_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_kb_manip(command->dsc_short)); } @@ -179,16 +186,15 @@ static uint8_t set_string_if_char_match(char c, char c_to_match, static char * build_server_message_with_argument(struct Command * cmd) { - char * f_name = "build_server_message_with_argument()"; uint8_t command_size = strlen(cmd->server_msg); char * arg_str = ""; uint8_t arg_size = 0; if ('i' == cmd->arg) { arg_size = 3; - arg_str = try_malloc(arg_size + 1, f_name); + arg_str = try_malloc(arg_size + 1, __func__); int test = sprintf(arg_str, "%d",world.player_inventory_select); - exit_trouble(test < 0, f_name, "sprintf()"); + exit_trouble(test < 0, __func__, "sprintf"); } else if ( set_string_if_char_match(cmd->arg, 'd', &arg_str, "east") || set_string_if_char_match(cmd->arg, 'c', &arg_str, "south-east") @@ -203,9 +209,9 @@ static char * build_server_message_with_argument(struct Command * cmd) { exit_err(1, "Illegal server command argument."); } - char * msg = try_malloc(command_size + 1 + arg_size + 1, f_name); + char * msg = try_malloc(command_size + 1 + arg_size + 1, __func__); int test = sprintf(msg, "%s %s", cmd->server_msg, arg_str); - exit_trouble(test < 0, f_name, "sprintf()"); + exit_trouble(test < 0, __func__, "sprintf"); if ('i' == cmd->arg) { free(arg_str);