X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_utils.c;h=8f69930d64126752b048164fcd1a8d7e9d0df379;hb=4ec02f37ba70c59641c08bf9199e5c3395e8d1ff;hp=40f73e63be96f548aa2d2559ceb39f7adf2f8ede;hpb=1cd28efa96dbc3d49a43d9b12c5b65d493baf949;p=ncmpc.git diff --git a/src/screen_utils.c b/src/screen_utils.c index 40f73e6..8f69930 100644 --- a/src/screen_utils.c +++ b/src/screen_utils.c @@ -1,7 +1,6 @@ -/* - * $Id$ - * - * (c) 2004 by Kalle Wallin +/* 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 @@ -12,269 +11,151 @@ * 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 -#include -#include -#include -#include - -#include "config.h" -#include "ncmpc.h" +#include "screen_utils.h" +#include "screen.h" #include "mpdclient.h" -#include "support.h" -#include "command.h" +#include "config.h" +#include "i18n.h" #include "options.h" -#include "list_window.h" #include "colors.h" #include "wreadln.h" -#include "screen.h" -#define FIND_PROMPT _("Find: ") -#define RFIND_PROMPT _("Find backward: ") +#include +#include void screen_bell(void) { - if( options.audible_bell ) - beep(); - if( options.visible_bell ) - flash(); + if (options.audible_bell) + beep(); + if (options.visible_bell) + 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, char *prompt) +screen_getch(const char *prompt) { - int key = -1; - int prompt_len = strlen(prompt); + WINDOW *w = screen.status_bar.window.w; - 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); + colors_use(w, COLOR_STATUS_ALERT); + werase(w); + wmove(w, 0, 0); + waddstr(w, prompt); - while( (key=my_wgetch(w)) == ERR ) - ; + echo(); + curs_set(1); -#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); - timeout(SCREEN_TIMEOUT); + noecho(); + curs_set(0); - return key; + return key; } -char * -screen_readln(WINDOW *w, - char *prompt, - char *value, - GList **history, - GCompletion *gcmp) +bool +screen_get_yesno(const char *prompt, bool def) { - char *line = NULL; - - 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; + /* 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_getstr(WINDOW *w, char *prompt) +screen_readln(const char *prompt, + const char *value, + GList **history, + GCompletion *gcmp) { - return screen_readln(w, prompt, NULL, NULL, NULL); + 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, window->cols, history, gcmp); + curs_set(0); + return line; } char * -screen_read_password(WINDOW *w, char *prompt) -{ - 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) - return wreadln_masked(w, _("Password: "), NULL, COLS, NULL, NULL); - else - return wreadln_masked(w, prompt, NULL, COLS, NULL, NULL); - curs_set(0); -} - -gint -_screen_auth(mpdclient_t *c, gint recursion) +screen_read_password(const char *prompt) { - 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; -} + struct window *window = &screen.status_bar.window; + WINDOW *w = window->w; -gint -screen_auth(mpdclient_t *c) -{ - _screen_auth(c, 0); - mpdclient_update(c); - curs_set(0); -} - -/* query user for a string and find it in a list window */ -int -screen_find(screen_t *screen, - 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; - char *prompt = FIND_PROMPT; - char *value = options.find_show_last_pattern ? (char *) -1 : NULL; + wmove(w, 0,0); + curs_set(1); + colors_use(w, COLOR_STATUS_ALERT); - if( findcmd==CMD_LIST_RFIND ||findcmd==CMD_LIST_RFIND_NEXT ) - { - prompt = RFIND_PROMPT; - reversed = 1; - } + if (prompt == NULL) + prompt = _("Password"); + char *ret = wreadln_masked(w, prompt, NULL, window->cols, NULL, NULL); - 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 ) - { - lw->repaint = 1; - } - else - { - screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf); - screen_bell(); - } - return 1; - default: - break; - } - return 0; + curs_set(0); + return ret; } void -screen_display_completion_list(screen_t *screen, GList *list) +screen_display_completion_list(GList *list) { - static GList *prev_list = NULL; - static gint prev_length = 0; - static gint offset = 0; - WINDOW *w = screen->main_window.w; - gint length, y=0; + static GList *prev_list = NULL; + static guint prev_length = 0; + static guint offset = 0; + WINDOW *w = screen.main_window.w; + + unsigned 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; + } - 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; - } + colors_use(w, COLOR_STATUS_ALERT); - colors_use(w, COLOR_STATUS_ALERT); - while( ymain_window.rows ) - { - GList *item = g_list_nth(list, y+offset); + unsigned y = 0; + 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, basename(tmp)); - g_free(tmp); + wmove(w, y++, 0); + wclrtoeol(w); + if (item) { + gchar *tmp = g_strdup(item->data); + waddstr(w, g_basename(tmp)); + g_free(tmp); + } } - } - wrefresh(w); - doupdate(); - colors_use(w, COLOR_LIST); -} -void -set_xterm_title(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; - } + wrefresh(w); + colors_use(w, COLOR_LIST); }