projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comments.
[bertos.git]
/
bertos
/
gui
/
menu.c
diff --git
a/bertos/gui/menu.c
b/bertos/gui/menu.c
index 146b3c1ffd0f6741d8a04bcb234db577aa71a8fc..432927895e28e03f63bf4243259378877cb50969 100644
(file)
--- a/
bertos/gui/menu.c
+++ b/
bertos/gui/menu.c
@@
-26,13
+26,11
@@
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
- * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2006
, 2010
Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
*
* -->
*
* Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
*
* -->
*
- * \version $Id$
- *
* \author Bernie Innocenti <bernie@codewiz.org>
* \author Stefano Fedrigo <aleph@develer.com>
*
* \author Bernie Innocenti <bernie@codewiz.org>
* \author Stefano Fedrigo <aleph@develer.com>
*
@@
-41,7
+39,9
@@
#include "menu.h"
#include "menu.h"
-#include "cfg/cfg_gfx.h"
+#include "cfg/cfg_menu.h"
+#include "cfg/cfg_arch.h"
+
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/compiler.h>
#include <cfg/debug.h>
@@
-49,6
+49,8
@@
#include <gfx/font.h>
#include <gfx/text.h>
#include <gfx/font.h>
#include <gfx/text.h>
+#include <cpu/power.h>
+
#include <drv/kbd.h>
#include <string.h> /* strcpy() */
#include <drv/kbd.h>
#include <string.h> /* strcpy() */
@@
-57,10
+59,6
@@
#include <avr/pgmspace.h> /* strncpy_P() */
#endif
#include <avr/pgmspace.h> /* strncpy_P() */
#endif
-#if CONFIG_MENU_SMOOTH
-#include <drv/lcd_gfx.h>
-#endif
-
#if (CONFIG_MENU_TIMEOUT != 0)
#include <drv/timer.h>
#endif
#if (CONFIG_MENU_TIMEOUT != 0)
#include <drv/timer.h>
#endif
@@
-168,9
+166,7
@@
static void menu_defaultRenderHook(struct Bitmap *bm, int ypos, bool selected, c
}
}
}
}
-#warning FIXME:REVISE this code!
-#if 0
-//#if CPU_HARVARD
+#if CPU_HARVARD
((item->flags & MIF_RAMLABEL) ? text_xyprintf : text_xyprintf_P)
#else
text_xyprintf
((item->flags & MIF_RAMLABEL) ? text_xyprintf : text_xyprintf_P)
#else
text_xyprintf
@@
-198,13
+194,11
@@
static void menu_layout(
ypos = bm->cr.ymin;
ypos = bm->cr.ymin;
-#if 1
if (redraw)
{
/* Clear screen */
text_clear(menu->bitmap);
}
if (redraw)
{
/* Clear screen */
text_clear(menu->bitmap);
}
-#endif
if (title)
{
if (title)
{
@@
-277,7
+271,7
@@
static void menu_layout(
/* Only print visible items */
if (!(item->flags & MIF_HIDDEN))
{
/* Only print visible items */
if (!(item->flags & MIF_HIDDEN))
{
- /* Check if a special render function is supplied, otherwise use defaults */
+ #warning __FILTER_NEXT_WARNING__
RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
/* Render menuitem */
RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
/* Render menuitem */
@@
-293,7
+287,7
@@
static void menu_layout(
/* Clear rest of area */
gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
/* Clear rest of area */
gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
-
lcd_blitBitmap(&lcd_bitmap
);
+
menu->lcd_blitBitmap(bm
);
}
/* Restore old cliprect */
}
/* Restore old cliprect */
@@
-440,7
+434,7
@@
iptr_t menu_handle(const struct Menu *menu)
items_per_page =
items_per_page =
- (menu->bitmap->height / menu->bitmap->font->height)
+ (menu->bitmap->height / menu->bitmap->font->height
- 1
)
#if CONFIG_MENU_MENUBAR
- 1 /* menu bar labels */
#endif
#if CONFIG_MENU_MENUBAR
- 1 /* menu bar labels */
#endif
@@
-472,6
+466,7
@@
iptr_t menu_handle(const struct Menu *menu)
#if CONFIG_MENU_SMOOTH || (CONFIG_MENU_TIMEOUT != 0)
key = kbd_peek();
#if CONFIG_MENU_SMOOTH || (CONFIG_MENU_TIMEOUT != 0)
key = kbd_peek();
+ cpu_relax();
#else
key = kbd_get();
#endif
#else
key = kbd_get();
#endif
@@
-540,6
+535,7
@@
iptr_t menu_handle(const struct Menu *menu)
/* Store currently selected item before leaving. */
if (menu->flags & MF_SAVESEL)
/* Store currently selected item before leaving. */
if (menu->flags & MF_SAVESEL)
+ #warning __FILTER_NEXT_WARNING__
CONST_CAST(struct Menu *, menu)->selected = selected;
return result;
CONST_CAST(struct Menu *, menu)->selected = selected;
return result;