![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_utils.c b/src/screen_utils.c
index 5134756163f4686865e96783d0a86844f9e3fbda..8f69930d64126752b048164fcd1a8d7e9d0df379 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (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
* it under the terms of the GNU General Public License as published by
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "screen_utils.h"
#include "mpdclient.h"
#include "config.h"
#include "i18n.h"
-#include "support.h"
#include "options.h"
#include "colors.h"
#include "wreadln.h"
-#include <stdlib.h>
-#include <unistd.h>
-
-#define FIND_PROMPT _("Find: ")
-#define RFIND_PROMPT _("Find backward: ")
+#include <mpd/client.h>
+#include <ctype.h>
void
screen_bell(void)
flash();
}
+static bool
+ignore_key(int key)
+{
+ return
+#ifdef HAVE_GETMOUSE
+ /* ignore mouse events */
+ key == KEY_MOUSE ||
+#endif
+ key == ERR;
+}
+
int
-screen_getch(WINDOW *w, const char *prompt)
+screen_getch(const char *prompt)
{
- int key = -1;
+ WINDOW *w = screen.status_bar.window.w;
colors_use(w, COLOR_STATUS_ALERT);
- wclear(w);
+ werase(w);
wmove(w, 0, 0);
waddstr(w, prompt);
echo();
curs_set(1);
- while ((key=my_wgetch(w)) == ERR)
- ;
-
-#ifdef HAVE_GETMOUSE
- /* ignore mouse events */
- if (key == KEY_MOUSE)
- return screen_getch(w, prompt);
-#endif
+ int key;
+ while (ignore_key(key = wgetch(w))) {}
noecho();
curs_set(0);
return key;
}
+bool
+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 */
+
+ int key = tolower(screen_getch(prompt));
+ if (key == YES[0])
+ return true;
+ else if (key == NO[0])
+ return false;
+ else
+ return def;
+}
+
char *
-screen_readln(WINDOW *w,
- const char *prompt,
+screen_readln(const char *prompt,
const char *value,
GList **history,
GCompletion *gcmp)
{
+ struct window *window = &screen.status_bar.window;
+ WINDOW *w = window->w;
char *line = NULL;
wmove(w, 0,0);
curs_set(1);
colors_use(w, COLOR_STATUS_ALERT);
- line = wreadln(w, prompt, value, COLS, history, gcmp);
+ line = wreadln(w, prompt, value, window->cols, history, gcmp);
curs_set(0);
return line;
}
char *
-screen_getstr(WINDOW *w, const char *prompt)
+screen_read_password(const char *prompt)
{
- return screen_readln(w, prompt, NULL, NULL, NULL);
-}
-
-static char *
-screen_read_password(WINDOW *w, const char *prompt)
-{
- char *ret;
-
- if (w == NULL) {
- int rows, cols;
- getmaxyx(stdscr, rows, cols);
- /* create window for input */
- w = newwin(1, cols, rows-1, 0);
- leaveok(w, FALSE);
- keypad(w, TRUE);
- }
+ struct window *window = &screen.status_bar.window;
+ WINDOW *w = window->w;
wmove(w, 0,0);
curs_set(1);
colors_use(w, COLOR_STATUS_ALERT);
if (prompt == NULL)
- prompt = _("Password: ");
- ret = wreadln_masked(w, prompt, NULL, COLS, NULL, NULL);
+ prompt = _("Password");
+ char *ret = wreadln_masked(w, prompt, NULL, window->cols, NULL, NULL);
curs_set(0);
return ret;
}
-static gint
-_screen_auth(struct mpdclient *c, gint recursion)
-{
- mpd_clearError(c->connection);
- if (recursion > 2)
- return 1;
- mpd_sendPasswordCommand(c->connection, screen_read_password(NULL, NULL));
- mpd_finishCommand(c->connection);
- mpdclient_update(c);
- if (c->connection->errorCode == MPD_ACK_ERROR_PASSWORD)
- return _screen_auth(c, ++recursion);
- return 0;
-}
-
-gint
-screen_auth(struct mpdclient *c)
-{
- gint ret = _screen_auth(c, 0);
- mpdclient_update(c);
- curs_set(0);
- return ret;
-}
-
-/* query user for a string and find it in a list window */
-int
-screen_find(list_window_t *lw,
- int rows,
- command_t findcmd,
- list_window_callback_fn_t callback_fn,
- void *callback_data)
-{
- int reversed = 0;
- int retval = 0;
- const char *prompt = FIND_PROMPT;
- char *value = options.find_show_last_pattern ? (char *) -1 : NULL;
-
- if (findcmd == CMD_LIST_RFIND || findcmd == CMD_LIST_RFIND_NEXT) {
- prompt = RFIND_PROMPT;
- reversed = 1;
- }
-
- switch (findcmd) {
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- if (screen.findbuf) {
- g_free(screen.findbuf);
- screen.findbuf=NULL;
- }
- /* continue... */
-
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- if (!screen.findbuf)
- screen.findbuf=screen_readln(screen.status_window.w,
- prompt,
- value,
- &screen.find_history,
- NULL);
-
- if (!screen.findbuf || !screen.findbuf[0])
- return 1;
-
- if (reversed)
- retval = list_window_rfind(lw,
- callback_fn,
- callback_data,
- screen.findbuf,
- options.find_wrap,
- rows);
- else
- retval = list_window_find(lw,
- callback_fn,
- callback_data,
- screen.findbuf,
- options.find_wrap);
-
- if (retval != 0) {
- screen_status_printf(_("Unable to find \'%s\'"),
- screen.findbuf);
- screen_bell();
- }
- return 1;
- default:
- break;
- }
- return 0;
-}
-
void
screen_display_completion_list(GList *list)
{
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);
wclrtoeol(w);
if (item) {
gchar *tmp = g_strdup(item->data);
- waddstr(w, basename(tmp));
+ waddstr(w, g_basename(tmp));
g_free(tmp);
}
}
wrefresh(w);
- doupdate();
colors_use(w, COLOR_LIST);
}
-
-void
-set_xterm_title(const char *format, ...)
-{
- /* the current xterm title exists under the WM_NAME property */
- /* and can be retreived 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;
- }
-}