1 files changed, 100 insertions, 32 deletions

diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 194f4c008b..1b051cd800 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -90,11 +90,57 @@ static int list_icon_width(enum screen_type screen)
     return get_icon_width(screen) + ICON_PADDING * 2;
 }
 
-static bool draw_title(struct screen *display, struct gui_synclist *list)
+static void _default_listdraw_fn(struct list_putlineinfo_t *list_info)
+{
+    struct screen *display = list_info->display; 
+    int x = list_info->x;
+    int y = list_info->y;
+    int item_indent = list_info->item_indent;
+    int item_offset = list_info->item_offset;
+    int icon = list_info->icon;
+    bool is_selected = list_info->is_selected;
+    bool is_title = list_info->is_title;
+    bool show_cursor = list_info->show_cursor;
+    bool have_icons = list_info->have_icons;
+    struct line_desc *linedes = list_info->linedes;
+    char *dsp_text = list_info->dsp_text;
+
+    if (is_title)
+    {
+        if (have_icons)
+            display->put_line(x, y, linedes, "$"ICON_PADDING_S"I$t",
+                    icon, dsp_text);
+        else
+            display->put_line(x, y, linedes, "$t", dsp_text);
+    }
+    else if (show_cursor && have_icons)
+    {
+    /* the list can have both, one of or neither of cursor and item icons,
+     * if both don't apply icon padding twice between the icons */
+        display->put_line(x, y, 
+                linedes, "$*s$"ICON_PADDING_S"I$i$"ICON_PADDING_S"s$*t",
+                item_indent, is_selected ? Icon_Cursor : Icon_NOICON,
+                icon, item_offset, dsp_text);
+    }
+    else if (show_cursor || have_icons)
+    {
+        display->put_line(x, y, linedes, "$*s$"ICON_PADDING_S"I$*t", item_indent,
+                show_cursor ? (is_selected ? Icon_Cursor:Icon_NOICON):icon,
+                item_offset, dsp_text);
+    }
+    else
+    {
+        display->put_line(x, y, linedes, "$*s$*t", item_indent, item_offset, dsp_text);
+    }
+}
+
+static bool draw_title(struct screen *display,
+                       struct gui_synclist *list,
+                       list_draw_item *callback_draw_item)
 {
     const int screen = display->screen_type;
     struct viewport *title_text_vp = &title_text[screen];
-    struct line_desc line = LINE_DESC_DEFINIT;
+    struct line_desc linedes = LINE_DESC_DEFINIT;
 
     if (sb_set_title_text(list->title, list->title_icon, screen))
         return false; /* the sbs is handling the title */
@@ -102,29 +148,39 @@ static bool draw_title(struct screen *display, struct gui_synclist *list)
     if (!list_display_title(list, screen))
         return false;
     *title_text_vp = *(list->parent[screen]);
-    line.height = list->line_height[screen];
-    title_text_vp->height = line.height;
+    linedes.height = list->line_height[screen];
+    title_text_vp->height = linedes.height;
 
 #if LCD_DEPTH > 1
     /* XXX: Do we want to support the separator on remote displays? */
     if (display->screen_type == SCREEN_MAIN && global_settings.list_separator_height != 0)
-        line.separator_height = abs(global_settings.list_separator_height)
+        linedes.separator_height = abs(global_settings.list_separator_height)
                                 + (lcd_get_dpi() > 200 ? 2 : 1);
 #endif
 
 #ifdef HAVE_LCD_COLOR
     if (list->title_color >= 0)
-        line.style |= (STYLE_COLORED|list->title_color);
+        linedes.style |= (STYLE_COLORED|list->title_color);
 #endif
-    line.scroll = true;
+    linedes.scroll = true;
 
     display->set_viewport(title_text_vp);
+    int icon = list->title_icon;
+    int icon_w = list_icon_width(display->screen_type);
+    bool have_icons = false;
+    if (icon != Icon_NOICON && global_settings.show_icons)
+        have_icons = true;
 
-    if (list->title_icon != Icon_NOICON && global_settings.show_icons)
-        put_line(display, 0, 0, &line, "$"ICON_PADDING_S"I$t",
-                 list->title_icon, list->title);
-    else
-        put_line(display, 0, 0, &line, "$t", list->title);
+    struct list_putlineinfo_t list_info =
+    {
+        .x = 0, .y = 0, .item_indent = 0, .item_offset = 0,
+         .line = -1, .icon = icon, .icon_width = icon_w,
+        .display = display, .vp = title_text_vp, .linedes = &linedes, .list = list,
+        .dsp_text = list->title,
+        .is_selected = false, .is_title = true, .show_cursor = false,
+        .have_icons = have_icons
+    };
+    callback_draw_item(&list_info);
 
     return true;
 }
