Split menu configuration. Add callback for smooth. Clean up.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3751 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cfg/cfg_gfx.h b/bertos/cfg/cfg_gfx.h
index 63454016fd4e13d72ac8a53bd3ad9c31c8e460dc..59dde04c8ba87525b86d44ed48af4bbeeb31f0c9 100644 (file)
--- a/bertos/cfg/cfg_gfx.h
+++ b/bertos/cfg/cfg_gfx.h
@@ -38,7 +38,6 @@
 #ifndef CFG_GFX_H
 #define CFG_GFX_H
 
-
 /**
  * Enable line clipping algorithm.
  * $WIZ$ type = "boolean"

diff --git a/bertos/cfg/cfg_menu.h b/bertos/cfg/cfg_menu.h
new file mode 100644 (file)
index 0000000..bbfa1e7
--- /dev/null
+++ b/bertos/cfg/cfg_menu.h
@@ -0,0 +1,67 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Configuration file for Menu module.
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+#ifndef CFG_MENU_H
+#define CFG_MENU_H
+
+/**
+ * Enable button bar behind menus
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_MENU_MENUBAR        0
+
+/**
+ * Level Edit Timeout
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_LEVELEDIT_TIMEOUT   0
+
+/**
+ * Menu timeout
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_MENU_TIMEOUT        0
+
+/**
+ * Enable smooth scrolling in menus
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_MENU_SMOOTH         1
+
+
+#endif /* CFG_MENU_H */
+

diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c
index 6c3f8d0d8fef038c8980a521585c46efc65e2f30..556985f645a3ed7cf6c832f88f4664c2e0395122 100644 (file)
--- a/bertos/gui/menu.c
+++ b/bertos/gui/menu.c
@@ -39,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>
 
@@ -56,10 +57,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
@@ -195,13 +192,11 @@ static void menu_layout(
 
        ypos = bm->cr.ymin;
 
-#if 1
        if (redraw)
        {
                /* Clear screen */
                text_clear(menu->bitmap);
        }
-#endif
 
        if (title)
        {
@@ -293,7 +288,7 @@ static void menu_layout(
                /* Clear rest of area */
                gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
 
-               lcd_blitBitmap(bm);
+               menu->lcd_blitBitmap(bm);
        }
 
        /* Restore old cliprect */

diff --git a/bertos/gui/menu.h b/bertos/gui/menu.h
index d5b516ae9cec6443b94eb660ea5cfd0170ac76fa..6e450d2360d3ca5a583a24d5fe4c900d1bcd7eb5 100644 (file)
--- a/bertos/gui/menu.h
+++ b/bertos/gui/menu.h
@@ -46,11 +46,11 @@
 
 #include <cfg/compiler.h>
 
-/* Fwd decl */
-struct Bitmap;
+#include <gfx/gfx.h>
 
 /** Menu callback function */
 typedef iptr_t (*MenuHook)(iptr_t userdata);
+typedef void (*BlitBitmap)(const Bitmap *bm);
 
 /**
  * Menu item description.
@@ -100,6 +100,7 @@ typedef struct Menu
        int              flags;    /**< See MF_#? definitions below */
        struct Bitmap   *bitmap;   /**< Bitmap where the menu is rendered */
        int              selected; /**< Initial selection (written to if MF_SAVESEL is set). */
+       BlitBitmap       lcd_blitBitmap; /**< Callback to call to do smooth the display */
 } Menu;
 
 /**