X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=17a76320e48c7ad70c3535ef5f754c26156829d6;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=60590963dceca0f36e8fd420ad9ca1b3faae49d7;hpb=fb9b40f0535b28b37b64983240c4b78e74ee9a2c;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 6059096..17a7632 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -1,26 +1,31 @@ /* src/client/control.c */ #include "control.h" -#include /* uint8_t, uint16_t */ +#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */ +#include /* free() */ #include /* sprintf() */ #include /* strlen() */ -#include "io.h" /* try_send() */ +#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_window.h" /* for map_scroll(), map_center() */ -#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 "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" /* for cycle_active_win(), shift_active_win() */ -#include "world.h" /* for global world */ +#include "windows.h" /* get_win_by_id() */ +#include "world.h" /* world */ +/* Move world.inventory_sel up ("dir"="u") or down (else) as far as possible. */ +static void nav_inventory(char dir); + /* If "command"'s .dsc_short fits "match", apply "f" with provided char * arguments and return 1; else, return 0. */ @@ -35,14 +40,44 @@ 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); +static void nav_inventory(char dir) +{ + if ('u' == dir) + { + world.player_inventory_select = world.player_inventory_select + - (world.player_inventory_select > 0); + return; + } + uint8_t n_elems = 0; + 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]); + } + world.player_inventory_select = world.player_inventory_select + + (world.player_inventory_select < n_elems); +} + + + static uint8_t try_0args(struct Command * command, char * match, void (* f) ()) { if (!strcmp(command->dsc_short, match)) @@ -82,16 +117,17 @@ 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_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, "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') + || try_1args(command, "map_l", map_scroll, '4') || 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_pad, '+') - || try_1args(command, "scrl_l", scroll_pad, '-') + || 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') @@ -101,10 +137,11 @@ static uint8_t try_client_commands(struct Command * command) || try_1args(command, "to_inv", toggle_window, 'c') || try_1args(command, "to_logwin", toggle_window, 'l') || try_0args(command, "winconf", toggle_winconfig) - || 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, "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_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') @@ -127,20 +164,71 @@ 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) +{ + 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); + int test = sprintf(arg_str, "%d",world.player_inventory_select); + exit_trouble(test < 0, f_name, "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, f_name); + int test = sprintf(msg, "%s %s", cmd->server_msg, arg_str); + exit_trouble(test < 0, f_name, "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); - try_send(msg); return 1; } return 0; @@ -150,30 +238,30 @@ 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 && world.wins.win_active) + struct Command * command = get_command_to_keycode(&world.kb_global, key); + if (!command && world.winDB.active) { - struct WinConf * wc = get_winconf_by_win(world.wins.win_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, key); } - else if (1 == wc->view) + else if (1 == w->view) { - command = get_command_to_keycode(world.kb_wingeom.kbs, key); + command = get_command_to_keycode(&world.kb_wingeom, key); } - else if (2 == wc->view) + else if (2 == w->view) { - command = get_command_to_keycode(world.kb_winkeys.kbs, key); + command = get_command_to_keycode(&world.kb_winkeys, 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; }