X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fdraw_wins.c;h=98afc5ab824c3aa814b39758c30140e553e47ba4;hb=4929d981b03789f914a184f0aabe09bab8263473;hp=1a3c9ad16c1c392963fc62401e3253a7fc89c4d1;hpb=e34629517265170e7bb3f446b9b067bab382b572;p=plomrogue
diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 1a3c9ad..98afc5a 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -9,7 +9,7 @@
#include "draw_wins.h"
#include /* attr_t, chtype, init_pair(), A_REVERSE, COLOR_PAIR() */
#include /* NULL */
-#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
+#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX, UINT32_MAX */
#include /* sprintf() */
#include /* free() */
#include /* 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 * 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++)
{
- 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] = ' ';
+ 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);
@@ -325,9 +336,9 @@ 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);
+ + 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);
}
@@ -349,43 +381,100 @@ extern void draw_win_log(struct Win * win)
extern void draw_win_map(struct Win * win)
{
- 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++)
+ uint16_t x, y;
+ init_pair(1, COLOR_WHITE, COLOR_WHITE); //
+ init_pair(2, COLOR_WHITE, COLOR_BLUE); //
+ init_pair(3, COLOR_BLUE, COLOR_WHITE); //
+ // 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 + 1);
+ 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++;
+ char c_m = world.mem_map[y * world.map.length + x]; //
+ attr_t a = COLOR_PAIR(2); //
+ if (c_m == ' ') //
+ { //
+ a = COLOR_PAIR(1); //
+ } //
+ else if (c_m == 'X') //
+ { //
+ a = COLOR_PAIR(3); //
+ } //
+ // 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];
+ set_ch_on_yx(win, y, x * 2 + (y % 2), c | a);
+ set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a);
}
}
- for (y = 0, z = 0; y < world.map.length; y++)
+ 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); //
+ for (y = 0; y < world.map.length; y++)
{
for (x = 0; x < world.map.length; x++)
{
- if (' ' != world.map.cells[z])
+ char c = world.map.cells[y*world.map.length + x]; //
+ if (' ' != c) //
+ // 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);
- }
+ attr_t a = COLOR_PAIR(4); //
+ if ('.' == c || ':' == c) //
+ { //
+ a = COLOR_PAIR(5); //
+ } //
+ else if ('@' == c) //
+ { //
+ a = COLOR_PAIR(6); //
+ } //
+ else if ('a' == c || 'd' == c || 'b' == c) //
+ { //
+ a = COLOR_PAIR(7); //
+ } //
+ else if ('#' == c) //
+ { //
+ a = COLOR_PAIR(8); //
+ } //
+ else if ('$' == c || '%' == c) //
+ { //
+ a = COLOR_PAIR(9); //
+ } //
+ else if ('m' == c) //
+ { //
+ a = COLOR_PAIR(10); //
+ } //
+ else if ('X' == c) //
+ { //
+ a = COLOR_PAIR(11); //
+ } //
+ else if ('_' == c) //
+ { //
+ a = COLOR_PAIR(12); //
+ } //
+ // 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); //
+ // set_ch_on_yx(win, y, x * 2 + (y % 2), c);
+ // set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ');
}
- 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;
+ 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);
+ }
}
@@ -394,10 +483,17 @@ 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: ";
+ char * dsc_godsmood = "\nGod's mood: "; // 7DRL
+ char * dsc_godsfavor = "\nGod's favor: "; // 7DRL
+ uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3 //
+ + strlen(dsc_satiation) + 6 + strlen(dsc_godsmood) + 6 //
+ + strlen(dsc_godsfavor) + 6; //
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%s%d%s%d", dsc_turn, world.turn,
+ dsc_hitpoints, world.player_lifepoints, dsc_satiation,
+ world.player_satiation, dsc_godsmood, world.godsmood, //
+ dsc_godsfavor, world.godsfavor); //
exit_trouble(test < 0, __func__, "sprintf");
add_text_with_linebreaks(win, text);
free(text);
@@ -434,6 +530,15 @@ extern void draw_win_inventory(struct Win * win)
+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);
+}
+
+
+
extern void draw_win_keybindings_global(struct Win * win)
{
win->center.y = world.kb_global.select;