![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/command.c b/src/command.c
index 1e9edcd0d5096e65088968c10beed11b105a6081..1d77d0d2d4b9d4a413e387c1e4049ed786cddc7e 100644 (file)
--- a/src/command.c
+++ b/src/command.c
/*
- * (c) 2004 by Kalle Wallin (kaw@linux.se)
+ * $Id$
+ *
+ * (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* 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
#include <ncurses.h>
#include "config.h"
+#include "ncmpc.h"
#include "command.h"
#undef DEBUG_KEYS
static command_definition_t cmds[] =
{
- { { 13, 0, 0 }, CMD_PLAY, "play",
- "Play/Enter directory" },
- { { 'P', 0, 0 }, CMD_PAUSE,"pause",
- "Pause" },
- { { 's', BS, 0 }, CMD_STOP, "stop",
- "Stop" },
- { { '>', 0, 0 }, CMD_TRACK_NEXT, "next",
- "Next track" },
- { { '<', 0, 0 }, CMD_TRACK_PREVIOUS, "prev",
- "Previous track" },
- { { 'f', 0, 0 }, CMD_SEEK_FORWARD, "seek-forward",
- "Seek forward" },
- { { 'b', 0, 0 }, CMD_SEEK_BACKWARD, "seek-backward",
- "Seek backward" },
-
- { { '+', RGHT, 0 }, CMD_VOLUME_UP, "volume-up",
- "Increase volume" },
- { { '-', LEFT, 0 }, CMD_VOLUME_DOWN, "volume-down",
- "Decrease volume" },
-
- { { 'w', 0, 0 }, CMD_TOGGLE_FIND_WRAP, "wrap-mode",
- "Toggle find mode" },
- { { 'U', 0, 0 }, CMD_TOGGLE_AUTOCENTER, "autocenter-mode",
- "Toggle auto center mode" },
-
- { { ' ', 'a', 0 }, CMD_SELECT, "select",
- "Select/deselect song in playlist" },
- { { DEL, 'd', 0 }, CMD_DELETE, "delete",
- "Delete song from playlist" },
- { { 'Z', 0, 0 }, CMD_SHUFFLE, "shuffle",
- "Shuffle playlist" },
- { { 'c', 0, 0 }, CMD_CLEAR, "clear",
- "Clear playlist" },
- { { 'r', 0, 0 }, CMD_REPEAT, "repeat",
- "Toggle repeat mode" },
- { { 'z', 0, 0 }, CMD_RANDOM, "random",
- "Toggle random mode" },
- { { 'x', 0, 0 }, CMD_CROSSFADE, "crossfade",
- "Toggle crossfade mode" },
- { { 'S', 0, 0 }, CMD_SAVE_PLAYLIST, "save",
- "Save playlist" },
-
- { { 0, 0, 0 }, CMD_LIST_MOVE_UP, "move-up",
- "Move item up" },
- { { 0, 0, 0 }, CMD_LIST_MOVE_DOWN, "move-down",
- "Move item down" },
-
- { { UP, ',', 0 }, CMD_LIST_PREVIOUS, "up",
- "Move cursor up" },
- { { DWN, '.', 0 }, CMD_LIST_NEXT, "down",
- "Move cursor down" },
- { { HOME, 0x01, 0 }, CMD_LIST_FIRST, "home",
- "Home " },
- { { END, 0x05, 0 }, CMD_LIST_LAST, "end",
- "End " },
- { { PGUP, 'A', 0 }, CMD_LIST_PREVIOUS_PAGE, "pgup",
- "Page up" },
- { { PGDN, 'B', 0 }, CMD_LIST_NEXT_PAGE, "pgdn",
- "Page down" },
- { { '/', 0, 0 }, CMD_LIST_FIND, "find",
- "Forward find" },
- { { 'n', 0, 0 }, CMD_LIST_FIND_NEXT, "find-next",
- "Forward find next" },
- { { '?', 0, 0 }, CMD_LIST_RFIND, "rfind",
- "Backward find" },
- { { 'p', 0, 0 }, CMD_LIST_RFIND_NEXT, "rfind-next",
- "Backward find previous" },
-
-
- { { TAB, 0, 0 }, CMD_SCREEN_NEXT, "screen-next",
- "Next screen" },
-
- { { STAB, 0, 0 }, CMD_SCREEN_PREVIOUS, "screen-prev",
- "Previous screen" },
-
- { { '1', F1, 'h' }, CMD_SCREEN_HELP, "screen-help",
- "Help screen" },
- { { '2', F2, 0 }, CMD_SCREEN_PLAY, "screen-playlist",
- "Playlist screen" },
- { { '3', F3, 0 }, CMD_SCREEN_FILE, "screen-browse",
- "Browse screen" },
- { {'u', 0, 0 }, CMD_SCREEN_UPDATE, "update",
- "Update screen" },
#ifdef ENABLE_KEYDEF_SCREEN
- { {'K', 0, 0 }, CMD_SCREEN_KEYDEF, "screen-keyedit",
- "Key configuration screen" },
+ { {'K', 0, 0 }, 0, CMD_SCREEN_KEYDEF, "screen-keyedit",
+ N_("Key configuration screen") },
+#endif
+ { { 'q', 'Q', 3 }, 0, CMD_QUIT, "quit",
+ N_("Quit") },
+
+ /* movment */
+ { { UP, 'k', 0 }, 0, CMD_LIST_PREVIOUS, "up",
+ N_("Move cursor up") },
+ { { DWN, 'j', 0 }, 0, CMD_LIST_NEXT, "down",
+ N_("Move cursor down") },
+ { { HOME, 0x01, 0 }, 0, CMD_LIST_FIRST, "home",
+ N_("Home ") },
+ { { END, 0x05, 0 }, 0, CMD_LIST_LAST, "end",
+ N_("End ") },
+ { { PGUP, 0, 0 }, 0, CMD_LIST_PREVIOUS_PAGE, "pgup",
+ N_("Page up") },
+ { { PGDN, 0, 0 }, 0, CMD_LIST_NEXT_PAGE, "pgdn",
+ N_("Page down") },
+
+
+ /* basic screens */
+ { { '1', F1, 'h' }, 0, CMD_SCREEN_HELP, "screen-help",
+ N_("Help screen") },
+ { { '2', F2, 0 }, 0, CMD_SCREEN_PLAY, "screen-playlist",
+ N_("Playlist screen") },
+ { { '3', F3, 0 }, 0, CMD_SCREEN_FILE, "screen-browse",
+ N_("Browse screen") },
+
+
+ /* player commands */
+ { { 13, 0, 0 }, 0, CMD_PLAY, "play",
+ N_("Play/Enter directory") },
+ { { 'P', 0, 0 }, 0, CMD_PAUSE,"pause",
+ N_("Pause") },
+ { { 's', BS, 0 }, 0, CMD_STOP, "stop",
+ N_("Stop") },
+ { { '>', 0, 0 }, 0, CMD_TRACK_NEXT, "next",
+ N_("Next track") },
+ { { '<', 0, 0 }, 0, CMD_TRACK_PREVIOUS, "prev",
+ N_("Previous track") },
+ { { 'f', 0, 0 }, 0, CMD_SEEK_FORWARD, "seek-forward",
+ N_("Seek forward") },
+ { { 'b', 0, 0 }, 0, CMD_SEEK_BACKWARD, "seek-backward",
+ N_("Seek backward") },
+ { { '+', RGHT, 0 }, 0, CMD_VOLUME_UP, "volume-up",
+ N_("Increase volume") },
+ { { '-', LEFT, 0 }, 0, CMD_VOLUME_DOWN, "volume-down",
+ N_("Decrease volume") },
+ { { ' ', 0, 0 }, 0, CMD_SELECT, "select",
+ N_("Select/deselect song in playlist") },
+ { { DEL, 'd', 0 }, 0, CMD_DELETE, "delete",
+ N_("Delete song from playlist") },
+ { { 'Z', 0, 0 }, 0, CMD_SHUFFLE, "shuffle",
+ N_("Shuffle playlist") },
+ { { 'c', 0, 0 }, 0, CMD_CLEAR, "clear",
+ N_("Clear playlist") },
+ { { 'r', 0, 0 }, 0, CMD_REPEAT, "repeat",
+ N_("Toggle repeat mode") },
+ { { 'z', 0, 0 }, 0, CMD_RANDOM, "random",
+ N_("Toggle random mode") },
+ { { 'x', 0, 0 }, 0, CMD_CROSSFADE, "crossfade",
+ N_("Toggle crossfade mode") },
+ { { 21, 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
+ N_("Start a music database update") },
+ { { 'S', 0, 0 }, 0, CMD_SAVE_PLAYLIST, "save",
+ N_("Save playlist") },
+ { { 'a', 0, 0 }, 0, CMD_ADD, "add",
+ N_("Add url/file to playlist") },
+
+
+ /* lists */
+ { { 11, 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
+ N_("Move item up") },
+ { { 10, 0, 0 }, 0, CMD_LIST_MOVE_DOWN, "move-down",
+ N_("Move item down") },
+ { { 12, 0, 0 }, 0, CMD_SCREEN_UPDATE, "update",
+ N_("Update screen") },
+
+
+ /* ncmpc options */
+ { { 'w', 0, 0 }, 0, CMD_TOGGLE_FIND_WRAP, "wrap-mode",
+ N_("Toggle find mode") },
+ { { 'U', 0, 0 }, 0, CMD_TOGGLE_AUTOCENTER, "autocenter-mode",
+ N_("Toggle auto center mode") },
+
+
+ /* change screen */
+ { { TAB, 0, 0 }, 0, CMD_SCREEN_NEXT, "screen-next",
+ N_("Next screen") },
+ { { STAB, 0, 0 }, 0, CMD_SCREEN_PREVIOUS, "screen-prev",
+ N_("Previous screen") },
+
+
+ /* find */
+ { { '/', 0, 0 }, 0, CMD_LIST_FIND, "find",
+ N_("Forward find") },
+ { { 'n', 0, 0 }, 0, CMD_LIST_FIND_NEXT, "find-next",
+ N_("Forward find next") },
+ { { '?', 0, 0 }, 0, CMD_LIST_RFIND, "rfind",
+ N_("Backward find") },
+ { { 'p', 0, 0 }, 0, CMD_LIST_RFIND_NEXT, "rfind-next",
+ N_("Backward find previous") },
+
+
+ /* extra screens */
+#ifdef ENABLE_CLOCK_SCREEN
+ { {'4', F4, 0 }, 0, CMD_SCREEN_CLOCK, "screen-clock",
+ N_("Clock screen") },
#endif
- { { 'q', 0, 0 }, CMD_QUIT, "quit",
- "Quit " PACKAGE },
-
- { { -1, -1, -1 }, CMD_NONE, NULL, NULL }
+ { { -1, -1, -1 }, 0, CMD_NONE, NULL, NULL }
};
command_definition_t *
switch(key)
{
case 0:
- return "Undefined";
+ return _("Undefined");
case ' ':
- return "Space";
+ return _("Space");
case 13:
- return "Enter";
+ return _("Enter");
case BS:
- return "Backspace";
+ return _("Backspace");
case DEL:
- return "Delete";
+ return _("Delete");
case UP:
- return "Up";
+ return _("Up");
case DWN:
- return "Down";
+ return _("Down");
case LEFT:
- return "Left";
+ return _("Left");
case RGHT:
- return "Right";
+ return _("Right");
case HOME:
- return "Home";
+ return _("Home");
case END:
- return "End";
+ return _("End");
case PGDN:
- return "PageDown";
+ return _("PageDown");
case PGUP:
- return "PageUp";
+ return _("PageUp");
case TAB:
- return "Tab";
+ return _("Tab");
case STAB:
- return "Shift+Tab";
+ return _("Shift+Tab");
case ESC:
- return "Esc";
+ return _("Esc");
case KEY_IC:
- return "Insert";
+ return _("Insert");
default:
for(i=0; i<=63; i++)
if( key==KEY_F(i) )
}
}
+int
+set_key_flags(command_definition_t *cp, command_t command, int flags)
+{
+ int i;
+
+ i=0;
+ while( cp[i].name )
+ {
+ if( cp[i].command == command )
+ {
+ cp[i].flags |= flags;
+ return 0;
+ }
+ i++;
+ }
+ return 1;
+}
+
char *
get_key_names(command_t command, int all)
{
while( cmds[i].description )
{
if( cmds[i].command == command )
- return cmds[i].description;
+ return _(cmds[i].description);
i++;
}
return NULL;
return find_key_command(key, cmds);
}
-
command_t
-get_keyboard_command(void)
+get_keyboard_command_with_timeout(int ms)
{
int key;
+ if( ms != SCREEN_TIMEOUT)
+ timeout(ms);
key = wgetch(stdscr);
+ if( ms != SCREEN_TIMEOUT)
+ timeout(SCREEN_TIMEOUT);
if( key==KEY_RESIZE )
screen_resize();
if( key==ERR )
return CMD_NONE;
- DK(fprintf(stderr, "key = 0x%02X\t", key));
+#ifdef HAVE_GETMOUSE
+ if( key==KEY_MOUSE )
+ return CMD_MOUSE_EVENT;
+#endif
return get_key_command(key);
}
+command_t
+get_keyboard_command(void)
+{
+ return get_keyboard_command_with_timeout(SCREEN_TIMEOUT);
+}
+
int
assign_keys(command_t command, int keys[MAX_COMMAND_KEYS])
{
if( cmds[i].command == command )
{
memcpy(cmds[i].keys, keys, sizeof(int)*MAX_COMMAND_KEYS);
+ cmds[i].flags |= COMMAND_KEY_MODIFIED;
return 0;
}
i++;
}
int
-check_key_bindings(void)
+check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize)
{
int i;
int retval = 0;
+
+ if( cp==NULL )
+ cp = cmds;
+
+ i=0;
+ while( cp[i].name )
+ {
+ cp[i].flags &= ~COMMAND_KEY_CONFLICT;
+ i++;
+ }
i=0;
- while( cmds[i].name )
+ while( cp[i].name )
{
int j;
- command_t cmd;
+ command_t cmd;
for(j=0; j<MAX_COMMAND_KEYS; j++)
- if( cmds[i].keys[j] &&
- (cmd=get_key_command(cmds[i].keys[j])) != cmds[i].command )
+ if( cp[i].keys[j] &&
+ (cmd=find_key_command(cp[i].keys[j],cp)) != cp[i].command )
{
- fprintf(stderr, "Error: Key %s assigned to %s and %s !!!\n",
- key2str(cmds[i].keys[j]),
- get_key_command_name(cmds[i].command),
- get_key_command_name(cmd));
+ if( buf )
+#ifdef ENABLE_KEYDEF_SCREEN
+ snprintf(buf, bufsize,
+ _("Key %s assigned to %s and %s (press %s for the key editor)"),
+ key2str(cp[i].keys[j]),
+ get_key_command_name(cp[i].command),
+ get_key_command_name(cmd),
+ get_key_names(CMD_SCREEN_KEYDEF,0));
+#else
+ snprintf(buf, bufsize,
+ _("Error: Key %s assigned to %s and %s !!!\n"),
+ key2str(cp[i].keys[j]),
+ get_key_command_name(cp[i].command),
+ get_key_command_name(cmd));
+#endif
+ else
+ fprintf(stderr,
+ _("Error: Key %s assigned to %s and %s !!!\n"),
+ key2str(cp[i].keys[j]),
+ get_key_command_name(cp[i].command),
+ get_key_command_name(cmd));
+ cp[i].flags |= COMMAND_KEY_CONFLICT;
+ set_key_flags(cp, cmd, COMMAND_KEY_CONFLICT);
retval = -1;
- }
+ }
i++;
}
return retval;
{
int i,j;
+ fprintf(f, "# Key bindings for ncmpc (generated by ncmpc)\n\n");
+
i=0;
while( cmds[i].name && !ferror(f) )
{
- fprintf(f, "# %s\n", cmds[i].description);
- fprintf(f, "key %s = ", cmds[i].name);
- for(j=0; j<MAX_COMMAND_KEYS; j++)
+ if( cmds[i].flags & COMMAND_KEY_MODIFIED )
{
- if( j && cmds[i].keys[j] )
- fprintf(f, ", ");
- if( !j || cmds[i].keys[j] )
+ fprintf(f, "# %s\n", cmds[i].description);
+ fprintf(f, "key %s = ", cmds[i].name);
+ for(j=0; j<MAX_COMMAND_KEYS; j++)
{
- if( cmds[i].keys[j]<256 && (isalpha(cmds[i].keys[j]) ||
- isdigit(cmds[i].keys[j])) )
- fprintf(f, "\'%c\'", cmds[i].keys[j]);
- else
- fprintf(f, "%d", cmds[i].keys[j]);
+ if( j && cmds[i].keys[j] )
+ fprintf(f, ", ");
+ if( !j || cmds[i].keys[j] )
+ {
+ if( cmds[i].keys[j]<256 && (isalpha(cmds[i].keys[j]) ||
+ isdigit(cmds[i].keys[j])) )
+ fprintf(f, "\'%c\'", cmds[i].keys[j]);
+ else
+ fprintf(f, "%d", cmds[i].keys[j]);
+ }
}
+ fprintf(f,"\n\n");
}
- fprintf(f,"\n\n");
i++;
}
return ferror(f);