X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=f05d6cffbb3aa93c9c285a4a39dba068fada4eae;hb=9ee3279f2caf89f2fdade2839840d2a07e86d50d;hp=1961334c0015064f103b825f64aaf89651652000;hpb=539f4419afa0966d67b341dc6b30a6174bd3f844;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 1961334..f05d6cf 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -1,22 +1,30 @@ -/* 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 */ +#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */ +#include /* free() */ #include /* sprintf() */ #include /* strlen() */ +#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() */ #include "io.h" /* send() */ #include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(), * mod_selected_keyb(), move_keyb_selection() */ -#include "map.h" /* for map_scroll(), map_center() */ +#include "map.h" /* map_scroll(), map_center(), toggle_autofocus() */ #include "wincontrol.h" /* shift_active_win(), resize_active_win(), * toggle_win_size_type(), toggle_window(), * cycle_active_win(), scroll_v_screen(), * toggle_linebreak_type(), toggle_winconfig() */ #include "windows.h" /* get_win_by_id() */ -#include "world.h" /* for global world */ +#include "world.h" /* world */ @@ -37,9 +45,17 @@ static uint8_t try_2args(struct Command * command, char * match, */ static uint8_t try_client_commands(struct Command * command); +/* If c == c_to_match, set "string" to "string_to_set". */ +static uint8_t set_string_if_char_match(char c, char c_to_match, + char ** string, char * string_to_set); + +/* Transform "command" to server command + argument string (free externally). */ +static char * build_server_message_with_argument(struct Command * command); + /* Try out "command" as one for server messaging; sending is .server_msg, * followed by either a string representing "command"'s .arg, or, if .arg is - * 'i', world.player_inventory_select. Return 1 on success, 0 on failure. + * 'i', world.player_inventory_select, or, if .arg is '0', nothing. Return 1 on + * success, 0 on failure. */ static uint8_t try_server_commands(struct Command * command); @@ -54,7 +70,9 @@ static void nav_inventory(char dir) return; } uint8_t n_elems = 0; - uint8_t i; + uint32_t i; + char * err = "Inventory string is too large."; + exit_err(UINT32_MAX <= strlen(world.player_inventory), err); for (i = 0; '\0' != world.player_inventory[i]; i++) { n_elems = n_elems + ('\n' == world.player_inventory[i]); @@ -104,6 +122,7 @@ static uint8_t try_2args(struct Command * command, char * match, static uint8_t try_client_commands(struct Command * command) { return ( try_0args(command, "map_c", map_center) + || try_0args(command, "to_autofocus", toggle_autofocus) || try_1args(command, "map_u", map_scroll, '8') || try_1args(command, "map_d", map_scroll, '2') || try_1args(command, "map_r", map_scroll, '6') @@ -114,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') @@ -150,20 +170,70 @@ static uint8_t try_client_commands(struct Command * command) +static uint8_t set_string_if_char_match(char c, char c_to_match, + char ** string, char * string_to_set) +{ + if (c == c_to_match) + { + *string = string_to_set; + return 1; + } + return 0; +} + + + +static char * build_server_message_with_argument(struct Command * cmd) +{ + 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, __func__); + int test = sprintf(arg_str, "%d",world.player_inventory_select); + 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") + || set_string_if_char_match(cmd->arg, 'x', &arg_str, "south-west") + || set_string_if_char_match(cmd->arg, 's', &arg_str, "west") + || set_string_if_char_match(cmd->arg, 'w', &arg_str, "north-west") + || set_string_if_char_match(cmd->arg, 'e', &arg_str, "north-east")) + { + arg_size = strlen(arg_str); + } + else + { + exit_err(1, "Illegal server command argument."); + } + 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, __func__, "sprintf"); + if ('i' == cmd->arg) + { + free(arg_str); + } + return msg; +} + + + static uint8_t try_server_commands(struct Command * command) { if (command->server_msg) { - uint8_t arg = (uint8_t) command->arg; - if ('i' == arg) + if ('0' == command->arg) + { + send(command->server_msg); + } + else { - arg = world.player_inventory_select; + char * msg = build_server_message_with_argument(command); + send(msg); + free(msg); } - uint8_t command_size = strlen(command->server_msg); - uint8_t arg_size = 3; - char msg[command_size + 1 + arg_size + 1]; - sprintf(msg, "%s %d", command->server_msg, arg); - send(msg); return 1; } return 0;