![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 2dda43db9225fcfeee086e97fb35a97a5a8221f9..6e19d8d2bb924cb62a38e89bd4f157cffb4415fd 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
-/*
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* 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
* 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 <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-
-#include "config.h"
-
-#ifdef ENABLE_KEYDEF_SCREEN
-#include "ncmpc.h"
-#include "libmpdclient.h"
-#include "options.h"
+#include "screen_keydef.h"
+#include "screen_interface.h"
+#include "screen_status.h"
+#include "screen_find.h"
+#include "i18n.h"
#include "conf.h"
-#include "mpc.h"
-#include "command.h"
#include "screen.h"
#include "screen_utils.h"
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <glib.h>
+
#define STATIC_ITEMS 0
#define STATIC_SUB_ITEMS 1
#define BUFSIZE 256
-#define LIST_ITEM_APPLY() (command_list_length)
+#define LIST_ITEM_APPLY() ((unsigned)command_list_length)
#define LIST_ITEM_SAVE() (LIST_ITEM_APPLY()+1)
#define LIST_LENGTH() (LIST_ITEM_SAVE()+1)
#define LIST_ITEM_APPLY_LABEL _("===> Apply key bindings ")
-static list_window_t *lw = NULL;
-static int command_list_length = 0;
+static struct list_window *lw;
+static unsigned command_list_length = 0;
static command_definition_t *cmds = NULL;
static int subcmd = -1;
-static int subcmd_length = 0;
-static int subcmd_addpos = 0;
+static unsigned subcmd_length = 0;
+static unsigned subcmd_addpos = 0;
static int
keybindings_changed(void)
{
- command_definition_t *orginal_cmds = get_command_definitions();
- size_t size = command_list_length*sizeof(command_definition_t);
-
- return memcmp(orginal_cmds, cmds, size);
+ command_definition_t *orginal_cmds = get_command_definitions();
+ size_t size = command_list_length * sizeof(command_definition_t);
+
+ return memcmp(orginal_cmds, cmds, size);
}
static void
apply_keys(void)
{
- if( keybindings_changed() )
- {
- command_definition_t *orginal_cmds = get_command_definitions();
- size_t size = command_list_length*sizeof(command_definition_t);
-
- memcpy(orginal_cmds, cmds, size);
- screen_status_printf(_("You have new key bindings!"));
- }
- else
- screen_status_printf(_("Keybindings unchanged."));
+ if (keybindings_changed()) {
+ command_definition_t *orginal_cmds = get_command_definitions();
+ size_t size = command_list_length * sizeof(command_definition_t);
+
+ memcpy(orginal_cmds, cmds, size);
+ screen_status_printf(_("You have new key bindings"));
+ } else
+ screen_status_printf(_("Keybindings unchanged."));
}
static int
save_keys(void)
{
- FILE *f;
- char *filename;
-
- if( check_user_conf_dir() )
- {
- screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"),
- strerror(errno));
- beep();
- return -1;
- }
-
- filename = get_user_key_binding_filename();
-
- if( (f=fopen(filename,"w")) == NULL )
- {
- screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
- beep();
- g_free(filename);
- return -1;
- }
- if( write_key_bindings(f) )
- screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
- else
- screen_status_printf(_("Wrote %s"), filename);
-
- g_free(filename);
- return fclose(f);
+ FILE *f;
+ char *filename;
+
+ if (check_user_conf_dir()) {
+ screen_status_printf(_("Error: Unable to create directory ~/.ncmpc - %s"),
+ strerror(errno));
+ screen_bell();
+ return -1;
+ }
+
+ filename = get_user_key_binding_filename();
+
+ if ((f = fopen(filename,"w")) == NULL) {
+ screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
+ screen_bell();
+ g_free(filename);
+ return -1;
+ }
+
+ if (write_key_bindings(f, KEYDEF_WRITE_HEADER))
+ screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
+ else
+ screen_status_printf(_("Wrote %s"), filename);
+
+ g_free(filename);
+ return fclose(f);
}
static void
check_subcmd_length(void)
{
- subcmd_length = 0;
- while( subcmd_length<MAX_COMMAND_KEYS && cmds[subcmd].keys[subcmd_length]>0 )
- subcmd_length ++;
-
- if( subcmd_length<MAX_COMMAND_KEYS )
- {
- subcmd_addpos = subcmd_length;
- subcmd_length++;
- }
- else
- subcmd_addpos = 0;
- subcmd_length += STATIC_SUB_ITEMS;
+ subcmd_length = 0;
+ while (subcmd_length < MAX_COMMAND_KEYS &&
+ cmds[subcmd].keys[subcmd_length] > 0)
+ ++subcmd_length;
+
+ if (subcmd_length < MAX_COMMAND_KEYS) {
+ subcmd_addpos = subcmd_length;
+ subcmd_length++;
+ } 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
delete_key(int cmd_index, int key_index)
{
- int i = key_index+1;
+ int i = key_index+1;
- screen_status_printf(_("Deleted"));
- while( i<MAX_COMMAND_KEYS && cmds[cmd_index].keys[i] )
- cmds[cmd_index].keys[key_index++] = cmds[cmd_index].keys[i++];
- cmds[cmd_index].keys[key_index] = 0;
+ screen_status_printf(_("Deleted"));
+ while (i < MAX_COMMAND_KEYS && cmds[cmd_index].keys[i])
+ cmds[cmd_index].keys[key_index++] = cmds[cmd_index].keys[i++];
+ cmds[cmd_index].keys[key_index] = 0;
+ cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED;
+ check_subcmd_length();
- 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[BUFSIZE];
- command_t cmd;
-
- snprintf(buf, BUFSIZE, _("Enter new key for %s: "), cmds[cmd_index].name);
- key = screen_getch(w, buf);
- if( key==KEY_RESIZE )
- screen_resize();
- if( key==ERR )
- {
- screen_status_printf(_("Aborted!"));
- return;
- }
- cmd = find_key_command(key, cmds);
- if( cmd!=CMD_NONE && cmd!= cmds[cmd_index].command )
- {
- screen_status_printf(_("Error: key %s is already used for %s"),
- key2str(key),
- get_key_command_name(cmd));
- beep();
- return;
- }
- cmds[cmd_index].keys[key_index] = key;
- screen_status_printf(_("Assigned %s to %s"),
- key2str(key),cmds[cmd_index].name);
- check_subcmd_length();
- lw->repaint = 1;
+ int key;
+ char *buf;
+ command_t cmd;
+
+ buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name);
+ key = screen_getch(buf);
+ g_free(buf);
+
+ if (key==ERR) {
+ screen_status_printf(_("Aborted"));
+ return;
+ }
+
+ cmd = find_key_command(key, cmds);
+ if (cmd != CMD_NONE && cmd != cmds[cmd_index].command) {
+ screen_status_printf(_("Error: key %s is already used for %s"),
+ key2str(key),
+ get_key_command_name(cmd));
+ screen_bell();
+ return;
+ }
+
+ cmds[cmd_index].keys[key_index] = key;
+ cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED;
+
+ screen_status_printf(_("Assigned %s to %s"),
+ key2str(key),cmds[cmd_index].name);
+ check_subcmd_length();
+
+ /* repaint */
+ keydef_repaint();
+
+ /* update key conflict flags */
+ check_key_bindings(cmds, NULL, 0);
}
-static char *
-list_callback(int index, int *highlight, void *data)
+static const char *
+list_callback(unsigned idx, G_GNUC_UNUSED void *data)
{
- static char buf[BUFSIZE];
-
- if( subcmd <0 )
- {
- if( index<command_list_length )
- return cmds[index].name;
- else if( index==LIST_ITEM_APPLY() )
- return LIST_ITEM_APPLY_LABEL;
- else if( index==LIST_ITEM_SAVE() )
- return LIST_ITEM_SAVE_LABEL;
- }
- else
- {
- if( index== 0 )
- return "[..]";
- index--;
- if( index<MAX_COMMAND_KEYS && cmds[subcmd].keys[index]>0 )
- {
- snprintf(buf,
- BUFSIZE, "%d. %-20s (%d) ",
- index+1,
- key2str(cmds[subcmd].keys[index]),
- cmds[subcmd].keys[index]);
- return buf;
- }
- else if ( index==subcmd_addpos )
- {
- snprintf(buf, BUFSIZE, _("%d. Add new key "), index+1 );
- return buf;
- }
- }
-
- return NULL;
+ static char buf[BUFSIZE];
+
+ if (subcmd < 0) {
+ 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 == subcmd_addpos) {
+ g_snprintf(buf, BUFSIZE, "%d. %s",
+ idx + 1, _("Add new key"));
+ return buf;
+ }
+
+ 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
+static void
keydef_init(WINDOW *w, int cols, int rows)
{
- lw = list_window_init(w, cols, rows);
+ lw = list_window_init(w, cols, rows);
}
static void
keydef_resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ list_window_resize(lw, cols, rows);
}
-static void
+static void
keydef_exit(void)
{
- list_window_free(lw);
- if( cmds )
- g_free(cmds);
- cmds = NULL;
- lw = NULL;
+ list_window_free(lw);
+ if (cmds)
+ g_free(cmds);
+ cmds = NULL;
+ lw = NULL;
}
-static void
-keydef_open(screen_t *screen, mpd_client_t *c)
+static void
+keydef_open(G_GNUC_UNUSED struct mpdclient *c)
{
- if( cmds == NULL )
- {
- command_definition_t *current_cmds = get_command_definitions();
- size_t cmds_size;
-
- command_list_length = 0;
- while( current_cmds[command_list_length].name )
- command_list_length++;
-
- cmds_size = (command_list_length+1)*sizeof(command_definition_t);
- 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());
+ if (cmds == NULL) {
+ command_definition_t *current_cmds = get_command_definitions();
+ size_t cmds_size;
+
+ command_list_length = 0;
+ while (current_cmds[command_list_length].name)
+ command_list_length++;
+
+ cmds_size = (command_list_length+1) * sizeof(command_definition_t);
+ cmds = g_malloc0(cmds_size);
+ memcpy(cmds, current_cmds, cmds_size);
+ command_list_length += STATIC_ITEMS;
+ }
+
+ subcmd = -1;
+ list_window_set_length(lw, LIST_LENGTH());
}
-static void
+static void
keydef_close(void)
{
- if( cmds && !keybindings_changed() )
- {
- g_free(cmds);
- cmds = NULL;
- }
- else
- screen_status_printf(_("Note: Did you forget to \'Apply\' your changes?"));
+ if (cmds && !keybindings_changed()) {
+ g_free(cmds);
+ cmds = NULL;
+ } else
+ screen_status_printf(_("Note: Did you forget to \'Apply\' your changes?"));
}
-static char *
+static const char *
keydef_title(char *str, size_t size)
{
- if( subcmd<0 )
- return _("Edit key bindings");
-
- snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name);
- return str;
-}
+ if (subcmd < 0)
+ return _("Edit key bindings");
-static void
-keydef_paint(screen_t *screen, mpd_client_t *c)
-{
- lw->clear = 1;
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
+ g_snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name);
+ return str;
}
-static void
-keydef_update(screen_t *screen, mpd_client_t *c)
-{
- if( lw->repaint )
- {
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
- lw->repaint = 0;
- }
+static void
+keydef_paint(void)
+{
+ list_window_paint(lw, list_callback, NULL);
}
-static int
-keydef_cmd(screen_t *screen, mpd_client_t *c, command_t cmd)
+static bool
+keydef_cmd(G_GNUC_UNUSED struct mpdclient *c, command_t cmd)
{
- int length = LIST_LENGTH();
-
- if( subcmd>=0 )
- length = subcmd_length;
-
- switch(cmd)
- {
- case CMD_PLAY:
- if( subcmd<0 )
- {
- if( lw->selected == LIST_ITEM_APPLY() )
- apply_keys();
- else if( lw->selected == LIST_ITEM_SAVE() )
- {
- apply_keys();
- save_keys();
- }
- else
- {
- subcmd = lw->selected;
- lw->selected=0;
- check_subcmd_length();
- }
- }
- else
- {
- if( lw->selected == 0 ) /* up */
- {
- lw->selected = subcmd;
- subcmd = -1;
- }
- else
- assign_new_key(screen->status_window.w,
- subcmd,
- lw->selected-STATIC_SUB_ITEMS);
+ if (cmd == CMD_LIST_RANGE_SELECT)
+ return false;
+
+ if (list_window_cmd(lw, cmd)) {
+ keydef_repaint();
+ return true;
}
- lw->repaint = 1;
- lw->clear = 1;
- return 1;
- case CMD_DELETE:
- if( subcmd>=0 && lw->selected-STATIC_SUB_ITEMS>=0 )
- delete_key(subcmd, lw->selected-STATIC_SUB_ITEMS);
- return 1;
- break;
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- return screen_find(screen, c,
- lw, length,
- cmd, list_callback);
-
- default:
- break;
- }
-
- return list_window_cmd(lw, length, cmd);
-}
-static list_window_t *
-keydef_lw(void)
-{
- return lw;
-}
+ switch(cmd) {
+ case CMD_PLAY:
+ if (subcmd < 0) {
+ if (lw->selected == LIST_ITEM_APPLY())
+ apply_keys();
+ else if (lw->selected == LIST_ITEM_SAVE()) {
+ apply_keys();
+ save_keys();
+ } else {
+ subcmd = lw->selected;
+ list_window_reset(lw);
+ check_subcmd_length();
+
+ keydef_repaint();
+ }
+ } else {
+ if (lw->selected == 0) { /* up */
+ list_window_set_length(lw, LIST_LENGTH());
+ list_window_set_cursor(lw, subcmd);
+ subcmd = -1;
+
+ keydef_repaint();
+ } else
+ assign_new_key(subcmd,
+ lw->selected - STATIC_SUB_ITEMS);
+ }
+ 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 true;
+ break;
+ case CMD_SAVE_PLAYLIST:
+ apply_keys();
+ save_keys();
+ break;
+ case CMD_LIST_FIND:
+ case CMD_LIST_RFIND:
+ case CMD_LIST_FIND_NEXT:
+ case CMD_LIST_RFIND_NEXT:
+ screen_find(lw, cmd, list_callback, NULL);
+ keydef_repaint();
+ return true;
+
+ default:
+ break;
+ }
-screen_functions_t *
-get_screen_keydef(void)
-{
- static screen_functions_t functions;
-
- memset(&functions, 0, sizeof(screen_functions_t));
- functions.init = keydef_init;
- functions.exit = keydef_exit;
- functions.open = keydef_open;
- functions.close = keydef_close;
- functions.resize = keydef_resize;
- functions.paint = keydef_paint;
- functions.update = keydef_update;
- functions.cmd = keydef_cmd;
- functions.get_lw = keydef_lw;
- functions.get_title = keydef_title;
-
- return &functions;
+ return false;
}
-
-#endif
+const struct screen_functions screen_keydef = {
+ .init = keydef_init,
+ .exit = keydef_exit,
+ .open = keydef_open,
+ .close = keydef_close,
+ .resize = keydef_resize,
+ .paint = keydef_paint,
+ .cmd = keydef_cmd,
+ .get_title = keydef_title,
+};