Ticket #4256: wgroup.patch

lib/widget/dialog-switch.c

@@ -237 +237 @@
         char *title;
 
         if (dlg->get_title != NULL)
-            title = dlg->get_title (dlg, WIDGET (listbox->list)->cols - 2);
+            title = dlg->get_title (dlg, WIDGET (LISTBOX_(listbox)->list)->cols - 2);
         else
             title = g_strdup ("");
 
-        listbox_add_item (listbox->list, LISTBOX_APPEND_BEFORE, get_hotkey (i++), title, h, FALSE);
+        listbox_add_item (LISTBOX_(listbox)->list, LISTBOX_APPEND_BEFORE, get_hotkey (i++), title, h, FALSE);
 
         g_free (title);
     }

lib/widget/history.c

@@ -158 +158 @@
     width = str_term_width1 (text);
     hd->max_width = MAX (width, hd->max_width);
 
-    listbox_add_item (hd->listbox, LISTBOX_APPEND_AT_END, 0, text, NULL, TRUE);
+    listbox_add_item (LISTBOX(hd->listbox), LISTBOX_APPEND_AT_END, 0, text, NULL, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -217 +217 @@
         hd->create (hd, z->data);
     /* after this, the order of history items is following: recent at begin, oldest at end */
 
-    count = listbox_get_length (hd->listbox);
+    count = listbox_get_length (LISTBOX(hd->listbox));
 
     hist_data.y = hd->y;
     hist_data.x = hd->x;
@@ -231 +231 @@
 
     /* this call makes list stick to all sides of dialog, effectively make
        it be resized with dialog */
-    group_add_widget_autopos (GROUP (query_dlg), hd->listbox, WPOS_KEEP_ALL, NULL);
+    group_add_widget_autopos (GROUP (query_dlg), LISTBOX(hd->listbox), WPOS_KEEP_ALL, NULL);
 
     /* to avoid diplicating of (calculating sizes in two places)
        code, call history_dlg_callback function here, to set dialog and
@@ -244 +244 @@
     {
         /* history is above base widget -- revert order to place recent item at bottom */
         /* revert history direction */
-        g_queue_reverse (hd->listbox->list);
+        g_queue_reverse (LISTBOX_(hd->listbox)->list);
         if (hd->current < 0 || (size_t) hd->current >= count)
-            listbox_select_last (hd->listbox);
+            listbox_select_last (LISTBOX(hd->listbox));
         else
-            listbox_select_entry (hd->listbox, count - 1 - (size_t) hd->current);
+            listbox_select_entry (LISTBOX(hd->listbox), count - 1 - (size_t) hd->current);
     }
     else
     {
         /* history is below base widget -- keep order to place recent item on top  */
         if (hd->current > 0)
-            listbox_select_entry (hd->listbox, hd->current);
+            listbox_select_entry (LISTBOX(hd->listbox), hd->current);
     }
 
     dlg_ret = dlg_run (query_dlg);
@@ -274 +274 @@
             hd->action = CK_Enter;
         }
 
-        listbox_get_current (hd->listbox, &q, NULL);
+        listbox_get_current (LISTBOX(hd->listbox), &q, NULL);
         hd->text = g_strdup (q);
     }
 
     /* get modified history from dialog */
     z = NULL;
-    for (hi = listbox_get_first_link (hd->listbox); hi != NULL; hi = g_list_next (hi))
+    for (hi = listbox_get_first_link (LISTBOX(hd->listbox)); hi != NULL; hi = g_list_next (hi))
         /* history is being reverted here again */
         z = g_list_prepend (z, hd->release (hd, LENTRY (hi->data)));
 

lib/widget/listbox-window.c

@@ -131 +131 @@
     int val = -1;
 
     if (dlg_run (l->dlg) != B_CANCEL)
-        val = l->list->pos;
+        val = LISTBOX_(l->list)->pos;
     widget_destroy (WIDGET (l->dlg));
     g_free (l);
     return val;
@@ -152 +152 @@
     void *val = NULL;
 
     if (select != NULL)
