command: move get_keyboard_command() to keyboard.c

[ncmpc.git] / src / song_paint.c

diff --git a/src/song_paint.c b/src/song_paint.c
index 5b7966be18bb877c9476c507365efb8cf59015f4..3b55eaf7c2d88136d3e012fe09d87e46dc1d27f2 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-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,12 +15,14 @@
  * 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 "song_paint.h"
 #include "paint.h"
 #include "strfsong.h"
 #include "utils.h"
+#include "hscroll.h"
+#include "charset.h"
 #include "config.h"
 
 #include <mpd/client.h>
@@ -30,23 +32,30 @@
 #include <string.h>
 
 void
-paint_song_row(WINDOW *w, G_GNUC_UNUSED unsigned y, unsigned width,
-              bool selected, bool highlight, const struct mpd_song *song)
+paint_song_row(WINDOW *w, gcc_unused unsigned y, unsigned width,
+              bool selected, bool highlight, const struct mpd_song *song,
+              gcc_unused struct hscroll *hscroll, const char *format)
 {
        char buffer[width * 4];
 
-       strfsong(buffer, sizeof(buffer), options.list_format, song);
+       strfsong(buffer, sizeof(buffer), format, song);
        row_paint_text(w, width, highlight ? COLOR_LIST_BOLD : COLOR_LIST,
                       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
 }