GWIN slider + image support

3 files changed, 146 insertions, 0 deletions

diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
new file mode 100644
index 00000000..477d7d29
--- /dev/null
+++ b/demos/modules/gwin/slider/gfxconf.h
@@ -0,0 +1,57 @@
+/**
+ * This file has a different license to the rest of the GFX system.
+ * You can copy, modify and distribute this file as you see fit.
+ * You do not need to publish your source modifications to this file.
+ * The only thing you are not permitted to do is to relicense it
+ * under a different license.
+ */
+
+#ifndef _GFXCONF_H
+#define _GFXCONF_H
+
+/* GFX sub-systems to turn on */
+#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GWIN			TRUE
+#define GFX_USE_GEVENT			TRUE
+#define GFX_USE_GTIMER			TRUE
+#define GFX_USE_GINPUT			TRUE
+
+/* Features for the GDISP sub-system. */
+#define GDISP_NEED_VALIDATION		TRUE
+#define GDISP_NEED_CLIP				TRUE
+#define GDISP_NEED_TEXT				TRUE
+#define GDISP_NEED_CIRCLE			FALSE
+#define GDISP_NEED_ELLIPSE			FALSE
+#define GDISP_NEED_ARC				FALSE
+#define GDISP_NEED_CONVEX_POLYGON	FALSE
+#define GDISP_NEED_SCROLL			FALSE
+#define GDISP_NEED_PIXELREAD		FALSE
+#define GDISP_NEED_CONTROL			FALSE
+#define GDISP_NEED_IMAGE			FALSE
+#define GDISP_NEED_MULTITHREAD		TRUE
+#define GDISP_NEED_ASYNC			FALSE
+#define GDISP_NEED_MSGAPI			FALSE
+
+/* Builtin Fonts */
+#define GDISP_INCLUDE_FONT_SMALL		FALSE
+#define GDISP_INCLUDE_FONT_LARGER		FALSE
+#define GDISP_INCLUDE_FONT_UI1			FALSE
+#define GDISP_INCLUDE_FONT_UI2			TRUE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS	FALSE
+
+/* GDISP image decoders */
+#define GDISP_NEED_IMAGE_NATIVE		FALSE
+#define GDISP_NEED_IMAGE_GIF		FALSE
+#define GDISP_NEED_IMAGE_BMP		FALSE
+#define GDISP_NEED_IMAGE_JPG		FALSE
+#define GDISP_NEED_IMAGE_PNG		FALSE
+
+/* Features for the GWIN sub-system. */
+#define GWIN_NEED_BUTTON		FALSE
+#define GWIN_NEED_CONSOLE		TRUE
+#define GWIN_NEED_SLIDER		TRUE
+
+/* Features for the GINPUT sub-system. */
+#define GINPUT_NEED_MOUSE		TRUE
+
+#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
new file mode 100644
index 00000000..9a318943
--- /dev/null
+++ b/demos/modules/gwin/slider/main.c
@@ -0,0 +1,89 @@
+/*
+    ChibiOS/GFX - Copyright (C) 2012, 2013
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX 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 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "ch.h"
+#include "hal.h"
+#include "gfx.h"
+#include "chprintf.h"
+
+static GListener gl;
+
+#define SLIDER_WIDTH	20
+
+int main(void) {
+	coord_t				swidth, sheight;
+	GHandle				ghSliderH, ghSliderV, ghConsole;
+	font_t				fui2;
+	GSourceHandle		gsMouse;
+	GEventGWinSlider *	pSliderEvent;
+	BaseSequentialStream *consout;
+
+	halInit();			// Initialize the Hardware
+	chSysInit();		// Initialize the OS
+	gdispInit();		// Initialize the display
+
+	gdispClear(Black);
+
+	// Get the display dimensions
+	swidth = gdispGetWidth();
+	sheight = gdispGetHeight();
+
+	// Get the font
+	fui2 = gdispOpenFont("UI2");
+
+	// Create out gwin windows/widgets
+	ghSliderH = gwinCreateSlider(NULL, 5, 5, swidth-10, SLIDER_WIDTH);
+	ghSliderV = gwinCreateSlider(NULL, 5, 10+SLIDER_WIDTH, SLIDER_WIDTH, sheight-15+SLIDER_WIDTH);
+	ghConsole = gwinCreateConsole(NULL, 10+SLIDER_WIDTH, 10+SLIDER_WIDTH, swidth-15-SLIDER_WIDTH, sheight-15-SLIDER_WIDTH, fui2);
+	consout = gwinGetConsoleStream(ghConsole);
+
+	// Color up the console window
+    gwinSetColor(ghConsole, White);
+    gwinSetBgColor(ghConsole, Blue);
+
+    // Assign the mouse to the sliders.
+    gsMouse = ginputGetMouse(0);
+    gwinAttachSliderMouseSource(ghSliderH, gsMouse);
+    gwinAttachSliderMouseSource(ghSliderV, gsMouse);
+
+    // We want to listen for slider events
+	geventListenerInit(&gl);
+	geventAttachSource(&gl, gwinGetSliderSource(ghSliderH), 0);
+	geventAttachSource(&gl, gwinGetSliderSource(ghSliderV), 0);
+
+	// Draw everything on the screen
+    gwinClear(ghConsole);
+    gwinSliderDraw(ghSliderH);
+    gwinSliderDraw(ghSliderV);
+
+	while(1) {
+		// Get an Event
+		//	- we can assume it is a slider event as that is all we are listening for
+		pSliderEvent = (GEventGWinSlider *)geventEventWait(&gl, TIME_INFINITE);
+
+		// Double check that assumption
+		if (pSliderEvent->type != GEVENT_GWIN_SLIDER)
+			continue;
+
+		chprintf(consout, "%c=%d\n", pSliderEvent->slider == ghSliderH ? 'H' : 'V', pSliderEvent->position);
+	}
+
+	return 0;
+}
diff --git a/demos/modules/gwin/slider/result_647x490.png b/demos/modules/gwin/slider/result_647x490.png
new file mode 100644
index 00000000..c7b12a93
--- /dev/null
+++ b/demos/modules/gwin/slider/result_647x490.png