X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen_utils.c;h=39b11622aeba0a35848f4b17981200204a89d0aa;hb=7b4a9f27827f8cca56cff52ecc2144093ebadff9;hp=5134756163f4686865e96783d0a86844f9e3fbda;hpb=ef040e296e46fcc7620edaf89ffac05e065ec3e3;p=ncmpc.git diff --git a/src/screen_utils.c b/src/screen_utils.c index 5134756..39b1162 100644 --- a/src/screen_utils.c +++ b/src/screen_utils.c @@ -1,36 +1,32 @@ -/* - * (c) 2004 by Kalle Wallin - * +/* ncmpc (Ncurses MPD Client) + * (c) 2004-2009 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * 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 "screen.h" #include "mpdclient.h" #include "config.h" #include "i18n.h" -#include "support.h" #include "options.h" #include "colors.h" #include "wreadln.h" -#include -#include - -#define FIND_PROMPT _("Find: ") -#define RFIND_PROMPT _("Find backward: ") +#include void screen_bell(void) @@ -42,25 +38,26 @@ screen_bell(void) } int -screen_getch(WINDOW *w, const char *prompt) +screen_getch(const char *prompt) { + WINDOW *w = screen.status_bar.window.w; int key = -1; 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) + while ((key = wgetch(w)) == ERR) ; #ifdef HAVE_GETMOUSE /* ignore mouse events */ if (key == KEY_MOUSE) - return screen_getch(w, prompt); + return screen_getch(prompt); #endif noecho(); @@ -70,142 +67,42 @@ screen_getch(WINDOW *w, const char *prompt) } 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) -{ - return screen_readln(w, prompt, NULL, NULL, NULL); -} - -static char * -screen_read_password(WINDOW *w, const char *prompt) +screen_read_password(const char *prompt) { + struct window *window = &screen.status_bar.window; + WINDOW *w = window->w; 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); + prompt = _("Password"); + 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) { @@ -234,7 +131,7 @@ screen_display_completion_list(GList *list) wclrtoeol(w); if (item) { gchar *tmp = g_strdup(item->data); - waddstr(w, basename(tmp)); + waddstr(w, g_basename(tmp)); g_free(tmp); } } @@ -244,11 +141,12 @@ screen_display_completion_list(GList *list) 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 */ + /* and can be retrieved with xprop -id $WINDOWID */ if (options.enable_xterm_title) { if (g_getenv("WINDOWID")) { @@ -264,3 +162,4 @@ set_xterm_title(const char *format, ...) options.enable_xterm_title = FALSE; } } +#endif