X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=1961334c0015064f103b825f64aaf89651652000;hb=539f4419afa0966d67b341dc6b30a6174bd3f844;hp=69c2570ec457fa48bb15fc573208eec8f0013f59;hpb=c74615b516cd7e44cc1a4005663eed1a373d0f68;p=plomrogue

diff --git a/src/client/control.c b/src/client/control.c
index 69c2570..1961334 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -4,23 +4,25 @@
 #include <stdint.h> /* uint8_t, uint16_t */
 #include <stdio.h> /* sprintf() */
 #include <string.h> /* strlen() */
+#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" /* 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(),
-                      * toggle_linebreak_type()
-                      */
+#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 */
 
 
 
+/* 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.
  */
@@ -43,6 +45,26 @@ 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;
+    uint8_t i;
+    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))