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

add a bit more debug info for skins... show the subimage id in the display image token's debug line

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22647 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2009-09-07 07:51:58 +00:00
parent fe2f042670
commit 8bf50ecf48
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/skin_engine/skin_parser.c
View file

@ -538,7 +538,7 @@ static int parse_image_display(const char *wps_bufptr,
img = find_image(label, wps_data); img = find_image(label, wps_data);
if (!img) if (!img)
{ {
token->value.i = label; /* do debug works */ token->value.i = label; /* so debug works */
return WPS_ERROR_INVALID_PARAM; return WPS_ERROR_INVALID_PARAM;
} }

22
apps/gui/skin_engine/wps_debug.c
View file

@ -45,7 +45,8 @@ static char *next_str(bool next) {
return next ? "next " : ""; return next ? "next " : "";
} }
static char *get_token_desc(struct wps_token *token, char *buf, int bufsize) static char *get_token_desc(struct wps_token *token, char *buf,
int bufsize, struct wps_data *data)
{ {
bool next = token->next; bool next = token->next;
@ -116,8 +117,15 @@ static char *get_token_desc(struct wps_token *token, char *buf, int bufsize)
break; break;
case WPS_TOKEN_IMAGE_PRELOAD_DISPLAY: case WPS_TOKEN_IMAGE_PRELOAD_DISPLAY:
snprintf(buf, bufsize, "display preloaded image '%c'", {
token->value.i&0xFF); char subimage = '\0';
char label = token->value.i&0xFF;
struct gui_img *img = find_image(label, data);
if (img && img->num_subimages > 1)
subimage = 'a' + (token->value.i>>8);
snprintf(buf, bufsize, "display preloaded image '%c%c'",
label, subimage);
}
break; break;
case WPS_TOKEN_IMAGE_DISPLAY: case WPS_TOKEN_IMAGE_DISPLAY:
@ -465,7 +473,7 @@ static void dump_wps_tokens(struct wps_data *data)
/* Dump parsed WPS */ /* Dump parsed WPS */
for (i = 0, token = data->tokens; i < data->num_tokens; i++, token++) for (i = 0, token = data->tokens; i < data->num_tokens; i++, token++)
{ {
get_token_desc(token, buf, sizeof(buf)); get_token_desc(token, buf, sizeof(buf), data);
switch(token->type) switch(token->type)
{ {
@ -583,21 +591,21 @@ void print_debug_info(struct wps_data *data, enum wps_parse_error fail, int line
case PARSE_FAIL_INVALID_CHAR: case PARSE_FAIL_INVALID_CHAR:
DEBUGF("ERR: Unexpected conditional char after token %d: \"%s\"", DEBUGF("ERR: Unexpected conditional char after token %d: \"%s\"",
data->num_tokens-1, data->num_tokens-1,
get_token_desc(&data->tokens[data->num_tokens-1], buf, sizeof(buf)) get_token_desc(&data->tokens[data->num_tokens-1], buf, sizeof(buf), data)
); );
break; break;
case PARSE_FAIL_COND_SYNTAX_ERROR: case PARSE_FAIL_COND_SYNTAX_ERROR:
DEBUGF("ERR: Conditional syntax error after token %d: \"%s\"", DEBUGF("ERR: Conditional syntax error after token %d: \"%s\"",
data->num_tokens-1, data->num_tokens-1,
get_token_desc(&data->tokens[data->num_tokens-1], buf, sizeof(buf)) get_token_desc(&data->tokens[data->num_tokens-1], buf, sizeof(buf), data)
); );
break; break;
case PARSE_FAIL_COND_INVALID_PARAM: case PARSE_FAIL_COND_INVALID_PARAM:
DEBUGF("ERR: Invalid parameter list for token %d: \"%s\"", DEBUGF("ERR: Invalid parameter list for token %d: \"%s\"",
data->num_tokens, data->num_tokens,
get_token_desc(&data->tokens[data->num_tokens], buf, sizeof(buf)) get_token_desc(&data->tokens[data->num_tokens], buf, sizeof(buf), data)
); );
break; break;