Ginput and structure changes

GINPUT Touch including drivers
GTIMER fixes
GEVENT fixes
GWIN button completion
Structure changes to better seperate sections of a sub-system

19 files changed, 957 insertions, 369 deletions

diff --git a/include/gdisp.h b/include/gdisp.h
index 7656e777..53848e16 100644
--- a/include/gdisp.h
+++ b/include/gdisp.h
@@ -114,7 +114,7 @@
 /*===========================================================================*/

 

 /* Include the low level driver information */

-#include "gdisp_lld.h"

+#include "lld/gdisp/gdisp_lld.h"

 

 /*===========================================================================*/

 /* Type definitions                                                          */

diff --git a/include/gdisp_fonts.h b/include/gdisp/fonts.h
index e3b07e86..e3b07e86 100644
--- a/include/gdisp_fonts.h
+++ b/include/gdisp/fonts.h
diff --git a/include/gevent.h b/include/gevent.h
index e7c5dcbf..fa735452 100644
--- a/include/gevent.h
+++ b/include/gevent.h
@@ -100,11 +100,16 @@ typedef union GEvent_u {
 	char				pad[GEVENT_MAXIMUM_STATUS_SIZE];		// This is here to allow static initialisation of GEventObject's in the application.

 	} GEvent;

 

+// A special callback function

+typedef void (*GEventCallbackFn)(void *param, GEvent *pe);

+

 // The Listener Object

 typedef struct GListener {

-	Semaphore		waitqueue;			// Private: Semaphore for the listener to wait on.

-	BinarySemaphore	eventlock;			// Private: Protect against more than one sources trying to use this event lock at the same time

-	GEvent			event;				// Public:  The event object into which the event information is stored.

+	Semaphore			waitqueue;			// Private: Semaphore for the listener to wait on.

+	BinarySemaphore		eventlock;			// Private: Protect against more than one sources trying to use this event lock at the same time

+	GEventCallbackFn	callback;			// Private: Call back Function

+	void				*param;				// Private: Parameter for the callback function.

+	GEvent				event;				// Public:  The event object into which the event information is stored.

 	} GListener;

 

 // The Source Object

@@ -177,13 +182,29 @@ void geventDetachSource(GListener *pl, GSourceHandle gsh);
  * timeout specifies the time to wait in system ticks.

  *		TIME_INFINITE means no timeout - wait forever for an event.

  *		TIME_IMMEDIATE means return immediately

- * Returns NULL on timeout.

+ * Returns NULL on timeout or if a callback function is already registered.

  * Note: The GEvent buffer is staticly allocated within the GListener so the event does not

  *			need to be dynamicly freed however it will get overwritten by the next call to

  *			this routine.

  */

 GEvent *geventEventWait(GListener *pl, systime_t timeout);

 

+/* Register a callback for an event on a listener from an assigned source.

+ *		The type of the event should be checked (pevent->type) and then pevent should be typecast to the

+ *		actual event type if it needs to be processed.

+ * Note: The GEvent buffer is valid only during the time of the callback. The callback MUST NOT save

+ * 		a pointer to the buffer for use outside the callback.

+ * Note: An existing callback function is de-registered by passing a NULL for 'fn'. Any existing

+ * 		callback function is replaced. Any thread currently waiting using geventEventWait will be sent the exit event.

+ * Note: Callbacks occur in a thread context but stack space must be kept to a minumum and

+ * 		the callback must process quickly as all other events are performed on a single thread.

+ * Note: In the callback function you should never call ANY event functions using your own GListener handle

+ * 		as it WILL create a deadlock and lock the system up.

+ * Note: Applications should not use this call - geventEventWait() is the preferred mechanism for an

+ * 		application. This call is provided for GUI objects that may not have their own thread.

+ */

+void geventRegisterCallback(GListener *pl, GEventCallbackFn fn, void *param);

+

 /*---------- Source Functions --------------------------------------------*/

 

 /* Sources create their own GSourceHandles which are pointers to any arbitrary structure

diff --git a/include/ginput.h b/include/ginput.h
index de2c617b..dc472e8e 100644
--- a/include/ginput.h
+++ b/include/ginput.h
@@ -37,41 +37,6 @@
  * @name    GINPUT more complex functionality to be compiled

  * @{

  */

-	/**

-	 * @brief   Should mouse functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_MOUSE

-		#define GINPUT_NEED_MOUSE	FALSE

-	#endif

-	/**

-	 * @brief   Should touch functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_TOUCH

-		#define GINPUT_NEED_TOUCH	FALSE

-	#endif

-	/**

-	 * @brief   Should keyboard functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_KEYBOARD

-		#define GINPUT_NEED_KEYBOARD	FALSE

-	#endif

-	/**

-	 * @brief   Should hardware toggle/switch/button (pio) functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_TOGGLE

-		#define GINPUT_NEED_TOGGLE	FALSE

-	#endif

-	/**

-	 * @brief   Should analog dial functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_DIAL

-		#define GINPUT_NEED_DIAL	FALSE

-	#endif

 /** @} */

 

 /*===========================================================================*/

@@ -81,10 +46,6 @@
 #ifndef GFX_USE_GDISP

 	#define GFX_USE_GDISP	FALSE

 #endif

-#if GINPUT_NEED_TOUCH || !GFX_USE_GDISP

-	#error "GINPUT: GFX_USE_GDISP must be defined for touch functions"

-#endif

-

 #if GFX_USE_GDISP

 	#include "gdisp.h"

 #else

@@ -94,14 +55,13 @@
 

 #ifndef GFX_USE_GEVENT

 	#define	GFX_USE_GEVENT		TRUE

-	#include "gevent.h"

 #elif !GFX_USE_GEVENT

 	#error "GINPUT: GFX_USE_GEVENT must be defined"

 #endif

+#include "gevent.h"

 

 #ifndef GFX_USE_GTIMER

 	#define	GFX_USE_GTIMER		TRUE

-	#include "gtimer.h"

 #elif !GFX_USE_GTIMER

 	#error "GINPUT: GFX_USE_GTIMER must be defined"

 #endif

@@ -110,138 +70,10 @@
 /* Type definitions                                                          */

 /*===========================================================================*/

 

-// Event types for various ginput sources

-#define GEVENT_MOUSE		(GEVENT_GINPUT_FIRST+0)

-#define GEVENT_TOUCH		(GEVENT_GINPUT_FIRST+1)

-#define GEVENT_KEYBOARD		(GEVENT_GINPUT_FIRST+2)

-#define GEVENT_TOGGLE		(GEVENT_GINPUT_FIRST+3)

-#define GEVENT_DIAL			(GEVENT_GINPUT_FIRST+4)

-

-#if GINPUT_NEED_MOUSE || GINPUT_NEED_TOUCH

