projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for parametrization of the sources dir and the project sources dir.
[bertos.git]
/
bertos
/
gui
/
menu.c
diff --git
a/bertos/gui/menu.c
b/bertos/gui/menu.c
index a00d951914a440c3e1fe6b4e56267150a5b62e5a..86e8f17dd4453cfc4bd277f48b8c9190c6042454 100644
(file)
--- a/
bertos/gui/menu.c
+++ b/
bertos/gui/menu.c
@@
-27,13
+27,13
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bern
ardo
Innocenti <bernie@codewiz.org>
+ * Copyright 2000 Bern
ie
Innocenti <bernie@codewiz.org>
*
* -->
*
* \version $Id$
*
*
* -->
*
* \version $Id$
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Stefano Fedrigo <aleph@develer.com>
*
* \brief General pourpose menu handling functions
* \author Stefano Fedrigo <aleph@develer.com>
*
* \brief General pourpose menu handling functions
@@
-41,7
+41,8
@@
#include "menu.h"
#include "menu.h"
-#include <cfg/cfg_gfx.h>
+#include "cfg/cfg_gfx.h"
+#include "cfg/cfg_arch.h"
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/compiler.h>
#include <cfg/debug.h>
@@
-168,9
+169,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,7
+197,7
@@
static void menu_layout(
ypos = bm->cr.ymin;
ypos = bm->cr.ymin;
-#if
0
+#if
1
if (redraw)
{
/* Clear screen */
if (redraw)
{
/* Clear screen */
@@
-278,6
+277,9
@@
static void menu_layout(
if (!(item->flags & MIF_HIDDEN))
{
/* Check if a special render function is supplied, otherwise use defaults */
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) ? (RenderHook)item->label : menu_defaultRenderHook;
/* Render menuitem */
RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
/* Render menuitem */
@@
-293,7
+295,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
);
+ lcd_blitBitmap(
bm
);
}
/* Restore old cliprect */
}
/* Restore old cliprect */
@@
-440,7
+442,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
@@
-540,6
+542,9
@@
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)
+ #if (ARCH & ARCH_NIGHTTEST)
+ #warning __FILTER_NEXT_WARNING__
+ #endif
CONST_CAST(struct Menu *, menu)->selected = selected;
return result;
CONST_CAST(struct Menu *, menu)->selected = selected;
return result;