diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/viewport.c | 6 | ||||
| -rw-r--r-- | apps/misc.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index f39a299..9bf0e80 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c @@ -445,7 +445,11 @@ const char* viewport_parse_viewport(struct viewport *vp, /* X and Y *must* be set */ if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y)) return NULL; - + /* check for negative values */ + if (vp->x < 0) + vp->x += screens[screen].lcdwidth; + if (vp->y < 0) + vp->y += screens[screen].lcdheight; /* fix defaults */ if (!LIST_VALUE_PARSED(set, PL_WIDTH)) vp->width = screens[screen].lcdwidth - vp->x; diff --git a/apps/misc.c b/apps/misc.c index 5af57fe..6be9f8f 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -945,7 +945,7 @@ const char* parse_list(const char *fmt, uint32_t *set_vals, const char* p = str, *f = fmt; const char** s; int* d; - bool set; + bool set, is_negative; int i=0; va_start(ap, str); @@ -973,7 +973,13 @@ const char* parse_list(const char *fmt, uint32_t *set_vals, break; case 'd': /* int */ + is_negative = false; d = va_arg(ap, int*); + if (*p == '-' && isdigit(*(p+1))) + { + is_negative = true; + p++; + } if (!isdigit(*p)) { if (!set_vals || *p != '-') @@ -987,6 +993,8 @@ const char* parse_list(const char *fmt, uint32_t *set_vals, while (isdigit(*p)) *d = (*d * 10) + (*p++ - '0'); set = true; + if (is_negative) + *d *= -1; } break; |