diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-06-07 09:01:02 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-06-07 09:01:02 +0000 |
commit | ae49b387bfe78250808a98565f6a233f22045f12 (patch) | |
tree | 78a465d3f077edcc2e50fd88311313702eff5f62 /apps/gui/wps_parser.c | |
parent | cbbbaac6507987619c78a4c6c4228fd4b43d9cd6 (diff) | |
download | rockbox-ae49b387bfe78250808a98565f6a233f22045f12.tar.gz rockbox-ae49b387bfe78250808a98565f6a233f22045f12.zip |
Accept FS#9075 and rename valid_vals to set_vals
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17698 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps_parser.c')
-rw-r--r-- | apps/gui/wps_parser.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 859e5eebe2..53605e27cc 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -544,7 +544,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
544 | const char *ptr = wps_bufptr; | 544 | const char *ptr = wps_bufptr; |
545 | struct viewport* vp; | 545 | struct viewport* vp; |
546 | int depth; | 546 | int depth; |
547 | int valid = 0; | 547 | uint32_t set = 0; |
548 | enum { | 548 | enum { |
549 | PL_X = 0, | 549 | PL_X = 0, |
550 | PL_Y, | 550 | PL_Y, |
@@ -590,7 +590,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
590 | #ifdef HAVE_LCD_COLOR | 590 | #ifdef HAVE_LCD_COLOR |
591 | if (depth == 16) | 591 | if (depth == 16) |
592 | { | 592 | { |
593 | if (!(ptr = parse_list("dddddcc", &valid, '|', ptr, &vp->x, &vp->y, &vp->width, | 593 | if (!(ptr = parse_list("dddddcc", &set, '|', ptr, &vp->x, &vp->y, &vp->width, |
594 | &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern))) | 594 | &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern))) |
595 | return WPS_ERROR_INVALID_PARAM; | 595 | return WPS_ERROR_INVALID_PARAM; |
596 | } | 596 | } |
@@ -601,7 +601,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
601 | /* Default to black on white */ | 601 | /* Default to black on white */ |
602 | vp->fg_pattern = 0; | 602 | vp->fg_pattern = 0; |
603 | vp->bg_pattern = 3; | 603 | vp->bg_pattern = 3; |
604 | if (!(ptr = parse_list("dddddgg", &valid, '|', ptr, &vp->x, &vp->y, &vp->width, | 604 | if (!(ptr = parse_list("dddddgg", &set, '|', ptr, &vp->x, &vp->y, &vp->width, |
605 | &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern))) | 605 | &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern))) |
606 | return WPS_ERROR_INVALID_PARAM; | 606 | return WPS_ERROR_INVALID_PARAM; |
607 | } | 607 | } |
@@ -610,7 +610,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
610 | #if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) | 610 | #if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) |
611 | if (depth == 1) | 611 | if (depth == 1) |
612 | { | 612 | { |
613 | if (!(ptr = parse_list("ddddd", &valid, '|', ptr, &vp->x, &vp->y, | 613 | if (!(ptr = parse_list("ddddd", &set, '|', ptr, &vp->x, &vp->y, |
614 | &vp->width, &vp->height, &vp->font))) | 614 | &vp->width, &vp->height, &vp->font))) |
615 | return WPS_ERROR_INVALID_PARAM; | 615 | return WPS_ERROR_INVALID_PARAM; |
616 | } | 616 | } |
@@ -622,17 +622,17 @@ static int parse_viewport(const char *wps_bufptr, | |||
622 | if (*ptr != '|') | 622 | if (*ptr != '|') |
623 | return WPS_ERROR_INVALID_PARAM; | 623 | return WPS_ERROR_INVALID_PARAM; |
624 | 624 | ||
625 | if ((valid&(1<<PL_X)) == 0 || (valid&(1<<PL_Y)) == 0) | 625 | if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y)) |
626 | return WPS_ERROR_INVALID_PARAM; | 626 | return WPS_ERROR_INVALID_PARAM; |
627 | 627 | ||
628 | /* fix defaults */ | 628 | /* fix defaults */ |
629 | if ((valid&(1<<PL_WIDTH)) == 0) | 629 | if (!LIST_VALUE_PARSED(set, PL_WIDTH)) |
630 | vp->width = lcd_width - vp->x; | 630 | vp->width = lcd_width - vp->x; |
631 | if ((valid&(1<<PL_HEIGHT)) == 0) | 631 | if (!LIST_VALUE_PARSED(set, PL_HEIGHT)) |
632 | vp->height = lcd_height - vp->y; | 632 | vp->height = lcd_height - vp->y; |
633 | 633 | ||
634 | /* Default to using the user font if the font was an invalid number */ | 634 | /* Default to using the user font if the font was an invalid number */ |
635 | if (((valid&(1<<PL_FONT)) == 0) || | 635 | if (!LIST_VALUE_PARSED(set, PL_FONT) || |
636 | ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))) | 636 | ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))) |
637 | vp->font = FONT_UI; | 637 | vp->font = FONT_UI; |
638 | 638 | ||
@@ -649,9 +649,9 @@ static int parse_viewport(const char *wps_bufptr, | |||
649 | #ifdef HAVE_LCD_COLOR | 649 | #ifdef HAVE_LCD_COLOR |
650 | if (depth == 16) | 650 | if (depth == 16) |
651 | { | 651 | { |
652 | if ((valid&(1<<PL_FG)) == 0) | 652 | if (!LIST_VALUE_PARSED(set, PL_FG)) |
653 | vp->fg_pattern = global_settings.fg_color; | 653 | vp->fg_pattern = global_settings.fg_color; |
654 | if ((valid&(1<<PL_BG)) == 0) | 654 | if (!LIST_VALUE_PARSED(set, PL_BG)) |
655 | vp->bg_pattern = global_settings.bg_color; | 655 | vp->bg_pattern = global_settings.bg_color; |
656 | } | 656 | } |
657 | #endif | 657 | #endif |