Ticket #2672: mc-4.8.0-listbox_vk111116.patch

lib/widget/listbox.c

@@ -156 +156 @@
         else
         {
             WLEntry *e = (WLEntry *) le->data;
-            text = e->text;
+            if (l->num_type == LISTBOX_NUMBERED)                   
+            {                   /* for the numbered list: display entry numbers in 3 characters */
+                text = g_strdup_printf ("%-3i%s", pos, e->text);
+            } 
+            else if (l->num_type == LISTBOX_NUMBERED_HOTKEYS)
+            {                   /* display the numbers 0..9 */
+                if (pos <= 9)
+                    text = g_strdup_printf ("%-2i%s", pos, e->text);
+                else
+                    text = g_strdup_printf ("  %s", e->text);
+            }
+            else
+                text = e->text;
             le = g_list_next (le);
             pos++;
         }

lib/widget/listbox.h

@@ -39 +39 @@
     void *data;                 /* Client information */
 } WLEntry;
 
+typedef enum
+{
+    LISTBOX_UNNUMBERED = 0,     /* unnumbered (default) listbox */
+    LISTBOX_NUMBERED,           /* all items in the listbox are numbered */
+    LISTBOX_NUMBERED_HOTKEYS    /* only the first ten items are numbered 0-9 (to show the hotkeys) */
+} listbox_numbered_t;
+
 typedef struct WListbox
 {
     Widget widget;
@@ -51 +58 @@
     gboolean deletable;         /* Can list entries be deleted? */
     lcback_fn callback;         /* The callback function */
     int cursor_x, cursor_y;     /* Cache the values */
+    listbox_numbered_t num_type; /* Numbered or unnumbered list */
 } WListbox;
 
 /*** global variables defined in .c file *********************************************************/

src/filemanager/hotlist.c

@@ -326 +326 @@
             break;
         case HL_TYPE_DOTDOT:
         case HL_TYPE_ENTRY:
-            if (hotlist_state.moving)
-                listbox_add_item (l_movelist, LISTBOX_APPEND_AT_END, 0, current->label, current);
-            else
-                listbox_add_item (l_hotlist, LISTBOX_APPEND_AT_END, 0, current->label, current);
-            break;
+            {
+                char *lbl = g_strdup_printf (" %s", current->label);      /* add a leading space to separate
+                                                                           ordinary entries from groups */
+                if (hotlist_state.moving)
+                    listbox_add_item (l_movelist, LISTBOX_APPEND_AT_END, 0, lbl, current);
+                else
+                    listbox_add_item (l_hotlist, LISTBOX_APPEND_AT_END, 0, lbl, current);
+                g_free (lbl);
+                break;
+            }
         default:
             break;
         }
@@ -812 +817 @@
     }
     /* get new listbox */
     l_hotlist = listbox_new (UY + 1, UX + 1, LINES - 14, COLS - 2 * UX - 8, FALSE, l_call);
+    /* display hotkey numbers 0..9 in the listbox */
+    l_hotlist->num_type = LISTBOX_NUMBERED_HOTKEYS;
 
     /* Fill the hotlist with the active VFS or the hotlist */
 #ifdef ENABLE_VFS
@@ -976 +983 @@
             g_free (lbl);
         }
         else
-            listbox_add_item (l_hotlist, pos, 0, new->label, new);
+        {
+            /* add a leading space to separate ordinary entries from groups */
+            char *lbl = g_strdup_printf(" %s", new->label);
+            listbox_add_item (l_hotlist, pos, 0, lbl, new);
+        }
         listbox_select_entry (l_hotlist, l_hotlist->pos);
     }
     return new;