X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_keydef.c;h=ba229ec87ab98ec4827ebc6fb4d149b37b9417f0;hb=1006a43225842d77e5fdb32e9d02bada5cdc2377;hp=3dda0ec72554b0a3ed55b92c7c4e2cf8d212e018;hpb=0fd4d0c99d31b69356c289d3bb1dcd791b898028;p=ncmpc.git diff --git a/src/screen_keydef.c b/src/screen_keydef.c index 3dda0ec..ba229ec 100644 --- a/src/screen_keydef.c +++ b/src/screen_keydef.c @@ -1,5 +1,6 @@ -/* - * (c) 2004 by Kalle Wallin +/* ncmpc (Ncurses MPD Client) + * (c) 2004-2010 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 @@ -10,29 +11,25 @@ * 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 "config.h" - -#ifndef DISABLE_KEYDEF_SCREEN -#include "ncmpc.h" -#include "mpdclient.h" -#include "options.h" +#include "screen_keydef.h" +#include "screen_interface.h" +#include "screen_message.h" +#include "screen_find.h" +#include "i18n.h" #include "conf.h" -#include "command.h" #include "screen.h" #include "screen_utils.h" -#include "gcc.h" +#include #include -#include #include #include -#include #define STATIC_ITEMS 0 #define STATIC_SUB_ITEMS 1 @@ -46,7 +43,7 @@ #define LIST_ITEM_APPLY_LABEL _("===> Apply key bindings ") -static list_window_t *lw = NULL; +static struct list_window *lw; static unsigned command_list_length = 0; static command_definition_t *cmds = NULL; @@ -71,7 +68,7 @@ apply_keys(void) size_t size = command_list_length * sizeof(command_definition_t); memcpy(orginal_cmds, cmds, size); - screen_status_printf(_("You have new key bindings!")); + screen_status_printf(_("You have new key bindings")); } else screen_status_printf(_("Keybindings unchanged.")); } @@ -83,7 +80,7 @@ save_keys(void) char *filename; if (check_user_conf_dir()) { - screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"), + screen_status_printf(_("Error: Unable to create directory ~/.ncmpc - %s"), strerror(errno)); screen_bell(); return -1; @@ -121,6 +118,17 @@ check_subcmd_length(void) } else subcmd_addpos = 0; subcmd_length += STATIC_SUB_ITEMS; + list_window_set_length(lw, subcmd_length); +} + +static void +keydef_paint(void); + +static void +keydef_repaint(void) +{ + keydef_paint(); + wrefresh(lw->w); } static void @@ -134,28 +142,27 @@ delete_key(int cmd_index, int key_index) cmds[cmd_index].keys[key_index] = 0; cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED; check_subcmd_length(); - lw->clear = 1; - lw->repaint = 1; + + /* repaint */ + keydef_repaint(); + /* update key conflict flags */ check_key_bindings(cmds, NULL, 0); } static void -assign_new_key(WINDOW *w, int cmd_index, int key_index) +assign_new_key(int cmd_index, int key_index) { int key; char *buf; command_t cmd; buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name); - key = screen_getch(w, buf); + key = screen_getch(buf); g_free(buf); - if (key == KEY_RESIZE) - screen_resize(); - if (key==ERR) { - screen_status_printf(_("Aborted!")); + screen_status_printf(_("Aborted")); return; } @@ -174,43 +181,47 @@ assign_new_key(WINDOW *w, int cmd_index, int key_index) screen_status_printf(_("Assigned %s to %s"), key2str(key),cmds[cmd_index].name); check_subcmd_length(); - lw->repaint = 1; + + /* repaint */ + keydef_repaint(); + /* update key conflict flags */ check_key_bindings(cmds, NULL, 0); } static const char * -list_callback(unsigned idx, int *highlight, mpd_unused void *data) +list_callback(unsigned idx, G_GNUC_UNUSED void *data) { static char buf[BUFSIZE]; if (subcmd < 0) { - if (idx < (unsigned)command_list_length) { - if (cmds[idx].flags & COMMAND_KEY_CONFLICT) - *highlight = 1; - return cmds[idx].name; - } else if (idx == LIST_ITEM_APPLY()) + if (idx == LIST_ITEM_APPLY()) return LIST_ITEM_APPLY_LABEL; else if (idx == LIST_ITEM_SAVE()) return LIST_ITEM_SAVE_LABEL; + + assert(idx < (unsigned)command_list_length); + + return cmds[idx].name; } else { if (idx == 0) return "[..]"; idx--; - if (idx < MAX_COMMAND_KEYS && cmds[subcmd].keys[idx] > 0) { - g_snprintf(buf, - BUFSIZE, "%d. %-20s (%d) ", - idx + 1, - key2str(cmds[subcmd].keys[idx]), - cmds[subcmd].keys[idx]); - return buf; - } else if (idx == subcmd_addpos) { - g_snprintf(buf, BUFSIZE, _("%d. Add new key "), idx + 1); + if (idx == subcmd_addpos) { + g_snprintf(buf, BUFSIZE, "%d. %s", + idx + 1, _("Add new key")); return buf; } - } - return NULL; + assert(idx < MAX_COMMAND_KEYS && cmds[subcmd].keys[idx] > 0); + + g_snprintf(buf, + BUFSIZE, "%d. %-20s (%d) ", + idx + 1, + key2str(cmds[subcmd].keys[idx]), + cmds[subcmd].keys[idx]); + return buf; + } } static void @@ -222,8 +233,7 @@ keydef_init(WINDOW *w, int cols, int rows) static void keydef_resize(int cols, int rows) { - lw->cols = cols; - lw->rows = rows; + list_window_resize(lw, cols, rows); } static void @@ -237,7 +247,7 @@ keydef_exit(void) } static void -keydef_open(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) +keydef_open(G_GNUC_UNUSED struct mpdclient *c) { if (cmds == NULL) { command_definition_t *current_cmds = get_command_definitions(); @@ -251,11 +261,10 @@ keydef_open(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) cmds = g_malloc0(cmds_size); memcpy(cmds, current_cmds, cmds_size); command_list_length += STATIC_ITEMS; - screen_status_printf(_("Welcome to the key editor!")); } subcmd = -1; - list_window_check_selected(lw, LIST_LENGTH()); + list_window_set_length(lw, LIST_LENGTH()); } static void @@ -279,30 +288,21 @@ keydef_title(char *str, size_t size) } static void -keydef_paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) +keydef_paint(void) { - lw->clear = 1; list_window_paint(lw, list_callback, NULL); - wrefresh(lw->w); -} - -static void -keydef_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) -{ - if (lw->repaint) { - list_window_paint(lw, list_callback, NULL); - wrefresh(lw->w); - lw->repaint = 0; - } } -static int -keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd) +static bool +keydef_cmd(G_GNUC_UNUSED struct mpdclient *c, command_t cmd) { - int length = LIST_LENGTH(); + if (cmd == CMD_LIST_RANGE_SELECT) + return false; - if (subcmd >= 0) - length = subcmd_length; + if (list_window_cmd(lw, cmd)) { + keydef_repaint(); + return true; + } switch(cmd) { case CMD_PLAY: @@ -314,25 +314,36 @@ keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd) save_keys(); } else { subcmd = lw->selected; - lw->selected=0; + list_window_reset(lw); check_subcmd_length(); + + keydef_repaint(); } } else { if (lw->selected == 0) { /* up */ - lw->selected = subcmd; + list_window_set_length(lw, LIST_LENGTH()); + list_window_set_cursor(lw, subcmd); subcmd = -1; + + keydef_repaint(); } else - assign_new_key(screen->status_window.w, - subcmd, + assign_new_key(subcmd, lw->selected - STATIC_SUB_ITEMS); } - lw->repaint = 1; - lw->clear = 1; - return 1; + return true; + case CMD_GO_PARENT_DIRECTORY: + if (subcmd >=0) { + list_window_set_length(lw, LIST_LENGTH()); + list_window_set_cursor(lw, subcmd); + subcmd = -1; + + keydef_repaint(); + } + break; case CMD_DELETE: if (subcmd >= 0 && lw->selected >= STATIC_SUB_ITEMS) delete_key(subcmd, lw->selected - STATIC_SUB_ITEMS); - return 1; + return true; break; case CMD_SAVE_PLAYLIST: apply_keys(); @@ -342,15 +353,15 @@ keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd) case CMD_LIST_RFIND: case CMD_LIST_FIND_NEXT: case CMD_LIST_RFIND_NEXT: - return screen_find(screen, - lw, length, - cmd, list_callback, NULL); + screen_find(lw, cmd, list_callback, NULL); + keydef_repaint(); + return true; default: break; } - return list_window_cmd(lw, length, cmd); + return false; } const struct screen_functions screen_keydef = { @@ -360,9 +371,6 @@ const struct screen_functions screen_keydef = { .close = keydef_close, .resize = keydef_resize, .paint = keydef_paint, - .update = keydef_update, .cmd = keydef_cmd, .get_title = keydef_title, }; - -#endif