X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=f05d6cffbb3aa93c9c285a4a39dba068fada4eae;hb=9ee3279f2caf89f2fdade2839840d2a07e86d50d;hp=f97f5bdcffe0b8a8e0a4ef2f70e5792af4dd5d93;hpb=483f25751ae49c810456faf0bb7a375bc437df10;p=plomrogue

diff --git a/src/client/control.c b/src/client/control.c
index f97f5bd..f05d6cf 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -1,11 +1,16 @@
-/* src/client/control.c */
+/* src/client/control.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #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() */
@@ -40,9 +45,17 @@ static uint8_t try_2args(struct Command * command, char * match,
  */
 static uint8_t try_client_commands(struct Command * command);
 
+/* If c == c_to_match, set "string" to "string_to_set". */
+static uint8_t set_string_if_char_match(char c, char c_to_match,
+                                        char ** string, char * string_to_set);
+
+/* Transform "command" to server command + argument string (free externally). */
+static char * build_server_message_with_argument(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);
 
@@ -120,7 +133,8 @@ 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, 'k')
+            || try_1args(command, "to_A_keywin", toggle_window, 'a')
+            || try_1args(command, "to_G_keywin", toggle_window, 'g')
             || 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')
@@ -156,22 +170,70 @@ static uint8_t try_client_commands(struct Command * command)
 
 
 
+static uint8_t set_string_if_char_match(char c, char c_to_match,
+                                        char ** string, char * string_to_set)
+{
+    if (c == c_to_match)
+    {
+        *string = string_to_set;
+        return 1;
+    }
+    return 0;
+}
+
+
+
+static char * build_server_message_with_argument(struct Command * cmd)
+{
+    uint8_t command_size = strlen(cmd->server_msg);
+    char * arg_str = "";
+    uint8_t arg_size = 0;
+    if ('i' == cmd->arg)
+    {
+        arg_size = 3;
+        arg_str = try_malloc(arg_size + 1, __func__);
+        int test = sprintf(arg_str, "%d",world.player_inventory_select);
+        exit_trouble(test < 0, __func__, "sprintf");
+    }
+    else if (   set_string_if_char_match(cmd->arg, 'd', &arg_str, "east")
+             || set_string_if_char_match(cmd->arg, 'c', &arg_str, "south-east")
+             || set_string_if_char_match(cmd->arg, 'x', &arg_str, "south-west")
+             || set_string_if_char_match(cmd->arg, 's', &arg_str, "west")
+             || set_string_if_char_match(cmd->arg, 'w', &arg_str, "north-west")
+             || set_string_if_char_match(cmd->arg, 'e', &arg_str, "north-east"))
+    {
+        arg_size = strlen(arg_str);
+    }
+    else
+    {
+        exit_err(1, "Illegal server command argument.");
+    }
+    char * msg = try_malloc(command_size + 1 + arg_size + 1, __func__);
+    int test = sprintf(msg, "%s %s", cmd->server_msg, arg_str);
+    exit_trouble(test < 0, __func__, "sprintf");
+    if ('i' == cmd->arg)
+    {
+        free(arg_str);
+    }
+    return msg;
+}
+
+
+
 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' == command->arg)
+        {
+            send(command->server_msg);
+        }
+        else
         {
-            arg = world.player_inventory_select;
+            char * msg = build_server_message_with_argument(command);
+            send(msg);
+            free(msg);
         }
-        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);
-        sprintf(msg, "%s %d", command->server_msg, arg);
-        send(msg);
-        free(msg);
         return 1;
     }
     return 0;