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

Revert "more CR on windows"

Browse Source 
This reverts commit 83fb79b775.
This commit is contained in:
nhmall
2018-11-17 21:29:41 -05:00
parent 83fb79b775
commit 2829e3f780
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
win/curses/cursmesg.c
View File

@@ -133,11 +133,9 @@ curses_message_win_puts(const char *message, boolean recursed)
}
#ifdef WIN32
#define RESP " \n\033\r" /* space, enter, esc, cr */
#define TRANS " \n\033\n" /* translated return value */
#define XTRA_RESP "\r"
#else
#define RESP " \n\033" /* space, enter, esc */
#define TRANS " \n\033"
#define XTRA_RESP ""
#endif
int
@@ -147,9 +145,8 @@ curses_block(boolean noscroll)
{
int height, width, ret;
WINDOW *win = curses_get_nhwin(MESSAGE_WIN);
char *resp = RESP;
char *trans = TRANS;
char *rp = (char *) 0;
char *resp = " \n\033" XTRA_RESP; /* space, enter, esc */
curses_get_window_size(MESSAGE_WIN, &height, &width);
curses_toggle_color_attr(win, MORECOLOR, NONE, ON);
mvwprintw(win, my, mx, iflags.msg_is_alert ? "<TAB!>" : ">>");
@@ -161,9 +158,7 @@ curses_block(boolean noscroll)
/* msgtype=stop should require space/enter rather than
* just any key, as we want to prevent YASD from
* riding direction keys. */
while (!iflags.msg_is_alert &&
(ret = wgetch(win)) && ((rp = index(resp,(char)ret)) == 0))
;
while (!iflags.msg_is_alert && (ret = wgetch(win)) && !index(resp,(char)ret));
if (iflags.msg_is_alert)
curses_alert_main_borders(FALSE);
if (height == 1) {
@@ -176,8 +171,6 @@ curses_block(boolean noscroll)
}
wrefresh(win);
}
if (rp)
ret = trans[(rp - resp)];
return ret;
}