#U567: lootiing counts (from <Someone>)

win/win32/mswproc.c

@@ -1393,12 +1393,12 @@ char yn_function(const char *ques, const char *choices, char default)
 char mswin_yn_function(const char *question, const char *choices,
 		CHAR_P def)
 {
-    int result=-1;
     char ch;
     char yn_esc_map='\033';
     char message[BUFSZ];
 	char res_ch[2];
     int createcaret;
+	boolean digit_ok, allow_num;
 
 	logDebug("mswin_yn_function(%s, %s, %d)\n", question, choices, def);
 
@@ -1419,6 +1419,9 @@ char mswin_yn_function(const char *question, const char *choices,
 
     if (choices) {
 		char *cb, choicebuf[QBUFSZ];
+
+		allow_num = (index(choices, '#') != 0);
+
 		Strcpy(choicebuf, choices);
 		if ((cb = index(choicebuf, '\033')) != 0) {
 			/* anything beyond <esc> is hidden */
@@ -1442,41 +1445,83 @@ char mswin_yn_function(const char *question, const char *choices,
     mswin_putstr(WIN_MESSAGE, ATR_BOLD, message);
 
     /* Only here if main window is not present */
-    while (result<0) {
+	ch = 0;
+    do {
 		ShowCaret(mswin_hwnd_from_winid(WIN_MESSAGE));
 		ch=mswin_nhgetch();
-	if (choices)
-		ch = lowc(ch);
 		HideCaret(mswin_hwnd_from_winid(WIN_MESSAGE));
+		if (choices) ch = lowc(ch);
+		else break; /* If choices is NULL, all possible inputs are accepted and returned. */
+
+		digit_ok = allow_num && digit(ch);
 		if (ch=='\033') {
-	    result=yn_esc_map;
+			if (index(choices, 'q'))
-	} else if (choices && !index(choices,ch)) {
+				ch = 'q';
-	    /* FYI: ch==-115 is for KP_ENTER */
+			else if (index(choices, 'n'))
-	    if (def && (ch==' ' || ch=='\r' || ch=='\n' || ch==-115)) {
+				ch = 'n';
-		result=def;
+			else
-	    } else if( index(choices, '#') && isdigit(ch) ) {
+				ch = def;
-		yn_number = ch;
+			break;
-		result = '#';
+	    } else if (index(quitchars, ch)) {
-	    } else {
+			ch = def;
+			break;
+		} else if (!index(choices, ch) && !digit_ok) {
 			mswin_nhbell();
+			ch = (char)0;
 			/* and try again... */
+		} else if (ch == '#' || digit_ok) {
+			char z, digit_string[2];
+			int n_len = 0;
+			long value = 0;
+			mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, ("#"), 1); n_len++;
+			digit_string[1] = '\0';
+			if (ch != '#') {
+				digit_string[0] = ch;
+				mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, digit_string, 1); n_len++;
+				value = ch - '0';
+				ch = '#';
 			}
+			do {	/* loop until we get a non-digit */
+				z = lowc(readchar());
+				if (digit(z)) {
+					value = (10 * value) + (z - '0');
+					if (value < 0) break;	/* overflow: try again */
+					digit_string[0] = z;
+					mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, digit_string, 1);
+					n_len++;
+				} else if (z == 'y' || index(quitchars, z)) {
+					if (z == '\033')  value = -1;	/* abort */
+					z = '\n';	/* break */
+				} else if (z == '\b') {
+					if (n_len <= 1) { value = -1;  break; }
+					else { value /= 10;  mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, digit_string, -1);  n_len--; }
 				} else {
-	    result=ch;
+					value = -1;	/* abort */
+					mswin_nhbell();
+					break;
+				}
+			} while (z != '\n');
+			if (value > 0) yn_number = value;
+			else if (value == 0) ch = 'n';		/* 0 => "no" */
+			else {	/* remove number from top line, then try again */
+				mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, digit_string, -n_len); n_len = 0;
+				ch = (char)0;
 			}
 		}
+	} while( !ch );
 
     createcaret = 0;
     SendMessage(mswin_hwnd_from_winid(WIN_MESSAGE), 
         WM_MSNH_COMMAND, (WPARAM)MSNH_MSG_CARET, (LPARAM)&createcaret );
+
 	/* display selection in the message window */
-	if( isprint(ch) ) {
+	if( isprint(ch) && ch!='#' ) {
 		res_ch[0] = ch;
 		res_ch[1] = '\x0';
 		mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, res_ch, 1);
 	}
 
-    return result;
+    return ch;
 }
 
 /*