X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Fdemo%2Fdemo.c;h=a7e151a6a2015c8e3404665baea3e597597b22b0;hb=bbc9b62788f5e2f94dd550708a6af22f6d49eb98;hp=b5b2ca0467903e08de90d9d02d7b26a53303ce24;hpb=2dcafe56095edd5c07139d7b150a4c8321cd83ee;p=bertos.git

diff --git a/examples/demo/demo.c b/examples/demo/demo.c
index b5b2ca04..a7e151a6 100644
--- a/examples/demo/demo.c
+++ b/examples/demo/demo.c
@@ -31,10 +31,8 @@
  *
  * \brief Multifunction system test for BeRTOS modules.
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
-
 #include <cfg/macros.h>
 
 #include <emul/emul.h>
@@ -47,8 +45,8 @@
 
 #include <drv/timer.h>
 #include <drv/buzzer.h>
-#include <drv/lcd_gfx.h>
 #include <drv/kbd.h>
+#include <drv/lcd_gfx_qt.h>
 
 #include <gfx/gfx.h>
 #include <gfx/win.h>
@@ -58,15 +56,15 @@
 #include <gui/menu.h>
 #include <icons/logo.h>
 
+/** Default LCD bitmap */
+static Bitmap lcd_bitmap;
+
 /**
- * Draw a pentacle in the provided bitmap.
- *
- * This is invoked by the keyboard polling routine, as a poor man's surrogate
- * of true task switching.
+ * Refresh the GUI.
  */
 void schedule(void)
 {
-	lcd_blitBitmap(&lcd_bitmap);
+	lcd_gfx_qt_blitBitmap(&lcd_bitmap);
 	emul_idle();
 }
 
@@ -86,21 +84,24 @@ static void magic(struct Bitmap *bitmap, coord_t x, coord_t y)
 static void hello_world(Bitmap *bm)
 {
 	extern const Font font_ncenB18;
-    const Font *old_font = bm->font;
+	const Font *old_font;
+
+	old_font = bm->font;
 
 	gfx_bitmapClear(bm);
 
 	/* Set big font */
 	gfx_setFont(bm, &font_ncenB18);
 
-	text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
+	text_xprintf(bm, 0, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
 			"Hello, world!");
-
-	lcd_blitBitmap(bm);
-	timer_delay(1000);
+	schedule();
+	while (1)
+		if (kbd_peek())
+			break;
 
 	/* Restore old font */
-    gfx_setFont(bm, old_font);
+	gfx_setFont(bm, old_font);
 }
 
 /**
@@ -136,8 +137,7 @@ static void bouncing_logo(Bitmap *bm)
 			(bm->width - bertos_logo.width) / 2,
 			h / SPEED_SCALE,
 			&bertos_logo);
-		lcd_blitBitmap(bm);
-
+		schedule();
 		timer_delay(10);
 	}
 }
@@ -177,9 +177,9 @@ void win_demo(Bitmap *bm)
 		/* Background animation */
 		bm = root_win.bitmap;
 		gfx_bitmapClear(bm);
-//		gfx_setClipRect(bm, 0, 0, bm->width, bm->height);
-//		gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10);
-//		gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11);
+		// gfx_setClipRect(bm, 0, 0, bm->width, bm->height);
+		// gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10);
+		// gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11);
 		magic(bm, x, y);
 		x += xdir;
 		y += ydir;
@@ -188,13 +188,11 @@ void win_demo(Bitmap *bm)
 		if (y >= bm->height) ydir = -1;
 		if (y <= -50)        ydir = +1;
 
-		/* Large window animation */
 		bm = large_win.bitmap;
 		gfx_bitmapClear(bm);
 		for (i = 0; i < bm->height / 2; i += 2)
 			gfx_rectDraw(bm, 0 + i, 0 + i, bm->width - i, bm->height - i);
 
-
 		/* Small window animation */
 		bm = small_win.bitmap;
 		gfx_bitmapClear(bm);
@@ -218,7 +216,6 @@ void win_demo(Bitmap *bm)
 			win_raise(&large_win);
 
 		win_compose(&root_win);
-
 		/* Also does LCD refresh, etc. */
 		if (kbd_peek())
 			break;
@@ -248,7 +245,7 @@ static struct MenuItem settings_items[] =
 	{ (const_iptr_t)"Power Saving", MIF_TOGGLE, (MenuHook)0, (iptr_t)0 },
 	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
+static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 
 /* MX SUBMENU */
@@ -262,7 +259,7 @@ static struct MenuItem mx_items[] =
 	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
 
-static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
+static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 
 /* DISPLAY SUBMENU */
@@ -275,7 +272,7 @@ static struct MenuItem display_items[] =
 	{ (const_iptr_t)"Icon Theme", 0, (MenuHook)0, (iptr_t)0 },
 	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0 };
+static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 
 /* MAIN MENU */
@@ -292,7 +289,7 @@ static struct MenuItem main_items[] =
 	{ (const_iptr_t)"Settings",    0, (MenuHook)menu_handle,  (iptr_t)&settings_menu },
 	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0 };
+static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 #if CONFIG_KERN_HEAP
 #define monitor_stack NULL
@@ -305,10 +302,10 @@ int main(int argc, char *argv[])
 	emul_init(&argc, argv);
 
 	timer_init();
+	proc_init();
 	buz_init();
 	kbd_init();
-	lcd_init();
-	proc_init();
+	lcd_gfx_qt_init(&lcd_bitmap);
 	monitor_start(KERN_MINSTACKSIZE, monitor_stack);
 
 	menu_handle(&main_menu);