X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=56c41fd4b132a34e37cf9c880065ec5af0bb035d;hb=c53b1488c5a53e8b12cb3a631763f98010420690;hp=1ccaf453a5bd9ab8d19300e7840b4dd296b0ce12;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 1ccaf45..56c41fd 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -4,10 +4,10 @@ #include /* uint8_t, uint16_t */ #include /* sprintf() */ #include /* strlen() */ -#include "command_db.h" /* get_command_id(), is_command_id_shortdsc() */ +#include "command_db.h" /* get_command_data() */ #include "io.h" /* try_send() */ -#include "keybindings.h" /* struct KeyBindingDB, get_actionname_to_keycode(), - * get_keycode_to_action(), mod_selected_keyb(), +#include "keybindings.h" /* struct KeyBindingDB, get_command_to_keycode(), + * get_keycode_to_command(), mod_selected_keyb(), * move_keyb_mod_selection() */ #include "map_window.h" /* for map_scroll(), map_center() */ @@ -23,22 +23,17 @@ -/* If "cmd" matches "match" in get_available_keycode_to_action(), execute "f" - * with provided char arguments and return 1; else only return 0. +/* If "keycode" matches "match" in get_available_keycode_to_command(), execute + * "f" with provided char arguments and return 1; else only return 0. */ -static uint8_t try_cmd_0args(int cmd, char * match, void (* f) ()); -static uint8_t try_cmd_1args(int cmd, char * match, void (* f) (char), char c); -static uint8_t try_cmd_2args(int cmd, char * match, +static uint8_t try_cmd_0args(int keycode, char * match, void (* f) ()); +static uint8_t try_cmd_1args(int keycode, char * match, + void (* f) (char), char c); +static uint8_t try_cmd_2args(int keycode, char * match, void (* f) (char, char), char c1, char c2); -/* If "action" is id of command named "match", send (via try_send()) a string - * of "match" + " " + the string representation of "arg" to the server. - */ -static uint8_t try_player_cmd(int action, char * match, char * command, - uint8_t arg); - -/* Return keycode to action of "name" if available in current window config. */ -static uint16_t get_available_keycode_to_action(char * name); +/* Return keycode to "command" if it is available in current window config. */ +static uint16_t get_available_keycode_to_command(char * command); /* Return pointer to global keybindings or to keybindings for wingeometry config * (c = "g") or winkeys config (c = "k") or active window's keybindings ("w"). @@ -51,9 +46,9 @@ static void wrap_mv_kb_mod(char c1, char c2); -static uint8_t try_cmd_0args(int cmd, char * match, void (* f) ()) +static uint8_t try_cmd_0args(int keycode, char * match, void (* f) ()) { - if (cmd == get_available_keycode_to_action(match)) + if (keycode == get_available_keycode_to_command(match)) { f(); return 1; @@ -63,9 +58,10 @@ static uint8_t try_cmd_0args(int cmd, char * match, void (* f) ()) -static uint8_t try_cmd_1args(int cmd, char * match, void (* f) (char), char c) +static uint8_t try_cmd_1args(int keycode, char * match, + void (* f) (char), char c) { - if (cmd == get_available_keycode_to_action(match)) + if (keycode == get_available_keycode_to_command(match)) { f(c); return 1; @@ -75,10 +71,10 @@ static uint8_t try_cmd_1args(int cmd, char * match, void (* f) (char), char c) -static uint8_t try_cmd_2args(int cmd, char * match, +static uint8_t try_cmd_2args(int keycode, char * match, void (* f) (char, char), char c1, char c2) { - if (cmd == get_available_keycode_to_action(match)) + if (keycode == get_available_keycode_to_command(match)) { f(c1, c2); return 1; @@ -88,42 +84,25 @@ static uint8_t try_cmd_2args(int cmd, char * match, -static uint8_t try_player_cmd(int action, char * match, char * command, - uint8_t arg) -{ - if (is_command_id_shortdsc(action, match)) - { - uint8_t command_size = strlen(command); - uint8_t arg_size = 3; - char msg[command_size + 1 + arg_size + 1]; - sprintf(msg, "%s %d", command, arg); - try_send(msg); - return 1; - } - return 0; -} - - - -static uint16_t get_available_keycode_to_action(char * name) +static uint16_t get_available_keycode_to_command(char * command) { - uint16_t keycode = get_keycode_to_action(world.kb_global.kbs, name); + uint16_t keycode = get_keycode_to_command(world.kb_global.kbs, command); if (0 != keycode || 0 == world.wmeta.active) { return keycode; } struct WinConf * wc = get_winconf_by_win(world.wmeta.active); - if (0 == wc->view) + if (0 == wc->view) { - keycode = get_keycode_to_action(wc->kb.kbs, name); + keycode = get_keycode_to_command(wc->kb.kbs, command); } else if (1 == wc->view) { - keycode = get_keycode_to_action(world.kb_wingeom.kbs, name); + keycode = get_keycode_to_command(world.kb_wingeom.kbs, command); } else if (2 == wc->view) { - keycode = get_keycode_to_action(world.kb_winkeys.kbs, name); + keycode = get_keycode_to_command(world.kb_winkeys.kbs, command); } return keycode; } @@ -168,26 +147,26 @@ static void wrap_mv_kb_mod(char c1, char c2) extern uint8_t player_control(int key) { - char * action_name = get_actionname_to_keycode(world.kb_global.kbs, key); - if (NULL == action_name && 0 != world.wmeta.active) + char * cmd = get_command_to_keycode(world.kb_global.kbs, key); + if (NULL == cmd && 0 != world.wmeta.active) { struct WinConf * wc = get_winconf_by_win(world.wmeta.active); - action_name = get_actionname_to_keycode(wc->kb.kbs, key); + cmd = get_command_to_keycode(wc->kb.kbs, key); } - if (NULL != action_name) + if (NULL != cmd) { - uint8_t id = get_command_id(action_name); - if ( try_player_cmd(id, "wait", "wait", 0) - || try_player_cmd(id, "drop", "drop", world.player_inventory_select) - || try_player_cmd(id, "pick", "pick_up", 0) - || try_player_cmd(id, "use", "use", world.player_inventory_select) - || try_player_cmd(id, "player_u", "move", 'N') - || try_player_cmd(id, "player_d", "move", 'S') - || try_player_cmd(id, "player_r", "move", 'E') - || try_player_cmd(id, "player_l", "move", 'W')) + struct Command * command_data = get_command_data(cmd); + uint8_t arg = (uint8_t) command_data->arg; + if ('i' == arg) { - return 1; + arg = world.player_inventory_select; } + uint8_t command_size = strlen(command_data->server_msg); + uint8_t arg_size = 3; + char msg[command_size + 1 + arg_size + 1]; + sprintf(msg, "%s %d", command_data->server_msg, arg); + try_send(msg); + return 1; } return 0; } @@ -227,7 +206,7 @@ extern uint8_t winkeyb_control(int key) extern uint8_t meta_control(int key) { - uint8_t ret = 2 * (key == get_available_keycode_to_action("quit")); + uint8_t ret = 2 * (key == get_available_keycode_to_command("quit")); if ( (0 == ret) && ( try_cmd_0args(key, "winconf", toggle_winconfig) || try_cmd_0args(key, "reload_conf", reload_interface_conf)