7DRL: Make "Things here" window scrollable.

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index 76d69ac4562b9b0dc39211fffd1d47767815f9ac..93220bc2c2881e54bd6ec39e32a8aea5b2c1d94d 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -17,9 +17,7 @@
 #include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(),
                           * mod_selected_keyb(), move_keyb_selection()
                           */
-#include "map.h" /* map_scroll(), map_center(), toggle_autofocus(),
-                  * toggle_lookmode(), lookmode_nav()
-                  */
+#include "map.h" /* toggle_lookmode(), lookmode_nav()*/
 #include "wincontrol.h" /* shift_active_win(), resize_active_win(),
                          * toggle_win_size_type(), toggle_window(),
                          * cycle_active_win(), scroll_v_screen(),
@@ -89,6 +87,36 @@ static void nav_inventory(char dir)
 
 
 
+static void nav_stack(char dir)  //
+{
+    FILE * file = fopen("test", "a");
+    fprintf(file, "called %d\n", world.things_here_scroll);
+    if ('u' == dir && world.things_here_scroll > 0)
+    {
+        world.things_here_scroll--;
+        fprintf(file, "u\n");
+    }
+    else if ('d' == dir && world.things_here)
+    {
+        uint32_t i;
+        uint32_t n_lines = 1;
+        for (i = 0; '\0' != world.things_here[i]; i++)
+        {
+            n_lines = n_lines + (world.things_here[i] == '\n');
+        }
+        uint16_t f_h = get_win_by_id('s')->frame_size.y;
+        fprintf(file, "%d %d\n", n_lines, f_h);
+        if (n_lines > f_h && world.things_here_scroll < n_lines - f_h)
+        {
+            world.things_here_scroll++;
+        }
+        fprintf(file, "d %d\n", world.things_here_scroll);
+    }
+    fclose(file);
+}
+
+
+
 static uint8_t try_0args(struct Command * command, char * match, void (* f) ())
 {
     if (!strcmp(command->dsc_short, match))
@@ -136,14 +164,10 @@ static uint8_t try_kb_manip(char * command)
 
 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')
-            || try_1args(command, "map_l", map_scroll, '4')
-            || try_1args(command, "inv_u", nav_inventory, 'u')
+    return (   try_1args(command, "inv_u", nav_inventory, 'u')
             || try_1args(command, "inv_d", nav_inventory, 'd')
+            || try_1args(command, "stack_u", nav_stack, 'u') //
+            || try_1args(command, "stack_d", nav_stack, '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, '+')