X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcommand.c;h=f903165f57a113034df735373395a4a5a3d43a7f;hb=373736315529f8b760df043a21ee7526941c8bea;hp=67e0ad3b11a22a0181076fb0aa488dadf8d57403;hpb=44c4e177bf52c70f307d6d528fb62b5c9176a3aa;p=ncmpc.git diff --git a/src/command.c b/src/command.c index 67e0ad3..f903165 100644 --- a/src/command.c +++ b/src/command.c @@ -1,29 +1,27 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2010 The Music Player Daemon Project + * (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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * 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., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + */ #include "command.h" -#include "config.h" -#include "ncmpc.h" #include "i18n.h" -#include "mpdclient.h" -#include "screen.h" +#include "ncmpc_curses.h" +#include #include #include #include @@ -32,14 +30,6 @@ #include #include -#undef DEBUG_KEYS - -#ifdef DEBUG_KEYS -#define DK(x) x -#else -#define DK(x) -#endif - #define KEY_CTL(x) ((x) & 0x1f) /* KEY_CTL(A) == ^A == \1 */ #define BS KEY_BACKSPACE @@ -64,6 +54,7 @@ #define F6 KEY_F(6) #define F7 KEY_F(7) #define F8 KEY_F(8) +#define F9 KEY_F(9) #define C(x) KEY_CTL(x) static command_definition_t cmds[] = { @@ -96,9 +87,9 @@ static command_definition_t cmds[] = { { { 'v', 0, 0 }, 0, CMD_LIST_RANGE_SELECT, "range-select", N_("Range selection") }, { { C('N'), 0, 0 }, 0, CMD_LIST_SCROLL_DOWN_LINE, "scroll-down-line", - N_("Scroll up one line") }, - { { C('B'), 0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line", N_("Scroll down one line") }, + { { C('B'), 0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line", + N_("Scroll up one line") }, { { 'N', 0, 0 }, 0, CMD_LIST_SCROLL_DOWN_HALF, "scroll-down-half", N_("Scroll up half a screen") }, { { 'B', 0, 0 }, 0, CMD_LIST_SCROLL_UP_HALF, "scroll-up-half", @@ -111,7 +102,7 @@ static command_definition_t cmds[] = { { { '1', F1, 'h' }, 0, CMD_SCREEN_HELP, "screen-help", N_("Help screen") }, { { '2', F2, 0 }, 0, CMD_SCREEN_PLAY, "screen-playlist", - N_("Playlist screen") }, + N_("Queue screen") }, { { '3', F3, 0 }, 0, CMD_SCREEN_FILE, "screen-browse", N_("Browse screen") }, @@ -138,15 +129,15 @@ static command_definition_t cmds[] = { { { '-', LEFT, 0 }, 0, CMD_VOLUME_DOWN, "volume-down", N_("Decrease volume") }, { { ' ', 0, 0 }, 0, CMD_SELECT, "select", - N_("Select/deselect song in playlist") }, + N_("Select/deselect song in queue") }, { { '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") }, + N_("Delete song from queue") }, { { 'Z', 0, 0 }, 0, CMD_SHUFFLE, "shuffle", - N_("Shuffle playlist") }, + N_("Shuffle queue") }, { { 'c', 0, 0 }, 0, CMD_CLEAR, "clear", - N_("Clear playlist") }, + N_("Clear queue") }, { { 'r', 0, 0 }, 0, CMD_REPEAT, "repeat", N_("Toggle repeat mode") }, { { 'z', 0, 0 }, 0, CMD_RANDOM, "random", @@ -160,9 +151,9 @@ static command_definition_t cmds[] = { { { C('U'), 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") }, + N_("Save queue") }, { { 'a', 0, 0 }, 0, CMD_ADD, "add", - N_("Add url/file to playlist") }, + N_("Add url/file to queue") }, { { '!', 0, 0 }, 0, CMD_GO_ROOT_DIRECTORY, "go-root-directory", N_("Go to root directory") }, @@ -241,6 +232,10 @@ static command_definition_t cmds[] = { N_("Interrupt action") }, { {'u', 0, 0 }, 0, CMD_LYRICS_UPDATE, "lyrics-update", N_("Update Lyrics") }, + /* this command may move out of #ifdef ENABLE_LYRICS_SCREEN + at some point */ + { {'e', 0, 0 }, 0, CMD_EDIT, "edit", + N_("Edit the current item") }, #endif #ifdef ENABLE_OUTPUTS_SCREEN @@ -248,6 +243,10 @@ static command_definition_t cmds[] = { N_("Outputs screen") }, #endif +#ifdef ENABLE_CHAT_SCREEN + { {'9', F9, 0}, 0, CMD_SCREEN_CHAT, "screen-chat", + N_("Chat screen") }, +#endif { { -1, -1, -1 }, 0, CMD_NONE, NULL, NULL } }; @@ -258,16 +257,35 @@ get_command_definitions(void) { return cmds; } + +size_t +get_cmds_max_name_width(command_definition_t *c) +{ + static size_t max = 0; + + if (max != 0) + return max; + + for (command_definition_t *p = c; p->name != NULL; p++) { + /* + * width and length are considered the same here, as command + * names are not translated. + */ + size_t len = strlen(p->name); + if (len > max) + max = len; + } + + return max; +} #endif const char * key2str(int key) { - static char buf[32]; - int i; - - buf[0] = 0; switch(key) { + static char buf[32]; + case 0: return _("Undefined"); case ' ': @@ -303,78 +321,66 @@ key2str(int key) case KEY_IC: return _("Insert"); default: - for (i = 0; i <= 63; i++) + for (int i = 0; i <= 63; i++) if (key == KEY_F(i)) { - g_snprintf(buf, 32, "F%d", i ); + g_snprintf(buf, 32, _("F%d"), i ); return buf; } if (!(key & ~037)) - g_snprintf(buf, 32, "Ctrl-%c", 'A'+(key & 037)-1 ); + g_snprintf(buf, 32, _("Ctrl-%c"), 'A'+(key & 037)-1 ); else if ((key & ~037) == 224) - g_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) g_snprintf(buf, 32, "%c", key); else g_snprintf(buf, 32, "0x%03X", key); + return buf; } - - return buf; } void command_dump_keys(void) { - int i = 0; - - while (cmds[i].description) { + for (size_t i = 0; cmds[i].description; i++) if (cmds[i].command != CMD_NONE) - printf(" %20s : %s\n", get_key_names(cmds[i].command,1),cmds[i].name); - i++; - } + printf(" %20s : %s\n", + get_key_names(cmds[i].command, true), + cmds[i].name); } #ifndef NCMPC_MINI -static int +static void set_key_flags(command_definition_t *cp, command_t command, int flags) { - int i = 0; - - while (cp[i].name) { + for (size_t i = 0; cp[i].name; i++) { if (cp[i].command == command) { cp[i].flags |= flags; - return 0; + break; } - i++; } - - return 1; } #endif const char * -get_key_names(command_t command, int all) +get_key_names(command_t command, bool all) { - int i = 0; - - while (cmds[i].description) { + for (int i = 0; cmds[i].description; i++) { if (cmds[i].command == command) { - int j; static char keystr[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) { + + for (unsigned j = 1; j < MAX_COMMAND_KEYS && + cmds[i].keys[j] > 0; j++) { g_strlcat(keystr, " ", sizeof(keystr)); g_strlcat(keystr, key2str(cmds[i].keys[j]), sizeof(keystr)); - j++; } return keystr; } - i++; } return NULL; } @@ -382,13 +388,9 @@ get_key_names(command_t command, int all) const char * get_key_description(command_t command) { - int i = 0; - - while (cmds[i].description) { + for (size_t i = 0; cmds[i].description; i++) if (cmds[i].command == command) return _(cmds[i].description); - i++; - } return NULL; } @@ -396,41 +398,33 @@ get_key_description(command_t command) const char * get_key_command_name(command_t command) { - int i = 0; - - while (cmds[i].name) { + for (size_t i = 0; cmds[i].name; i++) if (cmds[i].command == command) return cmds[i].name; - i++; - } + return NULL; } command_t -get_key_command_from_name(char *name) +get_key_command_from_name(const char *name) { - int i = 0; - - while (cmds[i].name) { + for (size_t i = 0; cmds[i].name; i++) if (strcmp(name, cmds[i].name) == 0) return cmds[i].command; - i++; - } return CMD_NONE; } command_t -find_key_command(int key, command_definition_t *c) +find_key_command(int key, const command_definition_t *c) { - int i = 0; - - while (key && c && c[i].name) { - if (c[i].keys[0] == key || - c[i].keys[1] == key || - c[i].keys[2] == key) - return c[i].command; - i++; + assert(key != 0); + assert(c != NULL); + + for (size_t i = 0; c[i].name; i++) { + for (int j = 0; j < MAX_COMMAND_KEYS; j++) + if (c[i].keys[j] == key) + return c[i].command; } return CMD_NONE; @@ -442,59 +436,36 @@ get_key_command(int key) return find_key_command(key, cmds); } -command_t -get_keyboard_command(void) -{ - int key; - - key = wgetch(stdscr); - if (key == ERR) - return CMD_NONE; - -#ifdef HAVE_GETMOUSE - if (key == KEY_MOUSE) - return CMD_MOUSE_EVENT; -#endif - - return get_key_command(key); -} - -int +bool assign_keys(command_t command, int keys[MAX_COMMAND_KEYS]) { - int i = 0; - - while (cmds[i].name) { + for (size_t i = 0; cmds[i].name; i++) { if (cmds[i].command == command) { memcpy(cmds[i].keys, keys, sizeof(int)*MAX_COMMAND_KEYS); #ifndef NCMPC_MINI cmds[i].flags |= COMMAND_KEY_MODIFIED; #endif - return 0; + return true; } - i++; } - return -1; + + return false; } #ifndef NCMPC_MINI -int +bool check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize) { - int i = 0; - int retval = 0; + bool success = true; if (cp == NULL) cp = cmds; - while (cp[i].name) { + for (size_t i = 0; cp[i].name; i++) cp[i].flags &= ~COMMAND_KEY_CONFLICT; - i++; - } - i = 0; - while (cp[i].name) { + for (size_t i = 0; cp[i].name; i++) { int j; command_t cmd; @@ -517,30 +488,28 @@ check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize) } cp[i].flags |= COMMAND_KEY_CONFLICT; set_key_flags(cp, cmd, COMMAND_KEY_CONFLICT); - retval = -1; + success = false; } } - i++; } - return retval; + + return success; } -int +bool write_key_bindings(FILE *f, int flags) { - int i = 0, j; - if (flags & KEYDEF_WRITE_HEADER) fprintf(f, "## Key bindings for ncmpc (generated by ncmpc)\n\n"); - while (cmds[i].name && !ferror(f)) { + for (size_t i = 0; cmds[i].name && !ferror(f); i++) { if (cmds[i].flags & COMMAND_KEY_MODIFIED || flags & KEYDEF_WRITE_ALL) { 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++) { + for (int j = 0; j < MAX_COMMAND_KEYS; j++) { if (j && cmds[i].keys[j]) fprintf(f, ", "); if (!j || cmds[i].keys[j]) { @@ -553,10 +522,9 @@ write_key_bindings(FILE *f, int flags) } fprintf(f,"\n\n"); } - i++; } - return ferror(f); + return ferror(f) == 0; } -#endif +#endif /* NCMPC_MINI */