diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-09-02 06:23:01 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-09-02 06:23:01 +0000 |
commit | 8f76e7ff8f512541b80818a175525f84b943e39d (patch) | |
tree | 630859c7d64d568e78847fceeec61dab56fb1179 | |
parent | a363507a43ad9f93d4f1583245f5ec47c3e3ecfa (diff) | |
download | rockbox-8f76e7ff8f512541b80818a175525f84b943e39d.tar.gz rockbox-8f76e7ff8f512541b80818a175525f84b943e39d.zip |
rename wps_[sub]line to skin_[sub]line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22606 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 12 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 22 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_debug.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 14 |
4 files changed, 26 insertions, 26 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 537468077c..0a43a19b90 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -506,7 +506,7 @@ struct skin_viewport* find_viewport(char label, struct wps_data *data) | |||
506 | The return value indicates whether the line needs to be updated. | 506 | The return value indicates whether the line needs to be updated. |
507 | */ | 507 | */ |
508 | static bool get_line(struct gui_wps *gwps, | 508 | static bool get_line(struct gui_wps *gwps, |
509 | struct wps_subline *subline, | 509 | struct skin_subline *subline, |
510 | struct align_pos *align, | 510 | struct align_pos *align, |
511 | char *linebuf, | 511 | char *linebuf, |
512 | int linebuf_size) | 512 | int linebuf_size) |
@@ -648,7 +648,7 @@ static bool get_line(struct gui_wps *gwps, | |||
648 | 648 | ||
649 | return update; | 649 | return update; |
650 | } | 650 | } |
651 | static void get_subline_timeout(struct gui_wps *gwps, struct wps_subline *subline) | 651 | static void get_subline_timeout(struct gui_wps *gwps, struct skin_subline *subline) |
652 | { | 652 | { |
653 | struct wps_data *data = gwps->data; | 653 | struct wps_data *data = gwps->data; |
654 | int i; | 654 | int i; |
@@ -682,7 +682,7 @@ static void get_subline_timeout(struct gui_wps *gwps, struct wps_subline *sublin | |||
682 | 682 | ||
683 | /* Calculates which subline should be displayed for the specified line | 683 | /* Calculates which subline should be displayed for the specified line |
684 | Returns true iff the subline must be refreshed */ | 684 | Returns true iff the subline must be refreshed */ |
685 | static bool update_curr_subline(struct gui_wps *gwps, struct wps_line *line) | 685 | static bool update_curr_subline(struct gui_wps *gwps, struct skin_line *line) |
686 | { | 686 | { |
687 | /* shortcut this whole thing if we need to reset the line completly */ | 687 | /* shortcut this whole thing if we need to reset the line completly */ |
688 | if (line->curr_subline == NULL) | 688 | if (line->curr_subline == NULL) |
@@ -920,7 +920,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode) | |||
920 | /* reset to first subline if refresh all flag is set */ | 920 | /* reset to first subline if refresh all flag is set */ |
921 | if (refresh_mode == WPS_REFRESH_ALL) | 921 | if (refresh_mode == WPS_REFRESH_ALL) |
922 | { | 922 | { |
923 | struct wps_line *line; | 923 | struct skin_line *line; |
924 | 924 | ||
925 | display->set_viewport(&find_viewport(VP_DEFAULT_LABEL, data)->vp); | 925 | display->set_viewport(&find_viewport(VP_DEFAULT_LABEL, data)->vp); |
926 | display->clear_viewport(); | 926 | display->clear_viewport(); |
@@ -1000,12 +1000,12 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode) | |||
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | /* loop over the lines for this viewport */ | 1002 | /* loop over the lines for this viewport */ |
1003 | struct wps_line *line; | 1003 | struct skin_line *line; |
1004 | int line_count = 0; | 1004 | int line_count = 0; |
1005 | 1005 | ||
1006 | for (line = skin_viewport->lines; line; line = line->next, line_count++) | 1006 | for (line = skin_viewport->lines; line; line = line->next, line_count++) |
1007 | { | 1007 | { |
1008 | struct wps_subline *subline; | 1008 | struct skin_subline *subline; |
1009 | memset(linebuf, 0, sizeof(linebuf)); | 1009 | memset(linebuf, 0, sizeof(linebuf)); |
1010 | update_line = false; | 1010 | update_line = false; |
1011 | 1011 | ||
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index f8c9b75a87..07f38bbee5 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -78,7 +78,7 @@ static int line_number; | |||
78 | /* the current viewport */ | 78 | /* the current viewport */ |
79 | static struct skin_viewport *curr_vp; | 79 | static struct skin_viewport *curr_vp; |
80 | /* the current line, linked to the above viewport */ | 80 | /* the current line, linked to the above viewport */ |
81 | static struct wps_line *curr_line; | 81 | static struct skin_line *curr_line; |
82 | 82 | ||
83 | #ifdef HAVE_LCD_BITMAP | 83 | #ifdef HAVE_LCD_BITMAP |
84 | 84 | ||
@@ -407,9 +407,9 @@ static int skip_end_of_line(const char *wps_bufptr) | |||
407 | } | 407 | } |
408 | 408 | ||
409 | /* Starts a new subline in the current line during parsing */ | 409 | /* Starts a new subline in the current line during parsing */ |
410 | static bool wps_start_new_subline(struct wps_line *line, int curr_token) | 410 | static bool skin_start_new_subline(struct skin_line *line, int curr_token) |
411 | { | 411 | { |
412 | struct wps_subline *subline = skin_buffer_alloc(sizeof(struct wps_subline)); | 412 | struct skin_subline *subline = skin_buffer_alloc(sizeof(struct skin_subline)); |
413 | if (!subline) | 413 | if (!subline) |
414 | return false; | 414 | return false; |
415 | 415 | ||
@@ -425,10 +425,10 @@ static bool wps_start_new_subline(struct wps_line *line, int curr_token) | |||
425 | return true; | 425 | return true; |
426 | } | 426 | } |
427 | 427 | ||
428 | static bool wps_start_new_line(struct skin_viewport *vp, int curr_token) | 428 | static bool skin_start_new_line(struct skin_viewport *vp, int curr_token) |
429 | { | 429 | { |
430 | struct wps_line *line = skin_buffer_alloc(sizeof(struct wps_line)); | 430 | struct skin_line *line = skin_buffer_alloc(sizeof(struct skin_line)); |
431 | struct wps_subline *subline = NULL; | 431 | struct skin_subline *subline = NULL; |
432 | if (!line) | 432 | if (!line) |
433 | return false; | 433 | return false; |
434 | 434 | ||
@@ -670,7 +670,7 @@ static int parse_viewport(const char *wps_bufptr, | |||
670 | skin_vp->lines = NULL; | 670 | skin_vp->lines = NULL; |
671 | 671 | ||
672 | curr_line = NULL; | 672 | curr_line = NULL; |
673 | if (!wps_start_new_line(skin_vp, wps_data->num_tokens)) | 673 | if (!skin_start_new_line(skin_vp, wps_data->num_tokens)) |
674 | return WPS_ERROR_INVALID_PARAM; | 674 | return WPS_ERROR_INVALID_PARAM; |
675 | 675 | ||
676 | 676 | ||
@@ -873,7 +873,7 @@ static int parse_progressbar(const char *wps_bufptr, | |||
873 | /* we need to know what line number (viewport relative) this pb is, | 873 | /* we need to know what line number (viewport relative) this pb is, |
874 | * so count them... */ | 874 | * so count them... */ |
875 | int line_num = -1; | 875 | int line_num = -1; |
876 | struct wps_line *line = curr_vp->lines; | 876 | struct skin_line *line = curr_vp->lines; |
877 | while (line) | 877 | while (line) |
878 | { | 878 | { |
879 | line_num++; | 879 | line_num++; |
@@ -1386,7 +1386,7 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug) | |||
1386 | break; | 1386 | break; |
1387 | } | 1387 | } |
1388 | 1388 | ||
1389 | if (!wps_start_new_subline(curr_line, data->num_tokens)) | 1389 | if (!skin_start_new_subline(curr_line, data->num_tokens)) |
1390 | fail = PARSE_FAIL_LIMITS_EXCEEDED; | 1390 | fail = PARSE_FAIL_LIMITS_EXCEEDED; |
1391 | 1391 | ||
1392 | break; | 1392 | break; |
@@ -1472,7 +1472,7 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug) | |||
1472 | data->tokens[data->num_tokens].next = false; | 1472 | data->tokens[data->num_tokens].next = false; |
1473 | data->num_tokens++; | 1473 | data->num_tokens++; |
1474 | 1474 | ||
1475 | if (!wps_start_new_line(curr_vp, data->num_tokens)) | 1475 | if (!skin_start_new_line(curr_vp, data->num_tokens)) |
1476 | { | 1476 | { |
1477 | fail = PARSE_FAIL_LIMITS_EXCEEDED; | 1477 | fail = PARSE_FAIL_LIMITS_EXCEEDED; |
1478 | break; | 1478 | break; |
@@ -1706,7 +1706,7 @@ bool skin_data_load(struct wps_data *wps_data, | |||
1706 | curr_vp->lines = NULL; | 1706 | curr_vp->lines = NULL; |
1707 | 1707 | ||
1708 | curr_line = NULL; | 1708 | curr_line = NULL; |
1709 | if (!wps_start_new_line(curr_vp, 0)) | 1709 | if (!skin_start_new_line(curr_vp, 0)) |
1710 | return false; | 1710 | return false; |
1711 | 1711 | ||
1712 | switch (statusbar_position(display->screen_type)) | 1712 | switch (statusbar_position(display->screen_type)) |
diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c index 8e0727516a..523e2d62ce 100644 --- a/apps/gui/skin_engine/wps_debug.c +++ b/apps/gui/skin_engine/wps_debug.c | |||
@@ -489,8 +489,8 @@ static void dump_wps_tokens(struct wps_data *data) | |||
489 | 489 | ||
490 | static void print_line_info(struct wps_data *data) | 490 | static void print_line_info(struct wps_data *data) |
491 | { | 491 | { |
492 | struct wps_line *line; | 492 | struct skin_line *line; |
493 | struct wps_subline *subline; | 493 | struct skin_subline *subline; |
494 | if (wps_verbose_level > 0) | 494 | if (wps_verbose_level > 0) |
495 | { | 495 | { |
496 | struct skin_token_list *viewport_list; | 496 | struct skin_token_list *viewport_list; |
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index bcc68a88f0..d1674ac88e 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h | |||
@@ -154,7 +154,7 @@ enum wps_parse_error { | |||
154 | 154 | ||
155 | 155 | ||
156 | /* Description of a subline on the WPS */ | 156 | /* Description of a subline on the WPS */ |
157 | struct wps_subline { | 157 | struct skin_subline { |
158 | 158 | ||
159 | /* Index of the first token for this subline in the token array. | 159 | /* Index of the first token for this subline in the token array. |
160 | Tokens of this subline end where tokens for the next subline | 160 | Tokens of this subline end where tokens for the next subline |
@@ -169,26 +169,26 @@ struct wps_subline { | |||
169 | unsigned char time_mult; | 169 | unsigned char time_mult; |
170 | 170 | ||
171 | /* pointer to the next subline in this line */ | 171 | /* pointer to the next subline in this line */ |
172 | struct wps_subline *next; | 172 | struct skin_subline *next; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | /* Description of a line on the WPS. A line is a set of sublines. | 175 | /* Description of a line on the WPS. A line is a set of sublines. |
176 | A subline is displayed for a certain amount of time. After that, | 176 | A subline is displayed for a certain amount of time. After that, |
177 | the next subline of the line is displayed. And so on. */ | 177 | the next subline of the line is displayed. And so on. */ |
178 | struct wps_line { | 178 | struct skin_line { |
179 | 179 | ||
180 | /* Linked list of all the sublines on this line, | 180 | /* Linked list of all the sublines on this line, |
181 | * a line *must* have at least one subline so no need to add an extra pointer */ | 181 | * a line *must* have at least one subline so no need to add an extra pointer */ |
182 | struct wps_subline sublines; | 182 | struct skin_subline sublines; |
183 | /* pointer to the current subline */ | 183 | /* pointer to the current subline */ |
184 | struct wps_subline *curr_subline; | 184 | struct skin_subline *curr_subline; |
185 | 185 | ||
186 | /* When the next subline of this line should be displayed | 186 | /* When the next subline of this line should be displayed |
187 | (absolute time value in ticks) */ | 187 | (absolute time value in ticks) */ |
188 | long subline_expire_time; | 188 | long subline_expire_time; |
189 | 189 | ||
190 | /* pointer to the next line */ | 190 | /* pointer to the next line */ |
191 | struct wps_line *next; | 191 | struct skin_line *next; |
192 | }; | 192 | }; |
193 | 193 | ||
194 | #define VP_DRAW_HIDEABLE 0x1 | 194 | #define VP_DRAW_HIDEABLE 0x1 |
@@ -199,7 +199,7 @@ struct wps_line { | |||
199 | struct skin_viewport { | 199 | struct skin_viewport { |
200 | struct viewport vp; /* The LCD viewport struct */ | 200 | struct viewport vp; /* The LCD viewport struct */ |
201 | struct progressbar *pb; | 201 | struct progressbar *pb; |
202 | struct wps_line *lines; | 202 | struct skin_line *lines; |
203 | char hidden_flags; | 203 | char hidden_flags; |
204 | char label; | 204 | char label; |
205 | }; | 205 | }; |