-	typedef struct GEventMouse_t {

-		GEventType		type;				// The type of this event (GEVENT_MOUSE or GEVENT_TOUCH)

-		uint16_t		instance;			// The mouse/touch instance

-		coord_t			x, y, z;			// The position of the mouse.

-											//		- For touch devices, Z is the current pressure if supported (otherwise 0)

-											//		- For mice, Z is the 3rd dimension if supported (otherwise 0)

-		uint16_t		current_buttons;	// A bit is set if the button is down.

-											//		- For touch only bit 0 is relevant

-											//		- For mice the order of the buttons is (from 0 to n)  left, right, middle, any other buttons

-											//		- Bit 15 being set indicates that an important mouse event has been missed.

-			#define GINPUT_TOUCH_PRESSED		0x0001

-			#define GINPUT_MOUSE_BTN_LEFT		0x0001

-			#define GINPUT_MOUSE_BTN_RIGHT		0x0002

-			#define GINPUT_MOUSE_BTN_MIDDLE		0x0004

-			#define GINPUT_MOUSE_BTN_4			0x0008

-			#define GINPUT_MISSED_MOUSE_EVENT	0x8000

-		uint16_t		last_buttons;		// The value of current_buttons on the last event

-		enum GMouseMeta_e {

-			GMETA_NONE,						// There is no meta event currently happenning

-			GMETA_DOWN, GMETA_UP,			// Button 0 has just gone up or down

-			GMETA_CLICK,					// Button 0 has just gone through a short down - up cycle

-			GMETA_CXTCLICK					// For mice - The right button has just been depressed

-											// For touch - a long press has just occurred

-		}				meta;

-	} GEventMouse, GEventTouch;

-

-	// Mouse/Touch Listen Flags - passed to geventAddSourceToListener()

-	#define GLISTEN_MOUSEMETA		0x0001			// Create events for meta events such as CLICK and CXTCLICK

-	#define GLISTEN_MOUSEDOWNMOVES	0x0002			// Creates mouse move events when the primary mouse button is down (touch is on the surface)

-	#define GLISTEN_MOUSEUPMOVES	0x0004			// Creates mouse move events when the primary mouse button is up (touch is off the surface - if the hardware allows).

-	#define GLISTEN_TOUCHMETA		0x0001			//		Ditto for touch

-	#define GLISTEN_TOUCHDOWNMOVES	0x0002

-	#define GLISTEN_TOUCHUPMOVES	0x0004

-#endif

-

-#if GINPUT_NEED_KEYBOARD

-	typedef struct GEventKeyboard_t {

-		GEventType		type;				// The type of this event (GEVENT_KEYBOARD)

-		uint16_t		instance;			// The keyboard instance

-		char			c;					// The Ascii code for the current key press.

-											//		The only possible values are 0(NUL), 8(BS), 9(TAB), 13(CR), 27(ESC), 32(SPACE) to 126(~), 127(DEL)

-											//		0 indicates an extended only key.

-		uint16_t		code;				// An extended keyboard code. Codes less than 128 match their ascii equivelent.

-			#define GKEY_NULL		0

-			#define GKEY_BACKSPACE	8

-			#define GKEY_TAB		9

-			#define GKEY_CR			13

-			#define GKEY_ESC		27

-			#define GKEY_SPACE		32

-			#define GKEY_DEL		127

-			#define GKEY_UP			0x0101

-			#define GKEY_DOWN		0x0102

-			#define GKEY_LEFT		0x0103

-			#define GKEY_RIGHT		0x0104

-			#define GKEY_HOME		0x0105

-			#define GKEY_END		0x0106

-			#define GKEY_PAGEUP		0x0107

-			#define GKEY_PAGEDOWN	0x0108

-			#define GKEY_INSERT		0x0109

-			#define GKEY_DELETE		0x010A

-			#define GKEY_SHIFT		0x0201

-			#define GKEY_CNTRL		0x0202

-			#define GKEY_ALT		0x0203

-			#define GKEY_WINKEY		0x0204

-			#define GKEY_RCLKEY		0x0205

-			#define GKEY_FNKEY		0x0206

-			#define GKEY_FN1		0x0301

-			#define GKEY_FN2		0x0302

-			#define GKEY_FN3		0x0303

-			#define GKEY_FN4		0x0304

-			#define GKEY_FN5		0x0305

-			#define GKEY_FN6		0x0306

-			#define GKEY_FN7		0x0307

-			#define GKEY_FN8		0x0308

-			#define GKEY_FN9		0x0309

-			#define GKEY_FN10		0x030A

-			#define GKEY_FN11		0x030B

-			#define GKEY_FN12		0x030C

-		uint16_t		current_buttons;		// A bit is set to indicate various meta status.

-			#define GMETA_KEYDN			0x0001

-			#define GMETA_SHIFT			0x0002

-			#define GMETA_CNTRL			0x0004

-			#define GMETA_ALT			0x0008

-			#define GMETA_WINKEY		0x0010

-			#define GMETA_RCLKKEY		0x0020

-			#define GMETA_FNKEY			0x0040

-			#define GMETA_MISSED_EVENT	0x8000

-		uint16_t		last_buttons;			// The value of current_buttons on the last event

-	} GEventKeyboard;

-

-	// Keyboard Listen Flags - passed to geventAddSourceToListener()

-	#define GLISTEN_KEYREPEATS		0x0001			// Return key repeats (where the key is held down to get a repeat character)

-	#define GLISTEN_KEYCODES		0x0002			// Return all key presses including extended code key presses (not just ascii codes)

-	#define GLISTEN_KEYALL			0x0004			// Return keyup's, keydown's and everything in between (but not repeats unless GLISTEN_KEYREPEATS is set).

-	#define GLISTEN_KEYSINGLE		0x8000			// Return only when one particular extended code key is pressed or released. The particular extended code is OR'd into this value

-													//		eg. (GLISTEN_KEYSINGLE | GKEY_CR)

-													//		No other flags may be set with this flag.

-#endif

-

-#if GINPUT_NEED_TOGGLE

-	typedef struct GEventToggle_t {

-		GEventType		type;				// The type of this event (GEVENT_TOGGLE)

-		uint16_t		instance;			// The toggle instance

-		BOOL			on;					// True if the toggle/button is on

-	} GEventToggle;

-#endif

-

-#if GINPUT_NEED_DIAL

-	typedef struct GEventDial_t {

-		GEventType		type;				// The type of this event (GEVENT_DIAL)

-		uint16_t		instance;			// The dial instance

-		uint16_t		value;				// The dial value

-	} GEventDial;

-#endif

-

-

 /*===========================================================================*/

 /* External declarations.                                                    */

 /*===========================================================================*/

 

-#ifdef __cplusplus

