screen_interface: make cols/rows unsigned

[ncmpc.git] / src / screen_queue.c

diff --git a/src/screen_queue.c b/src/screen_queue.c
index 0d08bbcb63ce67f3eb8a5dec83681fbc1b74a77a..de6b2a09627f19d7781b5cece0cc225283f396b3 100644 (file)
--- a/src/screen_queue.c
+++ b/src/screen_queue.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 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
@@ -415,7 +415,7 @@ handle_add_to_playlist(struct mpdclient *c)
 }
 
 static void
-screen_queue_init(WINDOW *w, int cols, int rows)
+screen_queue_init(WINDOW *w, unsigned cols, unsigned rows)
 {
        lw = list_window_init(w, cols, rows);
 
@@ -479,7 +479,7 @@ screen_queue_close(void)
 }
 
 static void
-screen_queue_resize(int cols, int rows)
+screen_queue_resize(unsigned cols, unsigned rows)
 {
        list_window_resize(lw, cols, rows);
 }
@@ -504,7 +504,7 @@ screen_queue_title(char *str, size_t size)
 static void
 screen_queue_paint_callback(WINDOW *w, unsigned i,
                            unsigned y, unsigned width,
-                           bool selected, gcc_unused void *data)
+                           bool selected, gcc_unused const void *data)
 {
        assert(playlist != NULL);
        assert(i < playlist_length(playlist));
@@ -519,7 +519,7 @@ screen_queue_paint_callback(WINDOW *w, unsigned i,
 
        paint_song_row(w, y, width, selected,
                       (int)mpd_song_get_id(song) == current_song_id,
-                      song, row_hscroll);
+                      song, row_hscroll, options.list_format);
 }
 
 static void
@@ -548,7 +548,7 @@ screen_queue_update(struct mpdclient *c)
            c->events & MPD_IDLE_QUEUE)
                /* the queue or the current song has changed, we must
                   paint the new version */
-               screen_queue_repaint();
+               screen_queue_paint();
 }
 
 #ifdef HAVE_GETMOUSE
@@ -559,7 +559,7 @@ handle_mouse_event(struct mpdclient *c)
        int row;
        if (screen_get_mouse_event(c, &bstate, &row) ||
            list_window_mouse(lw, bstate, row)) {
-               screen_queue_repaint();
+               screen_queue_paint();
                return true;
        }
 
@@ -593,7 +593,7 @@ handle_mouse_event(struct mpdclient *c)
        }
 
        screen_queue_save_selection();
-       screen_queue_repaint();
+       screen_queue_paint();
 
        return true;
 }
@@ -619,20 +619,20 @@ screen_queue_cmd(struct mpdclient *c, command_t cmd)
 
        if (list_window_cmd(lw, cmd)) {
                screen_queue_save_selection();
-               screen_queue_repaint();
+               screen_queue_paint();
                return true;
        }
 
        switch(cmd) {
        case CMD_SCREEN_UPDATE:
                center_playing_item(c->status, prev_cmd == CMD_SCREEN_UPDATE);
-               screen_queue_repaint();
+               screen_queue_paint();
                return false;
        case CMD_SELECT_PLAYING:
                list_window_set_cursor(lw, playlist_get_index(&c->playlist,
                                                              c->song));
                screen_queue_save_selection();
-               screen_queue_repaint();
+               screen_queue_paint();
                return true;
 
        case CMD_LIST_FIND:
@@ -641,12 +641,12 @@ screen_queue_cmd(struct mpdclient *c, command_t cmd)
        case CMD_LIST_RFIND_NEXT:
                screen_find(lw, cmd, screen_queue_lw_callback, NULL);
                screen_queue_save_selection();
-               screen_queue_repaint();
+               screen_queue_paint();
                return true;
        case CMD_LIST_JUMP:
-               screen_jump(lw, screen_queue_lw_callback, NULL, NULL);
+               screen_jump(lw, screen_queue_lw_callback, NULL, NULL, NULL);
                screen_queue_save_selection();
-               screen_queue_repaint();
+               screen_queue_paint();
                return true;
 
 #ifdef HAVE_GETMOUSE