devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Corrected a bug on archos with buttonbar which was erased when filetree refreshed (mistake introduced in 2005/10/29 commit; Changed some copyrights in the files (I hope this time will be the good one and the last one ! )

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7684 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kevin Ferrare 2005-10-30 01:24:35 +00:00
parent 6934eaf225
commit a3ed62b36f
15 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/gui/buttonbar.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) Linus Nielsen Feltzing (2002), Kevin FERRARE (2005) * Copyright (C) Linus Nielsen Feltzing (2002)
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.
@ -16,7 +16,13 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
/*
2005 Kevin Ferrare :
- Multi screen support
- Rewrote a lot of code to avoid global vars and make it accept eventually
more that 3 buttons on the bar (just the prototype of gui_buttonbar_set
and the constant BUTTONBAR_MAX_BUTTONS to modify)
*/
#include "config.h" #include "config.h"
#include "buttonbar.h" #include "buttonbar.h"
@ -43,8 +49,7 @@ void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
int xpos, ypos, button_width, text_width; int xpos, ypos, button_width, text_width;
int fw, fh; int fw, fh;
struct screen * display = buttonbar->display; struct screen * display = buttonbar->display;
display->setfont(FONT_SYSFIXED);
display->getstringsize("M", &fw, &fh); display->getstringsize("M", &fw, &fh);
button_width = display->width/BUTTONBAR_MAX_BUTTONS; button_width = display->width/BUTTONBAR_MAX_BUTTONS;
@ -62,7 +67,6 @@ void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
display->set_drawmode(DRMODE_COMPLEMENT); display->set_drawmode(DRMODE_COMPLEMENT);
display->fillrect(xpos, ypos, button_width - 1, fh); display->fillrect(xpos, ypos, button_width - 1, fh);
display->set_drawmode(DRMODE_SOLID); display->set_drawmode(DRMODE_SOLID);
display->setfont(FONT_UI);
} }
void gui_buttonbar_set(struct gui_buttonbar * buttonbar, void gui_buttonbar_set(struct gui_buttonbar * buttonbar,
@ -99,7 +103,8 @@ void gui_buttonbar_draw(struct gui_buttonbar * buttonbar)
{ {
struct screen * display = buttonbar->display; struct screen * display = buttonbar->display;
int i; int i;
display->setfont(FONT_SYSFIXED);
display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
display->fillrect(0, display->height - BUTTONBAR_HEIGHT, display->fillrect(0, display->height - BUTTONBAR_HEIGHT,
display->width, BUTTONBAR_HEIGHT); display->width, BUTTONBAR_HEIGHT);
@ -109,6 +114,7 @@ void gui_buttonbar_draw(struct gui_buttonbar * buttonbar)
gui_buttonbar_draw_button(buttonbar, i); gui_buttonbar_draw_button(buttonbar, i);
display->update_rect(0, display->height - BUTTONBAR_HEIGHT, display->update_rect(0, display->height - BUTTONBAR_HEIGHT,
display->width, BUTTONBAR_HEIGHT); display->width, BUTTONBAR_HEIGHT);
display->setfont(FONT_UI);
} }
bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar) bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar)

2
apps/gui/buttonbar.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/icon.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) Robert E. Hak(2002), Kevin FERRARE (2005) * Copyright (C) Robert E. Hak(2002)
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/icon.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/list.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/list.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/scrollbar.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) Markus Braun (2002), Kevin FERRARE (2005) * Copyright (C) Markus Braun (2002)
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/scrollbar.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 Kevin FERRARE * Copyright (C) 2005 Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/splash.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) Daniel Stenberg (2002), Kevin FERRARE (2005) * Copyright (C) Daniel Stenberg (2002)
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/splash.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/statusbar.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) Robert E. Hak (2002), Linus Nielsen Feltzing (2002), Kevin FERRARE (2005) * Copyright (C) Robert E. Hak (2002), Linus Nielsen Feltzing (2002)
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/gui/statusbar.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

2
apps/plugins/starfield.c
View file

@ -5,7 +5,7 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* Copyright (C) 2005 Kévin Ferrare * Copyright (C) 2005 Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.

5
apps/screen_access.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by Kevin FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.
@ -27,7 +27,6 @@
#include <icons.h> #include <icons.h>
#include "screen_access.h" #include "screen_access.h"
#include "buttonbar.h"
struct screen screens[NB_SCREENS]; struct screen screens[NB_SCREENS];
@ -156,7 +155,7 @@ void screen_update_nblines(struct screen * screen)
int height=screen->height; int height=screen->height;
if(global_settings.statusbar) if(global_settings.statusbar)
height -= STATUSBAR_HEIGHT; height -= STATUSBAR_HEIGHT;
#if CONFIG_KEYPAD == RECORDER_PAD #ifdef HAS_BUTTONBAR
if(global_settings.buttonbar) if(global_settings.buttonbar)
height -= BUTTONBAR_HEIGHT; height -= BUTTONBAR_HEIGHT;
#endif #endif

4
apps/screen_access.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 by K<EFBFBD>in FERRARE * Copyright (C) 2005 by Kevin Ferrare
* *
* All files in this archive are subject to the GNU General Public License. * 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. * See the file COPYING in the source tree root for full license agreement.
@ -21,6 +21,8 @@
#define _SCREEN_ACCESS_H_ #define _SCREEN_ACCESS_H_
#include "lcd.h" #include "lcd.h"
#include "buttonbar.h"
enum screen_type { enum screen_type {
SCREEN_MAIN SCREEN_MAIN
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD