diff options
| author | Teruaki Kawashima <teru@rockbox.org> | 2010-02-22 07:17:15 +0000 |
|---|---|---|
| committer | Teruaki Kawashima <teru@rockbox.org> | 2010-02-22 07:17:15 +0000 |
| commit | 56d29e89778f30e87a20bb1e67fd6854fe19684c (patch) | |
| tree | 588064022421b1094aebdc6f627a1a0f5ed4d4df /apps/plugins/star.c | |
| parent | 04067fd7a0570692b0a25f578aaeeb5ab1cbff46 (diff) | |
| download | rockbox-56d29e89778f30e87a20bb1e67fd6854fe19684c.tar.gz rockbox-56d29e89778f30e87a20bb1e67fd6854fe19684c.tar.bz2 rockbox-56d29e89778f30e87a20bb1e67fd6854fe19684c.zip | |
some changes to use of display_text.
* add parameter, wait_key to display_text().
- set this true to wait button press after all words is displayed.
* use ARRAYLEN macro instead of #define WORDS
* add macro to indicate end of style array.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24846 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/star.c')
| -rw-r--r-- | apps/plugins/star.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index c714601542..1e8eb868a9 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -1051,8 +1051,6 @@ static int star_run_game(int current_level) */ static bool star_help(void) { - int button; -#define WORDS (sizeof help_text / sizeof (char*)) static char* help_text[] = { "Star", "", "Aim", "", "Take", "all", "the", "stars", "to", "go", "to", "the", "next", "level.", @@ -1070,27 +1068,17 @@ static bool star_help(void) { 0, TEXT_CENTER|TEXT_UNDERLINE }, { 2, C_RED }, { 35, C_RED }, - { -1, 0 } + LAST_STYLE_ITEM }; -#if LCD_DEPTH > 1 -#ifndef HAVE_LCD_COLOR - rb->lcd_set_background(LCD_WHITE ); - rb->lcd_set_foreground(LCD_BLACK ); -#endif +#if LCD_DEPTH > 1 && !defined(HAVE_LCD_COLOR) + rb->lcd_set_background(LCD_WHITE); + rb->lcd_set_foreground(LCD_BLACK); #endif - if (display_text(WORDS, help_text, formation, NULL)) + if (display_text(ARRAYLEN(help_text), help_text, formation, NULL, true)) return true; - do { - button = rb->button_get(true); - if ( rb->default_event_handler( button ) == SYS_USB_CONNECTED ) - return true; - } while( ( button == BUTTON_NONE ) - || ( button & (BUTTON_REL|BUTTON_REPEAT) ) ); -#if LCD_DEPTH > 1 -#ifndef HAVE_LCD_COLOR - rb->lcd_set_background(LCD_BLACK ); - rb->lcd_set_foreground(LCD_WHITE ); -#endif +#if LCD_DEPTH > 1 && !defined(HAVE_LCD_COLOR) + rb->lcd_set_background(LCD_BLACK); + rb->lcd_set_foreground(LCD_WHITE); #endif return false; } |