1 files changed, 101 insertions, 3 deletions

diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index d635c10481..52704d9f69 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -35,6 +35,15 @@
 #include "screen_access.h"
 #include "appevents.h"
 
+
+
+#define LINE_SEL_FROM_SETTINGS(vp) \
+    do { \
+        vp->lss_pattern = global_settings.lss_color; \
+        vp->lse_pattern = global_settings.lse_color; \
+        vp->lst_pattern = global_settings.lst_color; \
+    } while (0)
+
 static int statusbar_enabled = 0;
 
 int viewport_get_nb_lines(struct viewport *vp)
@@ -88,9 +97,7 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
 #ifdef HAVE_LCD_COLOR
         vp->fg_pattern = global_settings.fg_color;
         vp->bg_pattern = global_settings.bg_color;
-        vp->lss_pattern = global_settings.lss_color;
-        vp->lse_pattern = global_settings.lse_color;
-        vp->lst_pattern = global_settings.lst_color;
+        LINE_SEL_FROM_SETTINGS(vp);
 #elif LCD_DEPTH > 1
         vp->fg_pattern = LCD_DEFAULT_FG;
         vp->bg_pattern = LCD_DEFAULT_BG;
@@ -151,3 +158,94 @@ void viewportmanager_statusbar_changed(void* data)
 #endif
     viewportmanager_set_statusbar(statusbar_enabled);
 }
+
+const char* viewport_parse_viewport(struct viewport *vp,
+                                    enum screen_type screen,
+                                    const char *bufptr,
+                                    const char separator)
+{
+    /* parse the list to the viewport struct */
+    const char *ptr = bufptr;
+    int depth;
+    uint32_t set = 0;
+
+    enum {
+        PL_X = 0,
+        PL_Y,
+        PL_WIDTH,
+        PL_HEIGHT,
+        PL_FONT,
+        PL_FG,
+        PL_BG,
+    };
+    
+    /* Work out the depth of this display */
+    depth = screens[screen].depth;
+#ifdef HAVE_LCD_COLOR
+    if (depth == 16)
+    {
+        if (!(ptr = parse_list("dddddcc", &set, separator, ptr, &vp->x, &vp->y, &vp->width,
+                    &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern)))
+            return VP_ERROR;
+    }
+    else 
+#endif
+#if (LCD_DEPTH == 2) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 2)
+    if (depth == 2) {
+        if (!(ptr = parse_list("dddddgg", &set, separator, ptr, &vp->x, &vp->y, &vp->width,
+                    &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern)))
+            return VP_ERROR;
+    }
+    else 
+#endif
+#if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1)
+    if (depth == 1)
+    {
+        if (!(ptr = parse_list("ddddd", &set, separator, ptr, &vp->x, &vp->y, &vp->width,
+                &vp->height, &vp->font)))
+            return VP_ERROR;
+    }
+    else
+#endif
+    {}
+
+    /* X and Y *must* be set */
+    if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y))
+        return VP_ERROR;
+    
+    /* fix defaults */
+    if (!LIST_VALUE_PARSED(set, PL_WIDTH))
+        vp->width = screens[screen].lcdwidth - vp->x;
+    if (!LIST_VALUE_PARSED(set, PL_HEIGHT))
+        vp->height = screens[screen].lcdheight - vp->y;
+
+#if (LCD_DEPTH > 1)
+    if (!LIST_VALUE_PARSED(set, PL_FG))
+        vp->fg_pattern = global_settings.fg_color;
+    if (!LIST_VALUE_PARSED(set, PL_BG))
+        vp->bg_pattern = global_settings.bg_color;
+#endif
+#ifdef HAVE_LCD_COLOR
+    LINE_SEL_FROM_SETTINGS(vp);
+#endif
+    /* Validate the viewport dimensions - we know that the numbers are
+       non-negative integers, ignore bars and assume the viewport takes them
+       * into account */
+    if ((vp->x >= screens[screen].lcdwidth) ||
+        ((vp->x + vp->width) > screens[screen].lcdwidth) ||
+        (vp->y >= screens[screen].lcdheight) ||
+        ((vp->y + vp->height) > screens[screen].lcdheight))
+    {
+        return VP_ERROR;
+    }
+
+    /* Default to using the user font if the font was an invalid number or '-'*/
+    if (((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))
+            || !LIST_VALUE_PARSED(set, PL_FONT)
+            )
+        vp->font = FONT_UI;
+        
+    vp->drawmode = DRMODE_SOLID;
+
+    return ptr;
+}