![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/command.c b/src/command.c
index 67e0ad3b11a22a0181076fb0aa488dadf8d57403..9495b79aa5ea62301478d9ee0e433c8315824194 100644 (file)
--- a/src/command.c
+++ b/src/command.c
/* 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
* 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 <signal.h>
#include <unistd.h>
-#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
#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[] = {
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
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 }
};
{
return cmds;
}
+
+size_t
+get_cmds_max_name_width(command_definition_t *c)
+{
+ static size_t max = 0;
+
+ if (max != 0)
+ return max;
+
+ size_t len;
+ command_definition_t *p;
+
+ for (p = c; p->name != NULL; p++) {
+ /*
+ * width and length are considered the same here, as command
+ * names are not translated.
+ */
+ len = (size_t) strlen(p->name);
+ if (len > max)
+ max = len;
+ }
+
+ return max;
+}
#endif
const char *
default:
for (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
void
command_dump_keys(void)
{
- int i = 0;
-
- while (cmds[i].description) {
+ for (int 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 (int 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 (int 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;
}
const char *
get_key_description(command_t command)
{
- int i = 0;
-
- while (cmds[i].description) {
+ for (int i = 0; cmds[i].description; i++)
if (cmds[i].command == command)
return _(cmds[i].description);
- i++;
- }
return NULL;
}
const char *
get_key_command_name(command_t command)
{
- int i = 0;
-
- while (cmds[i].name) {
+ for (int 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)
{
- int i = 0;
-
- while (cmds[i].name) {
+ for (int 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)
{
- 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 (int 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;
int key;
key = wgetch(stdscr);
- if (key == ERR)
+ if (key == ERR || key == '\0')
return CMD_NONE;
#ifdef HAVE_GETMOUSE
int
assign_keys(command_t command, int keys[MAX_COMMAND_KEYS])
{
- int i = 0;
-
- while (cmds[i].name) {
+ for (int i = 0; cmds[i].name; i++) {
if (cmds[i].command == command) {
memcpy(cmds[i].keys, keys, sizeof(int)*MAX_COMMAND_KEYS);
#ifndef NCMPC_MINI
#endif
return 0;
}
- i++;
}
+
return -1;
}
int
check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize)
{
- int i = 0;
+ int i;
int retval = 0;
if (cp == NULL)
cp = cmds;
- while (cp[i].name) {
+ for (i = 0; cp[i].name; i++)
cp[i].flags &= ~COMMAND_KEY_CONFLICT;
- i++;
- }
- i = 0;
- while (cp[i].name) {
+ for (i = 0; cp[i].name; i++) {
int j;
command_t cmd;
retval = -1;
}
}
- i++;
}
+
return retval;
}
int
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 (int 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]) {
}
fprintf(f,"\n\n");
}
- i++;
}
return ferror(f);
}
-#endif
+#endif /* NCMPC_MINI */