nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

revisit display artifact appearing to the right of status line

Browse Source 
The prior fix for this was a bit flawed. It was only considering
the length of the last field, but what it really needed to do was
consider the placement of the last character of the last field
on the row relative to the placement of the last character of
the last field on the row previously.

If the new placement of that last character of the last field
is left of the previous placement, some clearing must be done.
This commit is contained in:
nhmall
2018-09-29 22:28:10 -04:00
parent 394c72d366
commit d1c5649890
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
win/tty/wintty.c
View File

@@ -3588,7 +3588,7 @@ tty_status_init()
tty_status[NOW][i].valid = FALSE;
tty_status[NOW][i].dirty = FALSE;
tty_status[NOW][i].redraw = FALSE;
tty_status[NOW][i].padright = FALSE;
tty_status[NOW][i].padright = 0;
tty_status[BEFORE][i] = tty_status[NOW][i];
}
tty_condition_bits = 0L;
@@ -3883,11 +3883,17 @@ int *topsz, *bottomsz;
/* On a change to the field length, everything
further to the right must be updated as well */
if (tty_status[NOW][idx].lth != tty_status[BEFORE][idx].lth) {
if (tty_status[NOW][idx].lth != tty_status[BEFORE][idx].lth)
update_right = TRUE;
if ((tty_status[NOW][idx].lth < tty_status[BEFORE][idx].lth) &&
idx == last_on_row[row])
tty_status[NOW][idx].padright = TRUE;
if (idx == last_on_row[row]) {
int prevright = tty_status[BEFORE][idx].x
+ tty_status[BEFORE][idx].lth,
currright = tty_status[NOW][idx].x
+ tty_status[NOW][idx].lth;
if (currright < prevright)
tty_status[NOW][idx].padright = prevright - currright;
}
if (!update_right && !forcefields) {
@@ -4339,10 +4345,11 @@ render_status(VOID_ARGS)
term_end_color();
End_Attr(attridx);
}
if (tty_status[NOW][fldidx].padright) {
int cnt = tty_status[BEFORE][fldidx].lth
- tty_status[NOW][fldidx].lth;
if (tty_status[NOW][fldidx].padright > 0) {
int cnt = tty_status[NOW][fldidx].padright;
/* .lth - 1 below because we already did the leading
blank above */
x += (tty_status[NOW][fldidx].lth - 1);
while (cnt-- > 0)
tty_putstatusfield(nullfield, " ", x++, y);
@@ -4352,7 +4359,7 @@ render_status(VOID_ARGS)
/* reset .redraw, .dirty, .padright now that they've been rendered */
tty_status[NOW][fldidx].dirty = FALSE;
tty_status[NOW][fldidx].redraw = FALSE;
tty_status[NOW][fldidx].padright = FALSE;
tty_status[NOW][fldidx].padright = 0;
/*
* Make a copy of the entire tty_status struct for comparison