X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=inline;f=src%2Fclient%2Fcontrol.c;h=7ff99f3e75d39f538c6ede99b63431a178e850a3;hb=d2707c20a501a2c99af20c7e20f7c1a374bfe6aa;hp=ed44d120c63c24aa63768cd5cd727ccd6e03ed94;hpb=be8c57c7e1de5962913f849b862faae01bead264;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index ed44d12..7ff99f3 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -1,26 +1,31 @@
/* src/client/control.c */
#include "control.h"
-#include /* uint8_t, uint16_t */
+#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
+#include /* free() */
#include /* sprintf() */
#include /* strlen() */
+#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 "misc.h" /* nav_inventory() */
+#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 */
+/* Move world.inventory_sel up ("dir"="u") or down (else) as far as possible. */
+static void nav_inventory(char dir);
+
/* If "command"'s .dsc_short fits "match", apply "f" with provided char
* arguments and return 1; else, return 0.
*/
@@ -37,12 +42,35 @@ 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);
+static void nav_inventory(char dir)
+{
+ if ('u' == dir)
+ {
+ world.player_inventory_select = world.player_inventory_select
+ - (world.player_inventory_select > 0);
+ return;
+ }
+ uint8_t n_elems = 0;
+ uint32_t i;
+ char * err = "Inventory string is too large.";
+ exit_err(UINT32_MAX <= strlen(world.player_inventory), err);
+ for (i = 0; '\0' != world.player_inventory[i]; i++)
+ {
+ n_elems = n_elems + ('\n' == world.player_inventory[i]);
+ }
+ world.player_inventory_select = world.player_inventory_select
+ + (world.player_inventory_select < n_elems);
+}
+
+
+
static uint8_t try_0args(struct Command * command, char * match, void (* f) ())
{
if (!strcmp(command->dsc_short, match))
@@ -82,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')
@@ -130,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)
+ {
+ send(command->server_msg);
+ }
+ else
{
- arg = world.player_inventory_select;
+ 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;