devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#8135 - add an optional "left margin" parameter to the %s WPS tag - e.g. %s|100|. This patch uses parts of the scroll-margins patch (FS#2954), but is much smaller, only offers a left-margin, and only affects the WPS code.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15604 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-11-12 21:34:01 +00:00
parent 4b65cb67a5
commit f6ef46b73f
3 changed files with 67 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
apps/gui/wps_parser.c
View file

@ -115,6 +115,8 @@ static int parse_dir_level(const char *wps_bufptr,
struct wps_token *token, struct wps_data *wps_data);
#ifdef HAVE_LCD_BITMAP
static int parse_scrollmargin(const char *wps_bufptr,
struct wps_token *token, struct wps_data *wps_data);
static int parse_image_special(const char *wps_bufptr,
struct wps_token *token, struct wps_data *wps_data);
static int parse_statusbar_enable(const char *wps_bufptr,
@ -277,7 +279,12 @@ static const struct wps_tag all_tags[] = {
{ WPS_TOKEN_CROSSFADE, "xf", WPS_REFRESH_DYNAMIC, NULL },
#endif
#ifdef HAVE_LCD_BITMAP
{ WPS_TOKEN_ALIGN_SCROLLMARGIN, "s", WPS_REFRESH_SCROLL,
parse_scrollmargin },
#else
{ WPS_NO_TOKEN, "s", WPS_REFRESH_SCROLL, NULL },
#endif
{ WPS_TOKEN_SUBLINE_TIMEOUT, "t", 0, parse_subline_timeout },
#ifdef HAVE_LCD_BITMAP
@ -832,6 +839,34 @@ static int parse_albumart_conditional(const char *wps_bufptr,
};
#endif /* HAVE_ALBUMART */
#ifdef HAVE_LCD_BITMAP
static int parse_scrollmargin(const char *wps_bufptr, struct wps_token *token,
struct wps_data *wps_data)
{
const char* p;
const char* pend;
(void)wps_data; /* Kill the warning */
/* valid tag looks like %s or %s|12| */
if(*wps_bufptr == '|')
{
p = wps_bufptr + 1;
if(isdigit(*p) && (pend = strchr(p, '|')))
{
token->value.i = atoi(p);
return(pend - wps_bufptr + 1);
}
} else {
token->value.i = 0;
}
return(0);
}
#endif
/* Parse a generic token from the given string. Return the length read */
static int parse_token(const char *wps_bufptr, struct wps_data *wps_data)
{