}
#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
{
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!>" : ">>");
/* 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) {
}
wrefresh(win);
}
- if (rp)
- ret = trans[(rp - resp)];
return ret;
}