/* Wrappers to make some functions compatible to try_cmd_* single char args. */
static void wrap_mod_selected_keyb(char c);
static void wrap_mv_kb_mod(char c1, char c2);
-static void wrap_cycle_active_win(char c);
-static void wrap_shift_active_win(char c);
-static void wrap_cycle_active_win(char c)
-{
- cycle_active_win(world.wmeta, c);
-}
-
-
-
-static void wrap_shift_active_win(char c)
-{
- char * err = "Trouble with shift_active_win() in wingeom_control().";
- exit_err(shift_active_win(world.wmeta, c), err);
-}
-
-
-
extern uint16_t get_available_keycode_to_action(char * name)
{
uint16_t keycode = get_keycode_to_action(world.kb_global.kbs, name);
if ( try_cmd_0args('i', action, "wait", player_wait)
|| try_cmd_0args('i', action, "drop", player_drop)
|| try_cmd_0args('i', action, "pick", player_pick)
+ || try_cmd_0args('i', action, "use", player_use)
|| try_cmd_1args('i', action, "player_u", move_player, 'N')
|| try_cmd_1args('i', action, "player_d", move_player, 'S')
|| try_cmd_1args('i', action, "player_r", move_player, 'E')
|| try_cmd_1args('k', key, "shri_h", growshrink_active_window, '_')
|| try_cmd_1args('k', key, "grow_v", growshrink_active_window, '+')
|| try_cmd_1args('k', key, "shri_v", growshrink_active_window, '-')
- || try_cmd_1args('k', key, "shift_f", wrap_shift_active_win, 'f')
- || try_cmd_1args('k', key, "shift_b", wrap_shift_active_win, 'b'))
+ || try_cmd_1args('k', key, "shift_f", shift_active_win, 'f')
+ || try_cmd_1args('k', key, "shift_b", shift_active_win, 'b'))
{
return 1;
}
|| try_cmd_1args('k', key, "to_infowin", toggle_window, 'i')
|| try_cmd_1args('k', key, "to_inv", toggle_window, 'c')
|| try_cmd_1args('k', key, "to_logwin", toggle_window, 'l')
- || try_cmd_1args('k', key, "cyc_win_f", wrap_cycle_active_win, 'f')
- || try_cmd_1args('k', key, "cyc_win_b", wrap_cycle_active_win, 'b')
+ || try_cmd_1args('k', key, "cyc_win_f", cycle_active_win, 'f')
+ || try_cmd_1args('k', key, "cyc_win_b", cycle_active_win, 'b')
|| try_cmd_1args('k', key, "g_keys_m", wrap_mod_selected_keyb, 'G')
|| try_cmd_1args('k', key, "wg_keys_m", wrap_mod_selected_keyb, 'g')
|| try_cmd_1args('k', key, "wk_keys_m", wrap_mod_selected_keyb, 'k')