home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some variable / struct member renaming for greater clarity.
[plomrogue]
/
src
/
client
/
draw_wins.c
diff --git
a/src/client/draw_wins.c
b/src/client/draw_wins.c
index 8e792ca474af4bf47f94ca2b7cb3c38253a9b084..59b7c3aa444bb62642dc946737ce74bec0d3740a 100644
(file)
--- a/
src/client/draw_wins.c
+++ b/
src/client/draw_wins.c
@@
-9,8
+9,7
@@
#include <string.h> /* strlen(), strtok() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "keybindings.h" /* struct KeyBinding, get_keyname_to_keycode() */
#include <string.h> /* strlen(), strtok() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "keybindings.h" /* struct KeyBinding, get_keyname_to_keycode() */
-#include "wincontrol.h" /* struct WinConf, get_winconf_by_win() */
-#include "windows.h" /* struct Win */
+#include "windows.h" /* struct Win, get_win_by_id() */
#include "world.h" /* global world */
#include "world.h" /* global world */
@@
-58,17
+57,17
@@
static uint16_t draw_titled_keybinding_list(char * title, struct Win * w,
static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x)
{
char * f_name = "try_resize_winmap()";
static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x)
{
char * f_name = "try_resize_winmap()";
- if (w->winmap
size.y >= new_size_y && w->winmap
size.x >= new_size_x)
+ if (w->winmap
_size.y >= new_size_y && w->winmap_
size.x >= new_size_x)
{
return;
}
{
return;
}
- if (w->winmapsize.y > new_size_y)
+ if (w->winmap
_
size.y > new_size_y)
{
{
- new_size_y = w->winmapsize.y;
+ new_size_y = w->winmap
_
size.y;
}
}
- else if (w->winmapsize.x > new_size_x)
+ else if (w->winmap
_
size.x > new_size_x)
{
{
- new_size_x = w->winmapsize.x;
+ new_size_x = w->winmap
_
size.x;
}
chtype * old_winmap = w->winmap;
uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x;
}
chtype * old_winmap = w->winmap;
uint32_t new_size = sizeof(chtype) * new_size_y * new_size_x;
@@
-76,9
+75,9
@@
static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x)
uint16_t y, x;
for (y = 0; y < new_size_y; y++)
{
uint16_t y, x;
for (y = 0; y < new_size_y; y++)
{
- for (x = 0; y < w->winmap
size.y && x < w->winmap
size.x; x++)
+ for (x = 0; y < w->winmap
_size.y && x < w->winmap_
size.x; x++)
{
{
- chtype ch = old_winmap[(y * w->winmapsize.x) + x];
+ chtype ch = old_winmap[(y * w->winmap
_
size.x) + x];
w->winmap[(y * new_size_x) + x] = ch;
}
for (; x < new_size_x; x++)
w->winmap[(y * new_size_x) + x] = ch;
}
for (; x < new_size_x; x++)
@@
-87,15
+86,15
@@
static void try_resize_winmap(struct Win * w, int new_size_y, int new_size_x)
}
}
free(old_winmap);
}
}
free(old_winmap);
- w->winmapsize.y = new_size_y;
- w->winmapsize.x = new_size_x;
+ w->winmap
_
size.y = new_size_y;
+ w->winmap
_
size.x = new_size_x;
}
static void set_ch_on_yx(struct Win * w, int y, int x, chtype ch)
{
}
static void set_ch_on_yx(struct Win * w, int y, int x, chtype ch)
{
- w->winmap[(y * w->winmapsize.x) + x] = ch;
+ w->winmap[(y * w->winmap
_
size.x) + x] = ch;
}
}
@@
-104,10
+103,10
@@
static void add_text_with_linebreaks(struct Win * win, char * text)
{
uint16_t x, y;
int16_t z = -1;
{
uint16_t x, y;
int16_t z = -1;
- for (y = win->winmapsize.y; ; y++)
+ for (y = win->winmap
_
size.y; ; y++)
{
{
- try_resize_winmap(win, y + 1, win->framesize.x);
- for (x = 0; x < win->framesize.x; x++)
+ try_resize_winmap(win, y + 1, win->frame
_
size.x);
+ for (x = 0; x < win->frame
_
size.x; x++)
{
z++;
if ('\n' == text[z])
{
z++;
if ('\n' == text[z])
@@
-139,12
+138,12
@@
static void add_text_with_linebreaks(struct Win * win, char * text)
static void add_line(struct Win * w, char * line, attr_t attri)
{
static void add_line(struct Win * w, char * line, attr_t attri)
{
- uint16_t y = w->winmapsize.y;
+ uint16_t y = w->winmap
_
size.y;
uint16_t len_line = strlen(line);
if (attri
uint16_t len_line = strlen(line);
if (attri
- && w->winmap
size.x < w->framesize.x && w->frame
size.x > len_line)
+ && w->winmap
_size.x < w->frame_size.x && w->frame_
size.x > len_line)
{
{
- try_resize_winmap(w, y + 1, w->framesize.x);
+ try_resize_winmap(w, y + 1, w->frame
_
size.x);
}
else
{
}
else
{
@@
-157,7
+156,7
@@
static void add_line(struct Win * w, char * line, attr_t attri)
}
if (attri)
{
}
if (attri)
{
- for (; x < w->framesize.x; x++)
+ for (; x < w->frame
_
size.x; x++)
{
set_ch_on_yx(w, y, x, ' ' | attri);
}
{
set_ch_on_yx(w, y, x, ' ' | attri);
}
@@
-177,7
+176,7
@@
static void draw_text_from_bottom(struct Win * win, char * text)
int16_t z = -1;
for (y = 0; 0 == toggle; y++)
{
int16_t z = -1;
for (y = 0; 0 == toggle; y++)
{
- for (x = 0; x < win->framesize.x; x++)
+ for (x = 0; x < win->frame
_
size.x; x++)
{
z++;
if ('\n' == text[z])
{
z++;
if ('\n' == text[z])
@@
-200,16
+199,16
@@
static void draw_text_from_bottom(struct Win * win, char * text)
/* Depending on what's bigger, determine start point in window or text. */
uint16_t start_y = 0;
/* Depending on what's bigger, determine start point in window or text. */
uint16_t start_y = 0;
- if (y < win->framesize.y)
+ if (y < win->frame
_
size.y)
{
{
- start_y = win->framesize.y - y;
+ start_y = win->frame
_
size.y - y;
}
}
- else if (y > win->framesize.y)
+ else if (y > win->frame
_
size.y)
{
{
- uint16_t offset = y - win->framesize.y;
+ uint16_t offset = y - win->frame
_
size.y;
for (y = 0; y < offset; y++)
{
for (y = 0; y < offset; y++)
{
- for (x = 0; x < win->framesize.x; x++)
+ for (x = 0; x < win->frame
_
size.x; x++)
{
z++;
if ('\n' == text[z])
{
z++;
if ('\n' == text[z])
@@
-236,8
+235,8
@@
static char * get_kb_line_and_iterate(struct KeyBinding ** kb_pp)
{
char * f_name = "get_kb_line_and_iterate()";
struct KeyBinding * kb_p = * kb_pp;
{
char * f_name = "get_kb_line_and_iterate()";
struct KeyBinding * kb_p = * kb_pp;
- char * keyname = get_keyname_to_keycode(kb_p->key);
- struct Command * command = get_command_to_keycode(kb_p, kb_p->key);
+ char * keyname = get_keyname_to_keycode(kb_p->key
code
);
+ struct Command * command = get_command_to_keycode(kb_p, kb_p->key
code
);
uint16_t size = 9 + 1 + strlen(command->dsc_long) + 1;
char * line = try_malloc(size, f_name);
sprintf(line, "%-9s %s", keyname, command->dsc_long);
uint16_t size = 9 + 1 + strlen(command->dsc_long) + 1;
char * line = try_malloc(size, f_name);
sprintf(line, "%-9s %s", keyname, command->dsc_long);
@@
-341,14
+340,10
@@
extern void draw_win_info(struct Win * win)
{
char * dsc_turn = "Turn: ";
char * dsc_hitpoints = "\nHitpoints: ";
{
char * dsc_turn = "Turn: ";
char * dsc_hitpoints = "\nHitpoints: ";
- char * dsc_score = "\nScore: ";
- uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score)
- + 5 + 3 + 5; /* Max strlens of strings of numbers to use. */
+ uint16_t maxl = strlen(dsc_turn) + 5 + strlen(dsc_hitpoints) + 3;
char text[maxl + 1];
char text[maxl + 1];
- sprintf(text, "%s%d%s%d%s%d",
- dsc_turn, world.turn,
- dsc_hitpoints, world.player_lifepoints,
- dsc_score, world.score);
+ sprintf(text, "%s%d%s%d",
+ dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints);
add_text_with_linebreaks(win, text);
}
add_text_with_linebreaks(win, text);
}
@@
-359,12
+354,12
@@
extern void draw_win_inventory(struct Win * win)
win->center.y = world.player_inventory_select;
char inventory_copy[strlen(world.player_inventory) + 1];
sprintf(inventory_copy, "%s", world.player_inventory);
win->center.y = world.player_inventory_select;
char inventory_copy[strlen(world.player_inventory) + 1];
sprintf(inventory_copy, "%s", world.player_inventory);
- char *
foo
= inventory_copy;
+ char *
strtok_target
= inventory_copy;
uint8_t i = 0;
while (1)
{
uint8_t i = 0;
while (1)
{
- char * object = strtok(
foo
, "\n");
-
foo
= NULL;
+ char * object = strtok(
strtok_target
, "\n");
+
strtok_target
= NULL;
if (NULL == object)
{
return;
if (NULL == object)
{
return;
@@
-385,16
+380,16
@@
extern void draw_win_available_keybindings(struct Win * win)
{
char * title = "Active window's keybindings:";
struct KeyBinding * kb_p;
{
char * title = "Active window's keybindings:";
struct KeyBinding * kb_p;
- struct Win
Conf * wc = get_winconf_by_win(world.wins.win_
active);
- if (0 == w
c
->view)
+ struct Win
* w = get_win_by_id(world.winDB.
active);
+ if (0 == w->view)
{
{
- kb_p = w
c
->kb.kbs;
+ kb_p = w->kb.kbs;
}
}
- else if (1 == w
c
->view)
+ else if (1 == w->view)
{
kb_p = world.kb_wingeom.kbs;
}
{
kb_p = world.kb_wingeom.kbs;
}
- else if (2 == w
c
->view)
+ else if (2 == w->view)
{
kb_p = world.kb_winkeys.kbs;
}
{
kb_p = world.kb_winkeys.kbs;
}
@@
-432,19
+427,17
@@
extern void draw_win_keybindings_winconf_keybindings(struct Win * win)
extern void draw_winconf_keybindings(struct Win * win)
{
extern void draw_winconf_keybindings(struct Win * win)
{
- struct WinConf * wc = get_winconf_by_win(win);
char * title = "Window's keybindings:";
add_line(win, title, 0);
add_line(win, " ", 0);
char * title = "Window's keybindings:";
add_line(win, title, 0);
add_line(win, " ", 0);
- draw_keybinding_config(win, &w
c
->kb, 2);
- win->center.y = w
c
->kb.select + 2;
+ draw_keybinding_config(win, &w
in
->kb, 2);
+ win->center.y = w
in
->kb.select + 2;
}
extern void draw_winconf_geometry(struct Win * win)
{
}
extern void draw_winconf_geometry(struct Win * win)
{
- struct WinConf * wcp = get_winconf_by_win(win);
char * title = "Window's geometry:\n";
char * h_d = "\nHeight to save: ";
char * h_pos = " (width in cells)";
char * title = "Window's geometry:\n";
char * h_d = "\nHeight to save: ";
char * h_pos = " (width in cells)";
@@
-454,11
+447,11
@@
extern void draw_winconf_geometry(struct Win * win)
char * w_neg = " (negative diff: cells to screen height)";
char * h_t = h_pos;
char * w_t = w_pos;
char * w_neg = " (negative diff: cells to screen height)";
char * h_t = h_pos;
char * w_t = w_pos;
- if (1 == w
cp->
height_type)
+ if (1 == w
in->target_
height_type)
{
h_t = h_neg;
}
{
h_t = h_neg;
}
- if (1 == w
cp->
width_type)
+ if (1 == w
in->target_
width_type)
{
w_t = w_neg;
}
{
w_t = w_neg;
}
@@
-466,7
+459,7
@@
extern void draw_winconf_geometry(struct Win * win)
+ strlen(h_t) + strlen(h_d) + 6 /* 6 = n of chars to */
+ strlen(w_t) + strlen(w_d) + 6 + 1; /* write max int16_t */
char text[maxl + 1];
+ strlen(h_t) + strlen(h_d) + 6 /* 6 = n of chars to */
+ strlen(w_t) + strlen(w_d) + 6 + 1; /* write max int16_t */
char text[maxl + 1];
- sprintf(text, "%s%s%d%s%s%d%s", title, h_d, w
cp->
height, h_t,
- w_d, w
cp->
width, w_t);
+ sprintf(text, "%s%s%d%s%s%d%s", title, h_d, w
in->target_
height, h_t,
+ w_d, w
in->target_
width, w_t);
add_text_with_linebreaks(win, text);
}
add_text_with_linebreaks(win, text);
}