@@ -133,6 +189,8 @@ void list_draw(struct screen *display, struct gui_synclist *list)
 {
     int start, end, item_offset, i;
     const int screen = display->screen_type;
+    list_draw_item *callback_draw_item;
+
     const int list_start_item = list->start_item[screen];
     const bool scrollbar_in_left = (global_settings.scrollbar == SCROLLBAR_LEFT);
     const bool scrollbar_in_right = (global_settings.scrollbar == SCROLLBAR_RIGHT);
@@ -145,11 +203,16 @@ void list_draw(struct screen *display, struct gui_synclist *list)
     struct viewport *list_text_vp = &list_text[screen];
     int indent = 0;
 
+    if (list->callback_draw_item != NULL)
+        callback_draw_item = list->callback_draw_item;
+    else
+        callback_draw_item = _default_listdraw_fn;
+
     struct viewport * last_vp = display->set_viewport(parent);
     display->clear_viewport();
     display->scroll_stop_viewport(list_text_vp);
     *list_text_vp = *parent;
-    if ((show_title = draw_title(display, list)))
+    if ((show_title = draw_title(display, list, callback_draw_item)))
     {
         int title_height = title_text[screen].height;
         list_text_vp->y += title_height;
@@ -244,6 +307,16 @@ void list_draw(struct screen *display, struct gui_synclist *list)
     }
 
     display->set_viewport(list_text_vp);
+    int icon_w = list_icon_width(screen);
+    int character_width = display->getcharwidth();
+
+    struct list_putlineinfo_t list_info =
+    {
+        .x = 0, .y = 0, .vp = list_text_vp, .list = list,
+        .icon_width = icon_w, .is_title = false, .show_cursor = show_cursor,
+        .have_icons = have_icons, .linedes = &linedes, .display = display
+    };
+
     for (i=start; i<end && i<list->nb_items; i++)
     {
         /* do the text */
@@ -251,7 +324,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
         unsigned const char *s;
         char entry_buffer[MAX_PATH];
         unsigned char *entry_name;
-        int text_pos = 0;
+        const int text_pos = 0; /* UNUSED */
         int line = i - start;
         int line_indent = 0;
         int style = STYLE_DEFAULT;
@@ -268,9 +341,9 @@ void list_draw(struct screen *display, struct gui_synclist *list)
         if (line_indent)
         {
             if (global_settings.show_icons)
-                line_indent *= list_icon_width(screen);
+                line_indent *= icon_w;
             else
-                line_indent *= display->getcharwidth();
+                line_indent *= character_width;
         }
         line_indent += indent;
 
@@ -345,27 +418,22 @@ void list_draw(struct screen *display, struct gui_synclist *list)
             }
         }
 #endif
-
         linedes.style = style;
         linedes.scroll = is_selected ? true : list->scroll_all;
         linedes.line = i % list->selected_size;
         icon = list->callback_get_item_icon ?
                     list->callback_get_item_icon(i, list->data) : Icon_NOICON;
-        /* the list can have both, one of or neither of cursor and item icons,
-         * if both don't apply icon padding twice between the icons */
-        if (show_cursor && have_icons)
-            put_line(display, 0, line * linedes.height + draw_offset,
-                    &linedes, "$*s$"ICON_PADDING_S"I$i$"ICON_PADDING_S"s$*t",
-                    line_indent, is_selected ? Icon_Cursor : Icon_NOICON,
-                    icon, item_offset, entry_name);
-        else if (show_cursor || have_icons)
-            put_line(display, 0, line * linedes.height + draw_offset,
-                    &linedes, "$*s$"ICON_PADDING_S"I$*t", line_indent,
-                    show_cursor ? (is_selected ? Icon_Cursor:Icon_NOICON):icon,
-                    item_offset, entry_name);
-        else
-            put_line(display, 0, line * linedes.height + draw_offset,
-                    &linedes, "$*s$*t", line_indent, item_offset, entry_name);
+
+
+        list_info.y = line * linedes.height + draw_offset;
+        list_info.is_selected = is_selected;
+        list_info.item_indent = line_indent;
+        list_info.line = i;
+        list_info.icon = icon;
+        list_info.dsp_text = entry_name;
+        list_info.item_offset = item_offset;
+
+        callback_draw_item(&list_info);
     }
     display->set_viewport(parent);
     display->update_viewport();