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
This commit is contained in:
Björn Stenberg
parent
34fa70e321
commit
451d7f5d37
|
|
@ -20,30 +20,28 @@
|
|||
#include "options.h"
|
||||
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#ifdef USE_SCREENSAVERS
|
||||
#ifdef USE_DEMOS
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
#include "lcd.h"
|
||||
#include "menu.h"
|
||||
#include "screensavers_menu.h"
|
||||
#include "demo_menu.h"
|
||||
#include "button.h"
|
||||
#include "kernel.h"
|
||||
#include "sprintf.h"
|
||||
|
||||
#include "boxes.h"
|
||||
extern Menu bounce(void);
|
||||
extern Menu blank(void);
|
||||
extern Menu snow(void);
|
||||
|
||||
Menu screensavers_menu(void)
|
||||
Menu demo_menu(void)
|
||||
{
|
||||
int m;
|
||||
Menu result;
|
||||
|
||||
struct menu_items items[] = {
|
||||
{ "Boxes", boxes },
|
||||
{ "Bounce", bounce },
|
||||
{ "Blank", blank },
|
||||
{ "Snow", snow },
|
||||
};
|
||||
|
||||
m=menu_init( items, sizeof items / sizeof(struct menu_items) );
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
* KIND, either express or implied.
|
||||
*
|
||||
****************************************************************************/
|
||||
#ifndef _SCREENSAVERS_MENU_H
|
||||
#define _SCREENSAVERS_MENU_H
|
||||
#ifndef _DEMOS_MENU_H
|
||||
#define _DEMOS_MENU_H
|
||||
|
||||
Menu screensavers_menu(void);
|
||||
Menu demo_menu(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -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 },
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <stdio.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
#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
|
||||
|
||||
|
||||
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#include "config.h"
|
||||
#include "options.h"
|
||||
|
||||
#ifdef USE_SCREENSAVERS
|
||||
#ifdef USE_DEMOS
|
||||
|
||||
#include "lcd.h"
|
||||
#include "button.h"
|
||||
|
|
|
|||
|
|
@ -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 <stdio.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
#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
|
||||
|
|
@ -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__ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user