X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fcontrol.c;h=5595cccd45a1cb8aa7b7d18baa384bd46edfd74c;hb=b566b9e2b3689238911283d2bbaffa21c21b1f14;hp=7e1a596401b21228fe307db1fb5ea6499efb7bb6;hpb=a8097b8fef09444ebac0f1e2d3ffc4e621557b28;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index 7e1a596..5595ccc 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -1,35 +1,35 @@
-/* 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 /* 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 "keybindings.h" /* struct KeyBindingDB, get_command_to_keycode(),
- * get_keycode_to_command(), mod_selected_keyb(),
- * move_keyb_mod_selection()
+#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 "wincontrol.h" /* struct WinConf, toggle_window(), toggle_winconfig(),
- * scroll_pad(), get_winconf_by_win(),
- * growshrink_active_window(), toggle_win_size_type()
+#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" /* for cycle_active_win(), shift_active_win() */
-#include "world.h" /* for global world */
-
+#include "windows.h" /* get_win_by_id() */
+#include "world.h" /* world */
-/* Return pointer to global keybindings or to keybindings for wingeometry config
- * (c = "g") or winkeys config (c = "k") or active window's keybindings ("w").
- */
-static struct KeyBindingDB * select_keybindingdb_pointer(char c);
-/* Wrappers to make some functions compatible to try_cmd_* single char args. */
-static void wrap_mod_selected_keyb(char c);
-static void wrap_mv_kb_mod(char c1, char c2);
+/* 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.
@@ -45,46 +45,40 @@ 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);
-static struct KeyBindingDB * select_keybindingdb_pointer(char c)
+static void nav_inventory(char dir)
{
- struct KeyBindingDB * kbd;
- kbd = &world.kb_global;
- if ('g' == c)
- {
- kbd = &world.kb_wingeom;
- }
- else if ('k' == c)
+ if ('u' == dir)
{
- kbd = &world.kb_winkeys;
+ world.player_inventory_select = world.player_inventory_select
+ - (world.player_inventory_select > 0);
+ return;
}
- else if ('w' == c)
+ 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++)
{
- struct WinConf * wc = get_winconf_by_win(world.wmeta.active);
- kbd = &wc->kb;
+ n_elems = n_elems + ('\n' == world.player_inventory[i]);
}
- return kbd;
-}
-
-
-
-static void wrap_mod_selected_keyb(char c)
-{
- mod_selected_keyb(select_keybindingdb_pointer(c));
-}
-
-
-
-static void wrap_mv_kb_mod(char c1, char c2)
-{
- move_keyb_mod_selection(select_keybindingdb_pointer(c1), c2);
+ world.player_inventory_select = world.player_inventory_select
+ + (world.player_inventory_select < n_elems);
}
@@ -127,13 +121,19 @@ static uint8_t try_2args(struct Command * command, char * match,
static uint8_t try_client_commands(struct Command * command)
{
- return ( try_0args(command, "winconf", toggle_winconfig)
- || try_0args(command, "reload_conf", reload_interface_conf)
- || try_0args(command, "save_conf", save_interface_conf)
- || try_0args(command, "map_c", map_center)
- || try_1args(command, "scrl_r", scroll_pad, '+')
- || try_1args(command, "scrl_l", scroll_pad, '-')
- || try_1args(command, "to_a_keywin", toggle_window, 'k')
+ 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')
+ || 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_v_screen, '+')
+ || try_1args(command, "scrl_l", scroll_v_screen, '-')
+ || try_1args(command, "to_a_keywin", toggle_window, 'a')
|| 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')
@@ -141,34 +141,80 @@ static uint8_t try_client_commands(struct Command * command)
|| try_1args(command, "to_infowin", toggle_window, 'i')
|| try_1args(command, "to_inv", toggle_window, 'c')
|| try_1args(command, "to_logwin", toggle_window, 'l')
- || try_1args(command, "cyc_win_f", cycle_active_win, 'f')
- || try_1args(command, "cyc_win_b", cycle_active_win, 'b')
- || try_1args(command, "g_keys_m", wrap_mod_selected_keyb, 'G')
- || try_1args(command, "wg_keys_m", wrap_mod_selected_keyb, 'g')
- || try_1args(command, "wk_keys_m", wrap_mod_selected_keyb, 'k')
- || try_1args(command, "inv_u", nav_inventory, 'u')
- || try_1args(command, "inv_d", nav_inventory, 'd')
- || 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, "winconf", toggle_winconfig)
+ || 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, "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, "shift_f", shift_active_win, 'f')
|| try_1args(command, "shift_b", shift_active_win, 'b')
- || try_1args(command, "w_keys_m", wrap_mod_selected_keyb, 'w')
- || try_2args(command, "w_keys_u", wrap_mv_kb_mod, 'w', 'u')
- || try_2args(command, "w_keys_d", wrap_mv_kb_mod, 'w', 'd')
- || try_2args(command, "g_keys_u", wrap_mv_kb_mod, 'G', 'u')
- || try_2args(command, "g_keys_d", wrap_mv_kb_mod, 'G', 'd')
- || try_2args(command, "wg_keys_u", wrap_mv_kb_mod, 'g', 'u')
- || try_2args(command, "wg_keys_d", wrap_mv_kb_mod, 'g', 'd')
- || try_2args(command, "wk_keys_u", wrap_mv_kb_mod, 'k', 'u')
- || try_2args(command, "wk_keys_d", wrap_mv_kb_mod, 'k', 'd'));
+ || try_0args(command, "reload_conf", reload_interface_conf)
+ || try_0args(command, "save_conf", save_interface_conf)
+ || try_1args(command, "g_keys_m", mod_selected_keyb, 'G')
+ || try_2args(command, "g_keys_u", move_keyb_selection, 'G', 'u')
+ || try_2args(command, "g_keys_d", move_keyb_selection, 'G', 'd')
+ || try_1args(command, "w_keys_m", mod_selected_keyb, 'w')
+ || try_2args(command, "w_keys_u", move_keyb_selection, 'w', 'u')
+ || try_2args(command, "w_keys_d", move_keyb_selection, 'w', 'd')
+ || try_1args(command, "wg_keys_m", mod_selected_keyb, 'g')
+ || try_2args(command, "wg_keys_u", move_keyb_selection, 'g', 'u')
+ || try_2args(command, "wg_keys_d", move_keyb_selection, 'g', 'd')
+ || try_1args(command, "wk_keys_m", mod_selected_keyb, 'k')
+ || try_2args(command, "wk_keys_u", move_keyb_selection, 'k', 'u')
+ || try_2args(command, "wk_keys_d", move_keyb_selection, 'k', 'd'));
+}
+
+
+
+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;
}
@@ -177,16 +223,16 @@ static uint8_t try_server_commands(struct Command * command)
{
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[command_size + 1 + arg_size + 1];
- sprintf(msg, "%s %d", command->server_msg, arg);
- try_send(msg);
return 1;
}
return 0;
@@ -196,36 +242,36 @@ 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)
+ 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_client_commands(command))
+ if (try_server_commands(command))
{
return 1;
}
- else if (!strcmp("quit", command->dsc_short))
+ else if (try_client_commands(command))
{
- return 2;
+ return 1;
}
- else if (try_server_commands(command))
+ else if (!strcmp("quit", command->dsc_short))
{
- return 1;
+ return 2;
}
}
return 0;