![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/command.c b/src/command.c
index 57f90d437d2b80f722c214c6931ef13cfe73b76f..733bf6a314567d26a04b78a4c84e26848b1f5640 100644 (file)
--- a/src/command.c
+++ b/src/command.c
#include <string.h>
#include <ctype.h>
#include <glib.h>
+#include <signal.h>
#include <ncurses.h>
#include "config.h"
#include "ncmpc.h"
#include "command.h"
+#include "mpdclient.h"
+#include "screen.h"
#undef DEBUG_KEYS
#define DK(x)
#endif
-extern void screen_resize(void);
-
#define BS KEY_BACKSPACE
#define DEL KEY_DC
#define UP KEY_UP
#define F4 KEY_F(4)
#define F5 KEY_F(5)
#define F6 KEY_F(6)
+#define F7 KEY_F(7)
static command_definition_t cmds[] =
{
- { { 13, 0, 0 }, CMD_PLAY, "play",
+#ifdef ENABLE_KEYDEF_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 }, CMD_PAUSE,"pause",
+ { { 'P', 0, 0 }, 0, CMD_PAUSE,"pause",
N_("Pause") },
- { { 's', BS, 0 }, CMD_STOP, "stop",
+ { { 's', BS, 0 }, 0, CMD_STOP, "stop",
N_("Stop") },
- { { '>', 0, 0 }, CMD_TRACK_NEXT, "next",
+ { { '>', 0, 0 }, 0, CMD_TRACK_NEXT, "next",
N_("Next track") },
- { { '<', 0, 0 }, CMD_TRACK_PREVIOUS, "prev",
+ { { '<', 0, 0 }, 0, CMD_TRACK_PREVIOUS, "prev",
N_("Previous track") },
- { { 'f', 0, 0 }, CMD_SEEK_FORWARD, "seek-forward",
+ { { 'f', 0, 0 }, 0, CMD_SEEK_FORWARD, "seek-forward",
N_("Seek forward") },
- { { 'b', 0, 0 }, CMD_SEEK_BACKWARD, "seek-backward",
+ { { 'b', 0, 0 }, 0, CMD_SEEK_BACKWARD, "seek-backward",
N_("Seek backward") },
-
- { { '+', RGHT, 0 }, CMD_VOLUME_UP, "volume-up",
+ { { '+', RGHT, 0 }, 0, CMD_VOLUME_UP, "volume-up",
N_("Increase volume") },
- { { '-', LEFT, 0 }, CMD_VOLUME_DOWN, "volume-down",
+ { { '-', LEFT, 0 }, 0, CMD_VOLUME_DOWN, "volume-down",
N_("Decrease volume") },
-
- { { 'w', 0, 0 }, CMD_TOGGLE_FIND_WRAP, "wrap-mode",
- N_("Toggle find mode") },
- { { 'U', 0, 0 }, CMD_TOGGLE_AUTOCENTER, "autocenter-mode",
- N_("Toggle auto center mode") },
-
- { { ' ', 0, 0 }, CMD_SELECT, "select",
+ { { ' ', 0, 0 }, 0, CMD_SELECT, "select",
N_("Select/deselect song in playlist") },
- { { DEL, 'd', 0 }, CMD_DELETE, "delete",
+ { { 't', 0, 0 }, 0, CMD_SELECT_ALL, "select_all",
+ N_("Select all listed items") },
+ { { DEL, 'd', 0 }, 0, CMD_DELETE, "delete",
N_("Delete song from playlist") },
- { { 'Z', 0, 0 }, CMD_SHUFFLE, "shuffle",
+ { { 'Z', 0, 0 }, 0, CMD_SHUFFLE, "shuffle",
N_("Shuffle playlist") },
- { { 'c', 0, 0 }, CMD_CLEAR, "clear",
+ { { 'c', 0, 0 }, 0, CMD_CLEAR, "clear",
N_("Clear playlist") },
- { { 'r', 0, 0 }, CMD_REPEAT, "repeat",
+ { { 'r', 0, 0 }, 0, CMD_REPEAT, "repeat",
N_("Toggle repeat mode") },
- { { 'z', 0, 0 }, CMD_RANDOM, "random",
+ { { 'z', 0, 0 }, 0, CMD_RANDOM, "random",
N_("Toggle random mode") },
- { { 'x', 0, 0 }, CMD_CROSSFADE, "crossfade",
+ { { 'x', 0, 0 }, 0, CMD_CROSSFADE, "crossfade",
N_("Toggle crossfade mode") },
- { { 21, 0, 0 }, CMD_DB_UPDATE, "db-update",
+ { { 21, 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
N_("Start a music database update") },
-
- { { 'S', 0, 0 }, CMD_SAVE_PLAYLIST, "save",
+ { { 'S', 0, 0 }, 0, CMD_SAVE_PLAYLIST, "save",
N_("Save playlist") },
- { { 'a', 0, 0 }, CMD_ADD, "add",
+ { { 'a', 0, 0 }, 0, CMD_ADD, "add",
N_("Add url/file to playlist") },
- { { 0, 0, 0 }, CMD_LIST_MOVE_UP, "move-up",
+ { { '!', 0, 0 }, 0, CMD_GO_ROOT_DIRECTORY, "go-root-directory",
+ N_("Go to root directory") },
+ { { '"', 0, 0 }, 0, CMD_GO_PARENT_DIRECTORY, "go-parent-directory",
+ N_("Go to parent directory") },
+
+ /* lists */
+ { { 11, 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
N_("Move item up") },
- { { 0, 0, 0 }, CMD_LIST_MOVE_DOWN, "move-down",
+ { { 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") },
- { { UP, ',', 0 }, CMD_LIST_PREVIOUS, "up",
- N_("Move cursor up") },
- { { DWN, '.', 0 }, CMD_LIST_NEXT, "down",
- N_("Move cursor down") },
- { { HOME, 0x01, 0 }, CMD_LIST_FIRST, "home",
- N_("Home ") },
- { { END, 0x05, 0 }, CMD_LIST_LAST, "end",
- N_("End ") },
- { { PGUP, 'A', 0 }, CMD_LIST_PREVIOUS_PAGE, "pgup",
- N_("Page up") },
- { { PGDN, 'B', 0 }, CMD_LIST_NEXT_PAGE, "pgdn",
- N_("Page down") },
- { { '/', 0, 0 }, CMD_LIST_FIND, "find",
+
+ /* 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 }, CMD_LIST_FIND_NEXT, "find-next",
+ { { 'n', 0, 0 }, 0, CMD_LIST_FIND_NEXT, "find-next",
N_("Forward find next") },
- { { '?', 0, 0 }, CMD_LIST_RFIND, "rfind",
+ { { '?', 0, 0 }, 0, CMD_LIST_RFIND, "rfind",
N_("Backward find") },
- { { 'p', 0, 0 }, CMD_LIST_RFIND_NEXT, "rfind-next",
+ { { 'p', 0, 0 }, 0, CMD_LIST_RFIND_NEXT, "rfind-next",
N_("Backward find previous") },
- { { TAB, 0, 0 }, CMD_SCREEN_NEXT, "screen-next",
- N_("Next screen") },
-
- { { STAB, 0, 0 }, CMD_SCREEN_PREVIOUS, "screen-prev",
- N_("Previous screen") },
+ /* extra screens */
+#ifdef ENABLE_ARTIST_SCREEN
+ { {'4', F4, 0 }, 0, CMD_SCREEN_ARTIST, "screen-artist",
+ N_("Artist screen") },
+#endif
+#ifdef ENABLE_SEARCH_SCREEN
+ { {'5', F5, 0 }, 0, CMD_SCREEN_SEARCH, "screen-search",
+ N_("Search screen") },
+ { {'m', 0, 0 }, 0, CMD_SEARCH_MODE, "search-mode",
+ N_("Change search mode") },
+#endif
- { { '1', F1, 'h' }, CMD_SCREEN_HELP, "screen-help",
- N_("Help screen") },
- { { '2', F2, 0 }, CMD_SCREEN_PLAY, "screen-playlist",
- N_("Playlist screen") },
- { { '3', F3, 0 }, CMD_SCREEN_FILE, "screen-browse",
- N_("Browse screen") },
- { {'u', 0, 0 }, CMD_SCREEN_UPDATE, "update",
- N_("Update screen") },
#ifdef ENABLE_CLOCK_SCREEN
- { {'4', F4, 0 }, CMD_SCREEN_CLOCK, "screen-clock",
+ { {'6', F6, 0 }, 0, CMD_SCREEN_CLOCK, "screen-clock",
N_("Clock screen") },
#endif
-#ifdef ENABLE_KEYDEF_SCREEN
- { {'K', 0, 0 }, CMD_SCREEN_KEYDEF, "screen-keyedit",
- N_("Key configuration screen") },
+#ifdef ENABLE_LYRICS_SCREEN
+ { {'7', F7, 0 }, 0, CMD_SCREEN_LYRICS, "screen-lyrics",
+ N_("Lyrics screen") },
+ { {ESC, 0, 0 }, 0, CMD_INTERRUPT, "lyrics-interrupt",
+ N_("Interrupt action") },
+ { {'u', 0, 0 }, 0, CMD_LYRICS_UPDATE, "lyrics-update",
+ N_("Update Lyrics") },
#endif
- { { 'q', 'Q', 3 }, CMD_QUIT, "quit",
- N_("Quit") },
- { { -1, -1, -1 }, CMD_NONE, NULL, NULL }
+ { { -1, -1, -1 }, 0, CMD_NONE, NULL, NULL }
};
command_definition_t *
return cmds;
}
-char *
+const char *
key2str(int key)
{
static char buf[32];
for(i=0; i<=63; i++)
if( key==KEY_F(i) )
{
- snprintf(buf, 32, "F%d", i );
+ g_snprintf(buf, 32, "F%d", i );
return buf;
}
if( !(key & ~037) )
- snprintf(buf, 32, "Ctrl-%c", 'A'+(key & 037)-1 );
+ g_snprintf(buf, 32, "Ctrl-%c", 'A'+(key & 037)-1 );
else if( (key & ~037) == 224 )
- snprintf(buf, 32, "Alt-%c", 'A'+(key & 037)-1 );
+ g_snprintf(buf, 32, "Alt-%c", 'A'+(key & 037)-1 );
else if( key>32 && key<256 )
- snprintf(buf, 32, "%c", key);
+ g_snprintf(buf, 32, "%c", key);
else
- snprintf(buf, 32, "0x%03X", key);
+ g_snprintf(buf, 32, "0x%03X", key);
}
return buf;
}
}
}
-char *
+static 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;
+}
+
+const char *
get_key_names(command_t command, int all)
{
int i;
int j;
static char keystr[80];
- strncpy(keystr, key2str(cmds[i].keys[0]), 80);
+ g_strlcpy(keystr, key2str(cmds[i].keys[0]), sizeof(keystr));
if( !all )
return keystr;
j=1;
while( j<MAX_COMMAND_KEYS && cmds[i].keys[j]>0 )
{
- strcat(keystr, " ");
- strcat(keystr, key2str(cmds[i].keys[j]));
+ g_strlcat(keystr, " ", sizeof(keystr));
+ g_strlcat(keystr, key2str(cmds[i].keys[j]), sizeof(keystr));
j++;
}
return keystr;
return NULL;
}
-char *
+const char *
get_key_description(command_t command)
{
int i;
return NULL;
}
-char *
+const char *
get_key_command_name(command_t command)
{
int i;
}
-command_t
+command_t
find_key_command(int key, command_definition_t *cmds)
{
- int i;
+ int i;
+
+ i=0;
+ while (key && cmds && cmds[i].name) {
+ if (cmds[i].keys[0] == key ||
+ cmds[i].keys[1] == key ||
+ cmds[i].keys[2] == key)
+ return cmds[i].command;
+ i++;
+ }
- i=0;
- while( cmds && cmds[i].name )
- {
- if( cmds[i].keys[0] == key ||
- cmds[i].keys[1] == key ||
- cmds[i].keys[2] == key )
- return cmds[i].command;
- i++;
- }
- return CMD_NONE;
+ return CMD_NONE;
}
command_t
return find_key_command(key, cmds);
}
+int
+my_wgetch(WINDOW *w)
+{
+ int c;
+
+ c = wgetch(w);
+
+ /* handle resize event */
+ if( c==KEY_RESIZE )
+ screen_resize();
+
+#ifdef ENABLE_RAW_MODE
+ /* handle SIGSTOP (Ctrl-Z) */
+ if( c==26 || c==407 )
+ sigstop();
+ /* handle SIGINT (Ctrl-C) */
+ if( c==3 )
+ exit(EXIT_SUCCESS);
+#endif
+
+ return c;
+}
+
command_t
get_keyboard_command_with_timeout(int ms)
{
if( ms != SCREEN_TIMEOUT)
timeout(ms);
- key = wgetch(stdscr);
+ key = my_wgetch(stdscr);
if( ms != SCREEN_TIMEOUT)
timeout(SCREEN_TIMEOUT);
- if( key==KEY_RESIZE )
- screen_resize();
-
if( key==ERR )
return CMD_NONE;
+#ifdef HAVE_GETMOUSE
+ if( key==KEY_MOUSE )
+ return CMD_MOUSE_EVENT;
+#endif
+
return get_key_command(key);
}
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
+ g_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
+ g_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
-write_key_bindings(FILE *f)
+write_key_bindings(FILE *f, int flags)
{
int i,j;
+ if( flags & KEYDEF_WRITE_HEADER )
+ 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 || flags & KEYDEF_WRITE_ALL)
{
- if( j && cmds[i].keys[j] )
- fprintf(f, ", ");
- if( !j || cmds[i].keys[j] )
+ fprintf(f, "## %s\n", cmds[i].description);
+ if( flags & KEYDEF_COMMENT_ALL )
+ fprintf(f, "#");
+ 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);