diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 6585bc45825e7aa331689eef64a9dd1f2405d371..6e19d8d2bb924cb62a38e89bd4f157cffb4415fd 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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 "screen_keydef.h"
#include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "screen_find.h"
#include "i18n.h"
#include "conf.h"
#include "screen.h"
#include "screen_utils.h"
+#include <assert.h>
#include <errno.h>
#include <string.h>
#include <glib.h>
}
static const char *
-list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char** sc, G_GNUC_UNUSED void *data)
+list_callback(unsigned idx, G_GNUC_UNUSED void *data)
{
static char buf[BUFSIZE];
if (subcmd < 0) {
- if (idx < (unsigned)command_list_length) {
- if (cmds[idx].flags & COMMAND_KEY_CONFLICT)
- *highlight = true;
- return cmds[idx].name;
- } else if (idx == LIST_ITEM_APPLY())
+ 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 < 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;
- } else if (idx == subcmd_addpos) {
+ if (idx == subcmd_addpos) {
g_snprintf(buf, BUFSIZE, "%d. %s",
idx + 1, _("Add new key"));
return buf;
}
- }
- return NULL;
+ 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_resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ list_window_resize(lw, cols, rows);
}
static void