![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_utils.c b/src/screen_utils.c
index 6473244bbce7534dcbe4281ca51ee381e3e7d333..e44d8eb67cc03e442ef803af0f1da86a15eca39b 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
-/*
- * $Id$
- *
+/*
* (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
*
*/
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-
-#include "config.h"
-#include "ncmpc.h"
+#include "screen_utils.h"
+#include "screen.h"
#include "mpdclient.h"
+#include "config.h"
+#include "i18n.h"
#include "support.h"
-#include "command.h"
#include "options.h"
-#include "list_window.h"
#include "colors.h"
#include "wreadln.h"
-#include "screen.h"
+
+#include <stdlib.h>
+#include <unistd.h>
#define FIND_PROMPT _("Find: ")
#define RFIND_PROMPT _("Find backward: ")
+void
+screen_bell(void)
+{
+ if (options.audible_bell)
+ beep();
+ if (options.visible_bell)
+ flash();
+}
+
int
-screen_getch(WINDOW *w, char *prompt)
+screen_getch(WINDOW *w, const char *prompt)
{
- int key = -1;
- int prompt_len = strlen(prompt);
-
- colors_use(w, COLOR_STATUS_ALERT);
- wclear(w);
- wmove(w, 0, 0);
- waddstr(w, prompt);
- wmove(w, 0, prompt_len);
-
- echo();
- curs_set(1);
- timeout(-1);
-
- while( (key=wgetch(w)) == ERR )
- ;
-
- if( key==KEY_RESIZE )
- screen_resize();
-
- noecho();
- curs_set(0);
- timeout(SCREEN_TIMEOUT);
-
- return key;
+ int key = -1;
+
+ colors_use(w, COLOR_STATUS_ALERT);
+ wclear(w);
+ wmove(w, 0, 0);
+ waddstr(w, prompt);
+
+ echo();
+ curs_set(1);
+
+ while ((key = wgetch(w)) == ERR)
+ ;
+
+#ifdef HAVE_GETMOUSE
+ /* ignore mouse events */
+ if (key == KEY_MOUSE)
+ return screen_getch(w, prompt);
+#endif
+
+ noecho();
+ curs_set(0);
+
+ return key;
}
char *
-screen_readln(WINDOW *w,
- char *prompt,
- char *value,
+screen_readln(WINDOW *w,
+ const char *prompt,
+ const char *value,
GList **history,
GCompletion *gcmp)
{
- char *line = NULL;
+ char *line = NULL;
- wmove(w, 0,0);
- curs_set(1);
- line = wreadln(w, prompt, value, COLS, history, gcmp);
- curs_set(0);
- return line;
+ wmove(w, 0,0);
+ curs_set(1);
+ colors_use(w, COLOR_STATUS_ALERT);
+ line = wreadln(w, prompt, value, COLS, history, gcmp);
+ curs_set(0);
+ return line;
}
char *
-screen_getstr(WINDOW *w, char *prompt)
+screen_getstr(WINDOW *w, 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);
+ }
+
+ 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);
+
+ curs_set(0);
+ return ret;
+}
+
+static gint
+_screen_auth(struct mpdclient *c, gint recursion)
{
- return screen_readln(w, prompt, NULL, NULL, NULL);
+ 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(screen_t *screen,
- mpdclient_t *c,
- list_window_t *lw,
+int
+screen_find(list_window_t *lw,
int rows,
command_t findcmd,
- list_window_callback_fn_t callback_fn)
+ list_window_callback_fn_t callback_fn,
+ void *callback_data)
{
- int reversed = 0;
- int retval = 0;
- char *prompt = FIND_PROMPT;
-
- 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;
+ 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;
}
- /* continue... */
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- if( !screen->findbuf )
- screen->findbuf=screen_readln(screen->status_window.w,
- prompt,
- (char *) -1, //NULL,
- &screen->find_history,
- NULL);
- if( !screen->findbuf || !screen->findbuf[0] )
- return 1;
- if( reversed )
- retval = list_window_rfind(lw,
- callback_fn,
- c,
- screen->findbuf,
- options.find_wrap,
- rows);
- else
- retval = list_window_find(lw,
- callback_fn,
- c,
- screen->findbuf,
- options.find_wrap);
- if( retval == 0 )
- {
- lw->repaint = 1;
+ return 0;
+}
+
+void
+screen_display_completion_list(GList *list)
+{
+ static GList *prev_list = NULL;
+ static guint prev_length = 0;
+ static guint offset = 0;
+ WINDOW *w = screen.main_window.w;
+ guint length, y=0;
+
+ length = g_list_length(list);
+ if (list == prev_list && length == prev_length) {
+ offset += screen.main_window.rows;
+ if (offset >= length)
+ offset = 0;
+ } else {
+ prev_list = list;
+ prev_length = length;
+ offset = 0;
}
- else
- {
- screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf);
- beep();
+
+ colors_use(w, COLOR_STATUS_ALERT);
+ while (y < screen.main_window.rows) {
+ GList *item = g_list_nth(list, y+offset);
+
+ wmove(w, y++, 0);
+ wclrtoeol(w);
+ if (item) {
+ gchar *tmp = g_strdup(item->data);
+ waddstr(w, g_basename(tmp));
+ g_free(tmp);
+ }
}
- return 1;
- default:
- break;
- }
- return 0;
+
+ 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 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;
+ }
+}
+#endif