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

condition shrinkage when required

Browse Source
This commit is contained in:
nhmall
2018-05-12 02:18:42 -04:00
parent a3ba46d732
commit ba057ef3de
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
win/tty/wintty.c
View File

@@ -179,6 +179,7 @@ STATIC_DCL boolean NDECL(reset_role_filtering);
STATIC_DCL boolean FDECL(check_fields, (BOOLEAN_P)); STATIC_DCL boolean FDECL(check_fields, (BOOLEAN_P));
STATIC_DCL void NDECL(render_status); STATIC_DCL void NDECL(render_status);
STATIC_DCL void FDECL(tty_putstatusfield, (struct tty_status_fields *, const char *, int, int)); STATIC_DCL void FDECL(tty_putstatusfield, (struct tty_status_fields *, const char *, int, int));
STATIC_DCL int FDECL(set_cond_shrinklvl, (int, int));
/* /*
* A string containing all the default commands -- to add to a list * A string containing all the default commands -- to add to a list
@@ -3676,7 +3677,7 @@ render_status(VOID_ARGS)
long mask = 0L; long mask = 0L;
int i, c, row, shrinklvl = 0, attrmask = 0; int i, c, row, shrinklvl = 0, attrmask = 0;
struct WinDesc *cw = 0; struct WinDesc *cw = 0;
boolean do_color = FALSE; boolean do_color = FALSE, fit = FALSE;
struct tty_status_fields *nullfield = (struct tty_status_fields *)0; struct tty_status_fields *nullfield = (struct tty_status_fields *)0;
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
@@ -3709,6 +3710,7 @@ render_status(VOID_ARGS)
* | Condition Codes | * | Condition Codes |
* +-----------------+ * +-----------------+
*/ */
shrinklvl = set_cond_shrinklvl(x, cw->cols);
for (c = 0; c < SIZE(conditions); ++c) { for (c = 0; c < SIZE(conditions); ++c) {
mask = conditions[c].mask; mask = conditions[c].mask;
if ((tty_condition_bits & mask) == mask) { if ((tty_condition_bits & mask) == mask) {
@@ -3866,6 +3868,33 @@ int x,y;
} }
} }
int
set_cond_shrinklvl(col, ncols)
int col, ncols;
{
long mask = 0L;
int j, c, x, avail, shrinklvl = 0;
boolean fitting = FALSE;
avail = ncols - col;
/* determine appropriate shrinklvl required */
for (j = 0; j < 3 && !fitting; ++j) {
x = 0;
for (c = 0; c < SIZE(conditions); ++c) {
mask = conditions[c].mask;
if ((tty_condition_bits & mask) == mask) {
x++; /* for spacer */
x += (int) strlen(conditions[c].text[shrinklvl]);
}
}
if (x < avail)
fitting = TRUE;
else if (shrinklvl < 2)
shrinklvl++;
}
return shrinklvl;
}
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
/* /*
* Return what color this condition should * Return what color this condition should