-extern "C" {

-#endif

-

 /* How to use...

 

 	1. Get source handles for all the inputs you are interested in.

@@ -254,84 +86,11 @@ extern "C" {
 	5. When complete destroy the listener

 */

 

-#if GINPUT_NEED_MOUSE

-	/* Mouse Functions */

-	GSourceHandle ginputGetMouse(uint16_t instance);					// Instance = 0 to n-1

-	

-	/* Get the current mouse position and button status.

-	 *	Unlike a listener event, this status cannot record meta events such as "CLICK"

-	 *	Returns FALSE on error (eg invalid instance)

-	 */

-	BOOL ginputGetMouseStatus(uint16_t instance, GEventMouse *pmouse);

-#endif

-

-#if GINPUT_NEED_TOUCH

-	/* Touch Functions */

-	GSourceHandle ginputGetTouch(uint16_t instance);		// Instance = 0 to n-1

-

-	/* Get the current touch position and button status.

-	 *	Unlike a listener event, this status cannot record meta events such as "CLICK"

-	 *	Returns FALSE on error (eg invalid instance)

-	 */

-	BOOL ginputGetTouchStatus(uint16_t instance, GEventTouch *ptouch);

-	

-	/* Run a touch calibration.

-	 *	Returns FALSE if the driver doesn't support it or if the handle is invalid.

-	 */

-	BOOL ginputCalibrateTouch(uint16_t instance);

-

-	/* Set the routines to save and fetch calibration data.

-	 * This function should be called before first calling ginputGetTouch() for a particular instance

-	 *	as the gdispGetTouch() routine may attempt to fetch calibration data and perform a startup calibration if there is no way to get it.

-	 *	If this is called after gdispGetTouch() has been called and the driver requires calibration storage, it will immediately save the data is has already obtained.

-	 * The 'requireFree' parameter indicates if the fetch buffer must be free()'d to deallocate the buffer provided by the Fetch routine.

-	 */

-	typedef void (*)(uint16_t instance, const uint8_t *calbuf, size_t sz) GTouchCalibrationSaveRoutine;			// Save calibration data

-	typedef const char * (*)(uint16_t instance) GTouchCalibrationFetchRoutine;									// Fetch calibration data (returns NULL if not data saved)

-	void ginputSetTouchCalibrationRoutines(uint16_t instance, GTouchCalibrationSaveRoutine fnsave, GTouchCalibrationFetchRoutine fnfetch, BOOL requireFree);

-

-	/* Test if a particular touch instance requires routines to save its calibration data. */

-	BOOL ginputRequireTouchCalibrationStorage(uint16_t instance);

-#endif

-

-#if GINPUT_NEED_KEYBOARD

-	/* Keyboard Functions */

-	GSourceHandle ginputGetKeyboard(uint16_t instance);					// Instance = 0 to n-1

-	

-	/* Get the current keyboard button status.

-	 *	Returns FALSE on error (eg invalid instance)

-	 */

-	BOOL ginputGetKeyboardStatus(uint16_t instance, GEventKeyboard *pkeyboard);

-#endif

-

-#if GINPUT_NEED_TOGGLE

-	/* Hardware Toggle/Switch/Button Functions */

-	GSourceHandle ginputGetToggle(uint16_t instance);					// Instance = 0 to n-1

-	void ginputInvertToggle(uint16_t instance, BOOL invert);			// If invert is true, invert the on/off sense for the toggle

-

-	/* Get the current toggle status.

-	 *	Returns FALSE on error (eg invalid instance)

-	 */

-	BOOL ginputGetToggleStatus(uint16_t instance, GEventToggle *ptoggle);

-#endif

-

-#if GINPUT_NEED_DIAL

-	/* Dial Functions */

-	GSourceHandle ginputGetDial(uint16_t instance);						// Instance = 0 to n-1

-	void ginputResetDialRange(uint16_t instance);						// Reset the maximum value back to the hardware default.

-	uint16_t ginputGetDialRange(uint16_t instance);						// Get the maximum value. The readings are scaled to be 0...max-1. 0 means over the full uint16_t range.

-	void ginputSetDialRange(uint16_t instance, uint16_t max);			// Set the maximum value.

-	void ginputSetDialSensitivity(uint16_t instance, uint16_t diff);	// Set the level change required before a dial event is generated.

-																		//		- This is done after range scaling

-	/* Get the current keyboard button status.

-	 *	Returns FALSE on error (eg invalid instance)

-	 */

-	BOOL ginputGetDialStatus(uint16_t instance, GEventDial *pdial);

-#endif

-

-#ifdef __cplusplus

-}

-#endif

+// Include various ginput types

+#include "ginput/ginput_mouse.h"

+#include "ginput/ginput_keyboard.h"

+#include "ginput/ginput_toggle.h"

+#include "ginput/ginput_dial.h"

 

 #endif /* GFX_USE_GINPUT */

 

diff --git a/include/ginput/ginput_dial.h b/include/ginput/ginput_dial.h
new file mode 100644
index 00000000..71448c0b
--- /dev/null
+++ b/include/ginput/ginput_dial.h
@@ -0,0 +1,89 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    ginput/ginput_dial.h

+ * @brief   GINPUT GFX User Input subsystem header file.

+ *

+ * @addtogroup GINPUT

