7DRL: Make "Things here" window scrollable.

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index b636678e9597599f8e54a09efbc8429049883284..c8d87fc29c622eaa5719c17f754f4a666a7d7711 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -361,7 +361,7 @@ extern void draw_win_log(struct Win * win)
         if (x > win->frame_size.x || '\n' == world.log[i])
         {
             n_postbreak_lines++;
-            x = 0;
+            x = 1;
         }
     }
     if (n_postbreak_lines > win->frame_size.y)
@@ -369,6 +369,7 @@ extern void draw_win_log(struct Win * win)
         uint32_t size = n_postbreak_lines * (win->frame_size.x + 1);
         win->winmap = try_malloc(sizeof(chtype) * size, __func__);
         for (i = 0; i < size; win->winmap[i] = ' ', i++);
+        /* TODO: This should only be done with "long" line break style. */
         do_realloc_winmap = 0;
         draw_text_from_bottom(win, world.log);
         do_realloc_winmap = 1;
@@ -398,7 +399,7 @@ extern void draw_win_map(struct Win * win)
             { //
                 a = COLOR_PAIR(1); //
             } //
-            else if (c_m == 'X') //
+            else if (c_m == 'X' || c_m == '|') //
             { //
                 a = COLOR_PAIR(3); //
             } //
@@ -408,14 +409,17 @@ extern void draw_win_map(struct Win * win)
             set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a);
         }
     }
-    init_pair(4, COLOR_BLUE, COLOR_BLACK);
-    init_pair(5, COLOR_YELLOW, COLOR_BLACK);
-    init_pair(6, COLOR_RED, COLOR_WHITE);
-    init_pair(7, COLOR_WHITE, COLOR_RED);
-    init_pair(8, COLOR_GREEN, COLOR_BLACK);
-    init_pair(9, COLOR_MAGENTA, COLOR_BLACK);
-    init_pair(10, COLOR_CYAN, COLOR_BLACK);
-    init_pair(11, COLOR_BLACK, COLOR_GREEN);
+    init_pair(4, COLOR_BLUE, COLOR_BLACK); //
+    init_pair(5, COLOR_YELLOW, COLOR_BLACK); //
+    init_pair(6, COLOR_RED, COLOR_WHITE); //
+    init_pair(7, COLOR_WHITE, COLOR_RED); //
+    init_pair(8, COLOR_GREEN, COLOR_BLACK); //
+    init_pair(9, COLOR_MAGENTA, COLOR_BLACK); //
+    init_pair(10, COLOR_CYAN, COLOR_BLACK); //
+    init_pair(11, COLOR_BLACK, COLOR_GREEN); //
+    init_pair(12, COLOR_BLACK, COLOR_MAGENTA); //
+    init_pair(13, COLOR_WHITE, COLOR_BLACK); //
+    init_pair(14, COLOR_RED, COLOR_BLACK); //
     for (y = 0; y < world.map.length; y++)
     {
         for (x = 0; x < world.map.length; x++)
@@ -441,18 +445,30 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = COLOR_PAIR(8); //
                 } //
-                else if ('$' == c || '%' == c) //
+                else if ('$' == c) //
                 { //
                     a = COLOR_PAIR(9); //
                 } //
-                else if ('m' == c) //
+                else if ('m' == c || '/' == c || '-' == c) //
                 { //
                     a = COLOR_PAIR(10); //
                 } //
-                else if ('X' == c) //
+                else if ('X' == c || '|' == c) //
                 { //
                     a = COLOR_PAIR(11); //
                 } //
+                else if ('_' == c) //
+                { //
+                    a = COLOR_PAIR(12); //
+                } //
+                else if ('%' == c || '*' == c) //
+                { //
+                    a = COLOR_PAIR(13); //
+                } //
+                else if ('=' == c) //
+                { //
+                    a = COLOR_PAIR(14); //
+                } //
                 // char c = world.map.cells[y*world.map.length + x];
                 set_ch_on_yx(win, y, x * 2 + (y % 2),     c | a); //
                 set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); //
@@ -468,7 +484,7 @@ extern void draw_win_map(struct Win * win)
         char c = world.map.cells[y * world.map.length + x];
         c = ' ' == c ? world.mem_map[y * world.map.length + x] : c;
         set_ch_on_yx(win, y, x * 2 + (y % 2),     c   | A_REVERSE);
-        set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | A_REVERSE);
+        set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, '?' | A_REVERSE);
     }
 }
 
@@ -530,6 +546,7 @@ extern void draw_win_terrain_stack(struct Win * win)
     char * wait_response = "(polling)";
     char * text = world.things_here ? world.things_here : wait_response;
     add_text_with_linebreaks(win, text);
+    win->center.y = world.things_here_scroll + (win->frame_size.y / 2);  //
 }