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

Add a general-purpose parse_list function to parse a string containing a delimited list of items and adapt the parse_image_load() function in the WPS parser to use it. This function will also be used to parse the upcoming WPS %V viewport tag, but I'm committing it separately as these changes are unrelated to the viewport implementation itself.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16728 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2008-03-21 13:41:35 +00:00
parent bb026334c0
commit e92d2c51ed
6 changed files with 137 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

55
apps/gui/wps_parser.c
View file

@ -447,21 +447,27 @@ static int parse_image_load(const char *wps_bufptr,
{
int n;
const char *ptr = wps_bufptr;
const char *pos = NULL;
const char *newline;
const char* filename;
const char* id;
int x,y;
/* format: %x|n|filename.bmp|x|y|
or %xl|n|filename.bmp|x|y| */
ptr = strchr(ptr, '|') + 1;
pos = strchr(ptr, '|');
newline = strchr(ptr, '\n');
if (*ptr != '|')
return WPS_ERROR_INVALID_PARAM;
if (!pos || pos > newline)
return 0;
ptr++;
if (!(ptr = parse_list("ssdd", '|', ptr, &id, &filename, &x, &y)))
return WPS_ERROR_INVALID_PARAM;
/* Check there is a terminating | */
if (*ptr != '|')
return WPS_ERROR_INVALID_PARAM;
/* get the image ID */
n = get_image_id(*ptr);
n = get_image_id(*id);
/* check the image number and load state */
if(n < 0 || n >= MAX_IMAGES || wps_data->img[n].loaded)
@ -470,34 +476,11 @@ static int parse_image_load(const char *wps_bufptr,
return WPS_ERROR_INVALID_PARAM;
}
ptr = pos + 1;
/* save a pointer to the filename */
bmp_names[n] = filename;
/* get image name */
bmp_names[n] = ptr;
pos = strchr(ptr, '|');
ptr = pos + 1;
/* get x-position */
pos = strchr(ptr, '|');
if (pos && pos < newline)
wps_data->img[n].x = atoi(ptr);
else
{
/* weird syntax, bail out */
return WPS_ERROR_INVALID_PARAM;
}
/* get y-position */
ptr = pos + 1;
pos = strchr(ptr, '|');
if (pos && pos < newline)
wps_data->img[n].y = atoi(ptr);
else
{
/* weird syntax, bail out */
return WPS_ERROR_INVALID_PARAM;
}
wps_data->img[n].x = x;
wps_data->img[n].y = y;
if (token->type == WPS_TOKEN_IMAGE_DISPLAY)
wps_data->img[n].always_display = true;