+ * @{

+ */

+#ifndef _GINPUT_DIAL_H

+#define _GINPUT_DIAL_H

+

+/**

+ * @name    GINPUT more complex functionality to be compiled

+ * @{

+ */

+	/**

+	 * @brief   Should analog dial functions be included.

+	 * @details	Defaults to FALSE

+	 */

+	#ifndef GINPUT_NEED_DIAL

+		#define GINPUT_NEED_DIAL	FALSE

+	#endif

+/** @} */

+

+#if GINPUT_NEED_DIAL || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Low Level Driver details and error checks.                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Type definitions                                                          */

+/*===========================================================================*/

+

+// Event types for various ginput sources

+#define GEVENT_DIAL			(GEVENT_GINPUT_FIRST+4)

+

+typedef struct GEventDial_t {

+	GEventType		type;				// The type of this event (GEVENT_DIAL)

+	uint16_t		instance;			// The dial instance

+	uint16_t		value;				// The dial value

+	} GEventDial;

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	/* Dial Functions */

+	GSourceHandle ginputGetDial(uint16_t instance);						// Instance = 0 to n-1

+	void ginputResetDialRange(uint16_t instance);						// Reset the maximum value back to the hardware default.

+	uint16_t ginputGetDialRange(uint16_t instance);						// Get the maximum value. The readings are scaled to be 0...max-1. 0 means over the full uint16_t range.

+	void ginputSetDialRange(uint16_t instance, uint16_t max);			// Set the maximum value.

+	void ginputSetDialSensitivity(uint16_t instance, uint16_t diff);	// Set the level change required before a dial event is generated.

+																		//		- This is done after range scaling

+	/* Get the current keyboard button status.

+	 *	Returns FALSE on error (eg invalid instance)

+	 */

+	bool_t ginputGetDialStatus(uint16_t instance, GEventDial *pdial);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GINPUT_NEED_DIAL */

+

+#endif /* _GINPUT_DIAL_H */

+/** @} */

diff --git a/include/ginput/ginput_keyboard.h b/include/ginput/ginput_keyboard.h
new file mode 100644
index 00000000..850adf38
--- /dev/null
+++ b/include/ginput/ginput_keyboard.h
@@ -0,0 +1,143 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    ginput/ginput_keyboard.h

+ * @brief   GINPUT GFX User Input subsystem header file.

+ *

+ * @addtogroup GINPUT

+ * @{

+ */

+#ifndef _GINPUT_KEYBOARD_H

+#define _GINPUT_KEYBOARD_H

+

+/**

+ * @name    GINPUT more complex functionality to be compiled

+ * @{

+ */

+	/**

+	 * @brief   Should keyboard functions be included.

+	 * @details	Defaults to FALSE

+	 */

+	#ifndef GINPUT_NEED_KEYBOARD

+		#define GINPUT_NEED_KEYBOARD	FALSE

+	#endif

+/** @} */

+

+#if GINPUT_NEED_KEYBOARD || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Low Level Driver details and error checks.                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Type definitions                                                          */

+/*===========================================================================*/

+

+#define GINPUT_KEYBOARD_NUM_PORTS		1			// The total number of keyboard inputs

+

+// Event types for various ginput sources

+#define GEVENT_KEYBOARD		(GEVENT_GINPUT_FIRST+2)

+

+typedef struct GEventKeyboard_t {

+	GEventType		type;				// The type of this event (GEVENT_KEYBOARD)

+	uint16_t		instance;			// The keyboard instance

+	char			c;					// The Ascii code for the current key press.

+										//		The only possible values are 0(NUL), 8(BS), 9(TAB), 13(CR), 27(ESC), 32(SPACE) to 126(~), 127(DEL)

+										//		0 indicates an extended only key.

+	uint16_t		code;				// An extended keyboard code. Codes less than 128 match their ascii equivelent.

+		#define GKEY_NULL		0

+		#define GKEY_BACKSPACE	8

+		#define GKEY_TAB		9

+		#define GKEY_CR			13

+		#define GKEY_ESC		27

+		#define GKEY_SPACE		32

+		#define GKEY_DEL		127

+		#define GKEY_UP			0x0101

+		#define GKEY_DOWN		0x0102

+		#define GKEY_LEFT		0x0103

+		#define GKEY_RIGHT		0x0104

+		#define GKEY_HOME		0x0105

+		#define GKEY_END		0x0106

+		#define GKEY_PAGEUP		0x0107

+		#define GKEY_PAGEDOWN	0x0108

+		#define GKEY_INSERT		0x0109

+		#define GKEY_DELETE		0x010A

+		#define GKEY_SHIFT		0x0201

+		#define GKEY_CNTRL		0x0202

+		#define GKEY_ALT		0x0203

+		#define GKEY_WINKEY		0x0204

+		#define GKEY_RCLKEY		0x0205

+		#define GKEY_FNKEY		0x0206

+		#define GKEY_FN1		0x0301

+		#define GKEY_FN2		0x0302

+		#define GKEY_FN3		0x0303

+		#define GKEY_FN4		0x0304

+		#define GKEY_FN5		0x0305

+		#define GKEY_FN6		0x0306

+		#define GKEY_FN7		0x0307

+		#define GKEY_FN8		0x0308

+		#define GKEY_FN9		0x0309

+		#define GKEY_FN10		0x030A

+		#define GKEY_FN11		0x030B

+		#define GKEY_FN12		0x030C

+	uint16_t		current_buttons;		// A bit is set to indicate various meta status.

+		#define GMETA_KEY_DOWN			0x0001

+		#define GMETA_KEY_SHIFT			0x0002

+		#define GMETA_KEY_CNTRL			0x0004

+		#define GMETA_KEY_ALT			0x0008

+		#define GMETA_KEY_WINKEY		0x0010

+		#define GMETA_KEY_RCLKKEY		0x0020

+		#define GMETA_KEY_FN			0x0040

+		#define GMETA_KEY_MISSED_EVENT	0x8000

+	uint16_t		last_buttons;			// The value of current_buttons on the last event

+} GEventKeyboard;

+

+// Keyboard Listen Flags - passed to geventAddSourceToListener()

+#define GLISTEN_KEYREPEATS		0x0001			// Return key repeats (where the key is held down to get a repeat character)

+#define GLISTEN_KEYCODES		0x0002			// Return all key presses including extended code key presses (not just ascii codes)

+#define GLISTEN_KEYALL			0x0004			// Return keyup's, keydown's and everything in between (but not repeats unless GLISTEN_KEYREPEATS is set).

+#define GLISTEN_KEYSINGLE		0x8000			// Return only when one particular extended code key is pressed or released. The particular extended code is OR'd into this value

+												//		eg. (GLISTEN_KEYSINGLE | GKEY_CR)

+												//		No other flags may be set with this flag.

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	/* Keyboard Functions */

+	GSourceHandle ginputGetKeyboard(uint16_t instance);					// Instance = 0 to n-1

+	

+	/* Get the current keyboard button status.

+	 *	Returns FALSE on error (eg invalid instance)

+	 */

+	bool_t ginputGetKeyboardStatus(uint16_t instance, GEventKeyboard *pkeyboard);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GINPUT_NEED_KEYBOARD */

+

+#endif /* _GINPUT_KEYBOARD_H */

+/** @} */

diff --git a/include/ginput/ginput_mouse.h b/include/ginput/ginput_mouse.h
new file mode 100644
index 00000000..1b596ac9
--- /dev/null
+++ b/include/ginput/ginput_mouse.h
@@ -0,0 +1,135 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    ginput/ginput_mouse.h

+ * @brief   GINPUT GFX User Input subsystem header file for mouse and touch.

+ *

+ * @addtogroup GINPUT

+ * @{

+ */

+#ifndef _GINPUT_MOUSE_H

+#define _GINPUT_MOUSE_H

+

+/**

+ * @name    GINPUT more complex functionality to be compiled

+ * @{

+ */

+	/**

+	 * @brief   Should mouse/touch functions be included.

+	 * @details	Defaults to FALSE

+	 */

+	#ifndef GINPUT_NEED_MOUSE

+		#define GINPUT_NEED_MOUSE	FALSE

+	#endif

+/** @} */

+

+/*===========================================================================*/

+/* Type definitions                                                          */

+/*===========================================================================*/

+

+#if GINPUT_NEED_MOUSE || defined(__DOXYGEN__)

+

+/* This type definition is also used by touch */

+typedef struct GEventMouse_t {

+	GEventType		type;				// The type of this event (GEVENT_MOUSE or GEVENT_TOUCH)

+	uint16_t		instance;			// The mouse/touch instance

+	coord_t			x, y, z;			// The position of the mouse.

+										//		- For touch devices, Z is the current pressure if supported (otherwise 0)

+										//		- For mice, Z is the 3rd dimension if supported (otherwise 0)

+	uint16_t		current_buttons;	// A bit is set if the button is down.

+										//		- For touch only bit 0 is relevant

+										//		- For mice the order of the buttons is (from 0 to n)  left, right, middle, any other buttons

+										//		- Bit 15 being set indicates that an important mouse event has been missed.

+		#define GINPUT_MOUSE_BTN_LEFT		0x0001

+		#define GINPUT_MOUSE_BTN_RIGHT		0x0002

+		#define GINPUT_MOUSE_BTN_MIDDLE		0x0004

+		#define GINPUT_MOUSE_BTN_4			0x0008

+		#define GINPUT_MISSED_MOUSE_EVENT	0x8000

+		#define GINPUT_TOUCH_PRESSED		GINPUT_MOUSE_BTN_LEFT

+	uint16_t		last_buttons;		// The value of current_buttons on the last event

+	enum GMouseMeta_e {

+		GMETA_NONE = 0,						// There is no meta event currently happening

+		GMETA_MOUSE_DOWN = 1,				// Button 0 has just gone down

+		GMETA_MOUSE_UP = 2,					// Button 0 has just gone up

+		GMETA_MOUSE_CLICK = 4,				// Button 0 has just gone through a short down - up cycle

+		GMETA_MOUSE_CXTCLICK = 8			// For mice - The right button has just been depressed

+											// For touch - a long press has just occurred

+		}				meta;

+	} GEventMouse;

+

+// Mouse/Touch Listen Flags - passed to geventAddSourceToListener()

+#define GLISTEN_MOUSEMETA			0x0001			// Create events for meta events such as CLICK and CXTCLICK

+#define GLISTEN_MOUSEDOWNMOVES		0x0002			// Creates mouse move events when the primary mouse button is down (touch is on the surface)

+#define GLISTEN_MOUSEUPMOVES		0x0004			// Creates mouse move events when the primary mouse button is up (touch is off the surface - if the hardware allows).

+#define	GLISTEN_MOUSENOFILTER		0x0008			// Don't filter out mouse moves where the position hasn't changed.

+#define GLISTEN_TOUCHMETA			GLISTEN_MOUSEMETA

+#define GLISTEN_TOUCHDOWNMOVES		GLISTEN_MOUSEDOWNMOVES

+#define GLISTEN_TOUCHUPMOVES		GLISTEN_MOUSEUPMOVES

+#define	GLISTEN_TOUCHNOFILTER		GLISTEN_MOUSENOFILTER

+

+#define GINPUT_MOUSE_NUM_PORTS		1			// The total number of mouse/touch inputs supported

+

+// Event types for the mouse ginput source

+#define GEVENT_MOUSE		(GEVENT_GINPUT_FIRST+0)

+#define GEVENT_TOUCH		(GEVENT_GINPUT_FIRST+1)

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	/* Mouse Functions */

+	GSourceHandle ginputGetMouse(uint16_t instance);					// Instance = 0 to n-1

+	

+	/* Get the current mouse position and button status.

+	 *	Unlike a listener event, this status cannot record meta events such as "CLICK"

+	 *	Returns FALSE on error (eg invalid instance)

+	 */

+	bool_t ginputGetMouseStatus(uint16_t instance, GEventMouse *pmouse);

+

+	/* Run a calibration.

+	 *	Returns FALSE if the driver doesn't support it or if the handle is invalid.

+	 */

+	bool_t ginputCalibrateMouse(uint16_t instance);

+

+	/* Set the routines to save and fetch calibration data.

+	 * This function should be called before first calling ginputGetMouse() for a particular instance

+	 *	as the gdispGetMouse() routine may attempt to fetch calibration data and perform a startup calibration if there is no way to get it.

+	 *	If this is called after gdispGetMouse() has been called and the driver requires calibration storage, it will immediately save the data is has already obtained.

+	 * The 'requireFree' parameter indicates if the fetch buffer must be free()'d to deallocate the buffer provided by the Fetch routine.

+	 */

+	typedef void (*GMouseCalibrationSaveRoutine)(uint16_t instance, const uint8_t *calbuf, size_t sz);			// Save calibration data

+	typedef const char * (*GMouseCalibrationLoadRoutine)(uint16_t instance);									// Load calibration data (returns NULL if not data saved)

+	void ginputSetMouseCalibrationRoutines(uint16_t instance, GMouseCalibrationSaveRoutine fnsave, GMouseCalibrationLoadRoutine fnload, bool_t requireFree);

+

+	/* Test if a particular mouse/touch instance requires routines to save its calibration data. */

+	bool_t ginputRequireMouseCalibrationStorage(uint16_t instance);

+	

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GINPUT_NEED_MOUSE */

+

+#endif /* _GINPUT_MOUSE_H */

+/** @} */

diff --git a/include/ginput/ginput_toggle.h b/include/ginput/ginput_toggle.h
new file mode 100644
index 00000000..10be1da9
--- /dev/null
+++ b/include/ginput/ginput_toggle.h
@@ -0,0 +1,93 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    ginput/ginput_toggle.h

+ * @brief   GINPUT GFX User Input subsystem header file.

+ *

+ * @addtogroup GINPUT

+ * @{

+ */

+#ifndef _GINPUT_TOGGLE_H

+#define _GINPUT_TOGGLE_H

+

+/**

+ * @name    GINPUT more complex functionality to be compiled

+ * @{

+ */

+	/**

+	 * @brief   Should hardware toggle/switch/button (pio) functions be included.

+	 * @details	Defaults to FALSE

+	 */

+	#ifndef GINPUT_NEED_TOGGLE

+		#define GINPUT_NEED_TOGGLE	FALSE

+	#endif

+/** @} */

+

+#if GINPUT_NEED_TOGGLE || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Low Level Driver details and error checks.                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Type definitions                                                          */

+/*===========================================================================*/

+

+// Event types for various ginput sources

+#define GEVENT_TOGGLE		(GEVENT_GINPUT_FIRST+3)

+

+// Get the hardware definitions - Number of instances etc.

+#include "ginput_lld_toggle_config.h"

+

+typedef struct GEventToggle_t {

+	GEventType		type;				// The type of this event (GEVENT_TOGGLE)

+	uint16_t		instance;			// The toggle instance

+	bool_t			on;					// True if the toggle/button is on

+	} GEventToggle;

+

+// Toggle Listen Flags - passed to geventAddSourceToListener()

+#define GLISTEN_TOGGLE_ON		0x0001			// Return an event when the toggle turns on

+#define GLISTEN_TOGGLE_OFF		0x0002			// Return an event when the toggle turns off

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	/* Hardware Toggle/Switch/Button Functions */

+	GSourceHandle ginputGetToggle(uint16_t instance);					// Instance = 0 to n-1

+	void ginputInvertToggle(uint16_t instance, bool_t invert);			// If invert is true, invert the on/off sense for the toggle

+

+	/* Get the current toggle status.

+	 *	Returns FALSE on error (eg invalid instance)

+	 */

+	bool_t ginputGetToggleStatus(uint16_t instance, GEventToggle *ptoggle);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GINPUT_NEED_TOGGLE */

+

+#endif /* _GINPUT_TOGGLE_H */

+/** @} */

diff --git a/include/gtimer.h b/include/gtimer.h
index 76c52583..cf25ac8a 100644
--- a/include/gtimer.h
+++ b/include/gtimer.h
@@ -40,7 +40,7 @@
 	/**

 	 * @brief   Data part of a static GTimer initializer.

 	 */

-	#define _GTIMER_DATA() {0}

+	#define _GTIMER_DATA() {0,0,0,0,0,0,0}

 	/**

 	 * @brief   Static GTimer initializer.

 	 */

@@ -80,7 +80,7 @@ typedef struct GTimer_t {
 	uint16_t			flags;

 	struct GTimer_t		*next;

 	struct GTimer_t		*prev;

-} GTimer;

+	} GTimer;

 

 /*===========================================================================*/

 /* External declarations.                                                    */

@@ -93,6 +93,7 @@ extern "C" {
 void gtimerInit(GTimer *pt);

 void gtimerStart(GTimer *pt, GTimerFunction fn, void *param, bool_t periodic, systime_t millisec);

 void gtimerStop(GTimer *pt);

+bool_t gtimerIsActive(GTimer *pt);

 void gtimerJab(GTimer *pt);

 void gtimerJabI(GTimer *pt);

 

diff --git a/include/gwin.h b/include/gwin.h
index 24eba20c..f54c8d37 100644
--- a/include/gwin.h
+++ b/include/gwin.h
@@ -45,21 +45,6 @@
  * @name    GWIN more complex functionality to be compiled

  * @{

  */

-	/**

-	 * @brief   Should console functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GWIN_NEED_CONSOLE

-		#define GWIN_NEED_CONSOLE	FALSE

-	#endif

-	/**

-	 * @brief   Should button functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GWIN_NEED_BUTTON

-		#define GWIN_NEED_BUTTON	FALSE

-	#endif

-

 /** @} */

 

 /*===========================================================================*/

@@ -75,25 +60,13 @@
 	#warning "GWIN: Drawing can occur outside the defined window as GDISP_NEED_CLIP is FALSE"

 #endif

 

-#if GWIN_NEED_CONSOLE && !GDISP_NEED_TEXT

-	#error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_CONSOLE is defined."

-#endif

-

-#if GWIN_NEED_BUTTON && !GDISP_NEED_TEXT

-	#error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_BUTTON is defined."

-#endif

-

-#if GWIN_NEED_BUTTON

-	#warning "GWIN: Button support is not complete yet"

-#endif

-

 /*===========================================================================*/

 /* Type definitions                                                          */

 /*===========================================================================*/

 

-typedef enum GWindowType_e {

-	GW_WINDOW, GW_CONSOLE, GW_BUTTON

-	} GWindowType;

+typedef uint16_t	GWindowType;

+#define GW_WINDOW				0x0000

+#define GW_FIRST_USER_WINDOW	0x8000

 

 // A basic window

 typedef struct GWindowObject_t {

@@ -107,58 +80,6 @@ typedef struct GWindowObject_t {
 #endif

 } GWindowObject, * GHandle;

 

-#if GWIN_NEED_CONSOLE

-	// A console window. Supports wrapped text writing and a cursor.

-	typedef struct GConsoleObject_t {

-		GWindowObject		gwin;

-		

-		struct GConsoleWindowStream_t {

-			const struct GConsoleWindowVMT_t *vmt;

-			_base_asynchronous_channel_data

-			} stream;

-		

-		coord_t		cx,cy;			// Cursor position

-		uint8_t		fy;				// Current font height

-		uint8_t		fp;				// Current font inter-character spacing

-	} GConsoleObject;

-#endif

-

-#if GWIN_NEED_BUTTON

-	typedef enum GButtonShape_e {

-		GBTN_3D, GBTN_SQUARE, GBTN_ROUNDED, GBTN_ELLIPSE

-	} GButtonShape;

-

-	typedef struct GButtonStyle_t {

-		GButtonShape		shape;

-		color_t				color_up_edge;

-		color_t				color_up_fill;

-		color_t				color_up_txt;

-		color_t				color_dn_edge;

-		color_t				color_dn_fill;

-		color_t				color_dn_txt;

-	} GButtonStyle;

-	

-	typedef enum GButtonType_e {

-		GBTN_NORMAL, GBTN_TOGGLE

-	} GButtonType;

-	

-	typedef enum GButtonState_e {

-		GBTN_UP, GBTN_DOWN

-	} GButtonState;

-	

-	// A button window

-	typedef struct GButtonObject_t {

-		GWindowObject		gwin;

-

-		GButtonStyle		style;

-		GButtonState		state;

-		GButtonType			type;

-		const char *		txt;

-		void *				callback;		// To be fixed

-		void *				inputsrc;		// To be fixed

-	} GButtonObject;

-#endif

-

 /*===========================================================================*/

 /* External declarations.                                                    */

 /*===========================================================================*/

@@ -237,59 +158,45 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor
 

 /* Circle Functions */

 #if GDISP_NEED_CIRCLE

-void gwinDrawCircle(GHandle gh, coord_t x, coord_t y, coord_t radius);

-void gwinFillCircle(GHandle gh, coord_t x, coord_t y, coord_t radius);

+	void gwinDrawCircle(GHandle gh, coord_t x, coord_t y, coord_t radius);

+	void gwinFillCircle(GHandle gh, coord_t x, coord_t y, coord_t radius);

 #endif

 

 /* Ellipse Functions */

 #if GDISP_NEED_ELLIPSE

-void gwinDrawEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b);

-void gwinFillEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b);

+	void gwinDrawEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b);

+	void gwinFillEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b);

 #endif

 

 /* Arc Functions */

 #if GDISP_NEED_ARC

-void gwinDrawArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle);

-void gwinFillArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle);

