X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=dacc26bf23351d48e70d6e41cb0d3c0400bbf053;hb=d4693165cda2814c544e05b219c2cf3798e31857;hp=6287b20587039729aa4c6fd9fdd219063fc496c7;hpb=b4b3167da3c47ae09419fb5d871eedf85dc6e957;p=plomrogue
diff --git a/src/draw_wins.c b/src/draw_wins.c
index 6287b20..dacc26b 100644
--- a/src/draw_wins.c
+++ b/src/draw_wins.c
@@ -1,7 +1,7 @@
/* draw_wins.c */
#include "draw_wins.h"
-#include /* for malloc(), free() */
+#include /* for free() */
#include /* for uint16_t */
#include /* for strlen() */
#include /* for mvwaddch() */
@@ -11,16 +11,26 @@
#include "map_objects.h" /* for structs MapObj, Player */
#include "map.h" /* for Map struct */
#include "main.h" /* for World struct */
+#include "rexit.h" /* for err_exit() */
+#include "command_db.h" /* for get_command_longdesc() */
+#include "wincontrol.h" /* for WinConf struct, get_winconf_by_win() */
+/* Write "text" into window "win" as far as possible. Start on row "start_y". */
+static void draw_with_linebreaks(struct Win * win, char * text,
+ uint16_t start_y);
+
+/* Write "text" not starting from the top but from the bottom of "win". */
+static void draw_text_from_bottom(struct Win * win, char * text);
+
/* Draw onto "map" in "win" the objects in the chain at "start". */
static void draw_map_objects(struct World * world, struct MapObj * start,
struct Map * map, struct Win * win);
-extern void draw_with_linebreaks(struct Win * win, char * text,
+static void draw_with_linebreaks(struct Win * win, char * text,
uint16_t start_y)
{
uint16_t x, y;
@@ -64,7 +74,7 @@ extern void draw_with_linebreaks(struct Win * win, char * text,
-extern void draw_text_from_bottom (struct Win * win, char * text)
+static void draw_text_from_bottom (struct Win * win, char * text)
{
/* Determine number of lines text would have in a window of win's width,
* but infinite height. Treat \n and \0 as control chars for incrementing
@@ -129,6 +139,29 @@ extern void draw_text_from_bottom (struct Win * win, char * text)
+static void draw_map_objects(struct World * world, struct MapObj * start,
+ struct Map * map, struct Win * win)
+{
+ struct MapObj * o;
+ struct MapObjDef * d;
+ char c;
+ for (o = start; o != 0; o = o->next)
+ {
+ if ( o->pos.y >= map->offset.y
+ && o->pos.y < map->offset.y + win->frame.size.y
+ && o->pos.x >= map->offset.x
+ && o->pos.x < map->offset.x + win->frame.size.x)
+ {
+ d = get_map_obj_def (world, o->type);
+ c = d->mapchar;
+ mvwaddch(win->frame.curses_win,
+ o->pos.y - map->offset.y, o->pos.x - map->offset.x, c);
+ }
+ }
+}
+
+
+
extern void draw_log_win(struct Win * win)
{
struct World * world = (struct World *) win->data;
@@ -176,9 +209,16 @@ extern void draw_map_win(struct Win * win)
extern void draw_info_win(struct Win * win)
{
struct World * world = (struct World *) win->data;
- char text[100];
- snprintf(text, 100,
- "Turn: %d\nHitpoints: %d", world->turn, world->player->hitpoints);
+ char * dsc_turn = "Turn: ";
+ char * dsc_hitpoints = "\nHitpoints: ";
+ char * dsc_score = "\nScore: ";
+ uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score)
+ + 10 + 5 + 10; /* max strlens of numbers to be used */
+ char text[maxl + 1];
+ sprintf(text, "%s%d%s%d%s%d",
+ dsc_turn, world->turn,
+ dsc_hitpoints, world->player->hitpoints,
+ dsc_score, world->score);
draw_with_linebreaks(win, text, 0);
}
@@ -191,22 +231,27 @@ extern void draw_keys_win(struct Win * win)
offset = center_offset(world->keyswindata->select, world->keyswindata->max,
win->frame.size.y - 1);
uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */
- char * keydesc = malloc(keydescwidth), * keyname;
+ char keydesc[keydescwidth];
+ char * keyname;
+ char * err_hint = "Trouble with draw_scroll_hint() in draw_keys_win().";
attr_t attri;
+ char * cmd_dsc;
for (y = 0; y <= world->keyswindata->max && y < win->frame.size.y; y++)
{
if (0 == y && offset > 0)
{
- draw_scroll_hint(&win->frame, y, offset + 1, '^');
+ exit_err(draw_scroll_hint(&win->frame, y, offset + 1, '^'),
+ world, err_hint);
continue;
}
else if (win->frame.size.y == y + 1
&& 0 < world->keyswindata->max
- (win->frame.size.y + offset - 1))
{
- draw_scroll_hint(&win->frame, y,
- world->keyswindata->max
- - (offset + win->frame.size.y) + 2, 'v');
+ exit_err(draw_scroll_hint(&win->frame, y,
+ world->keyswindata->max
+ - (offset + win->frame.size.y) + 2, 'v'),
+ world, err_hint);
continue;
}
attri = 0;
@@ -218,22 +263,22 @@ extern void draw_keys_win(struct Win * win)
attri = attri | A_BLINK;
}
}
- keyname = get_keyname(world->keybindings[y + offset].key);
+ keyname = get_keyname(world, world->keybindings[y + offset].key);
snprintf(keydesc, keydescwidth, "%-9s", keyname);
free(keyname);
+ cmd_dsc = get_command_longdsc(world,
+ world->keybindings[y + offset].name);
for (x = 0; x < win->frame.size.x; x++)
{
if (x < strlen(keydesc))
{
mvwaddch(win->frame.curses_win, y, x, keydesc[x] | attri);
}
- else if (strlen(keydesc) < x
- && x < strlen(world->keybindings[y + offset].name)
- + strlen(keydesc) + 1)
+ else if ( strlen(keydesc) < x
+ && x < strlen(cmd_dsc) + strlen(keydesc) + 1)
{
mvwaddch(win->frame.curses_win, y, x,
- world->keybindings[y + offset]
- .name[x - strlen(keydesc) - 1] | attri);
+ cmd_dsc[x - strlen(keydesc) - 1] | attri);
}
else
{
@@ -241,28 +286,36 @@ extern void draw_keys_win(struct Win * win)
}
}
}
- free(keydesc);
}
-static void draw_map_objects(struct World * world, struct MapObj * start,
- struct Map * map, struct Win * win)
+extern void draw_winconf(struct Win * win)
{
- struct MapObj * o;
- struct MapObjDef * d;
- char c;
- for (o = start; o != 0; o = o->next)
+ struct World * world = (struct World *) win->data;
+ struct WinConf * wcp = get_winconf_by_win(world, win);
+ char * title = "Window configuration:\n";
+ char * h_d = "\nWidth to save: ";
+ char * h_pos = " (height in cells)";
+ char * h_neg = " (negative diff: cells to maximum height)";
+ char * w_d = "\n\nHeight to save: ";
+ char * w_pos = " (width in cells)";
+ char * w_neg = " (negative diff: cells to maximum width)";
+ char * h_t = h_pos;
+ char * w_t = w_pos;
+ if (1 == wcp->height_type)
{
- if ( o->pos.y >= map->offset.y
- && o->pos.y < map->offset.y + win->frame.size.y
- && o->pos.x >= map->offset.x
- && o->pos.x < map->offset.x + win->frame.size.x)
- {
- d = get_map_obj_def (world, o->type);
- c = d->mapchar;
- mvwaddch(win->frame.curses_win,
- o->pos.y - map->offset.y, o->pos.x - map->offset.x, c);
- }
+ h_t = h_neg;
}
+ if (1 == wcp->width_type)
+ {
+ w_t = w_neg;
+ }
+ uint16_t maxl = strlen(title)
+ + strlen(h_t) + strlen(h_d) + 6
+ + strlen(w_t) + strlen(w_d) + 6 + 1;
+ char text[maxl + 1];
+ sprintf(text, "%s%s%d%s%s%d%s", title, h_d, wcp->height, h_t,
+ w_d, wcp->width, w_t);
+ draw_with_linebreaks(win, text, 0);
}