diff options
Diffstat (limited to 'apps/gui/skin_engine/wps_debug.c')
-rw-r--r-- | apps/gui/skin_engine/wps_debug.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c index 78f58c42b1..8e0727516a 100644 --- a/apps/gui/skin_engine/wps_debug.c +++ b/apps/gui/skin_engine/wps_debug.c | |||
@@ -60,8 +60,11 @@ static char *get_token_desc(struct wps_token *token, char *buf, int bufsize) | |||
60 | break; | 60 | break; |
61 | 61 | ||
62 | case WPS_TOKEN_CHARACTER: | 62 | case WPS_TOKEN_CHARACTER: |
63 | snprintf(buf, bufsize, "Character '%c'", | 63 | if (token->value.c == '\n') |
64 | token->value.c); | 64 | snprintf(buf, bufsize, "Character '\\n'"); |
65 | else | ||
66 | snprintf(buf, bufsize, "Character '%c'", | ||
67 | token->value.c); | ||
65 | break; | 68 | break; |
66 | 69 | ||
67 | case WPS_TOKEN_STRING: | 70 | case WPS_TOKEN_STRING: |
@@ -486,7 +489,6 @@ static void dump_wps_tokens(struct wps_data *data) | |||
486 | 489 | ||
487 | static void print_line_info(struct wps_data *data) | 490 | static void print_line_info(struct wps_data *data) |
488 | { | 491 | { |
489 | int i, j; | ||
490 | struct wps_line *line; | 492 | struct wps_line *line; |
491 | struct wps_subline *subline; | 493 | struct wps_subline *subline; |
492 | if (wps_verbose_level > 0) | 494 | if (wps_verbose_level > 0) |
@@ -498,16 +500,14 @@ static void print_line_info(struct wps_data *data) | |||
498 | struct skin_viewport *v = | 500 | struct skin_viewport *v = |
499 | (struct skin_viewport *)viewport_list->token->value.data; | 501 | (struct skin_viewport *)viewport_list->token->value.data; |
500 | DEBUGF("vp Label:'%c' Hidden flags:%x\n", v->label, v->hidden_flags); | 502 | DEBUGF("vp Label:'%c' Hidden flags:%x\n", v->label, v->hidden_flags); |
501 | DEBUGF(" First line: %d\n", v->first_line); | ||
502 | DEBUGF(" Last line: %d\n", v->last_line); | ||
503 | } | 503 | } |
504 | DEBUGF("Number of sublines : %d\n", data->num_sublines); | ||
505 | DEBUGF("Number of tokens : %d\n", data->num_tokens); | 504 | DEBUGF("Number of tokens : %d\n", data->num_tokens); |
506 | DEBUGF("\n"); | 505 | DEBUGF("\n"); |
507 | } | 506 | } |
508 | 507 | ||
509 | if (wps_verbose_level > 1) | 508 | if (wps_verbose_level > 1) |
510 | { | 509 | { |
510 | int line_number = 0; | ||
511 | struct skin_token_list *viewport_list; | 511 | struct skin_token_list *viewport_list; |
512 | for (viewport_list = data->viewports; | 512 | for (viewport_list = data->viewports; |
513 | viewport_list; viewport_list = viewport_list->next) | 513 | viewport_list; viewport_list = viewport_list->next) |
@@ -516,17 +516,15 @@ static void print_line_info(struct wps_data *data) | |||
516 | (struct skin_viewport *)viewport_list->token->value.data; | 516 | (struct skin_viewport *)viewport_list->token->value.data; |
517 | DEBUGF("Viewport '%c' - +%d+%d (%dx%d)\n",v->label, v->vp.x, v->vp.y, | 517 | DEBUGF("Viewport '%c' - +%d+%d (%dx%d)\n",v->label, v->vp.x, v->vp.y, |
518 | v->vp.width, v->vp.height); | 518 | v->vp.width, v->vp.height); |
519 | for (i = v->first_line, line = &data->lines[v->first_line]; i <= v->last_line; i++,line++) | 519 | for (line = v->lines; line; line = line->next, line_number++) |
520 | { | 520 | { |
521 | DEBUGF("Line %2d (num_sublines=%d, first_subline=%d)\n", | 521 | DEBUGF("Line %2d\n", line_number); |
522 | i, line->num_sublines, line->first_subline_idx); | 522 | int subline_number = 0; |
523 | 523 | subline = &line->sublines; | |
524 | for (j = 0, subline = data->sublines + line->first_subline_idx; | 524 | while (subline) |
525 | j < line->num_sublines; j++, subline++) | ||
526 | { | 525 | { |
527 | DEBUGF(" Subline %d: first_token=%3d, last_token=%3d", | 526 | DEBUGF(" Subline %d: first_token=%3d, last_token=%3d", |
528 | j, subline->first_token_idx, | 527 | subline_number, subline->first_token_idx,subline->last_token_idx); |
529 | skin_last_token_index(data, i, j)); | ||
530 | 528 | ||
531 | if (subline->line_type & WPS_REFRESH_SCROLL) | 529 | if (subline->line_type & WPS_REFRESH_SCROLL) |
532 | DEBUGF(", scrolled"); | 530 | DEBUGF(", scrolled"); |
@@ -536,6 +534,8 @@ static void print_line_info(struct wps_data *data) | |||
536 | DEBUGF(", peakmeter"); | 534 | DEBUGF(", peakmeter"); |
537 | 535 | ||
538 | DEBUGF("\n"); | 536 | DEBUGF("\n"); |
537 | subline = subline->next; | ||
538 | subline_number++; | ||
539 | } | 539 | } |
540 | } | 540 | } |
541 | } | 541 | } |