+	void gwinDrawArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle);

+	void gwinFillArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle);

 #endif

 

 /* Read a pixel Function */

 #if GDISP_NEED_PIXELREAD

-color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y);

+	color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y);

 #endif

 

 /* Extra Text Functions */

 #if GDISP_NEED_TEXT

-void gwinDrawChar(GHandle gh, coord_t x, coord_t y, char c);

-void gwinFillChar(GHandle gh, coord_t x, coord_t y, char c);

-void gwinDrawString(GHandle gh, coord_t x, coord_t y, const char *str);

-void gwinFillString(GHandle gh, coord_t x, coord_t y, const char *str);

-void gwinDrawStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify);

-void gwinFillStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify);

-#endif

-

-#if GWIN_NEED_CONSOLE

-GHandle gwinCreateConsole(GConsoleObject *gc, coord_t x, coord_t y, coord_t width, coord_t height, font_t font);

-BaseSequentialStream *gwinGetConsoleStream(GHandle gh);

-void gwinPutChar(GHandle gh, char c);

-void gwinPutString(GHandle gh, const char *str);

-void gwinPutCharArray(GHandle gh, const char *str, size_t n);

-#endif

-

-#if GWIN_NEED_BUTTON

-GHandle gwinCreateButton(GButtonObject *gb, coord_t x, coord_t y, coord_t width, coord_t height, font_t font, GButtonType type);

