Add "look" mode to query things on any cell via new THINGS_HERE command.

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index 5595cccd45a1cb8aa7b7d18baa384bd46edfd74c..76d69ac4562b9b0dc39211fffd1d47767815f9ac 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -9,7 +9,7 @@
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
 #include <stdlib.h> /* free() */
 #include <stdio.h> /* sprintf() */
-#include <string.h> /* strlen() */
+#include <string.h> /* strlen(), strcmp(), strncmp() */
 #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() */
@@ -17,7 +17,9 @@
 #include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(),
                           * mod_selected_keyb(), move_keyb_selection()
                           */
-#include "map.h" /* map_scroll(), map_center(), toggle_autofocus() */
+#include "map.h" /* map_scroll(), map_center(), toggle_autofocus(),
+                  * toggle_lookmode(), lookmode_nav()
+                  */
 #include "wincontrol.h" /* shift_active_win(), resize_active_win(),
                          * toggle_win_size_type(), toggle_window(),
                          * cycle_active_win(), scroll_v_screen(),
@@ -37,8 +39,12 @@ static void nav_inventory(char dir);
 static uint8_t try_0args(struct Command * command, char * match, void (* f) ());
 static uint8_t try_1args(struct Command * command, char * match,
                          void (* f) (char), char c);
-static uint8_t try_2args(struct Command * command, char * match,
-                         void (* f) (char, char), char c1, char c2);
+
+/* If "command" fits pattern "keyb_XY" with Y a proper keybinding list ID char
+ * and X one of "u" (for "up"), "d" (for "down") or "m" (for "modify"), move up
+ * or down or modify entry in the selected keybinding list.
+ */
+static uint8_t try_kb_manip(char * command);
 
 /* Try if "command" matches a hard-coded list of client-only commands and, if
  * successful, execute the match and return 1. Else, return 0.
@@ -93,6 +99,8 @@ static uint8_t try_0args(struct Command * command, char * match, void (* f) ())
     return 0;
 }
 
+
+
 static uint8_t try_1args(struct Command * command, char * match,
                              void (* f) (char), char c)
 {
@@ -106,12 +114,19 @@ static uint8_t try_1args(struct Command * command, char * match,
 
 
 
-static uint8_t try_2args(struct Command * command, char * match,
-                             void (* f) (char, char), char c1, char c2)
+static uint8_t try_kb_manip(char * command)
 {
-    if (!strcmp(command->dsc_short, match))
+    char * cmp = "keyb_";
+    if (strlen(command) == strlen(cmp)+2 && !strncmp(command, cmp, strlen(cmp)))
     {
-        f(c1, c2);
+        if ('m' == command[strlen(cmp)])
+        {
+            mod_selected_keyb(command[strlen(cmp) + 1]);
+        }
+        else if ('u' == command[strlen(cmp)] || 'd' == command[strlen(cmp)])
+        {
+            move_keyb_selection(command[strlen(cmp) + 1], command[strlen(cmp)]);
+        }
         return 1;
     }
     return 0;
@@ -133,7 +148,6 @@ 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, 'a')
             || 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')
@@ -141,6 +155,7 @@ 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, "to_terrain", toggle_window, 's')
             || try_0args(command, "winconf", toggle_winconfig)
             || try_1args(command, "grow_h", resize_active_win, '*')
             || try_1args(command, "shri_h", resize_active_win, '_')
@@ -153,18 +168,8 @@ static uint8_t try_client_commands(struct Command * command)
             || try_1args(command, "shift_b", shift_active_win, 'b')
             || 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'));
+            || try_0args(command, "to_look", toggle_lookmode)
+            || try_kb_manip(command->dsc_short));
 }
 
 
@@ -261,7 +266,7 @@ extern uint8_t try_key(uint16_t key)
     }
     if (command)
     {
-        if      (try_server_commands(command))
+        if (world.look && lookmode_nav(command->dsc_short))
         {
             return 1;
         }
@@ -269,6 +274,10 @@ extern uint8_t try_key(uint16_t key)
         {
             return 1;
         }
+        else if (try_server_commands(command))
+        {
+            return 1;
+        }
         else if (!strcmp("quit", command->dsc_short))
         {
             return 2;