Client: Send no arguments for commands where the server expects none.

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index d5d8d9e7935441848a57ccb9011a97509dee6854..7ff99f3e75d39f538c6ede99b63431a178e850a3 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -2,22 +2,24 @@
 
 #include "control.h"
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
+#include <stdlib.h> /* free() */
 #include <stdio.h> /* sprintf() */
 #include <string.h> /* strlen() */
-#include "../common/rexit.h" /* exit_err() */
+#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.h" /* for map_scroll(), map_center() */
+#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" /* get_win_by_id() */
-#include "world.h" /* for global world */
+#include "world.h" /* world */
 
 
 
@@ -40,7 +42,8 @@ static uint8_t try_client_commands(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);
 
@@ -107,6 +110,7 @@ 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_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')
@@ -155,18 +159,28 @@ static uint8_t try_client_commands(struct Command * command)
 
 static uint8_t try_server_commands(struct Command * command)
 {
+    char * f_name = "try_server_commands()";
     if (command->server_msg)
     {
         uint8_t arg = (uint8_t) command->arg;
-        if ('i' == arg)
+        if ('0' == arg)
         {
-            arg = world.player_inventory_select;
+            send(command->server_msg);
+        }
+        else
+        {
+            if ('i' == arg)
+            {
+                arg = world.player_inventory_select;
+            }
+            uint8_t command_size = strlen(command->server_msg);
+            uint8_t arg_size = 3;
+            char * msg = try_malloc(command_size + 1 + arg_size + 1, f_name);
+            int test = sprintf(msg, "%s %d", command->server_msg, arg);
+            exit_trouble(test < 0, f_name, "sprintf()");
+            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);
-        send(msg);
         return 1;
     }
     return 0;