-void gwinSetButtonStyle(GHandle gh, const GButtonStyle *style);

-void gwinSetButtonText(GHandle gh, const char *txt, bool_t useAlloc);

-void gwinButtonDraw(GHandle gh);

-#define gwinGetButtonState(gh)		(((GButtonObject *)(gh))->state)

-//void gwinSetButtonCallback(GHandle gh, ????);

-//void gwinSetButtonInput(GHandle gh, ????);

+	void gwinDrawChar(GHandle gh, coord_t x, coord_t y, char c);

+	void gwinFillChar(GHandle gh, coord_t x, coord_t y, char c);

+	void gwinDrawString(GHandle gh, coord_t x, coord_t y, const char *str);

+	void gwinFillString(GHandle gh, coord_t x, coord_t y, const char *str);

+	void gwinDrawStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify);

+	void gwinFillStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify);

 #endif

 

 #ifdef __cplusplus

 }

 #endif

 

+/* Include extra window types */

+#include "gwin/gwin_console.h"

+#include "gwin/gwin_button.h"

+

 #endif /* GFX_USE_GWIN */

 

 #endif /* _GWIN_H */

diff --git a/include/gwin/gwin_button.h b/include/gwin/gwin_button.h
new file mode 100644
index 00000000..69a2474c
--- /dev/null
+++ b/include/gwin/gwin_button.h
@@ -0,0 +1,142 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    gwin/gwin_button.h

