diff --git a/src/screen_utils.c b/src/screen_utils.c
index 8889ac13277b8b8cb0b2edf53609847bc469ae80..6c5ce43368c5310058534d9df608b613a1736ac6 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
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)
{
WINDOW *w = screen.status_bar.window.w;
- int key = -1;
colors_use(w, COLOR_STATUS_ALERT);
werase(w);
echo();
curs_set(1);
- while ((key = wgetch(w)) == ERR)
- ;
-
-#ifdef HAVE_GETMOUSE
- /* ignore mouse events */
- if (key == KEY_MOUSE)
- return screen_getch(prompt);
-#endif
+ int key;
+ 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])
{
struct window *window = &screen.status_bar.window;
WINDOW *w = window->w;
- char *ret;
wmove(w, 0,0);
curs_set(1);
if (prompt == NULL)
prompt = _("Password");
- ret = wreadln_masked(w, prompt, NULL, window->cols, NULL, NULL);
+ char *ret = wreadln_masked(w, prompt, NULL, window->cols, NULL, NULL);
curs_set(0);
return ret;
static guint prev_length = 0;
static guint offset = 0;
WINDOW *w = screen.main_window.w;
- guint length, y=0;
- length = g_list_length(list);
+ unsigned length = g_list_length(list);
if (list == prev_list && length == prev_length) {
offset += screen.main_window.rows;
if (offset >= length)
}
colors_use(w, COLOR_STATUS_ALERT);
+
+ unsigned y = 0;
while (y < screen.main_window.rows) {
GList *item = g_list_nth(list, y+offset);
}
wrefresh(w);
- doupdate();
colors_use(w, COLOR_LIST);
}
-
-#ifndef NCMPC_MINI
-void
-set_xterm_title(const char *format, ...)
-{
- /* the current xterm title exists under the WM_NAME property */
- /* and can be retrieved with xprop -id $WINDOWID */
-
- if (options.enable_xterm_title) {
- if (g_getenv("WINDOWID")) {
- char *msg;
- va_list ap;
-
- va_start(ap,format);
- msg = g_strdup_vprintf(format,ap);
- va_end(ap);
- printf("%c]0;%s%c", '\033', msg, '\007');
- g_free(msg);
- } else
- options.enable_xterm_title = FALSE;
- }
-}
-#endif