X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=594b70763f4963ffae1efd31622807623e17e5dc;hb=258e57c1621533e206610453047d829cc8aa13fe;hp=b230b6a2bb23330710f306e311b676bca6654030;hpb=f934d0193c89585b9154210bf1ffb08aeebef12a;p=plomrogue

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index b230b6a..594b707 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -16,7 +16,7 @@
 #include "../common/rexit.h" /* exit_err(), exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */
-#include "windows.h" /* yx_uint16, Win, get_win_by_id() */
+#include "windows.h" /* yx_uint16, Win */
 #include "world.h" /* global world */
 
 
@@ -56,9 +56,6 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
 static void add_text_with_linebreaks(struct Win * win, char * text);
 static void draw_text_from_bottom(struct Win * win, char * text);
 
-/* Return a properly formatted keybinding list line for "kb". */
-static char * get_kb_line(struct KeyBinding * kb);
-
 /* Draw from line "start" on config view for keybindings defined at "kb". */
 static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
                                    uint16_t offset);
@@ -68,6 +65,9 @@ static char * get_keyname_to_command(char * command_name);
 static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
                                   char * newlines, char * value_prefix);
 
+/* Draw map cell "c" into win "w" at position "y"/"x" with attribute "a". */
+static void draw_mapcell(struct Win * w, char c, uint8_t y, uint8_t x,attr_t a);
+
 
 
 static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x)
@@ -259,19 +259,6 @@ static void draw_text_from_bottom(struct Win * win, char * text)
 
 
 
-static char * get_kb_line(struct KeyBinding * kb)
-{
-    char * keyname = get_keyname_to_keycode(kb->keycode);
-    uint16_t size = strlen(keyname) + 3 + strlen(kb->command->dsc_long) + 1;
-    char * kb_line = try_malloc(size, __func__);
-    int test = sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long);
-    exit_trouble(test < 0, __func__, "sprintf");
-    free(keyname);
-    return kb_line;
-}
-
-
-
 static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
                                    uint16_t offset)
 {
@@ -293,7 +280,13 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
             }
             win->center.y = win->winmap_size.y;
         }
-        char * kb_line = get_kb_line(&kbdb->kbs[kb_n]);
+        struct KeyBinding kb = kbdb->kbs[kb_n];
+        char * keyname = get_keyname_to_keycode(kb.keycode);
+        uint16_t size = strlen(keyname) + 3 + strlen(kb.command->dsc_long) + 1;
+        char * kb_line = try_malloc(size, __func__);
+        int test = sprintf(kb_line, "%s - %s", keyname, kb.command->dsc_long);
+        exit_trouble(test < 0, __func__, "sprintf");
+        free(keyname);
         add_line(win, kb_line, attri, &offset, (kbdb->n_of_kbs == kb_n + 1));
         free(kb_line);
     }
@@ -335,7 +328,7 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
     }
     char * p11 = ")";
     uint8_t size =   strlen(p0) + strlen(p1) + strlen(p2) + strlen(sep)
-                   + strlen(p4) + strlen(sep) + strlen(p6) + strlen(value_prefix)
+                   + strlen(p4) + strlen(sep) + strlen(p6) +strlen(value_prefix)
                    + strlen(p8) + strlen(p9) + strlen(p10) + strlen(p11)
                    + strlen(newlines);
     char * msg = try_malloc(size, __func__);
@@ -346,6 +339,17 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
 
 
 
+static void draw_mapcell(struct Win * w, char c, uint8_t y, uint8_t x, attr_t a)
+{
+    set_ch_on_yx(w, y, x * 2 + (y % 2), c | a);
+    if (x + (y % 2) < world.map.length)
+    {
+        set_ch_on_yx(w, y, x * 2 + (y % 2) + 1, ' ' | a);
+    }
+}
+
+
+
 extern void draw_win_log(struct Win * win)
 {
     if (!world.log)
@@ -359,43 +363,40 @@ extern void draw_win_log(struct Win * win)
 
 extern void draw_win_map(struct Win * win)
 {
+    uint16_t x, y;
     init_pair(1, COLOR_WHITE, COLOR_BLUE);
     init_pair(2, COLOR_BLUE, COLOR_BLACK);
-    attr_t attr_fov = 0;
     attr_t attr_mem = COLOR_PAIR(2);
     attr_t attr_sha = COLOR_PAIR(1);
     try_resize_winmap(win, world.map.length, world.map.length * 2);
-    uint16_t x, y, z;
-    for (y = 0, z = 0; y < world.map.length; y++)
+    for (y = 0; y < world.map.length; y++)
     {
         for (x = 0; x < world.map.length; x++)
         {
-            attr_t attr_c = ' ' == world.mem_map[z] ? attr_sha : attr_mem;
-            chtype c = world.mem_map[z] | attr_c;
-            set_ch_on_yx(win, y, x * 2 + (y % 2), c);
-            if (x + (y % 2) < world.map.length)
-            {
-                set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | attr_c);
-            }
-            z++;
+            attr_t a=' '==world.mem_map[y*world.map.length+x]?attr_sha:attr_mem;
+            char c = world.mem_map[y*world.map.length + x];
+            draw_mapcell(win, c, y, x, a);
         }
     }
-    for (y = 0, z = 0; y < world.map.length; y++)
+    for (y = 0; y < world.map.length; y++)
     {
         for (x = 0; x < world.map.length; x++)
         {
-            if (' ' != world.map.cells[z])
+            if (' ' != world.map.cells[y*world.map.length + x])
             {
-                chtype c = world.map.cells[z] | attr_fov;
-                set_ch_on_yx(win, y, x * 2 + (y % 2), c);
-                if (x + (y % 2) < world.map.length)
-                {
-                    set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | attr_fov);
-                }
+                char c = world.map.cells[y*world.map.length + x];
+                draw_mapcell(win, c, y, x, 0);
             }
-            z++;
         }
     }
+    if (world.look)
+    {
+        y = world.look_pos.y;
+        x = world.look_pos.x;
+        char c = world.map.cells[y * world.map.length + x];
+        c = ' ' == c ? world.mem_map[y * world.map.length + x] : c;
+        draw_mapcell(win, c, y, x, A_REVERSE);
+    }
 }
 
 
@@ -444,32 +445,12 @@ extern void draw_win_inventory(struct Win * win)
 
 
 
-extern void draw_win_active_windows_keys(struct Win * win)
+extern void draw_win_terrain_stack(struct Win * win)
 {
-    struct Win * win_active = get_win_by_id(world.winDB.active);
-    struct KeyBindingDB * kbdb = &win_active->kb;
-    if      (1 == win_active->view)
-    {
-        kbdb = &world.kb_wingeom;
-    }
-    else if (2 == win_active->view)
+    if (world.things_here)
     {
-        kbdb = &world.kb_winkeys;
+        add_text_with_linebreaks(win, world.things_here);
     }
-    uint16_t offset = 0;
-    if (0 == kbdb->n_of_kbs)
-    {
-        add_line(win, "(none)", 0, &offset, 0);
-        return;
-    }
-    uint8_t kb_n;
-    for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++)
-    {
-        char * kb_line = get_kb_line(&kbdb->kbs[kb_n]);
-        add_line(win, kb_line, 0, &offset, (0 == kb_n + 1));
-        free(kb_line);
-    }
-
 }