screen_song: make Path a proper label

[ncmpc.git] / src / screen_keydef.c

diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 6585bc45825e7aa331689eef64a9dd1f2405d371..8ecc003ac94cc0493a0c6daaef125dafc9cb5769 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -1,5 +1,5 @@
 /* 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
@@ -26,6 +26,7 @@
 #include "screen.h"
 #include "screen_utils.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <glib.h>
@@ -189,38 +190,38 @@ assign_new_key(int cmd_index, int key_index)
 }
 
 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
@@ -232,8 +233,7 @@ keydef_init(WINDOW *w, int cols, int rows)
 static void
 keydef_resize(int cols, int rows)
 {
-       lw->cols = cols;
-       lw->rows = rows;
+       list_window_resize(lw, cols, rows);
 }
 
 static void