ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle a few lines, for Christmas and to group things better

master
Benno Schulenberg 2021-11-24 10:44:12 +01:00
parent 3638fb9da4
commit c06f7d43e9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/winio.c
View File

@ -2238,12 +2238,12 @@ void minibar(void)
* is higher than that of a message that is already there. */ * is higher than that of a message that is already there. */
void statusline(message_type importance, const char *msg, ...) void statusline(message_type importance, const char *msg, ...)
{ {
va_list ap;
int colorpair;
char *compound, *message;
static size_t start_col = 0;
bool bracketed;
bool showed_whitespace = ISSET(WHITESPACE_DISPLAY); bool showed_whitespace = ISSET(WHITESPACE_DISPLAY);
static size_t start_col = 0;
char *compound, *message;
bool bracketed;
int colorpair;
va_list ap;
/* Ignore a message with an importance that is lower than the last one. */ /* Ignore a message with an importance that is lower than the last one. */
if (importance < lastmessage && lastmessage > NOTICE) if (importance < lastmessage && lastmessage > NOTICE)
@ -2305,7 +2305,9 @@ void statusline(message_type importance, const char *msg, ...)
UNSET(WHITESPACE_DISPLAY); UNSET(WHITESPACE_DISPLAY);
message = display_string(compound, 0, COLS, FALSE, FALSE); message = display_string(compound, 0, COLS, FALSE, FALSE);
free(compound);
if (showed_whitespace)
SET(WHITESPACE_DISPLAY);
start_col = (COLS - breadth(message)) / 2; start_col = (COLS - breadth(message)) / 2;
bracketed = (start_col > 1); bracketed = (start_col > 1);
@ -2327,10 +2329,9 @@ void statusline(message_type importance, const char *msg, ...)
/* Push the message to the screen straightaway. */ /* Push the message to the screen straightaway. */
wrefresh(bottomwin); wrefresh(bottomwin);
free(message);
if (showed_whitespace) free(compound);
SET(WHITESPACE_DISPLAY); free(message);
/* When requested, wipe the status bar after just one keystroke. */ /* When requested, wipe the status bar after just one keystroke. */
statusblank = (ISSET(QUICK_BLANK) ? 1 : 20); statusblank = (ISSET(QUICK_BLANK) ? 1 : 20);