unicode fixes from Dmitry Baryshkov/René van Bevern

[ncmpc.git] / src / list_window.c

diff --git a/src/list_window.c b/src/list_window.c
index b541ac708f186602d72518917bbe3861fa612b59..05f5630e9b4e5d6228132a16edcd736a17c71278 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -165,12 +165,9 @@ list_window_paint(list_window_t *lw,
 {
   int i;
   int fill = options.wide_cursor;
+  int show_cursor = !(lw->flags & LW_HIDE_CURSOR);
 
-  if( lw->flags & LW_HIDE_CURSOR )
-    {
-      lw->selected = -1;
-    }
-  else
+  if( show_cursor )
     {
       while( lw->selected < lw->start )
        {
@@ -183,7 +180,7 @@ list_window_paint(list_window_t *lw,
          lw->clear=1;
        }
     }
-
+  
   for(i=0; i<lw->rows; i++)
     {
       int highlight = 0;
@@ -196,17 +193,18 @@ list_window_paint(list_window_t *lw,
       if( label )
        {
          int selected = lw->start+i == lw->selected;
-         size_t len = strlen(label);
+         size_t len = my_strlen(label);
 
          if( highlight )
            colors_use(lw->w, COLOR_LIST_BOLD);
          else
            colors_use(lw->w, COLOR_LIST);
 
-         if( selected )
+         if( show_cursor && selected )
            wattron(lw->w, A_REVERSE);
          
-         waddnstr(lw->w, label, lw->cols);
+         //waddnstr(lw->w, label, lw->cols);
+         waddnstr(lw->w, label);
          if( fill && len<lw->cols )
            mvwhline(lw->w, i, len, ' ', lw->cols-len);
 
@@ -245,6 +243,8 @@ list_window_find(list_window_t *lw,
        }
       if( wrap )
        {
+         if ( i==0 ) /* empty list */
+           return 1;
          i=0; /* first item */
          screen_bell();
        }
@@ -265,6 +265,9 @@ list_window_rfind(list_window_t *lw,
   int i = lw->selected-1;
   char *label;
 
+  if ( rows == 0 )
+    return 1;
+
   while( wrap || i==lw->selected-1 )
     {
       while( i>=0 && (label=(callback) (i,&h,callback_data)) )
@@ -325,3 +328,62 @@ list_window_cmd(list_window_t *lw, int rows, command_t cmd)
 }
 
 
+
+
+
+list_window_state_t *
+list_window_init_state(void)
+{
+  return g_malloc0(sizeof(list_window_state_t));
+}
+
+list_window_state_t *
+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);
+    }
+  return NULL;
+}
+
+void 
+list_window_push_state(list_window_state_t *state, list_window_t *lw)
+{
+  if( state )
+    {
+      list_window_t *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);
+    }
+}
+
+void 
+list_window_pop_state(list_window_state_t *state, list_window_t *lw)
+{
+  if( state && state->list )
+    {
+      list_window_t *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);
+    }
+}
+
+
+