diff --git a/src/screen_utils.c b/src/screen_utils.c
index 28d5e4b2fd4319384bf117178213f40f030485fa..6c5ce43368c5310058534d9df608b613a1736ac6 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
flash();
}
+static bool
+ignore_key(int key)
+{
+ return
+#ifdef HAVE_GETMOUSE
+ /* ignore mouse events */
+ key == KEY_MOUSE ||
+#endif
+ key == ERR;
+}
+
int
screen_getch(const char *prompt)
{
curs_set(1);
int key;
- while ((key = wgetch(w)) == ERR)
- ;
-
-#ifdef HAVE_GETMOUSE
- /* ignore mouse events */
- if (key == KEY_MOUSE)
- return screen_getch(prompt);
-#endif
+ while (ignore_key(key = wgetch(w))) {}
noecho();
curs_set(0);
}
bool
-screen_get_yesno(const char *prompt, bool def)
+screen_get_yesno(const char *_prompt, bool def)
{
/* NOTE: if one day a translator decides to use a multi-byte character
for one of the yes/no keys, we'll have to parse it properly */
+ char *prompt = g_strdup_printf(_("%s [%s/%s] "), _prompt, YES, NO);
int key = tolower(screen_getch(prompt));
+ g_free(prompt);
+
if (key == YES[0])
return true;
else if (key == NO[0])