Add basic food clock (but no consumables yet to re-set it).

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 26a7485fa4175c8eb532bc8a3ea89a94633dd0a0..9857af522565dee13086b9deeaa3250c7065a826 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -9,7 +9,7 @@
 #include "draw_wins.h"
 #include <ncurses.h> /* attr_t, chtype, init_pair(), A_REVERSE, COLOR_PAIR() */
 #include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX, UINT32_MAX */
 #include <stdio.h> /* sprintf() */
 #include <stdlib.h> /* free() */
 #include <string.h> /* memset(), strcmp(), strchr(), strdup/(), strlen() */
@@ -67,6 +67,14 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
 
 
 
+/* try_resize_winmap() only realloc's Win->winmap if this is set. Use this to
+ * skip inflationary malloc's by successive try_resize_winmap() calls when the
+ * memory needed can be pre-calculated.
+ */
+static uint8_t do_realloc_winmap = 1;
+
+
+
 static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x)
 {
     if (win->winmap_size.y >= new_size_y && win->winmap_size.x >= new_size_x)
@@ -81,23 +89,26 @@ static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x)
     {
         new_size_x = win->winmap_size.x;
     }
-    chtype * old_winmap = win->winmap;
-    uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x;
-    win->winmap = try_malloc(new_size, __func__);
-    uint16_t y, x;
-    for (y = 0; y < new_size_y; y++)
+    if (do_realloc_winmap)
     {
-        for (x = 0; y < win->winmap_size.y && x < win->winmap_size.x; x++)
-        {
-            chtype ch = old_winmap[(y * win->winmap_size.x) + x];
-            win->winmap[(y * new_size_x) + x] = ch;
-        }
-        for (; x < new_size_x; x++)
+        chtype * old_winmap = win->winmap;
+        uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x;
+        win->winmap = try_malloc(new_size, __func__);
+        uint16_t y, x;
+        for (y = 0; y < new_size_y; y++)
         {
-            win->winmap[(y * new_size_x) + x] = ' ';
+            for (x = 0; y < win->winmap_size.y && x < win->winmap_size.x; x++)
+            {
+                chtype ch = old_winmap[(y * win->winmap_size.x) + x];
+                win->winmap[(y * new_size_x) + x] = ch;
+            }
+            for (; x < new_size_x; x++)
+            {
+                win->winmap[(y * new_size_x) + x] = ' ';
+            }
         }
+        free(old_winmap);
     }
-    free(old_winmap);
     win->winmap_size.y = new_size_y;
     win->winmap_size.x = new_size_x;
 }
@@ -247,7 +258,7 @@ static void draw_text_from_bottom(struct Win * win, char * text)
         }
         while (new_y_start > win->winmap_size.y);
         if (2 == win->linebreak) /* add_text_with_linebreaks() will start not */
-        {                        /* not after, but within the last line then. */
+        {                        /* after, but within the last line then.     */
             add_line_wide(win, " ", 0);
         }
         add_text_with_linebreaks(win, text);
@@ -327,7 +338,7 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
     uint8_t size =   strlen(p0) + strlen(p1) + strlen(p2) + strlen(sep)
                    + strlen(p4) + strlen(sep) + strlen(p6) +strlen(value_prefix)
                    + strlen(p8) + strlen(p9) + strlen(p10) + strlen(p11)
-                   + strlen(newlines);
+                   + strlen(newlines) + 1;
     char * msg = try_malloc(size, __func__);
     sprintf(msg, "%s%s%s%s%s%s%s%s%s%s%s%s%s", p0, p1, p2, sep, p4, sep, p6,
             value_prefix, p8, p9, p10, p11, newlines);
@@ -342,6 +353,27 @@ extern void draw_win_log(struct Win * win)
     {
         return;
     }
+    uint32_t x, i, n_postbreak_lines;
+    for (i = 0, x = 0, n_postbreak_lines = 1; i < strlen(world.log); i++)
+    {
+        exit_err(i == UINT32_MAX, "Log too large.");
+        x++;
+        if (x > win->frame_size.x || '\n' == world.log[i])
+        {
+            n_postbreak_lines++;
+            x = 0;
+        }
+    }
+    if (n_postbreak_lines > win->frame_size.y)
+    {
+        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++);
+        do_realloc_winmap = 0;
+        draw_text_from_bottom(win, world.log);
+        do_realloc_winmap = 1;
+        return;
+    }
     draw_text_from_bottom(win, world.log);
 }
 
@@ -394,10 +426,13 @@ extern void draw_win_info(struct Win * win)
 {
     char * dsc_turn      = "Turn: ";
     char * dsc_hitpoints = "\nHitpoints: ";
-    uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3;
+    char * dsc_satiation = "\nSatiation: ";
+    uint16_t maxl =   strlen(dsc_turn) + 5 + strlen(dsc_hitpoints)
+                    + strlen(dsc_satiation) + 6 + 3;
     char * text = try_malloc(maxl + 1, __func__);
-    int test = sprintf(text, "%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints,
-                                         world.player_lifepoints);
+    int test = sprintf(text, "%s%d%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints,
+                       world.player_lifepoints, dsc_satiation,
+                       world.player_satiation);
     exit_trouble(test < 0, __func__, "sprintf");
     add_text_with_linebreaks(win, text);
     free(text);
@@ -436,10 +471,9 @@ extern void draw_win_inventory(struct Win * win)
 
 extern void draw_win_terrain_stack(struct Win * win)
 {
-    if (world.things_here)
-    {
-        add_text_with_linebreaks(win, world.things_here);
-    }
+    char * wait_response = "(polling)";
+    char * text = world.things_here ? world.things_here : wait_response;
+    add_text_with_linebreaks(win, text);
 }