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

tweaks: improve a comment, reshuffle a scroll command, elide a variable 

Also, drop an unneeded keyboard check: the next check is just a few
microseconds away.
master
Benno Schulenberg 2020-05-06 17:29:20 +02:00
parent ad1331527e
commit 56fc8f6d30
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/winio.c
View File

@ -3489,8 +3489,8 @@ void spotlight_softwrapped(size_t from_col, size_t to_col)
#define CREDIT_LEN 54 #define CREDIT_LEN 54
#define XLCREDIT_LEN 9 #define XLCREDIT_LEN 9
/* Easter egg: Display credits. Assume nodelay(edit) and scrollok(edit) /* Fully blank the terminal screen, then slowly "crawl" the credits over it.
* are FALSE. */ * Abort the crawl upon any keystroke. */
void do_credits(void) void do_credits(void)
{ {
bool with_empty_line = ISSET(EMPTY_LINE); bool with_empty_line = ISSET(EMPTY_LINE);
@ -3572,6 +3572,7 @@ void do_credits(void)
} }
nodelay(edit, TRUE); nodelay(edit, TRUE);
scrollok(edit, TRUE);
blank_titlebar(); blank_titlebar();
blank_edit(); blank_edit();
@ -3583,41 +3584,31 @@ void do_credits(void)
napms(700); napms(700);
for (crpos = 0; crpos < CREDIT_LEN + editwinrows / 2; crpos++) { for (crpos = 0; crpos < CREDIT_LEN + editwinrows / 2; crpos++) {
if ((kbinput = wgetch(edit)) != ERR)
break;
if (crpos < CREDIT_LEN) { if (crpos < CREDIT_LEN) {
const char *what; const char *what;
size_t start_col;
if (credits[crpos] == NULL) if (credits[crpos] == NULL)
what = _(xlcredits[xlpos++]); what = _(xlcredits[xlpos++]);
else else
what = credits[crpos]; what = credits[crpos];
start_col = COLS / 2 - breadth(what) / 2 - 1;
mvwaddstr(edit, editwinrows - 1 - (editwinrows % 2), mvwaddstr(edit, editwinrows - 1 - (editwinrows % 2),
start_col, what); COLS / 2 - breadth(what) / 2 - 1, what);
wrefresh(edit);
} }
if ((kbinput = wgetch(edit)) != ERR)
break;
napms(700);
wscrl(edit, 1);
wrefresh(edit); wrefresh(edit);
if ((kbinput = wgetch(edit)) != ERR) if ((kbinput = wgetch(edit)) != ERR)
break; break;
napms(700); napms(700);
scrollok(edit, TRUE);
wscrl(edit, 1); wscrl(edit, 1);
scrollok(edit, FALSE);
wrefresh(edit);
if ((kbinput = wgetch(edit)) != ERR)
break;
napms(700);
scrollok(edit, TRUE);
wscrl(edit, 1);
scrollok(edit, FALSE);
wrefresh(edit); wrefresh(edit);
} }
@ -3630,6 +3621,7 @@ void do_credits(void)
UNSET(NO_HELP); UNSET(NO_HELP);
window_init(); window_init();
scrollok(edit, FALSE);
nodelay(edit, FALSE); nodelay(edit, FALSE);
total_refresh(); total_refresh();