+ * @brief   GWIN Graphic window subsystem header file.

+ *

+ * @addtogroup GWIN

+ * @{

+ */

+#ifndef _GWIN_BUTTON_H

+#define _GWIN_BUTTON_H

+

+/**

+ * @name    GWIN more complex functionality to be compiled

+ * @{

+ */

+	/**

+	 * @brief   Should button functions be included.

+	 * @details	Defaults to FALSE

+	 */

+	#ifndef GWIN_NEED_BUTTON

+		#define GWIN_NEED_BUTTON	FALSE

+	#endif

+

+/** @} */

+

+#if GWIN_NEED_BUTTON || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Driver constants.														 */

+/*===========================================================================*/

+

+#define GW_BUTTON				0x0002

+#define GEVENT_GWIN_BUTTON		(GEVENT_GWIN_FIRST+0)

+

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+

+/*===========================================================================*/

+/* Low Level Driver details and error checks.                                */

+/*===========================================================================*/

+

+#if !GDISP_NEED_TEXT

+	#error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_BUTTON is defined."

+#endif

+

+#if !defined(GFX_USE_GEVENT) || !GFX_USE_GEVENT

+	#error "GWIN Buttons require GFX_USE_GEVENT"

+#endif

+#include "gevent.h"

+

+/*===========================================================================*/

+/* Type definitions                                                          */

+/*===========================================================================*/

+

+typedef struct GEventGWinButton_t {

+	GEventType		type;				// The type of this event (GEVENT_GWIN_BUTTON)

+	GHandle			button;				// The button that has been depressed (actually triggered on release)

+} GEventGWinButton;

+

+// There are currently no GEventGWinButton listening flags - use 0

+

+typedef enum GButtonShape_e {

+	GBTN_3D, GBTN_SQUARE, GBTN_ROUNDED, GBTN_ELLIPSE

+} GButtonShape;

+

+typedef struct GButtonStyle_t {

+	GButtonShape		shape;

+	color_t				color_up_edge;

+	color_t				color_up_fill;

+	color_t				color_up_txt;

+	color_t				color_dn_edge;

+	color_t				color_dn_fill;

+	color_t				color_dn_txt;

+} GButtonStyle;

+

+typedef enum GButtonType_e {

+	GBTN_NORMAL, GBTN_TOGGLE

+} GButtonType;

+

+typedef enum GButtonState_e {

+	GBTN_UP, GBTN_DOWN

+} GButtonState;

+

+// A button window

+typedef struct GButtonObject_t {

+	GWindowObject		gwin;

+

+	GButtonStyle		style;

+	GButtonState		state;

+	GButtonType			type;

+	const char *		txt;

+	GListener			listener;

+} GButtonObject;

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	GHandle gwinCreateButton(GButtonObject *gb, coord_t x, coord_t y, coord_t width, coord_t height, font_t font, GButtonType type);

+	void gwinSetButtonStyle(GHandle gh, const GButtonStyle *style);

+	void gwinSetButtonText(GHandle gh, const char *txt, bool_t useAlloc);

+	void gwinButtonDraw(GHandle gh);

+	#define gwinGetButtonState(gh)		(((GButtonObject *)(gh))->state)

+

+	// Get the source handle so the application can listen for events

+	#define gwinGetButtonSource(gh)		((GSourceHandle)(gh))

+

+	// Attach a source to this button. Sources recognised: Mouse, Touch and Toggle - others are ignored (returns false).

+	bool_t gwinAttachButtonSource(GHandle gh, GSourceHandle gsh, GEventType type);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GWIN_NEED_BUTTON */

+

+#endif /* _GWIN_BUTTON_H */

+/** @} */

diff --git a/include/gwin/gwin_console.h b/include/gwin/gwin_console.h
new file mode 100644
index 00000000..5462ec2b
--- /dev/null
+++ b/include/gwin/gwin_console.h
@@ -0,0 +1,102 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    gwin/gwin_console.h

+ * @brief   GWIN Graphic window subsystem header file.

+ *

+ * @addtogroup GWIN

+ * @{

+ */

+#ifndef _GWIN_CONSOLE_H

+#define _GWIN_CONSOLE_H

+

+/**

+ * @name    GWIN more complex functionality to be compiled

+ * @{

+ */

+	/**

+	 * @brief   Should console functions be included.

+	 * @details	Defaults to FALSE

+	 */

+	#ifndef GWIN_NEED_CONSOLE

+		#define GWIN_NEED_CONSOLE	FALSE

+	#endif

+/** @} */

+

+#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)

+

+/*===========================================================================*/

+/* Driver constants.														 */

+/*===========================================================================*/

+

+#define GW_CONSOLE				0x0001

+

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Low Level Driver details and error checks.                                */

+/*===========================================================================*/

+

+#if GWIN_NEED_CONSOLE && !GDISP_NEED_TEXT

+	#error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_CONSOLE is defined."

+#endif

+

+/*===========================================================================*/

+/* Type definitions                                                          */

+/*===========================================================================*/

+

+// A console window. Supports wrapped text writing and a cursor.

+typedef struct GConsoleObject_t {

+	GWindowObject		gwin;

+	

+	struct GConsoleWindowStream_t {

+		const struct GConsoleWindowVMT_t *vmt;

+		_base_asynchronous_channel_data

+		} stream;

+	

+	coord_t		cx,cy;			// Cursor position

+	uint8_t		fy;				// Current font height

+	uint8_t		fp;				// Current font inter-character spacing

+	} GConsoleObject;

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	GHandle gwinCreateConsole(GConsoleObject *gc, coord_t x, coord_t y, coord_t width, coord_t height, font_t font);

+	BaseSequentialStream *gwinGetConsoleStream(GHandle gh);

+	void gwinPutChar(GHandle gh, char c);

+	void gwinPutString(GHandle gh, const char *str);

+	void gwinPutCharArray(GHandle gh, const char *str, size_t n);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GWIN_NEED_CONSOLE */

+

+#endif /* _GWIN_CONSOLE_H */

+/** @} */

diff --git a/include/gdisp_emulation.c b/include/lld/gdisp/emulation.c
index 31ca1a03..88a8c42f 100644
--- a/include/gdisp_emulation.c
+++ b/include/lld/gdisp/emulation.c
@@ -481,7 +481,7 @@
 #endif

 

 #if GDISP_NEED_TEXT && !GDISP_HARDWARE_TEXT

-	#include "gdisp_fonts.h"

+	#include "gdisp/fonts.h"

 #endif

 

 #if GDISP_NEED_TEXT && !GDISP_HARDWARE_TEXT

diff --git a/include/gdisp_lld.h b/include/lld/gdisp/gdisp_lld.h
index fecd710a..fecd710a 100644
--- a/include/gdisp_lld.h
+++ b/include/lld/gdisp/gdisp_lld.h
diff --git a/include/gdisp_lld_msgs.h b/include/lld/gdisp/gdisp_lld_msgs.h
index 5885a70c..5885a70c 100644
--- a/include/gdisp_lld_msgs.h
+++ b/include/lld/gdisp/gdisp_lld_msgs.h
diff --git a/include/lld/ginput/mouse.h b/include/lld/ginput/mouse.h
new file mode 100644
index 00000000..64c7c5ec
--- /dev/null
+++ b/include/lld/ginput/mouse.h
@@ -0,0 +1,125 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    lld/ginput/mouse.h

+ * @brief   GINPUT LLD header file for mouse/touch drivers.

+ *

+ * @addtogroup GINPUT_MOUSE

+ * @{

+ */

+#ifndef _LLD_GINPUT_MOUSE_H

+#define _LLD_GINPUT_MOUSE_H

+

+#ifndef GINPUT_NEED_MOUSE

+	#define GINPUT_NEED_MOUSE FALSE

+#endif

+#ifndef GINPUT_NEED_TOUCH

+	#define GINPUT_NEED_TOUCH FALSE

+#endif

+

+#if GINPUT_NEED_MOUSE || GINPUT_NEED_TOUCH

+

+#include "ginput_lld_mouse_config.h"

+

+// GEVENT_MOUSE or GEVENT_TOUCH - What type of device is this.

+#ifndef GINPUT_MOUSE_EVENT_TYPE

+	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_MOUSE

+#endif

+

+// TRUE/FALSE - Does the mouse/touch driver require calibration?

+#ifndef GINPUT_MOUSE_NEED_CALIBRATION

+	#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE

+#endif

+

+// TRUE/FALSE	- Can the mouse/touch driver itself save calibration data?

+#ifndef GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE

+	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE

+#endif

+

+// n or -1		- n means to test calibration result (+/- pixels), -1 means not to.

+#ifndef GINPUT_MOUSE_MAX_CALIBRATION_ERROR

+	#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		-1

+#endif

+

+// n			- How many times to read (and average) per poll

+#ifndef GINPUT_MOUSE_READ_CYCLES

+	#define GINPUT_MOUSE_READ_CYCLES				1

+#endif

+

+// n			 - Millisecs between poll's

+#ifndef GINPUT_MOUSE_POLL_PERIOD

+	#define GINPUT_MOUSE_POLL_PERIOD				100

+#endif

+

+// n			- Movement allowed without discarding the CLICK or CLICKCXT event (+/- pixels)

+#ifndef GINPUT_MOUSE_MAX_CLICK_JITTER

+	#define GINPUT_MOUSE_MAX_CLICK_JITTER			1

+#endif

+

+// n			- Movement allowed without discarding the MOVE event (+/- pixels)

+#ifndef GINPUT_MOUSE_MAX_MOVE_JITTER

+	#define GINPUT_MOUSE_MAX_MOVE_JITTER			0

+#endif

+

+// ms			- Millisecs seperating a CLICK from a CXTCLICK

+#ifndef GINPUT_MOUSE_CLICK_TIME

+	#define GINPUT_MOUSE_CLICK_TIME					700

+#endif

+

+

+typedef struct MouseReading_t {

+	coord_t		x, y, z;

+	uint16_t	buttons;

+	} MouseReading;

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	void ginput_lld_mouse_init(void);

+	void ginput_lld_mouse_get_reading(MouseReading *pt);

+

+	#if GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE

+		const char *ginput_lld_mouse_calibration_load(uint16_t instance);

+		void ginput_lld_mouse_calibration_save(uint16_t instance, const uint8_t *calbuf, size_t sz);

+	#endif

+

+	/* This routine is provided to low level drivers to wakeup a value read from a thread context.

+	 *	Particularly useful if GINPUT_MOUSE_POLL_PERIOD = TIME_INFINITE

+	 */

+	void ginputMouseWakeup(void);

+

+	/* This routine is provided to low level drivers to wakeup a value read from an ISR

+	 *	Particularly useful if GINPUT_MOUSE_POLL_PERIOD = TIME_INFINITE

+	 */

+	void ginputMouseWakeupI(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GINPUT_NEED_MOUSE || GINPUT_NEED_TOUCH */

+

+#endif /* _LLD_GINPUT_MOUSE_H */

+/** @} */

diff --git a/include/lld/ginput/toggle.h b/include/lld/ginput/toggle.h
new file mode 100644
index 00000000..826ace83
--- /dev/null
+++ b/include/lld/ginput/toggle.h
@@ -0,0 +1,71 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

+                 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/>.

+*/

+/**

+ * @file    lld/ginput/toggle.h

+ * @brief   GINPUT header file for toggle drivers.

+ *

+ * @addtogroup GINPUT_TOGGLE

+ * @{

+ */

+#ifndef _LLD_GINPUT_TOGGLE_H

+#define _LLD_GINPUT_TOGGLE_H

+

+#ifndef GFX_USE_GINPUT

+	#define GFX_USE_GINPUT FALSE

+#endif

+

+#if GFX_USE_GINPUT || defined(__DOXYGEN__)

+

+#if GINPUT_NEED_TOGGLE

+	// Describes how the toggle bits are obtained

+	typedef struct GToggleConfig_t {

+		void		*id;

+		unsigned	mask;

+		unsigned	invert;

+		iomode_t	mode;

+	} GToggleConfig;

+#endif

+

+// This must be included after the above type definition

+#include "ginput.h"

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#if GINPUT_NEED_TOGGLE

+	extern const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES];

+	

+	void ginput_lld_toggle_init(const GToggleConfig *ptc);

+	unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc);

+#endif

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GFX_USE_GINPUT */

+

+#endif /* _LLD_GINPUT_TOGGLE_H */

+/** @} */

diff --git a/include/touchscreen_lld.h b/include/lld/touchscreen/touchscreen_lld.h
index 9dd29629..9dd29629 100644
--- a/include/touchscreen_lld.h
+++ b/include/lld/touchscreen/touchscreen_lld.h
diff --git a/include/touchscreen.h b/include/touchscreen.h
index 253855ca..5a84afdf 100644
--- a/include/touchscreen.h
+++ b/include/touchscreen.h
@@ -40,7 +40,7 @@
 /*===========================================================================*/

 

 /* Include the low level driver information */

-#include "touchscreen_lld.h"

+#include "lld/touchscreen/touchscreen_lld.h"

 

 /* For definitions of coord_t, we require gdisp.h */

 #include "gdisp.h"