X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=02e4fed2360bf8fda263b7b4f54ef0b1eda7733d;hb=778534bf6946fe0fef17e353c55678d248d8d09d;hp=538f52ceb2795ea5be5bd71dcb1ecdfbc4cde06d;hpb=024b404c0db59dc6651b1c8f3d379c2797654fdf;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index 538f52c..02e4fed 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -1,25 +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 "io.h" /* try_send() */
+#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_window.h" /* for map_scroll(), map_center() */
-#include "misc.h" /* reload_interface_conf(), save_interface_conf(),
- * nav_inventory()
- */
-#include "windows.h" /* get_win_byid(), shift_active_win(), resize_active_win(),
- * toggle_win_size_type(), toggle_window(),
- * cycle_active_win(), scroll_v_screen()
- */
-#include "world.h" /* for global world */
+#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" /* 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.
*/
@@ -42,6 +48,28 @@ 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))
@@ -81,10 +109,11 @@ 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_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_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')
+ || try_1args(command, "map_l", map_scroll, '4')
|| 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')
@@ -104,6 +133,7 @@ static uint8_t try_client_commands(struct Command * command)
|| try_1args(command, "shri_h", resize_active_win, '_')
|| try_1args(command, "grow_v", resize_active_win, '+')
|| try_1args(command, "shri_v", resize_active_win, '-')
+ || try_0args(command, "to_break", toggle_linebreak_type)
|| 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')
@@ -128,6 +158,7 @@ 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;
@@ -137,9 +168,11 @@ static uint8_t try_server_commands(struct Command * command)
}
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);
- try_send(msg);
+ 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);
return 1;
}
return 0;
@@ -149,30 +182,30 @@ static uint8_t try_server_commands(struct Command * command)
extern uint8_t try_key(uint16_t key)
{
- struct Command * command = get_command_to_keycode(world.kb_global.kbs, key);
- if (!command && world.windb.active)
+ struct Command * command = get_command_to_keycode(&world.kb_global, key);
+ if (!command && world.winDB.active)
{
- struct Win * w = get_win_by_id(world.windb.active);
+ struct Win * w = get_win_by_id(world.winDB.active);
if (0 == w->view)
{
- command = get_command_to_keycode(w->kb.kbs, key);
+ command = get_command_to_keycode(&w->kb, key);
}
else if (1 == w->view)
{
- command = get_command_to_keycode(world.kb_wingeom.kbs, key);
+ command = get_command_to_keycode(&world.kb_wingeom, key);
}
else if (2 == w->view)
{
- command = get_command_to_keycode(world.kb_winkeys.kbs, key);
+ command = get_command_to_keycode(&world.kb_winkeys, key);
}
}
if (command)
{
- if (try_server_commands(command))
+ if (try_server_commands(command))
{
return 1;
}
- else if (try_client_commands(command))
+ else if (try_client_commands(command))
{
return 1;
}