removed GDISP_LLD() macro

6 files changed, 0 insertions, 856 deletions

diff --git a/include/gwin/button.h b/include/gwin/button.h
deleted file mode 100644
index ffec858b..00000000
--- a/include/gwin/button.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*

-    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    include/gwin/button.h

- * @brief   GWIN Graphic window subsystem header file.

- *

- * @defgroup Button Button

- * @ingroup GWIN

- *

- * @details		GWIN allows it to easily create buttons with different styles

- *				and check for different meta states such as: PRESSED, CLICKED,

- *				RELEASED etc.

- *

- * @pre			GFX_USE_GWIN must be set to TRUE in your gfxconf.h

- * @pre			GWIN_NEED_BUTTON must be set to TRUE in your gfxconf.h

- * @{

- */

-

-#ifndef _GWIN_BUTTON_H

-#define _GWIN_BUTTON_H

-

-#if GWIN_NEED_BUTTON || defined(__DOXYGEN__)

-

-/*===========================================================================*/

-/* Driver constants.														 */

-/*===========================================================================*/

-

-#define GW_BUTTON				0x0002

-#define GEVENT_GWIN_BUTTON		(GEVENT_GWIN_FIRST+0)

-

-/*===========================================================================*/

-/* 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

-

-/**

- * @brief   Create a button window.

- * @return  NULL if there is no resultant drawing area, otherwise a window handle.

- *

- * @param[in] gb		The GButtonObject structure to initialise. If this is NULL the structure is dynamically allocated.

- * @param[in] x,y		The screen co-ordinates for the bottom left corner of the window

- * @param[in] width		The width of the window

- * @param[in] height	The height of the window

- * @param[in] font		The font to use

- * @param[in] type		The type of button

- * @note				The drawing color gets set to White and the background drawing color to Black.

- * @note				The dimensions and position may be changed to fit on the real screen.

- * @note				The button is not automatically drawn. Call gwinButtonDraw() after changing the button style or setting the text.

- *

- * @api

- */	

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

-

-/**

- * @brief   Set the style of a button.

- * @details	The button style is defined by its shape and colours.

- *

- * @param[in] gh		The window handle (must be a button window)

- * @param[in] style		The button style to set.

- * @note				The button is not automatically redrawn. Call gwinButtonDraw() after changing the button style

- *

- * @api

- */

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

-

-/**

- * @brief   Set the text of a button.

- *

- * @param[in] gh		The window handle (must be a button window)

- * @param[in] txt		The button text to set. This must be a constant string unless useAlloc is set.

- * @param[in] useAlloc	If TRUE the string specified will be copied into dynamically allocated memory.

- * @note				The button is not automatically redrawn. Call gwinButtonDraw() after changing the button text.

- *

- * @api

- */

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

-

-/**

- * @brief   Redraw the button.

- *

- * @param[in] gh		The window handle (must be a button window)

- *

- * @api

- */

-void gwinButtonDraw(GHandle gh);

-

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

-

-/**

- * @brief Get the source handle of a button

- * @details Get the source handle of a button so the application can listen for events

- *

- * @param[in] gh	The Hanlde

- */

-#define gwinGetButtonSource(gh)		((GSourceHandle)(gh))

-

-#if defined(GINPUT_NEED_MOUSE) && GINPUT_NEED_MOUSE

-	/**

-	 * @brief	Attach a mouse source

-	 * @details	Attach a mouse source to a given button

-	 *

-	 * @param[in] gh	The button handle

-	 * @param[in] gsh	The source handle

-	 *

-	 * @return

-	 */

-	bool_t gwinAttachButtonMouseSource(GHandle gh, GSourceHandle gsh);

-#endif

-

-#if defined(GINPUT_NEED_TOGGLE) && GINPUT_NEED_TOGGLE

-	/**

-	 * @brief	Attach a toggle source

-	 * @details	Attach a toggle source to this button

-	 *

-	 * @gh		The button handle

-	 * @gsh		The source handle

-	 *

-	 * @return

-	 */

-	bool_t gwinAttachButtonToggleSource(GHandle gh, GSourceHandle gsh);

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* GWIN_NEED_BUTTON */

-

-#endif /* _GWIN_BUTTON_H */

-/** @} */

diff --git a/include/gwin/console.h b/include/gwin/console.h
deleted file mode 100644
index 30058b2b..00000000
--- a/include/gwin/console.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*

-    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    include/gwin/console.h

- * @brief   GWIN Graphic window subsystem header file.

- *

- * @defgroup Console Console

- * @ingroup GWIN

- *

- * @details		GWIN allows it to create a console/terminal like window.

- *				You can simply use chprintf() to print to the terminal.

- *

- * @pre			GFX_USE_GWIN must be set to TRUE in your gfxconf.h

- * @pre			GWIN_NEED_CONSOLE must be set to TRUE in your gfxconf.h

- *

- * @{

- */

-

-#ifndef _GWIN_CONSOLE_H

-#define _GWIN_CONSOLE_H

-

-#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)

-

-/*===========================================================================*/

-/* Driver constants.														 */

-/*===========================================================================*/

-

-#define GW_CONSOLE				0x0001

-

-/*===========================================================================*/

-/* 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

-

-/**

- * @brief   Create a console window.

- * @details	A console window allows text to be written using chprintf() (and the console functions defined here).

- * @brief	Text in a console window supports newlines and will wrap text as required.

- * @return  NULL if there is no resultant drawing area, otherwise a window handle.

- *

- * @param[in] gc		The GConsoleObject structure to initialise. If this is NULL the structure is dynamically allocated.

- * @param[in] x,y		The screen co-ordinates for the bottom left corner of the window

- * @param[in] width		The width of the window

- * @param[in] height	The height of the window

- * @param[in] font		The font to use

- * @note				The console is not automatically cleared on creation. You must do that by calling gwinClear() (possibly after changing your background color)

- * @note				If the dispay does not support scrolling, the window will be cleared when the bottom line is reached.

- * @note				The default drawing color gets set to White and the background drawing color to Black.

- * @note				The dimensions and position may be changed to fit on the real screen.

- *

- * @api

- */

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

-

-/**

- * @brief   Get a stream from a console window suitable for use with chprintf().

- * @return	The stream handle or NULL if this is not a console window.

- *

- * @param[in] gh	The window handle (must be a console window)

- *

- * @api

- */

-BaseSequentialStream *gwinGetConsoleStream(GHandle gh);

-

-/**

- * @brief   Put a character at the cursor position in the window.

- * @note	Uses the current foreground color to draw the character and fills the background using the background drawing color

- *

- * @param[in] gh	The window handle (must be a console window)

- * @param[in] c		The character to draw

- *

- * @api

- */

-void gwinPutChar(GHandle gh, char c);

-

-/**

- * @brief   Put a string at the cursor position in the window. It will wrap lines as required.

- * @note	Uses the current foreground color to draw the string and fills the background using the background drawing color

- *

- * @param[in] gh	The window handle (must be a console window)

- * @param[in] str	The string to draw

- *

- * @api

- */

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

-

-/**

- * @brief   Put the character array at the cursor position in the window. It will wrap lines as required.

- * @note	Uses the current foreground color to draw the string and fills the background using the background drawing color

- *

- * @param[in] gh	The window handle (must be a console window)

- * @param[in] str	The string to draw

- * @param[in] n		The number of characters to draw

- *

- * @api

- */

-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/gwin/graph.h b/include/gwin/graph.h
deleted file mode 100644
index 9267813b..00000000
--- a/include/gwin/graph.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*

-    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	include/gwin/graph.h

- * @brief	GWIN GRAPH module header file.

- *

- * @defgroup Graph Graph

- * @ingroup GWIN

- *

- * @details	GWIN allows it to easily draw graphs.

- * @pre		GFX_USE_GWIN must be set to TRUE in your gfxconf.h

- * @pre		GWIN_NEED_GRAPH must be set to TRUE in your gfxconf.h

- *

- * @{

- */

-

-#ifndef _GWIN_GRAPH_H

-#define _GWIN_GRAPH_H

-

-#if GWIN_NEED_GRAPH || defined(__DOXYGEN__)

-

-/*===========================================================================*/

-/* Driver constants.														 */

-/*===========================================================================*/

-

-#define GW_GRAPH				0x0003

-

-/*===========================================================================*/

-/* Type definitions                                                          */

-/*===========================================================================*/

-

-typedef struct GGraphPoint_t {

-	coord_t		x, y;

-	} GGraphPoint;

-

-typedef enum GGraphPointType_e {

-	GGRAPH_POINT_NONE, GGRAPH_POINT_DOT, GGRAPH_POINT_SQUARE, GGRAPH_POINT_CIRCLE

-	} GGraphPointType;

-

-typedef struct GGraphPointStyle_t {

-	GGraphPointType		type;

-	coord_t				size;

-	color_t				color;

-	} GGraphPointStyle;

-

-typedef enum GGraphLineType_e {

-	GGRAPH_LINE_NONE, GGRAPH_LINE_SOLID, GGRAPH_LINE_DOT, GGRAPH_LINE_DASH

-	} GGraphLineType;

-

-typedef struct GGraphLineStyle_t {

-	GGraphLineType		type;

-	coord_t				size;

-	color_t				color;

-	} GGraphLineStyle;

-

-typedef struct GGraphGridStyle_t {

-	GGraphLineType		type;

-	coord_t				size;

-	color_t				color;

-	coord_t				spacing;

-	} GGraphGridStyle;

-

-typedef struct GGraphStyle_t {

-	GGraphPointStyle	point;

-	GGraphLineStyle		line;

-	GGraphLineStyle		xaxis;

-	GGraphLineStyle		yaxis;

-	GGraphGridStyle		xgrid;

-	GGraphGridStyle		ygrid;

-	uint16_t			flags;

-		#define GWIN_GRAPH_STYLE_XAXIS_POSITIVE_ARROWS	0x0001

-		#define GWIN_GRAPH_STYLE_XAXIS_NEGATIVE_ARROWS	0x0002

-		#define GWIN_GRAPH_STYLE_YAXIS_POSITIVE_ARROWS	0x0004

-		#define GWIN_GRAPH_STYLE_YAXIS_NEGATIVE_ARROWS	0x0008

-		#define GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS	(GWIN_GRAPH_STYLE_XAXIS_POSITIVE_ARROWS|GWIN_GRAPH_STYLE_YAXIS_POSITIVE_ARROWS)

-		#define GWIN_GRAPH_STYLE_NEGATIVE_AXIS_ARROWS	(GWIN_GRAPH_STYLE_XAXIS_NEGATIVE_ARROWS|GWIN_GRAPH_STYLE_YAXIS_NEGATIVE_ARROWS)

-		#define GWIN_GRAPH_STYLE_XAXIS_ARROWS			(GWIN_GRAPH_STYLE_XAXIS_POSITIVE_ARROWS|GWIN_GRAPH_STYLE_XAXIS_NEGATIVE_ARROWS)

-		#define GWIN_GRAPH_STYLE_YAXIS_ARROWS			(GWIN_GRAPH_STYLE_YAXIS_POSITIVE_ARROWS|GWIN_GRAPH_STYLE_YAXIS_NEGATIVE_ARROWS)

-		#define GWIN_GRAPH_STYLE_ALL_AXIS_ARROWS		(GWIN_GRAPH_STYLE_XAXIS_ARROWS|GWIN_GRAPH_STYLE_YAXIS_ARROWS)

-} GGraphStyle;

-

-// A graph window

-typedef struct GGraphObject_t {

-	GWindowObject		gwin;

-	GGraphStyle			style;

-	coord_t				xorigin, yorigin;

-	coord_t				lastx, lasty;

-	} GGraphObject;

-

-/*===========================================================================*/

-/* External declarations.                                                    */

-/*===========================================================================*/

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/**

- * @brief   Create a graph window.

- * @return  NULL if there is no resultant drawing area, otherwise a window handle.

- *

- * @param[in] gg		The GGraphObject structure to initialise. If this is NULL the structure is dynamically allocated.

- * @param[in] x,y		The screen co-ordinates for the bottom left corner of the window

- * @param[in] width		The width of the window

- * @param[in] height	The height of the window

- * @note				The console is not automatically cleared on creation. You must do that by calling gwinClear() (possibly after changing your background color)

- * @note				The coordinate system within the window for graphing operations (but not for any other drawing

- * 						operation) is relative to the bottom left corner and then shifted right and up by the specified

- * 						graphing x and y origin. Note that this system is inverted in the y direction relative to the display.

- * 						This gives the best graphing arrangement ie. increasing y values are closer to the top of the display.

- *

- * @api

- */

-GHandle gwinCreateGraph(GGraphObject *gg, coord_t x, coord_t y, coord_t width, coord_t height);

-

-/**

- * @brief   Set the style of the graphing operations.

- *

- * @param[in] gh		The window handle (must be a graph window)

- * @param[in] pstyle	The graph style to set.

- * @note				The graph is not automatically redrawn. The new style will apply to any new drawing operations.

- *

- * @api

- */

-void gwinGraphSetStyle(GHandle gh, const GGraphStyle *pstyle);

-

-/**

- * @brief   Set the origin for graphing operations.

- *

- * @param[in] gh		The window handle (must be a graph window)

- * @param[in] x, y		The new origin for the graph (in graph coordinates relative to the bottom left corner).

- * @note				The graph is not automatically redrawn. The new origin will apply to any new drawing operations.

- *

- * @api

- */

-void gwinGraphSetOrigin(GHandle gh, coord_t x, coord_t y);

-

-/**

- * @brief   Draw the axis and the background grid.

- *

- * @param[in] gh		The window handle (must be a graph window)

- * @note				The graph is not automatically cleared. You must do that first by calling gwinClear().

- *

- * @api

- */

-void gwinGraphDrawAxis(GHandle gh);

-

-/**

- * @brief   Start a new set of graphing data.

- * @details	This prevents a line being drawn from the last data point to the next point to be drawn.

- *

- * @param[in] gh		The window handle (must be a graph window)

- *

- * @api

- */

-void gwinGraphStartSet(GHandle gh);

-

-/**

- * @brief   Draw a graph point.

- * @details	A graph point and a line connecting to the previous point will be drawn.

- *

- * @param[in] gh		The window handle (must be a graph window)

- * @param[in] x, y		The new point for the graph.

- *

- * @api

- */

-void gwinGraphDrawPoint(GHandle gh, coord_t x, coord_t y);

-

-/**

- * @brief   Draw multiple graph points.

- * @details	A graph point and a line connecting to each previous point will be drawn.

- *

- * @param[in] gh		The window handle (must be a graph window)

- * @param[in] points	The array of points for the graph.

- * @param[in] count		The number of points in the array.

- * @note				This is slightly more efficient than calling gwinGraphDrawPoint() repeatedly.

- *

- * @api

- */

-void gwinGraphDrawPoints(GHandle gh, const GGraphPoint *points, unsigned count);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif	/* GWIN_NEED_GRAPH */

-

-#endif	/* _GWIN_GRAPH_H */

-/** @} */

-

diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
deleted file mode 100644
index e109dd83..00000000
--- a/include/gwin/gwin.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

-    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    include/gwin/gwin.h

- * @brief   GWIN Graphic window subsystem header file.

- *

- * @defgroup Window Window

- * @ingroup GWIN

- *

- * @details	GWIN provides a basic window manager which allows it to easily

- *			create and destroy different windows on runtime. Each window

- *			will have it's own properties such as colors, brushes as well as

- *			it's own drawing origin.

- *			Moving the windows around is not supported yet.

- *

- * @pre		GFX_USE_GWIN must be set to TRUE in your gfxconf.h

- *

- * @{

- */

-

-#ifndef _GWIN_H

-#define _GWIN_H

-

-#include "gfx.h"

-

-#if GFX_USE_GWIN || defined(__DOXYGEN__)

-

-/*===========================================================================*/

-/* Type definitions                                                          */

-/*===========================================================================*/

-

-typedef uint16_t	GWindowType;

-#define GW_WINDOW				0x0000

-#define GW_FIRST_USER_WINDOW	0x8000

-

-// A basic window

-typedef struct GWindowObject_t {

-	GWindowType	type;				// What type of window is this

-	uint16_t	flags;				// Internal flags

-	coord_t		x, y;				// Screen relative position

-	coord_t		width, height;		// Dimensions of this window

-	color_t		color, bgcolor;		// Current drawing colors

-#if GDISP_NEED_TEXT

-	font_t		font;				// Current font

-#endif

-} GWindowObject, * GHandle;

-

-/*===========================================================================*/

-/* External declarations.                                                    */

-/*===========================================================================*/

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/* Base Functions */

-GHandle gwinCreateWindow(GWindowObject *gw, coord_t x, coord_t y, coord_t width, coord_t height);

-void gwinDestroyWindow(GHandle gh);

-

-/**

- * @brief	Get the X coordinate of the window

- * @details	Returns the X coordinate of the origin of the window.

- *			The coordinate is relative to the physical screen zero point.

- *

- * @param[in] gh	The window

- */

-#define gwinGetScreenX(gh)			((gh)->x)

-

-/**

- * @brief	Get the Y coordinate of the window

- * @details	Returns the Y coordinate of the origin of the window.

- *			The coordinate is relative to the physical screen zero point.

- *

- * @param[in] gh	The window

- */

-#define gwinGetScreenY(gh)			((gh)->y)

-

-/**

- * @brief	Get the width of the window

- *

- * @param[in] gh	The window

- */

-#define gwinGetWidth(gh)			((gh)->width)

-

-/**

- * @brief	Get the height of the window

- *

- * @param[in] gh	The window

- */

-#define gwinGetHeight(gh)			((gh)->height)

-

-/**

- * @brief	Set foreground color

- * @details Set the color which will be used to draw

- *

- * @param[in] gh	The window

- * @param[in] clr	The color to be set

- */

-#define gwinSetColor(gh, clr)		(gh)->color = (clr)

-

-/**

- * @brief	Set background color

- * @details	Set the color which will be used as background

- * @note	gwinClear() must be called to set the background color

- *

- * @param[in] gh	The window

- * @param[in] bgclr	The background color

- */

-#define gwinSetBgColor(gh, bgclr)	(gh)->bgcolor = (bgclr)

-

-/* Set up for text */

-#if GDISP_NEED_TEXT

-	void gwinSetFont(GHandle gh, font_t font);

-#endif

-

-/* Drawing Functions */

-void gwinClear(GHandle gh);

-void gwinDrawPixel(GHandle gh, coord_t x, coord_t y);

-void gwinDrawLine(GHandle gh, coord_t x0, coord_t y0, coord_t x1, coord_t y1);

-void gwinDrawBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy);

-void gwinFillArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy);

-void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer);

-

-/* 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);

-#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);

-#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);

-#endif

-

-/* Read a pixel Function */

-#if GDISP_NEED_PIXELREAD

-	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

-

-#ifdef __cplusplus

-}

