X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgui%2Fmenu.c;h=432927895e28e03f63bf4243259378877cb50969;hb=69189320a33089d77c2623698c583a7a0fc48702;hp=e689ff96cd96ef8362768ab4d5e20eb1dd434d3b;hpb=6450bc5d51cf02b42fe910f313e62155a2bf5e11;p=bertos.git

diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c
index e689ff96..43292789 100644
--- 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.
  *
- * 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>
  *
  * -->
  *
- * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
@@ -41,8 +39,9 @@
 
 #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>
 
@@ -50,6 +49,8 @@
 #include <gfx/font.h>
 #include <gfx/text.h>
 
+#include <cpu/power.h>
+
 #include <drv/kbd.h>
 
 #include <string.h> /* strcpy() */
@@ -58,10 +59,6 @@
 #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
@@ -197,13 +194,11 @@ static void menu_layout(
 
 	ypos = bm->cr.ymin;
 
-#if 1
 	if (redraw)
 	{
 		/* Clear screen */
 		text_clear(menu->bitmap);
 	}
-#endif
 
 	if (title)
 	{
@@ -276,11 +271,8 @@ static void menu_layout(
 		/* Only print visible items */
 		if (!(item->flags & MIF_HIDDEN))
 		{
-			/* Check if a special render function is supplied, otherwise use defaults */
-			#if (ARCH & ARCH_NIGHTTEST)
-				#warning __FILTER_NEXT_WARNING__
-			#endif
-			RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? CONST_CAST(RenderHook, item->label) : menu_defaultRenderHook;
+			#warning __FILTER_NEXT_WARNING__
+			RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
 
 			/* Render menuitem */
 			renderhook(menu->bitmap, ypos++, (i == selected), item);
@@ -295,7 +287,7 @@ static void menu_layout(
 		/* 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 */
@@ -442,7 +434,7 @@ iptr_t menu_handle(const struct Menu *menu)
 
 
 	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
@@ -474,6 +466,7 @@ iptr_t menu_handle(const struct Menu *menu)
 
 		#if CONFIG_MENU_SMOOTH || (CONFIG_MENU_TIMEOUT != 0)
 			key = kbd_peek();
+			cpu_relax();
 		#else
 			key = kbd_get();
 		#endif
@@ -542,9 +535,7 @@ iptr_t menu_handle(const struct Menu *menu)
 
 	/* Store currently selected item before leaving. */
 	if (menu->flags & MF_SAVESEL)
-		#if (ARCH & ARCH_NIGHTTEST)
-			#warning __FILTER_NEXT_WARNING__
-		#endif
+		#warning __FILTER_NEXT_WARNING__
 		CONST_CAST(struct Menu *, menu)->selected = selected;
 
 	return result;