screen_browser: convert path only for the message

[ncmpc.git] / src / screen_browser.c

diff --git a/src/screen_browser.c b/src/screen_browser.c
index c795414ba916cf4b3187928d324581618cb0d5fd..8802e5f93bb1eab29ed8d8ace445048a8fea495f 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -30,6 +30,9 @@
 #include "strfsong.h"
 #include "mpdclient.h"
 #include "filelist.h"
+#include "colors.h"
+#include "paint.h"
+#include "song_paint.h"
 
 #include <mpd/client.h>
 
@@ -72,8 +75,8 @@ screen_browser_sync_highlights(struct filelist *fl,
 #endif
 
 /* list_window callback */
-const char *
-browser_lw_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char **second_column, void *data)
+static const char *
+browser_lw_callback(unsigned idx, void *data)
 {
        const struct filelist *fl = (const struct filelist *) data;
        static char buf[BUFSIZE];
@@ -87,22 +90,15 @@ browser_lw_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char **second_c
        assert(entry != NULL);
 
        entity = entry->entity;
-#ifndef NCMPC_MINI
-       *highlight = (entry->flags & HIGHLIGHT) != 0;
-#else
-       *highlight = false;
-#endif
 
        if( entity == NULL )
-               return "[..]";
+               return "..";
 
        if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY) {
                const struct mpd_directory *dir =
                        mpd_entity_get_directory(entity);
                char *directory = utf8_to_locale(g_basename(mpd_directory_get_path(dir)));
-
-               g_snprintf(buf, BUFSIZE, "[%s]", directory);
-               g_free(directory);
+               g_strlcpy(buf, directory, sizeof(buf));
                return buf;
        } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) {
                const struct mpd_song *song = mpd_entity_get_song(entity);
@@ -126,16 +122,17 @@ static bool
 load_playlist(struct mpdclient *c, const struct mpd_playlist *playlist)
 {
        struct mpd_connection *connection = mpdclient_get_connection(c);
-       char *filename = utf8_to_locale(mpd_playlist_get_path(playlist));
 
        if (mpd_run_load(connection, mpd_playlist_get_path(playlist))) {
+               char *filename = utf8_to_locale(mpd_playlist_get_path(playlist));
                screen_status_printf(_("Loading playlist %s..."),
                                     g_basename(filename));
+               g_free(filename);
+
                c->events |= MPD_IDLE_QUEUE;
        } else
                mpdclient_handle_error(c);
 
-       g_free(filename);
        return true;
 }
 
@@ -384,6 +381,10 @@ browser_handle_mouse_event(struct screen_browser *browser, struct mpdclient *c)
 }
 #endif
 
+static void
+screen_browser_paint_callback(WINDOW *w, unsigned i, unsigned y,
+                             unsigned width, bool selected, void *data);
+
 bool
 browser_cmd(struct screen_browser *browser,
            struct mpdclient *c, command_t cmd)
@@ -405,7 +406,8 @@ browser_cmd(struct screen_browser *browser,
                            browser->filelist);
                return true;
        case CMD_LIST_JUMP:
-               screen_jump(browser->lw, browser_lw_callback, browser->filelist);
+               screen_jump(browser->lw, browser_lw_callback,
+                           screen_browser_paint_callback, browser->filelist);
                return true;
 
 #ifdef HAVE_GETMOUSE
@@ -477,3 +479,97 @@ browser_cmd(struct screen_browser *browser,
 
        return false;
 }
+
+static void
+screen_browser_paint_directory(WINDOW *w, unsigned width,
+                              bool selected, const char *name)
+{
+       row_color(w, COLOR_DIRECTORY, selected);
+
+       waddch(w, '[');
+       waddstr(w, name);
+       waddch(w, ']');
+
+       /* erase the unused space after the text */
+       row_clear_to_eol(w, width, selected);
+}
+
+static void
+screen_browser_paint_playlist(WINDOW *w, unsigned width,
+                             bool selected, const char *name)
+{
+       row_paint_text(w, width, COLOR_PLAYLIST, selected, name);
+}
+
+static void
+screen_browser_paint_callback(WINDOW *w, unsigned i,
+                             unsigned y, unsigned width,
+                             bool selected, void *data)
+{
+       const struct filelist *fl = (const struct filelist *) data;
+       const struct filelist_entry *entry;
+       const struct mpd_entity *entity;
+       bool highlight;
+       const struct mpd_directory *directory;
+       const struct mpd_playlist *playlist;
+       char *p;
+
+       assert(fl != NULL);
+       assert(i < filelist_length(fl));
+
+       entry = filelist_get(fl, i);
+       assert(entry != NULL);
+
+       entity = entry->entity;
+       if (entity == NULL) {
+               screen_browser_paint_directory(w, width, selected, "..");
+               return;
+       }
+
+#ifndef NCMPC_MINI
+       highlight = (entry->flags & HIGHLIGHT) != 0;
+#else
+       highlight = false;
+#endif
+
+       if (highlight)
+               colors_use(w, COLOR_LIST_BOLD);
+       else
+               colors_use(w, COLOR_LIST);
+
+       switch (mpd_entity_get_type(entity)) {
+       case MPD_ENTITY_TYPE_DIRECTORY:
+               directory = mpd_entity_get_directory(entity);
+               p = utf8_to_locale(g_basename(mpd_directory_get_path(directory)));
+               screen_browser_paint_directory(w, width, selected, p);
+               g_free(p);
+               break;
+
+       case MPD_ENTITY_TYPE_SONG:
+               paint_song_row(w, y, width, selected, highlight,
+                              mpd_entity_get_song(entity));
+               break;
+
+       case MPD_ENTITY_TYPE_PLAYLIST:
+               playlist = mpd_entity_get_playlist(entity);
+               p = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist)));
+               screen_browser_paint_playlist(w, width, selected, p);
+               g_free(p);
+               break;
+
+       default:
+               waddstr(w, "<unknown>");
+       }
+
+       whline(w, ' ', width);
+
+       if (selected)
+               wattroff(w, A_REVERSE);
+}
+
+void
+screen_browser_paint(const struct screen_browser *browser)
+{
+       list_window_paint2(browser->lw, screen_browser_paint_callback,
+                          browser->filelist);
+}