tyler.durden/dgamelaunch
1
0
Fork 0
mirror of https://github.com/paxed/dgamelaunch.git synced 2025-07-31 01:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of tty loss

Browse Source 
git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@406 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Pasi Kallinen 2008-01-12 22:29:13 +00:00
parent 61ac74268c
commit a5eab78b5a
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dgamelaunch.c
View File

@ -423,6 +423,7 @@ inprogressmenu (int gameid)
offset -= 14; offset -= 14;
break; break;
case ERR:
case 'q': case 'Q': case 'q': case 'Q':
return; return;
@ -549,7 +550,8 @@ change_email ()
mvaddstr(4, 1, "Please enter a new one (max 80 chars; blank line aborts)"); mvaddstr(4, 1, "Please enter a new one (max 80 chars; blank line aborts)");
mvaddstr(6, 1, "=> "); mvaddstr(6, 1, "=> ");
mygetnstr (buf, 80, 1); if (mygetnstr (buf, 80, 1) != OK)
return;
if (*buf == '\0') if (*buf == '\0')
return; return;
@ -620,7 +622,8 @@ changepw (int dowrite)
refresh (); refresh ();
mygetnstr (buf, 20, 0); if (mygetnstr (buf, 20, 0) != OK)
return 0;
if (*buf == '\0') if (*buf == '\0')
return 0; return 0;
@ -631,7 +634,8 @@ changepw (int dowrite)
mvaddstr (12, 1, "And again:"); mvaddstr (12, 1, "And again:");
mvaddstr (13, 1, "=> "); mvaddstr (13, 1, "=> ");
mygetnstr (repeatbuf, 20, 0); if (mygetnstr (repeatbuf, 20, 0) != OK)
return 0;
if (!strcmp (buf, repeatbuf)) if (!strcmp (buf, repeatbuf))
error = 0; error = 0;
@ -684,7 +688,8 @@ domailuser (char *username)
"Enter your message here. It is to be one line only and 80 characters or less."); "Enter your message here. It is to be one line only and 80 characters or less.");
mvaddstr (7, 1, "=> "); mvaddstr (7, 1, "=> ");
mygetnstr (message, 80, 1); if (mygetnstr (message, 80, 1) != OK)
return;
for (i = 0; i < strlen (message); i++) for (i = 0; i < strlen (message); i++)
{ {
@ -918,7 +923,8 @@ loginprompt (int from_ttyplay)
refresh (); refresh ();
/* keep this at 20 chars for hysterical raisins */ /* keep this at 20 chars for hysterical raisins */
mygetnstr (user_buf, 20, 1); if (mygetnstr (user_buf, 20, 1) != OK)
return;
if (*user_buf == '\0') if (*user_buf == '\0')
return; return;
@ -943,7 +949,8 @@ loginprompt (int from_ttyplay)
refresh (); refresh ();
mygetnstr (pw_buf, 20, 0); if (mygetnstr (pw_buf, 20, 0) != OK)
return;
if (passwordgood (pw_buf)) if (passwordgood (pw_buf))
{ {
@ -1017,7 +1024,8 @@ newuser ()
refresh (); refresh ();
mygetnstr (buf, globalconfig.max_newnick_len, 1); if (mygetnstr (buf, globalconfig.max_newnick_len, 1) != OK)
buf[0] = 0;
if (*buf == '\0') { if (*buf == '\0') {
free(me); free(me);
@ -1086,8 +1094,9 @@ newuser ()
} }
refresh (); refresh ();
mygetnstr (buf, 80, 1); if (mygetnstr (buf, 80, 1) != OK)
buf[0] = 0;
if (check_email (buf)) if (check_email (buf))
error = 0; error = 0;
else else
@ -1742,6 +1751,7 @@ gamemenuloop(int game)
if (loggedin && myconfig[game]->rcfile) if (loggedin && myconfig[game]->rcfile)
editoptions (game); editoptions (game);
break; break;
case ERR:
case 'q': case 'q':
return 0; return 0;
case 'r': case 'r':
@ -1794,6 +1804,7 @@ menuloop (void)
if (loggedin && (num_games == 0)) if (loggedin && (num_games == 0))
return 0; return 0;
break; break;
case ERR:
case 'q': case 'q':
endwin (); endwin ();
graceful_exit(0); graceful_exit(0);

5
mygetnstr.c
View File

@ -95,6 +95,11 @@ mygetnstr(char *buf, int maxlen, int doecho)
} }
else if (c == 10 || c == 13 || c == KEY_ENTER) else if (c == 10 || c == 13 || c == KEY_ENTER)
break; break;
else if (c == ERR)
{
buf[i] = 0;
return ERR;
}
else else
beep(); beep();
} }