mpdclient: fall back to simple "deleteid" if range is 1

[ncmpc.git] / src / screen_text.c

diff --git a/src/screen_text.c b/src/screen_text.c
index 6f642e8498bb570c356df2bb855fd03d48291e28..a80b56240b09ecc18c22d21ce7b6ebf32ba4b175 100644 (file)
--- a/src/screen_text.c
+++ b/src/screen_text.c
@@ -18,7 +18,7 @@
 */
 
 #include "screen_text.h"
-#include "screen_utils.h"
+#include "screen_find.h"
 #include "charset.h"
 
 #include <assert.h>
@@ -33,6 +33,7 @@ screen_text_clear(struct screen_text *text)
                g_free(g_ptr_array_index(text->lines, i));
 
        g_ptr_array_set_size(text->lines, 0);
+       list_window_set_length(text->lw, 0);
 }
 
 void
@@ -74,6 +75,8 @@ screen_text_set(struct screen_text *text, const GString *str)
 
        if (*p != 0)
                g_ptr_array_add(text->lines, g_strdup(p));
+
+       list_window_set_length(text->lw, text->lines->len);
 }
 
 const char *
@@ -84,8 +87,7 @@ screen_text_list_callback(unsigned idx, G_GNUC_UNUSED bool *highlight,
        static char buffer[256];
        char *value;
 
-       if (idx >= text->lines->len)
-               return NULL;
+       assert(idx < text->lines->len);
 
        value = utf8_to_locale(g_ptr_array_index(text->lines, idx));
        g_strlcpy(buffer, value, sizeof(buffer));
@@ -98,17 +100,15 @@ bool
 screen_text_cmd(struct screen_text *text,
                G_GNUC_UNUSED struct mpdclient *c, command_t cmd)
 {
-       if (list_window_scroll_cmd(text->lw, text->lines->len, cmd)) {
+       if (list_window_scroll_cmd(text->lw, cmd)) {
                screen_text_repaint(text);
                return true;
        }
 
-       text->lw->selected = text->lw->start + text->lw->rows;
-       if (screen_find(text->lw, text->lines->len,
-                       cmd, screen_text_list_callback, text)) {
+       list_window_set_cursor(text->lw, text->lw->start);
+       if (screen_find(text->lw, cmd, screen_text_list_callback, text)) {
                /* center the row */
-               list_window_center(text->lw, text->lines->len,
-                                  text->lw->selected);
+               list_window_center(text->lw, text->lw->selected);
                screen_text_repaint(text);
                return true;
        }