X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fdraw_wins.c;h=6736a1bbb77b980872fa2950c6b57201f546bb22;hb=edebb2bf9aa780ee2f7006c1d2be9168564d34df;hp=dc655e76dad51d71d522794a2e240bfa50dbde19;hpb=6b1d36c9e673fd8f8595119080dca63a39ba483b;p=plomrogue
diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index dc655e7..6736a1b 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -2,17 +2,16 @@
#define _POSIX_C_SOURCE 200809L /* strdup() */
#include "draw_wins.h"
-#include /* typedefs attr_t, chtype, define A_REVERSE */
+#include /* attr_t, chtype, init_pair(), A_REVERSE, COLOR_PAIR() */
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
#include /* sprintf() */
#include /* free() */
#include /* memset(), strchr(), strdup/(), strlen() */
-#include "../common/rexit.h" /* exit_err() */
+#include "../common/rexit.h" /* exit_err(), exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint16.h" /* struct yx_uint16 */
#include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */
-#include "windows.h" /* struct Win, get_win_by_id() */
+#include "windows.h" /* yx_uint16, Win, get_win_by_id() */
#include "world.h" /* global world */
@@ -70,7 +69,6 @@ static void draw_titled_keybinding_list(char * title, struct Win * win,
static void try_resize_winmap(struct Win * win, int new_size_y, int new_size_x)
{
- char * f_name = "try_resize_winmap()";
if (win->winmap_size.y >= new_size_y && win->winmap_size.x >= new_size_x)
{
return;
@@ -85,7 +83,7 @@ static void try_resize_winmap(struct Win * win, int new_size_y, int new_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, f_name);
+ win->winmap = try_malloc(new_size, __func__);
uint16_t y, x;
for (y = 0; y < new_size_y; y++)
{
@@ -184,9 +182,11 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
uint16_t len_line = strlen(line);
char * separator = last ? "" : " / ";
uint32_t len_line_new = len_line + strlen(separator);
- char line_new[len_line_new];
- sprintf(line_new, "%s%s", line, separator);
- uint16_t x, y;
+ char * line_new = try_malloc(len_line_new, __func__);
+ int test = sprintf(line_new, "%s%s", line, separator);
+ exit_trouble(test < 0, __func__, "sprintf");
+ uint16_t x = 0;
+ uint16_t y;
uint32_t z;
for (z = 0, y = y_start; z < len_line_new; y++)
{
@@ -204,7 +204,8 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
try_resize_winmap(win, y + 1 + 1, win->winmap_size.x);
}
}
- * offset = x;
+ free(line_new);
+ *offset = x;
}
@@ -257,11 +258,11 @@ static void draw_text_from_bottom(struct Win * win, char * text)
static char * get_kb_line(struct KeyBinding * kb)
{
- char * f_name = "get_kb_line()";
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, f_name);
- sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long);
+ 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;
}
@@ -338,14 +339,40 @@ extern void draw_win_log(struct Win * win)
extern void draw_win_map(struct Win * win)
{
- try_resize_winmap(win, world.map.size.y, world.map.size.x * 2);
- uint16_t z = 0;
- uint16_t x, y;
- for (y = 0; y < world.map.size.y; 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 (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++;
+ }
+ }
+ for (y = 0, z = 0; y < world.map.length; y++)
{
- for (x = 0; x < world.map.size.x; x++)
+ for (x = 0; x < world.map.length; x++)
{
- set_ch_on_yx(win, y, x * 2 + (y % 2), world.map.cells[z]);
+ if (' ' != world.map.cells[z])
+ {
+ 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);
+ }
+ }
z++;
}
}
@@ -358,10 +385,12 @@ 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 text[maxl + 1];
- sprintf(text, "%s%d%s%d",
- dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints);
+ char * text = try_malloc(maxl + 1, __func__);
+ int test = sprintf(text, "%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints,
+ world.player_lifepoints);
+ exit_trouble(test < 0, __func__, "sprintf");
add_text_with_linebreaks(win, text);
+ free(text);
}
@@ -458,13 +487,15 @@ extern void draw_winconf_geometry(struct Win * win)
char * title = "Window's geometry:\n\n";
char * h_title = "Height to save: ";
char h_value[6 + 1]; /* 6: int16_t value max strlen */
- sprintf(h_value, "%d", win->target_height);
+ int test = sprintf(h_value, "%d", win->target_height);
+ exit_trouble(test < 0, __func__, "sprintf");
char * h_plus = " (width in cells)\n\n";
char * h_minus = " (negative diff: cells to screen width)\n\n";
char * h_type = (1 == win->target_height_type) ? h_minus : h_plus;
char * w_title = "Width to save: ";
char w_value[6 + 1];
- sprintf(w_value, "%d", win->target_width);
+ test = sprintf(w_value, "%d", win->target_width);
+ exit_trouble(test < 0, __func__, "sprintf");
char * w_plus = "(height in cells)\n\n";
char * w_minus = " (negative diff: cells to screen height)\n\n";
char * w_type = (1 == win->target_width_type) ? w_minus : w_plus;
@@ -475,8 +506,10 @@ extern void draw_winconf_geometry(struct Win * win)
+ strlen(h_title) + strlen(h_value) + strlen(h_type)
+ strlen(w_title) + strlen(w_value) + strlen(w_type)
+ strlen(breaks_title) + strlen(breaks_type);
- char text[text_size + 1];
- sprintf(text, "%s%s%s%s%s%s%s%s%s", title, h_title, h_value, h_type,
- w_title, w_value, w_type, breaks_title, breaks_type);
+ char * text = try_malloc(text_size + 1, __func__);
+ test = sprintf(text, "%s%s%s%s%s%s%s%s%s", title, h_title, h_value, h_type,
+ w_title, w_value, w_type, breaks_title, breaks_type);
+ exit_trouble(test < 0, __func__, "sprintf");
add_text_with_linebreaks(win, text);
+ free(text);
}