Client: reload_interface_conf() calls map_center() to re-focus map on player.

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index 7e1a596401b21228fe307db1fb5ea6499efb7bb6..4c512dcf978a62ad8a62086a2ff1595c505f1686 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -5,9 +5,8 @@
 #include <stdio.h> /* sprintf() */
 #include <string.h> /* strlen() */
 #include "io.h" /* try_send() */
-#include "keybindings.h" /* struct KeyBindingDB, get_command_to_keycode(),
-                          * get_keycode_to_command(), mod_selected_keyb(),
-                          * move_keyb_mod_selection()
+#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(),
@@ -22,15 +21,6 @@
 
 
 
-/* Return pointer to global keybindings or to keybindings for wingeometry config
- * (c = "g") or winkeys config (c = "k") or active window's keybindings ("w").
- */
-static struct KeyBindingDB * select_keybindingdb_pointer(char c);
-
-/* 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);
-
 /* If "command"'s .dsc_short fits "match", apply "f" with provided char
  * arguments and return 1; else, return 0.
  */
@@ -53,42 +43,6 @@ static uint8_t try_server_commands(struct Command * command);
 
 
 
-static struct KeyBindingDB * select_keybindingdb_pointer(char c)
-{
-    struct KeyBindingDB * kbd;
-    kbd = &world.kb_global;
-    if      ('g' == c)
-    {
-        kbd = &world.kb_wingeom;
-    }
-    else if ('k' == c)
-    {
-        kbd = &world.kb_winkeys;
-    }
-    else if ('w' == c)
-    {
-        struct WinConf * wc = get_winconf_by_win(world.wmeta.active);
-        kbd = &wc->kb;
-    }
-    return kbd;
-}
-
-
-
-static void wrap_mod_selected_keyb(char c)
-{
-        mod_selected_keyb(select_keybindingdb_pointer(c));
-}
-
-
-
-static void wrap_mv_kb_mod(char c1, char c2)
-{
-        move_keyb_mod_selection(select_keybindingdb_pointer(c1), c2);
-}
-
-
-
 static uint8_t try_0args(struct Command * command, char * match, void (* f) ())
 {
     if (!strcmp(command->dsc_short, match))
@@ -127,10 +81,15 @@ static uint8_t try_2args(struct Command * command, char * match,
 
 static uint8_t try_client_commands(struct Command * command)
 {
-    return (   try_0args(command, "winconf", toggle_winconfig)
-            || try_0args(command, "reload_conf", reload_interface_conf)
-            || try_0args(command, "save_conf", save_interface_conf)
-            || try_0args(command, "map_c", map_center)
+    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_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, "to_a_keywin", toggle_window, 'k')
@@ -141,34 +100,29 @@ 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, "cyc_win_f", cycle_active_win, 'f')
-            || try_1args(command, "cyc_win_b", cycle_active_win, 'b')
-            || try_1args(command, "g_keys_m", wrap_mod_selected_keyb, 'G')
-            || try_1args(command, "wg_keys_m", wrap_mod_selected_keyb, 'g')
-            || try_1args(command, "wk_keys_m", wrap_mod_selected_keyb, 'k')
-            || try_1args(command, "inv_u", nav_inventory, 'u')
-            || try_1args(command, "inv_d", nav_inventory, 'd')
-            || 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_1args(command, "to_height_t", toggle_win_size_type, 'y')
-            || try_1args(command, "to_width_t", toggle_win_size_type, 'x')
+            || 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, "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')
             || try_1args(command, "shift_b", shift_active_win, 'b')
-            || try_1args(command, "w_keys_m", wrap_mod_selected_keyb, 'w')
-            || try_2args(command, "w_keys_u", wrap_mv_kb_mod, 'w', 'u')
-            || try_2args(command, "w_keys_d", wrap_mv_kb_mod, 'w', 'd')
-            || try_2args(command, "g_keys_u", wrap_mv_kb_mod, 'G', 'u')
-            || try_2args(command, "g_keys_d", wrap_mv_kb_mod, 'G', 'd')
-            || try_2args(command, "wg_keys_u", wrap_mv_kb_mod, 'g', 'u')
-            || try_2args(command, "wg_keys_d", wrap_mv_kb_mod, 'g', 'd')
-            || try_2args(command, "wk_keys_u", wrap_mv_kb_mod, 'k', 'u')
-            || try_2args(command, "wk_keys_d", wrap_mv_kb_mod, 'k', 'd'));
+            || 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'));
 }
 
 
@@ -215,17 +169,17 @@ extern uint8_t try_key(uint16_t key)
     }
     if (command)
     {
-        if      (try_client_commands(command))
+        if (try_server_commands(command))
         {
             return 1;
         }
-        else if (!strcmp("quit", command->dsc_short))
+        else if      (try_client_commands(command))
         {
-            return 2;
+            return 1;
         }
-        else if (try_server_commands(command))
+        else if (!strcmp("quit", command->dsc_short))
         {
-            return 1;
+            return 2;
         }
     }
     return 0;