-#endif

-

-/* Include extra window types */

-#include "gwin/console.h"

-#include "gwin/button.h"

-#include "gwin/graph.h"

-

-#endif /* GFX_USE_GWIN */

-

-#endif /* _GWIN_H */

-/** @} */

diff --git a/include/gwin/internal.h b/include/gwin/internal.h
deleted file mode 100644
index b47a2229..00000000
--- a/include/gwin/internal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

-    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    include/gwin/internal.h

- * @brief   GWIN Graphic window subsystem header file.

- *

- * @addtogroup GWIN

- * @{

- */

-#ifndef _GWIN_INTERNAL_H

-#define _GWIN_INTERNAL_H

-

-#if GFX_USE_GWIN || defined(__DOXYGEN__)

-

-/*===========================================================================*/

-/* Sub-system constants.													 */

-/*===========================================================================*/

-

-#define GWIN_FLG_DYNAMIC				0x0001

-#define GBTN_FLG_ALLOCTXT				0x0002

-#define GWIN_FIRST_CONTROL_FLAG			0x0004

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-GHandle _gwinInit(GWindowObject *gw, coord_t x, coord_t y, coord_t width, coord_t height, size_t size);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* GFX_USE_GWIN */

-

-#endif /* _GWIN_INTERNAL_H */

-/** @} */

diff --git a/include/gwin/options.h b/include/gwin/options.h
deleted file mode 100644
index 6e17e61f..00000000
--- a/include/gwin/options.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

-    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    include/gwin/options.h

- * @brief   GWIN sub-system options header file.

- *

- * @addtogroup GWIN

- * @{

- */

-

-#ifndef _GWIN_OPTIONS_H

-#define _GWIN_OPTIONS_H

-

-/**

- * @name    GWIN Functionality to be included

- * @{

- */

-	/**

-	 * @brief   Should button functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GWIN_NEED_BUTTON

-		#define GWIN_NEED_BUTTON	FALSE

-	#endif

-	/**

-	 * @brief   Should console functions be included.

-	 * @details	Defaults to FALSE

-	 * @note	To use chprintf() for printing in a console window you need to

-	 * 			include in your application source file...

-	 * 			\#include "chprintf.h"

-	 * 			Also in your makefile, as part of your list of C source files, include

-	 * 			${CHIBIOS}/os/various/chprintf.c

-	 */

-	#ifndef GWIN_NEED_CONSOLE

-		#define GWIN_NEED_CONSOLE	FALSE

-	#endif

-	/**

-	 * @brief   Should graph functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GWIN_NEED_GRAPH

-		#define GWIN_NEED_GRAPH		FALSE

-	#endif

-/**

- * @}

- *

- * @name    GWIN Optional Sizing Parameters

- * @{

- */

-/** @} */

-

-#endif /* _GWIN_OPTIONS_H */

-/** @} */