list_window: reset cursor when list is empty

[ncmpc.git] / src / list_window.c

diff --git a/src/list_window.c b/src/list_window.c
index 5a4ccf36d7906d7f9cffa8d0bb8e34d2313e96b3..9f34f539fc6d212dfcfdff9643611128bab8238a 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -1,6 +1,4 @@
-/* 
- * $Id$
- *
+/*
  * (c) 2004 by Kalle Wallin <kaw@linux.se>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,6 +19,7 @@
 #include "list_window.h"
 #include "config.h"
 #include "options.h"
+#include "charset.h"
 #include "support.h"
 #include "command.h"
 #include "colors.h"
@@ -41,7 +40,6 @@ list_window_init(WINDOW *w, unsigned width, unsigned height)
        lw->w = w;
        lw->cols = width;
        lw->rows = height;
-       lw->clear = 1;
        return lw;
 }
 
@@ -60,7 +58,6 @@ list_window_reset(struct list_window *lw)
        lw->selected = 0;
        lw->xoffset = 0;
        lw->start = 0;
-       lw->clear = 1;
 }
 
 void
@@ -76,7 +73,9 @@ list_window_check_selected(struct list_window *lw, unsigned length)
        if (lw->selected < lw->start)
                lw->selected = lw->start;
 
-       if (length > 0 && lw->selected >= length)
+       if (length == 0)
+               lw->selected = 0;
+       else if (lw->selected >= length)
                lw->selected = length - 1;
 }
 
@@ -94,8 +93,6 @@ list_window_center(struct list_window *lw, unsigned rows, unsigned n)
                else
                        lw->start = 0;
        }
-
-       lw->repaint = lw->clear = 1;
 }
 
 void
@@ -172,15 +169,11 @@ list_window_paint(struct list_window *lw,
        int show_cursor = !(lw->flags & LW_HIDE_CURSOR);
 
        if (show_cursor) {
-               if (lw->selected < lw->start) {
+               if (lw->selected < lw->start)
                        lw->start = lw->selected;
-                       lw->clear=1;
-               }
 
-               if (lw->selected >= lw->start + lw->rows) {
+               if (lw->selected >= lw->start + lw->rows)
                        lw->start = lw->selected - lw->rows + 1;
-                       lw->clear=1;
-               }
        }
 
        for (i = 0; i < lw->rows; i++) {
@@ -189,12 +182,10 @@ list_window_paint(struct list_window *lw,
 
                label = callback(lw->start + i, &highlight, callback_data);
                wmove(lw->w, i, 0);
-               if( lw->clear && (!fill || !label) )
-                       wclrtoeol(lw->w);
 
                if (label) {
                        int selected = lw->start + i == lw->selected;
-                       size_t len = my_strlen(label);
+                       unsigned len = utf8_width(label);
 
                        if (highlight)
                                colors_use(lw->w, COLOR_LIST_BOLD);
@@ -211,10 +202,12 @@ list_window_paint(struct list_window *lw,
 
                        if (selected)
                                wattroff(lw->w, A_REVERSE);
-               }
-       }
 
-       lw->clear=0;
+                       if (!fill && len < lw->cols)
+                               wclrtoeol(lw->w);
+               } else
+                       wclrtoeol(lw->w);
+       }
 }
 
 int
@@ -309,7 +302,6 @@ list_window_cmd(struct list_window *lw, unsigned rows, command_t cmd)
                return 0;
        }
 
-       lw->repaint  = 1;
        return 1;
 }
 
@@ -359,7 +351,6 @@ list_window_scroll_cmd(struct list_window *lw, unsigned rows, command_t cmd)
                return 0;
        }
 
-       lw->repaint = lw->clear = 1;
        return 1;
 }
 
@@ -391,57 +382,3 @@ list_window_mouse(struct list_window *lw, unsigned rows,
        return 0;
 }
 #endif
-
-list_window_state_t *
-list_window_init_state(void)
-{
-       return g_malloc0(sizeof(list_window_state_t));
-}
-
-void
-list_window_free_state(list_window_state_t *state)
-{
-       if (state) {
-               if (state->list) {
-                       GList *list = state->list;
-
-                       while (list) {
-                               g_free(list->data);
-                               list->data = NULL;
-                               list = list->next;
-                       }
-
-                       g_list_free(state->list);
-                       state->list = NULL;
-               }
-
-               g_free(state);
-       }
-}
-
-void
-list_window_push_state(list_window_state_t *state, struct list_window *lw)
-{
-       if (state) {
-               struct list_window *tmp = g_malloc(sizeof(list_window_t));
-               memcpy(tmp, lw, sizeof(list_window_t));
-               state->list = g_list_prepend(state->list, (gpointer) tmp);
-               list_window_reset(lw);
-       }
-}
-
-bool
-list_window_pop_state(list_window_state_t *state, struct list_window *lw)
-{
-       if (state && state->list) {
-               struct list_window *tmp = state->list->data;
-
-               memcpy(lw, tmp, sizeof(list_window_t));
-               g_free(tmp);
-               state->list->data = NULL;
-               state->list = g_list_delete_link(state->list, state->list);
-       }
-
-       // return TRUE if there are still states in the list
-       return (state && state->list) ? TRUE : FALSE;
-}