Merge branch 'master' of git://git.musicpd.org/avuton/ncmpc

[ncmpc.git] / src / song_paint.c

diff --git a/src/song_paint.c b/src/song_paint.c
index 5b7966be18bb877c9476c507365efb8cf59015f4..c8123fdce6a06bf097a30d1edc4260e03c359f85 100644 (file)
--- a/src/song_paint.c
+++ b/src/song_paint.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
@@ -21,6 +21,8 @@
 #include "paint.h"
 #include "strfsong.h"
 #include "utils.h"
+#include "hscroll.h"
+#include "charset.h"
 #include "config.h"
 
 #include <mpd/client.h>
@@ -31,7 +33,8 @@
 
 void
 paint_song_row(WINDOW *w, G_GNUC_UNUSED unsigned y, unsigned width,
-              bool selected, bool highlight, const struct mpd_song *song)
+              bool selected, bool highlight, const struct mpd_song *song,
+              G_GNUC_UNUSED struct hscroll *hscroll)
 {
        char buffer[width * 4];
 
@@ -40,13 +43,19 @@ paint_song_row(WINDOW *w, G_GNUC_UNUSED unsigned y, unsigned width,
                       selected, buffer);
 
 #ifndef NCMPC_MINI
-       if (mpd_song_get_duration(song) > 0) {
+       if (options.second_column && mpd_song_get_duration(song) > 0) {
                char duration[32];
                format_duration_short(duration, sizeof(duration),
                                      mpd_song_get_duration(song));
-               wmove(w, y, width - strlen(duration) - 1);
+               width -= strlen(duration) + 1;
+               wmove(w, y, width);
                waddch(w, ' ');
                waddstr(w, duration);
        }
+
+       if (hscroll != NULL && utf8_width(buffer) >= width) {
+               hscroll_set(hscroll, 0, y, width, buffer);
+               hscroll_draw(hscroll);
+       }
 #endif
 }