/* src/client/control.c */
#include "control.h"
-#include <stdint.h> /* uint8_t, uint16_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
#include <stdio.h> /* sprintf() */
#include <string.h> /* strlen() */
-#include "io.h" /* try_send() */
+#include "../common/rexit.h" /* exit_err() */
+#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 "wincontrol.h" /* struct WinConf, toggle_window(), toggle_winconfig(),
- * scroll_pad(), get_winconf_by_win(),
- * growshrink_active_window(), toggle_win_size_type()
+#include "map.h" /* for map_scroll(), map_center() */
+#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" /* for cycle_active_win(), shift_active_win() */
+#include "windows.h" /* get_win_by_id() */
#include "world.h" /* for global 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.
*/
+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))
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_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')
|| try_1args(command, "cyc_win_b", cycle_active_win, 'b')
- || try_1args(command, "scrl_r", scroll_pad, '+')
- || try_1args(command, "scrl_l", scroll_pad, '-')
+ || 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_g_keywin", toggle_window, '0')
|| try_1args(command, "to_wg_keywin", toggle_window, '1')
|| try_1args(command, "to_inv", toggle_window, 'c')
|| try_1args(command, "to_logwin", toggle_window, 'l')
|| try_0args(command, "winconf", toggle_winconfig)
- || try_1args(command, "grow_h", growshrink_active_window, '*')
- || try_1args(command, "shri_h", growshrink_active_window, '_')
- || try_1args(command, "grow_v", growshrink_active_window, '+')
- || try_1args(command, "shri_v", growshrink_active_window, '-')
+ || try_1args(command, "grow_h", resize_active_win, '*')
+ || 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')
uint8_t arg_size = 3;
char msg[command_size + 1 + arg_size + 1];
sprintf(msg, "%s %d", command->server_msg, arg);
- try_send(msg);
+ send(msg);
return 1;
}
return 0;
extern uint8_t try_key(uint16_t key)
{
- struct Command * command = get_command_to_keycode(world.kb_global.kbs, key);
- if (!command && world.wmeta.active)
+ struct Command * command = get_command_to_keycode(&world.kb_global, key);
+ if (!command && world.winDB.active)
{
- struct WinConf * wc = get_winconf_by_win(world.wmeta.active);
- if (0 == wc->view)
+ struct Win * w = get_win_by_id(world.winDB.active);
+ if (0 == w->view)
{
- command = get_command_to_keycode(wc->kb.kbs, key);
+ command = get_command_to_keycode(&w->kb, key);
}
- else if (1 == wc->view)
+ 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 == wc->view)
+ 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;
}