-        listbox_select_entry (l->list, listbox_search_data (l->list, select));
+        listbox_select_entry (LISTBOX_(l->list), listbox_search_data (LISTBOX_(l->list), select));
 
     if (dlg_run (l->dlg) != B_CANCEL)
     {
         WLEntry *e;
-        e = listbox_get_nth_item (l->list, l->list->pos);
+        e = listbox_get_nth_item (LISTBOX_(l->list), LISTBOX_(l->list)->pos);
         if (e != NULL)
         {
             /* The assert guards against returning a soon-to-be deallocated

lib/widget/listbox.c

@@ -51 +51 @@
 /*** file scope macro definitions ****************************************************************/
 
 /* Gives the position of the last item. */
-#define LISTBOX_LAST(l) (listbox_is_empty (l) ? 0 : (int) g_queue_get_length ((l)->list) - 1)
+#define LISTBOX_LAST(l) (listbox_is_empty (l) ? 0 : (int) g_queue_get_length (LISTBOX_(l)->list) - 1)
 
 /*** file scope type declarations ****************************************************************/
 
@@ -76 +76 @@
 listbox_entry_free (void *data)
 {
     WLEntry *e = data;
-
+        FILE *f=fopen("mc-.log","a+");
+        fprintf(f,"1.FREE:%p, text:%s\n",data,e->text);
+        fclose(f);
     g_free (e->text);
     if (e->free_data)
         g_free (e->data);
@@ -86 +88 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_draw (WListbox * l, gboolean focused)
+listbox_draw (WListbox_ * l, gboolean focused)
 {
     Widget *w = WIDGET (l);
     const int *colors;
@@ -97 +99 @@
     int pos;
     int i;
     int sel_line = -1;
-
     colors = widget_get_colors (w);
 
     disabled = widget_get_state (w, WST_DISABLED);
     normalc = disabled ? DISABLED_COLOR : colors[DLG_COLOR_NORMAL];
     selc = disabled ? DISABLED_COLOR : colors[focused ? DLG_COLOR_HOT_FOCUS : DLG_COLOR_FOCUS];
 
+        FILE *f=fopen("mc-.log","a+");
+        fprintf(f,"ptr:%p, first:%p, ->data--: %p, text:%p\n",l->list,
+                g_queue_peek_head_link(l->list),
+                LENTRY(g_queue_peek_head(l->list))?
+                        LENTRY(g_queue_peek_head(l->list)):0,
+                g_queue_peek_head(l->list));
+        fclose(f);
+
     if (l->list != NULL)
     {
         length = g_queue_get_length (l->list);
@@ -142 +151 @@
 
     l->cursor_y = sel_line;
 
-    if (l->draw_scrollbar)
+    if (LISTBOX(WIDGET(l)->owner)->draw_scrollbar)
     {
         tty_setcolor (normalc);
-        scrollbar_set_state (l->scrollbar, w->y - 1, w->x + w->cols, w->lines + 2, g_queue_get_length (l->list), w->lines, l->top);
-        WIDGET (l->scrollbar)->callback (WIDGET (l->scrollbar), NULL, MSG_DRAW, 0, NULL);
+        /*scrollbar_set_state (SCROLLBAR_(l), w->y - 1, w->x + w->cols, w->lines + 2, g_queue_get_length (l->list), w->lines, l->top);*/
+        /*WIDGET (SCROLLBAR_(l))->callback (WIDGET (SCROLLBAR_(l)), NULL, MSG_DRAW, 0, NULL);*/
     }
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static int
-listbox_check_hotkey (WListbox * l, int key)
+listbox_check_hotkey (WListbox_ * l, int key)
 {
-    if (!listbox_is_empty (l))
+    if (!listbox_is_empty ((LISTBOX(WIDGET(l)->owner))))
     {
         int i;
         GList *le;
@@ -176 +185 @@
 
 /* Calculates the item displayed at screen row 'y' (y==0 being the widget's 1st row). */
 static int
-listbox_y_pos (WListbox * l, int y)
+listbox_y_pos (WListbox_ * l, int y)
 {
-    return MIN (l->top + y, LISTBOX_LAST (l));
+    return MIN (l->top + y, LISTBOX_LAST (LISTBOX(WIDGET(l)->owner)));
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_fwd (WListbox * l, gboolean wrap)
+listbox_fwd (WListbox_ * l, gboolean wrap)
 {
-    if (!listbox_is_empty (l))
+    if (!listbox_is_empty ((LISTBOX(WIDGET(l)->owner))))
     {
         if ((guint) l->pos + 1 < g_queue_get_length (l->list))
-            listbox_select_entry (l, l->pos + 1);
+            listbox_select_entry (LISTBOX(WIDGET(l)->owner), l->pos + 1);
         else if (wrap)
-            listbox_select_first (l);
+            listbox_select_first (LISTBOX(WIDGET(l)->owner));
     }
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_fwd_n (WListbox * l, int n)
+listbox_fwd_n (WListbox_ * l, int n)
 {
-    listbox_select_entry (l, MIN (l->pos + n, LISTBOX_LAST (l)));
+    listbox_select_entry (LISTBOX(WIDGET(l)->owner), MIN (l->pos + n, LISTBOX_LAST (LISTBOX(WIDGET(l)->owner))));
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_back (WListbox * l, gboolean wrap)
+listbox_back (WListbox_ * l, gboolean wrap)
 {
-    if (!listbox_is_empty (l))
+    if (!listbox_is_empty ((LISTBOX(WIDGET(l)->owner))))
     {
         if (l->pos > 0)
-            listbox_select_entry (l, l->pos - 1);
+            listbox_select_entry (LISTBOX(WIDGET(l)->owner), l->pos - 1);
         else if (wrap)
-            listbox_select_last (l);
+            listbox_select_last (LISTBOX(WIDGET(l)->owner));
     }
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_back_n (WListbox * l, int n)
+listbox_back_n (WListbox_ * l, int n)
 {
-    listbox_select_entry (l, MAX (l->pos - n, 0));
+    listbox_select_entry (LISTBOX(WIDGET(l)->owner), MAX (l->pos - n, 0));
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-listbox_execute_cmd (WListbox * l, long command)
+listbox_execute_cmd (WListbox_ * l, long command)
 {
     cb_ret_t ret = MSG_HANDLED;
     Widget *w = WIDGET (l);
@@ -245 +254 @@
         listbox_fwd (l, TRUE);
         break;
     case CK_Top:
-        listbox_select_first (l);
+        listbox_select_first (LISTBOX(WIDGET(l)->owner));
         break;
     case CK_Bottom:
-        listbox_select_last (l);
+        listbox_select_last (LISTBOX(WIDGET(l)->owner));
         break;
     case CK_PageUp:
         listbox_back_n (l, w->lines - 1);
@@ -267 +276 @@
             is_last = (l->pos + 1 >= length);
             is_more = (l->top + w->lines >= length);
 
-            listbox_remove_current (l);
+            listbox_remove_current (LISTBOX(WIDGET(l)->owner));
             if ((l->top > 0) && (is_last || is_more))
                 l->top--;
         }
@@ -278 +287 @@
             && (query_dialog (Q_ ("DialogTitle|History cleanup"),
                               _("Do you want clean this history?"),
                               D_ERROR, 2, _("&Yes"), _("&No")) == 0))
-            listbox_remove_list (l);
+            listbox_remove_list (LISTBOX(WIDGET(l)->owner));
         break;
     case CK_View:
     case CK_Edit:
@@ -296 +305 @@
 
 /* Return MSG_HANDLED if we want a redraw */
 static cb_ret_t
-listbox_key (WListbox * l, int key)
+listbox_key (WListbox_ * l, int key)
 {
     long command;
 
@@ -306 +315 @@
     /* focus on listbox item N by '0'..'9' keys */
     if (key >= '0' && key <= '9')
     {
-        listbox_select_entry (l, key - '0');
+        listbox_select_entry (LISTBOX(WIDGET(l)->owner), key - '0');
         return MSG_HANDLED;
     }
 
@@ -320 +329 @@
 
 /* Listbox item adding function */
 static inline void
-listbox_append_item (WListbox * l, WLEntry * e, listbox_append_t pos)
+listbox_append_item (WListbox_ * l, WLEntry * e, listbox_append_t pos)
 {
     if (l->list == NULL)
     {
@@ -349 +358 @@
     default:
         break;
     }
+
+    FILE *f=fopen("mc-.log","a+");
+    fprintf(f,"Append ptr:%p, first:%p, ->dat: %p, text:%s\n",l->list,
+        g_queue_peek_head_link(l->list),
+        g_queue_peek_head (l->list),
+        LENTRY(g_queue_peek_tail(l->list))->text);
+    fclose(f);
+
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 /* Call this whenever the user changes the selected item. */
 static void
-listbox_on_change (WListbox * l)
+listbox_on_change (WListbox_ * l)
 {
     listbox_draw (l, TRUE);
     send_message (WIDGET (l)->owner, l, MSG_NOTIFY, 0, NULL);
@@ -364 +381 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_do_action (WListbox * l)
+listbox_do_action (WListbox_ * l)
 {
     int action;
 
-    if (listbox_is_empty (l))
+    if (listbox_is_empty ((LISTBOX(WIDGET(l)->owner))))
         return;
 
     if (l->callback != NULL)
-        action = l->callback (l);
+        action = l->callback (LISTBOX(WIDGET(l)->owner));
     else
         action = LISTBOX_DONE;
 
@@ -388 +405 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-listbox_run_hotkey (WListbox * l, int pos)
+listbox_run_hotkey (WListbox_ * l, int pos)
 {
-    listbox_select_entry (l, pos);
+    listbox_select_entry (LISTBOX(WIDGET(l)->owner), pos);
     listbox_on_change (l);
     listbox_do_action (l);
 }
@@ -398 +415 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static inline void
-listbox_destroy (WListbox * l)
+listbox_destroy (WListbox_ * l)
 {
-    widget_destroy (WIDGET (l->scrollbar));
-    listbox_remove_list (l);
+    widget_destroy (WIDGET (SCROLLBAR_(l)));
+    listbox_remove_list (LISTBOX(WIDGET(l)->owner));
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -409 +426 @@
 static cb_ret_t
 listbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
 {
-    WListbox *l = LISTBOX (w);
+    WListbox_ *l = LISTBOX__ (w);
 
     switch (msg)
     {
@@ -440 +457 @@
         return listbox_execute_cmd (l, parm);
 
     case MSG_CURSOR:
-        widget_gotoyx (l, l->cursor_y, 0);
+        widget_gotoyx (w, l->cursor_y, 0);
         return MSG_HANDLED;
 
     case MSG_DRAW:
@@ -461 +478 @@
 static void
 listbox_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
 {
-    WListbox *l = LISTBOX (w);
+    WListbox_ *l = LISTBOX__ (w);
     int old_pos;
 
     old_pos = l->pos;
@@ -470 +487 @@
     {
     case MSG_MOUSE_DOWN:
         widget_select (w);
-        listbox_select_entry (l, listbox_y_pos (l, event->y));
+        listbox_select_entry (LISTBOX(WIDGET(l)->owner), listbox_y_pos(l, event->y));
         break;
 
     case MSG_MOUSE_SCROLL_UP:
-        listbox_back (l, FALSE);
+        listbox_back(l, FALSE);
         break;
 
     case MSG_MOUSE_SCROLL_DOWN:
@@ -483 +500 @@
 
     case MSG_MOUSE_DRAG:
         event->result.repeat = TRUE;    /* It'd be functional even without this. */
-        listbox_select_entry (l, listbox_y_pos (l, event->y));
+        listbox_select_entry (LISTBOX(WIDGET(l)->owner), listbox_y_pos (l, event->y));
         break;
 
     case MSG_MOUSE_CLICK:
@@ -505 +522 @@
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-WListbox *
-listbox_new (int y, int x, int height, int width, gboolean deletable, lcback_fn callback)
+static WListbox_ *
+listbox_new_inter (int y, int x, int height, int width, gboolean deletable, gboolean so, lcback_fn callback)
 {
-    WListbox *l;
+    WListbox_ *l;
     Widget *w;
 
     if (height <= 0)
         height = 1;
 
-    l = g_new (WListbox, 1);
+    l = g_new0 (WListbox_, 1);
     w = WIDGET (l);
     widget_init (w, y, x, height, width, listbox_callback, listbox_mouse_callback);
     w->options |= WOP_SELECTABLE | WOP_WANT_HOTKEY;
@@ -525 +542 @@
     l->deletable = deletable;
     l->callback = callback;
     l->allow_duplicates = TRUE;
-    l->draw_scrollbar = !mc_global.tty.slow_terminal;
-    l->scrollbar = scrollbar_new (y, x + width - 1, height, TRUE);
 
     return l;
 }
 
+
+WListbox *
+listbox_new (int y, int x, int height, int width, gboolean pruneable, lcback_fn callback)
+{
+    WGroup *g;
+    Widget *w;
+    WListbox *l;
+    WListbox_ *w1;
+    WScrollbar *w2;
+
+    if (height <= 0)
+        height = 1;
+
+    l = g_new0 (WListbox, 1);
+    g = GROUP(l);
+    w = WIDGET(l);
+    group_init(g,y,x,height,width,NULL,NULL);
+
+    w->options |= WOP_SELECTABLE | WOP_TOP_SELECT;
+    w->state |= WST_FOCUSED;
+
+    w1 = listbox_new_inter(y,x,height,width,pruneable,TRUE,callback);
+    w2 = scrollbar_new (y, x + width - 1, height, TRUE);
+    l->draw_scrollbar = !mc_global.tty.slow_terminal;
+    group_add_widget_autopos(g,w2,0,0);
+    group_add_widget_autopos(g,w1,0,0);
+    return l;
+}
+
 /* --------------------------------------------------------------------------------------------- */
 
 /**
@@ -544 +588 @@
         int i;
         GList *le;
 
-        for (i = 0, le = g_queue_peek_head_link (l->list); le != NULL; i++, le = g_list_next (le))
+        for (i = 0, le = g_queue_peek_head_link (LISTBOX_(l)->list); le != NULL; i++, le = g_list_next (le))
         {
             WLEntry *e = LENTRY (le->data);
 
@@ -569 +613 @@
         int i;
         GList *le;
 
-        for (i = 0, le = g_queue_peek_head_link (l->list); le != NULL; i++, le = g_list_next (le))
+        for (i = 0, le = g_queue_peek_head_link (LISTBOX_(l)->list); le != NULL; i++, le = g_list_next (le))
         {
             WLEntry *e = LENTRY (le->data);
 
@@ -587 +631 @@
 void
 listbox_select_first (WListbox * l)
 {
-    l->pos = l->top = 0;
+    LISTBOX_(l)->pos = LISTBOX_(l)->top = 0;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -601 +645 @@
 
     length = listbox_get_length (l);
 
-    l->pos = DOZ (length, 1);
-    l->top = DOZ (length, lines);
+    LISTBOX_(l)->pos = DOZ (length, 1);
+    LISTBOX_(l)->top = DOZ (length, lines);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -618 +662 @@
         return;
 
     /* Special case */
-    for (pos = 0, le = g_queue_peek_head_link (l->list); le != NULL; pos++, le = g_list_next (le))
+    for (pos = 0, le = g_queue_peek_head_link (LISTBOX_(l)->list); le != NULL; pos++, le = g_list_next (le))
     {
-        if (pos == l->top)
+        if (pos == LISTBOX_(l)->top)
             top_seen = TRUE;
 
         if (pos == dest)
         {
-            l->pos = dest;
+            LISTBOX_(l)->pos = dest;
             if (!top_seen)
-                l->top = l->pos;
+                LISTBOX_(l)->top = LISTBOX_(l)->pos;
             else
             {
                 int lines = WIDGET (l)->lines;
 
-                if (l->pos - l->top >= lines)
-                    l->top = l->pos - lines + 1;
+                if (LISTBOX_(l)->pos - LISTBOX_(l)->top >= lines)
+                    LISTBOX_(l)->top = LISTBOX_(l)->pos - lines + 1;
             }
             return;
         }
     }
 
     /* If we are unable to find it, set decent values */
-    l->pos = l->top = 0;
+    LISTBOX_(l)->pos = LISTBOX_(l)->top = 0;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -648 +692 @@
 int
 listbox_get_length (const WListbox * l)
 {
-    return listbox_is_empty (l) ? 0 : (int) g_queue_get_length (l->list);
+    return listbox_is_empty (l) ? 0 : (int) g_queue_get_length (LISTBOX_(l)->list);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -661 +705 @@
     gboolean ok;
 
     if (l != NULL)
-        e = listbox_get_nth_item (l, l->pos);
+        e = listbox_get_nth_item (l, LISTBOX_(l)->pos);
 
     ok = (e != NULL);
 
@@ -681 +725 @@
     {
         GList *item;
 
-        item = g_queue_peek_nth_link (l->list, (guint) pos);
+        item = g_queue_peek_nth_link (LISTBOX_(l)->list, (guint) pos);
         if (item != NULL)
             return LENTRY (item->data);
     }
@@ -694 +738 @@
 GList *
 listbox_get_first_link (const WListbox * l)
 {
-    return (l == NULL || l->list == NULL) ? NULL : g_queue_peek_head_link (l->list);
+    return (l == NULL || LISTBOX_(l)->list == NULL) ? NULL : g_queue_peek_head_link (LISTBOX_(l)->list);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -707 +751 @@
         GList *current;
         int length;
 
-        current = g_queue_peek_nth_link (l->list, (guint) l->pos);
+        current = g_queue_peek_nth_link (LISTBOX_(l)->list, (guint) LISTBOX_(l)->pos);
         listbox_entry_free (current->data);
-        g_queue_delete_link (l->list, current);
+        g_queue_delete_link (LISTBOX_(l)->list, current);
 
-        length = g_queue_get_length (l->list);
+        length = g_queue_get_length (LISTBOX_(l)->list);
 
         if (length == 0)
-            l->top = l->pos = 0;
-        else if (l->pos >= length)
-            l->pos = length - 1;
+            LISTBOX_(l)->top = LISTBOX_(l)->pos = 0;
+        else if (LISTBOX_(l)->pos >= length)
+            LISTBOX_(l)->pos = length - 1;
     }
 }
 
@@ -725 +769 @@
 gboolean
 listbox_is_empty (const WListbox * l)
 {
-    return (l == NULL || l->list == NULL || g_queue_is_empty (l->list));
+    return (l == NULL || LISTBOX_(l)->list == NULL || g_queue_is_empty (LISTBOX_(l)->list));
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -733 +777 @@
 /**
  * Set new listbox items list.
  *
- * @param l WListbox object
+ * @param l WListbox_ object
  * @param list list of WLEntry objects
  */
 void
@@ -742 +786 @@
     listbox_remove_list (l);
 
     if (l != NULL)
-        l->list = list;
+        LISTBOX_(l)->list = list;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -752 +796 @@
 {
     if (l != NULL)
     {
-        if (l->list != NULL)
+        if (LISTBOX_(l)->list != NULL)
         {
-            g_queue_free_full (l->list, (GDestroyNotify) listbox_entry_free);
-            l->list = NULL;
+        FILE *f=fopen("mc-.log","a+");
+        fprintf(f,"1.release:%p, first:%p, entry: %p\n",LISTBOX_(l)->list,
+                g_queue_peek_head(LISTBOX_(l)->list),
+                0);
+        fclose(f);            g_queue_free_full (LISTBOX_(l)->list, (GDestroyNotify) listbox_entry_free);
+            LISTBOX_(l)->list = NULL;
         }
 
-        l->pos = l->top = 0;
+        LISTBOX_(l)->pos = LISTBOX_(l)->top = 0;
     }
 }
 
@@ -773 +821 @@
     if (l == NULL)
         return NULL;
 
-    if (!l->allow_duplicates && (listbox_search_text (l, text) >= 0))
+    if (!LISTBOX_(l)->allow_duplicates && (listbox_search_text (l, text) >= 0))
         return NULL;
 
     entry = g_new (WLEntry, 1);
@@ -781 +829 @@
     entry->data = data;
     entry->free_data = free_data;
     entry->hotkey = hotkey;
-
-    listbox_append_item (l, entry, pos);
+        FILE *f=fopen("mc-.log","a+");
+        fprintf(f,"1.Add-item ptr:%p, first:%p, entry: %p\n",LISTBOX_(l)->list,
+                g_queue_peek_head(LISTBOX_(l)->list),
+                entry);
+        fclose(f);
+    listbox_append_item (LISTBOX_ (l), entry, pos);
 
     return entry->text;
 }

lib/widget/listbox.h

@@ -8 +8 @@
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
-#define LISTBOX(x) ((WListbox *)(x))
+#define SCROLLBAR_(x) ((WScrollbar *)(((GList *)GROUP((WListbox *)(x))->widgets)->data))
+#define LISTBOX(x) ((WListbox *)x)
+#define LISTBOX__(x) ((WListbox_ *)x)
+#define LISTBOX_(x) ((WListbox_ *)(g_list_next(GROUP((WListbox *)(x))->widgets)->data))
 #define LENTRY(x) ((WLEntry *)(x))
 
 /*** enums ***************************************************************************************/
@@ -30 +33 @@
 
 /*** structures declarations (and typedefs of structures)*****************************************/
 
-struct WListbox;
-typedef lcback_ret_t (*lcback_fn) (struct WListbox * l);
+typedef struct WListbox WListbox;
+typedef struct WListbox_ WListbox_;
+typedef lcback_ret_t (*lcback_fn) (WListbox * l);
 
 typedef struct WLEntry
 {
@@ -42 +46 @@
 } WLEntry;
 
 typedef struct WListbox
+{
+    WGroup base;
+    gboolean draw_scrollbar;
+} WListbox;
+
+typedef struct WListbox_
 {
     Widget widget;
     GQueue *list;               /* Pointer to the list of WLEntry */
     int pos;                    /* The current element displayed */
     int top;                    /* The first element displayed */
     gboolean allow_duplicates;  /* Do we allow duplicates on the list? */
-    gboolean draw_scrollbar;    /* Draw a scrollbar? */
-    WScrollbar *scrollbar;      /* Scrollbar widget */
     gboolean deletable;         /* Can list entries be deleted? */
     lcback_fn callback;         /* The callback function */
     int cursor_x, cursor_y;     /* Cache the values */
-} WListbox;
+} WListbox_;
 
 /*** global variables defined in .c file *********************************************************/
 

lib/widget/scrollbar.c

@@ -132 +132 @@
     WScrollbar *scrollbar;
     Widget *w;
 
-    scrollbar = g_new (WScrollbar, 1);
+    scrollbar = g_new0 (WScrollbar, 1);
     w = WIDGET (scrollbar);
     widget_init (w, y, x, lines, 1, scrollbar_callback, NULL);
 

src/filemanager/achown.c

@@ -582 +582 @@
 
         listbox_select_entry (chl_list, fe);
 
-        b_pos = chl_list->pos;
+        b_pos = LISTBOX_(chl_list)->pos;
         group_add_widget (GROUP (chl_dlg), chl_list);
 
         result = dlg_run (chl_dlg);
 
         if (result != B_CANCEL)
         {
-            if (b_pos != chl_list->pos)
+            if (b_pos != LISTBOX_(chl_list)->pos)
             {
                 gboolean ok = FALSE;
                 char *text;

src/filemanager/boxes.c

@@ -488 +488 @@
 
     (void) button;
 
-    if (bg_list->list == NULL)
+    if (LISTBOX_(bg_list)->list == NULL)
         return 0;
 
     /* Get this instance information */

src/filemanager/hotlist.c

@@ -990 +990 @@
         }
         else
             listbox_add_item (l_hotlist, pos, 0, new->label, new, FALSE);
-        listbox_select_entry (l_hotlist, l_hotlist->pos);
+        listbox_select_entry (l_hotlist, LISTBOX_(l_hotlist)->pos);
     }
 
     return new;

src/filemanager/panelize.c

@@ -92 +92 @@
 static void
 update_command (void)
 {
-    if (l_panelize->pos != last_listitem)
+    if (LISTBOX_(l_panelize)->pos != last_listitem)
     {
         struct panelize *data = NULL;
 
-        last_listitem = l_panelize->pos;
+        last_listitem = LISTBOX_(l_panelize)->pos;
         listbox_get_current (l_panelize, NULL, (void **) &data);
         input_assign_text (pname, data->command);
         pname->point = 0;