From 451d7f5d3755b48bd397b6586cf3c4943dc55573 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Fri, 6 Sep 2002 22:28:28 +0000 Subject: Renamed menu item 'Screensavers' to more descriptive 'Demos'. Added snow, removed blank and boxes. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2215 a1c6a512-1295-4272-9138-f99709370657 --- apps/demo_menu.c | 55 ++++++++++++++++++++ apps/demo_menu.h | 25 +++++++++ apps/main_menu.c | 12 ++--- apps/options.h | 6 +-- apps/recorder/blank.c | 96 ----------------------------------- apps/recorder/bounce.c | 2 +- apps/recorder/boxes.c | 129 ----------------------------------------------- apps/recorder/boxes.h | 28 ---------- apps/screensavers_menu.c | 57 --------------------- apps/screensavers_menu.h | 25 --------- 10 files changed, 90 insertions(+), 345 deletions(-) create mode 100644 apps/demo_menu.c create mode 100644 apps/demo_menu.h delete mode 100644 apps/recorder/blank.c delete mode 100644 apps/recorder/boxes.c delete mode 100644 apps/recorder/boxes.h delete mode 100644 apps/screensavers_menu.c delete mode 100644 apps/screensavers_menu.h diff --git a/apps/demo_menu.c b/apps/demo_menu.c new file mode 100644 index 0000000000..cbd5742c7c --- /dev/null +++ b/apps/demo_menu.c @@ -0,0 +1,55 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 Robert Hak + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "options.h" + +#ifdef HAVE_LCD_BITMAP +#ifdef USE_DEMOS + +#include +#include +#include "lcd.h" +#include "menu.h" +#include "demo_menu.h" +#include "button.h" +#include "kernel.h" +#include "sprintf.h" + +extern Menu bounce(void); +extern Menu snow(void); + +Menu demo_menu(void) +{ + int m; + Menu result; + + struct menu_items items[] = { + { "Bounce", bounce }, + { "Snow", snow }, + }; + + m=menu_init( items, sizeof items / sizeof(struct menu_items) ); + result = menu_run(m); + menu_exit(m); + + return result; +} + +#endif +#endif diff --git a/apps/demo_menu.h b/apps/demo_menu.h new file mode 100644 index 0000000000..13c315dd82 --- /dev/null +++ b/apps/demo_menu.h @@ -0,0 +1,25 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 Robert Hak + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#ifndef _DEMOS_MENU_H +#define _DEMOS_MENU_H + +Menu demo_menu(void); + +#endif + diff --git a/apps/main_menu.c b/apps/main_menu.c index c9c17b59de..464b514bc3 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -45,9 +45,9 @@ #include "games_menu.h" #endif /* End USE_GAMES */ -#ifdef USE_SCREENSAVERS -#include "screensavers_menu.h" -#endif /* End USE_SCREENSAVERS */ +#ifdef USE_DEMOS +#include "demo_menu.h" +#endif /* End USE_DEMOS */ #endif /* End HAVE_LCD_BITMAP */ @@ -211,9 +211,9 @@ Menu main_menu(void) #ifdef USE_GAMES { "Games", games_menu }, #endif -#ifdef USE_SCREENSAVERS - { "Screensavers", screensavers_menu }, -#endif /* end USE_SCREENSAVERS */ +#ifdef USE_DEMOS + { "Demos", demo_menu }, +#endif /* end USE_DEMOS */ #endif { "Info", show_info }, { "Version", show_credits }, diff --git a/apps/options.h b/apps/options.h index de7b94b112..24cd2ad58c 100644 --- a/apps/options.h +++ b/apps/options.h @@ -20,9 +20,9 @@ #ifndef __OPTIONS_H__ #define __OPTIONS_H__ -#ifndef DISABLE_SCREENSAVERS -#undef USE_SCREENSAVERS /* since older Makefiles set the define */ -#define USE_SCREENSAVERS +#ifndef DISABLE_DEMOS +#undef USE_DEMOS /* since older Makefiles set the define */ +#define USE_DEMOS #endif #ifndef DISABLE_GAMES diff --git a/apps/recorder/blank.c b/apps/recorder/blank.c deleted file mode 100644 index 78cc093622..0000000000 --- a/apps/recorder/blank.c +++ /dev/null @@ -1,96 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Robert E. Hak - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "config.h" -#include "options.h" - -#ifdef USE_SCREENSAVERS - -#include "lcd.h" -#include "button.h" -#include "kernel.h" -#include "menu.h" - -#ifdef SIMULATOR -#include -#endif -#include - -#define SS_TITLE "Blank" -#define SS_TITLE_FONT 2 - -Menu blank(void) -{ - int w, h; - char *off = "[Off] to stop"; - int len = strlen(SS_TITLE); - - lcd_getfontsize(SS_TITLE_FONT, &w, &h); - - /* Get horizontel centering for text */ - len *= w; - if (len%2 != 0) - len = ((len+1)/2)+(w/2); - else - len /= 2; - - if (h%2 != 0) - h = (h/2)+1; - else - h /= 2; - - lcd_clear_display(); - lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT); - - len = strlen(off); - lcd_getfontsize(0, &w, &h); - - /* Get horizontel centering for text */ - len *= w; - if (len%2 != 0) - len = ((len+1)/2)+(w/2); - else - len /= 2; - - if (h%2 != 0) - h = (h/2)+1; - else - h /= 2; - - lcd_putsxy(LCD_WIDTH/2-len, LCD_HEIGHT-(2*h), off, 0); - - lcd_update(); - sleep(HZ); - - lcd_clear_display(); - lcd_update(); - - while(1) { - if(button_get(false)) - return MENU_OK; - sleep(HZ/10); - } - - return MENU_OK; -} - -#endif - - - diff --git a/apps/recorder/bounce.c b/apps/recorder/bounce.c index 8f6ffe6226..96291066e5 100644 --- a/apps/recorder/bounce.c +++ b/apps/recorder/bounce.c @@ -20,7 +20,7 @@ #include "config.h" #include "options.h" -#ifdef USE_SCREENSAVERS +#ifdef USE_DEMOS #include "lcd.h" #include "button.h" diff --git a/apps/recorder/boxes.c b/apps/recorder/boxes.c deleted file mode 100644 index 8e80006953..0000000000 --- a/apps/recorder/boxes.c +++ /dev/null @@ -1,129 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Robert E. Hak (rhak at ramapo.edu) - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "config.h" -#include "options.h" - -#ifdef USE_SCREENSAVERS - -#include "boxes.h" -#include "lcd.h" -#include "button.h" -#include "kernel.h" -#include "menu.h" - -#ifdef SIMULATOR -#include -#endif -#include - -#define SS_TITLE "Boxes" -#define SS_TITLE_FONT 2 - -static void ss_loop(void) -{ - int b; - int x = LCD_WIDTH/2; - int y = LCD_HEIGHT/2; - int i = 0; - int center = 0; - int factor = 0; - - if (LCD_HEIGHT < LCD_WIDTH) - center = LCD_HEIGHT/2; - else - center = LCD_WIDTH/2; - - i = center+1; - while(1) - { - /* Grow */ - if ( i < 0 ) { - factor = 1; - i = 1; - } - - /* Shrink */ - if (i >= center) { - factor = -1; - i = center; - } - - b = button_get(false); - if ( b & BUTTON_OFF ) - return; - - lcd_clear_display(); - lcd_drawrect(x-i, y-i, 2*i+1, 2*i+1); - lcd_update(); - - i+=factor; - - sleep(HZ/10); - } -} - -Menu boxes(void) -{ - int w, h; - char *off = "[Off] to stop"; - int len = strlen(SS_TITLE); - - lcd_getfontsize(SS_TITLE_FONT, &w, &h); - - /* Get horizontel centering for text */ - len *= w; - if (len%2 != 0) - len = ((len+1)/2)+(w/2); - else - len /= 2; - - if (h%2 != 0) - h = (h/2)+1; - else - h /= 2; - - lcd_clear_display(); - lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT); - - len = strlen(off); - lcd_getfontsize(0, &w, &h); - - /* Get horizontel centering for text */ - len *= w; - if (len%2 != 0) - len = ((len+1)/2)+(w/2); - else - len /= 2; - - if (h%2 != 0) - h = (h/2)+1; - else - h /= 2; - - lcd_putsxy(LCD_WIDTH/2-len, LCD_HEIGHT-(2*h), off,0); - - lcd_update(); - sleep(HZ/2); - ss_loop(); - - return MENU_OK; -} - -#endif diff --git a/apps/recorder/boxes.h b/apps/recorder/boxes.h deleted file mode 100644 index 2defb0bbfc..0000000000 --- a/apps/recorder/boxes.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Robert E. Hak - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __BOXES_H__ -#define __BOXES_H__ - -#include "menu.h" - -Menu boxes(void); - -#endif /* __BOXES_H__ */ - diff --git a/apps/screensavers_menu.c b/apps/screensavers_menu.c deleted file mode 100644 index 3d43347362..0000000000 --- a/apps/screensavers_menu.c +++ /dev/null @@ -1,57 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Robert Hak - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "options.h" - -#ifdef HAVE_LCD_BITMAP -#ifdef USE_SCREENSAVERS - -#include -#include -#include "lcd.h" -#include "menu.h" -#include "screensavers_menu.h" -#include "button.h" -#include "kernel.h" -#include "sprintf.h" - -#include "boxes.h" -extern Menu bounce(void); -extern Menu blank(void); - -Menu screensavers_menu(void) -{ - int m; - Menu result; - - struct menu_items items[] = { - { "Boxes", boxes }, - { "Bounce", bounce }, - { "Blank", blank }, - }; - - m=menu_init( items, sizeof items / sizeof(struct menu_items) ); - result = menu_run(m); - menu_exit(m); - - return result; -} - -#endif -#endif diff --git a/apps/screensavers_menu.h b/apps/screensavers_menu.h deleted file mode 100644 index cac4c43cc9..0000000000 --- a/apps/screensavers_menu.h +++ /dev/null @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Robert Hak - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _SCREENSAVERS_MENU_H -#define _SCREENSAVERS_MENU_H - -Menu screensavers_menu(void); - -#endif - -- cgit v1.2.3