Added new type definitions - moving towards V3.0

6 files changed, 83 insertions, 83 deletions

diff --git a/drivers/multiple/SDL/gdisp_lld_SDL.c b/drivers/multiple/SDL/gdisp_lld_SDL.c
index 5e2661a3..3ea2168f 100644
--- a/drivers/multiple/SDL/gdisp_lld_SDL.c
+++ b/drivers/multiple/SDL/gdisp_lld_SDL.c
@@ -40,8 +40,8 @@
 	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
-	static bool_t SDL_MouseInit(GMouse *m, unsigned driverinstance);
-	static bool_t SDL_MouseRead(GMouse *m, GMouseReading *prd);
+	static gBool SDL_MouseInit(GMouse *m, unsigned driverinstance);
+	static gBool SDL_MouseRead(GMouse *m, GMouseReading *prd);
 	const GMouseVMT GMOUSE_DRIVER_VMT[1] = {{
 		{
 			GDRIVER_TYPE_MOUSE,
@@ -78,7 +78,7 @@
 	#include "../../../src/ginput/ginput_driver_keyboard.h"
 
 	// Forward definitions
-	static bool_t SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance);
+	static gBool SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance);
 	static int SDL_KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz);
 
 	const GKeyboardVMT GKEYBOARD_DRIVER_VMT[1] = {{
@@ -366,7 +366,7 @@ void sdl_driver_init (void) {
 }
 
 
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
 	g->board = 0;					// No board interface for this driver
 
 #if GINPUT_NEED_MOUSE
@@ -380,7 +380,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	g->g.Width = GDISP_SCREEN_WIDTH;
 	g->g.Height = GDISP_SCREEN_HEIGHT;
 
-	return TRUE;
+	return gTrue;
 }
 
 
@@ -433,29 +433,29 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g)
 #endif
 
 #if GINPUT_NEED_MOUSE
-	static bool_t SDL_MouseInit(GMouse *m, unsigned driverinstance) {
+	static gBool SDL_MouseInit(GMouse *m, unsigned driverinstance) {
 		mouse = m;
 		(void)	driverinstance;
-		return TRUE;
+		return gTrue;
 	}
 
-	static bool_t SDL_MouseRead(GMouse *m, GMouseReading *pt) {
+	static gBool SDL_MouseRead(GMouse *m, GMouseReading *pt) {
 		(void)	m;
 		if (!context)
-			return FALSE;
+			return gFalse;
 		pt->x = context->mousex;
 		pt->y = context->mousey;
 		pt->z = (context->buttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0;
 		pt->buttons = context->buttons;
-		return TRUE;
+		return gTrue;
 	}
 #endif /* GINPUT_NEED_MOUSE */
 
 #if GINPUT_NEED_KEYBOARD
-	static bool_t SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance) {
+	static gBool SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance) {
 		keyboard = k;
 		(void)	driverinstance;
-		return TRUE;
+		return gTrue;
 	}
 
 	static int SDL_KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz) {
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index 10818269..86af1d80 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -96,8 +96,8 @@
 	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
-	static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
-	static bool_t Win32MouseRead(GMouse *m, GMouseReading *prd);
+	static gBool Win32MouseInit(GMouse *m, unsigned driverinstance);
+	static gBool Win32MouseRead(GMouse *m, GMouseReading *prd);
 
 	const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
 		{
@@ -390,7 +390,7 @@
 	#endif
 
 	// Forward definitions
-	static bool_t Win32KeyboardInit(GKeyboard *k, unsigned driverinstance);
+	static gBool Win32KeyboardInit(GKeyboard *k, unsigned driverinstance);
 	static int Win32KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz);
 
 	const GKeyboardVMT const GKEYBOARD_DRIVER_VMT[1] = {{
@@ -420,7 +420,7 @@
 #endif
 
 static DWORD			winThreadId;
-static volatile bool_t	QReady;
+static volatile gBool	QReady;
 static HANDLE			drawMutex;
 static HWND				hWndParent = 0;
 
@@ -445,7 +445,7 @@ typedef struct winPriv {
 		coord_t		mousex, mousey;
 		uint16_t	mousebuttons;
 		GMouse		*mouse;
-		bool_t		mouseenabled;
+		gBool		mouseenabled;
 		void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
 	#endif
 	#if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
@@ -472,7 +472,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) {
 		if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL))		// For normal setup this is always true
 			_gmouseWakeup(priv->mouse);
 	}
-	void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled) {
+	void gfxEmulatorMouseEnable(GDisplay *g, gBool enabled) {
 		((winPriv *)g->priv)->mouseenabled = enabled;
 	}
 	void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y)) {
@@ -761,7 +761,7 @@ static DWORD WINAPI WindowThread(void *param) {
 	// Establish this thread as a message queue thread
 	winThreadId = GetCurrentThreadId();
 	PeekMessage(&msg, 0, WM_USER, WM_USER, PM_NOREMOVE);
-	QReady = TRUE;
+	QReady = gTrue;
 
 	// Create the window class
 	{
@@ -825,7 +825,7 @@ static DWORD WINAPI WindowThread(void *param) {
 /* Driver exported functions.                                                */
 /*===========================================================================*/
 
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
 	winPriv	*	priv;
 	char		buf[132];
 
@@ -838,7 +838,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 
 		// Create the thread
 		if (!(hth = CreateThread(0, 0, WindowThread, 0, CREATE_SUSPENDED, 0)))
-			return FALSE;
+			return gFalse;
 		SetThreadPriority(hth, THREAD_PRIORITY_ABOVE_NORMAL);
 		ResumeThread(hth);
 		CloseHandle(hth);
@@ -884,7 +884,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 
 	// Create the associated mouse
 	#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
-		priv->mouseenabled = hWndParent ? FALSE : TRUE;
+		priv->mouseenabled = hWndParent ? gFalse : gTrue;
 		priv->mouse = (GMouse *)gdriverRegister((const GDriverVMT const *)GMOUSE_DRIVER_VMT, g);
 	#endif
 
@@ -893,7 +893,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	ShowWindow(priv->hwnd, SW_SHOW);
 	UpdateWindow(priv->hwnd);
 
-	return TRUE;
+	return gTrue;
 }
 
 #if GDISP_HARDWARE_FLUSH
@@ -1551,12 +1551,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 #endif
 
 #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
-	static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance) {
+	static gBool Win32MouseInit(GMouse *m, unsigned driverinstance) {
 		(void)	m;
 		(void)	driverinstance;
-		return TRUE;
+		return gTrue;
 	}
-	static bool_t Win32MouseRead(GMouse *m, GMouseReading *pt) {
+	static gBool Win32MouseRead(GMouse *m, GMouseReading *pt) {
 		GDisplay *	g;
 		winPriv	*	priv;
 
@@ -1595,20 +1595,20 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 			}
 		#endif
 
-		return TRUE;
+		return gTrue;
 	}
 #endif /* GINPUT_NEED_MOUSE */
 
 #if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD
-	static bool_t Win32KeyboardInit(GKeyboard *k, unsigned driverinstance) {
+	static gBool Win32KeyboardInit(GKeyboard *k, unsigned driverinstance) {
 		(void)	driverinstance;
 
 		// Only one please
 		if (keyboard)
-			return FALSE;
+			return gFalse;
 
 		keyboard = k;
-		return TRUE;
+		return gTrue;
 	}
 
 	static int Win32KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz) {
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index 710cd3fb..c95b554a 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -58,7 +58,7 @@ void gfxEmulatorSetParentWindow(void *hwnd);
 	void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
 
 	// This function enables you to turn on/off normal mouse functions on a ugfx Win32 display window.
-	void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled);
+	void gfxEmulatorMouseEnable(GDisplay *g, gBool enabled);
 
 	// This function enables you to capture mouse events on a ugfx Win32 display window.
 	// Passing NULL turns off the capture
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c
index f27795a8..05e80614 100644
--- a/drivers/multiple/X/gdisp_lld_X.c
+++ b/drivers/multiple/X/gdisp_lld_X.c
@@ -59,8 +59,8 @@
 	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
-	static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
-	static bool_t XMouseRead(GMouse *m, GMouseReading *prd);
+	static gBool XMouseInit(GMouse *m, unsigned driverinstance);
+	static gBool XMouseRead(GMouse *m, GMouseReading *prd);
 
 	const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
 		{
@@ -140,7 +140,7 @@
 	#endif
 
 	// Forward definitions
-	static bool_t XKeyboardInit(GKeyboard *k, unsigned driverinstance);
+	static gBool XKeyboardInit(GKeyboard *k, unsigned driverinstance);
 	static int XKeyboardGetData(GKeyboard *k, uint8_t *pch, int sz);
 
 	const GKeyboardVMT const GKEYBOARD_DRIVER_VMT[1] = {{
@@ -167,7 +167,7 @@
 	static GKeyboard	*keyboard;
 #endif
 
-static bool_t			initdone;
+static gBool			initdone;
 static Display			*dis;
 static int				scr;
 static XEvent			evt;
@@ -294,7 +294,7 @@ static int FatalXIOError(Display *d) {
 	exit(0);
 }
 
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
 	XSizeHints				*pSH;
 	XSetWindowAttributes	xa;
 	XTextProperty			WindowTitle;
@@ -304,7 +304,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	if (!initdone) {
 		gfxThreadHandle			hth;
 
-		initdone = TRUE;
+		initdone = gTrue;
 		#if GFX_USE_OS_LINUX || GFX_USE_OS_OSX
 			XInitThreads();
 		#endif
@@ -319,7 +319,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 			if (!XMatchVisualInfo(dis, scr, 24, TrueColor, &vis)) {
 				fprintf(stderr, "Your display has no TrueColor mode\n");
 				XCloseDisplay(dis);
-				return FALSE;
+				return gFalse;
 			}
 			cmap = XCreateColormap(dis, RootWindow(dis, scr),
 					vis.visual, AllocNone);
@@ -404,7 +404,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     g->g.Width = GDISP_SCREEN_WIDTH;
     g->g.Height = GDISP_SCREEN_HEIGHT;
 
-    return TRUE;
+    return gTrue;
 }
 
 LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g)
@@ -480,12 +480,12 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g)
 #endif
 
 #if GINPUT_NEED_MOUSE
-	static bool_t XMouseInit(GMouse *m, unsigned driverinstance) {
+	static gBool XMouseInit(GMouse *m, unsigned driverinstance) {
 		(void)	m;
 		(void)	driverinstance;
-		return TRUE;
+		return gTrue;
 	}
-	static bool_t XMouseRead(GMouse *m, GMouseReading *pt) {
+	static gBool XMouseRead(GMouse *m, GMouseReading *pt) {
 		xPriv	*	priv;
 
 		priv = m->display->priv;
@@ -493,20 +493,20 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g)
 		pt->y = priv->mousey;
 		pt->z = (priv->buttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0;
 		pt->buttons = priv->buttons;
-		return TRUE;
+		return gTrue;
 	}
 #endif /* GINPUT_NEED_MOUSE */
 
 #if GINPUT_NEED_KEYBOARD
-	static bool_t XKeyboardInit(GKeyboard *k, unsigned driverinstance) {
+	static gBool XKeyboardInit(GKeyboard *k, unsigned driverinstance) {
 		(void)	driverinstance;
 
 		// Only one please
 		if (keyboard)
-			return FALSE;
+			return gFalse;
 
 		keyboard = k;
-		return TRUE;
+		return gTrue;
 	}
 
 	static int XKeyboardGetData(GKeyboard *k, uint8_t *pch, int sz) {
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
index bb8ffbe6..653b75c4 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
+++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
@@ -42,8 +42,8 @@
 	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
-	static bool_t NMouseInit(GMouse *m, unsigned driverinstance);
-	static bool_t NMouseRead(GMouse *m, GMouseReading *prd);
+	static gBool NMouseInit(GMouse *m, unsigned driverinstance);
+	static gBool NMouseRead(GMouse *m, GMouseReading *prd);
 
 	const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
 		{
@@ -182,9 +182,9 @@ static gfxThreadHandle	hThread;
  * Send a whole packet of data.
  * Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's.
  * Note that contents of the packet are modified to ensure it will cross the wire in the correct format.
- * If the connection closes before we send all the data - the call returns FALSE.
+ * If the connection closes before we send all the data - the call returns gFalse.
  */
-static bool_t sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) {
+static gBool sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) {
 	int		i;
 
 	// Convert each uint16_t to network order
@@ -196,7 +196,7 @@ static bool_t sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) {
 	return send(netfd, (const char *)pkt, len, 0) == len;
 }
 
-static bool_t newconnection(SOCKET_TYPE clientfd) {
+static gBool newconnection(SOCKET_TYPE clientfd) {
 	GDisplay *	g;
     netPriv *	priv;
 
@@ -213,7 +213,7 @@ static bool_t newconnection(SOCKET_TYPE clientfd) {
 
 	// Was anything found?
 	if (!g)
-		return FALSE;
+		return gFalse;
 
 	// Reset the priv area
 	priv = g->priv;
@@ -240,13 +240,13 @@ static bool_t newconnection(SOCKET_TYPE clientfd) {
 	// Send a redraw all
 	#if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER
 		gdispGClear(g, gwinGetDefaultBgColor());
-		gwinRedrawDisplay(g, FALSE);
+		gwinRedrawDisplay(g, gFalse);
 	#endif
 
-	return TRUE;
+	return gTrue;
 }
 
-static bool_t rxdata(SOCKET_TYPE fd) {
+static gBool rxdata(SOCKET_TYPE fd) {
 	GDisplay *	g;
     netPriv *	priv;
     int			len;
@@ -269,7 +269,7 @@ static bool_t rxdata(SOCKET_TYPE fd) {
 		// The higher level is still processing the previous data.
 		//	Give it a chance to run by coming back to this data.
 		gfxSleepMilliseconds(1);
-		return TRUE;
+		return gTrue;
 	}
 
 	/* handle data from a client */
@@ -278,14 +278,14 @@ static bool_t rxdata(SOCKET_TYPE fd) {
 		// Socket closed or in error state
 		MUTEX_EXIT;
 		g->flags &= ~GDISP_FLG_CONNECTED;
-		return FALSE;
+		return gFalse;
 	}
 	MUTEX_EXIT;
 
 	// Do we have a full reply yet
 	priv->databytes += len;
 	if (priv->databytes < sizeof(priv->data))
-		return TRUE;
+		return gTrue;
 	priv->databytes = 0;
 
 	// Convert network byte or to host byte order
@@ -315,7 +315,7 @@ static bool_t rxdata(SOCKET_TYPE fd) {
 		// Just ignore unrecognised data
 		break;
 	}
-	return TRUE;
+	return gTrue;
 }
 
 static DECLARE_THREAD_STACK(waNetThread, 512);
@@ -429,7 +429,7 @@ static DECLARE_THREAD_FUNCTION(NetThread, param) {
 /* Driver exported functions.                                                */
 /*===========================================================================*/
 
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
 	netPriv	*	priv;
 
 	// Initialise the receiver thread (if it hasn't been done already)
@@ -459,7 +459,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	g->g.Width = GDISP_SCREEN_WIDTH;
 	g->g.Height = GDISP_SCREEN_HEIGHT;
 
-	return TRUE;
+	return gTrue;
 }
 
 #if GDISP_HARDWARE_FLUSH
@@ -636,7 +636,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	LLDSPEC void gdisp_lld_control(GDisplay *g) {
 		netPriv	*	priv;
 		uint16_t	buf[3];
-		bool_t		allgood;
+		gBool		allgood;
 
 		#if GDISP_DONT_WAIT_FOR_NET_DISPLAY
 			if (!(g->flags & GDISP_FLG_CONNECTED))
@@ -680,7 +680,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 			gfxSleepMilliseconds(1);
 
 		// Extract the return status
-		allgood = priv->data[1] ? TRUE : FALSE;
+		allgood = priv->data[1] ? gTrue : gFalse;
 		g->flags &= ~GDISP_FLG_HAVEDATA;
 
 		// Do nothing more if the operation failed
@@ -716,12 +716,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 #endif
 
 #if GINPUT_NEED_MOUSE
-	static bool_t NMouseInit(GMouse *m, unsigned driverinstance) {
+	static gBool NMouseInit(GMouse *m, unsigned driverinstance) {
 		(void)	m;
 		(void)	driverinstance;
-		return TRUE;
+		return gTrue;
 	}
-	static bool_t NMouseRead(GMouse *m, GMouseReading *pt) {
+	static gBool NMouseRead(GMouse *m, GMouseReading *pt) {
 		GDisplay *	g;
 		netPriv	*	priv;
 
@@ -732,7 +732,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 		pt->y = priv->mousey;
 		pt->z = (priv->mousebuttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0;
 		pt->buttons = priv->mousebuttons;
-		return TRUE;
+		return gTrue;
 	}
 #endif /* GINPUT_NEED_MOUSE */
 
diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
index dc208cbe..8df5e08d 100644
--- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
+++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
@@ -34,7 +34,7 @@
 
 static WiFiServer	server(GDISP_GFXNET_PORT);
 static GTimer		poller;
-static bool_t		uGFXInitDone;
+static gBool		uGFXInitDone;
 
 #ifndef GDISP_GFXNET_WIFI_INIT_FUNCTION
 	#define GDISP_GFXNET_WIFI_INIT_FUNCTION	uGFXnetArduinoWifiInit
@@ -62,8 +62,8 @@ static bool_t		uGFXInitDone;
 	#include "../../../src/ginput/ginput_driver_mouse.h"
 
 	// Forward definitions
-	static bool_t NMouseInit(GMouse *m, unsigned driverinstance);
-	static bool_t NMouseRead(GMouse *m, GMouseReading *prd);
+	static gBool NMouseInit(GMouse *m, unsigned driverinstance);
+	static gBool NMouseRead(GMouse *m, GMouseReading *prd);
 
 	const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
 		{
@@ -150,9 +150,9 @@ static void endcon(GDisplay *g) {
  * Send a whole packet of data.
  * Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's.
  * Note that contents of the packet are modified to ensure it will cross the wire in the correct format.
- * If the connection closes before we send all the data - the call returns FALSE.
+ * If the connection closes before we send all the data - the call returns gFalse.
  */
-static bool_t sendpkt(CLIENTFD fd, uint16_t *pkt, int len) {
+static gBool sendpkt(CLIENTFD fd, uint16_t *pkt, int len) {
 	// Convert each uint16_t to network order
 	#if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE
 		{
@@ -284,7 +284,7 @@ void uGFXnetClientPoller(void *param) {
 				// Send a redraw all
 				#if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER
 					gdispGClear(g, gwinGetDefaultBgColor());
-					gwinRedrawDisplay(g, FALSE);
+					gwinRedrawDisplay(g, gFalse);
 				#endif
 				break;
 			}
@@ -307,7 +307,7 @@ void uGFXnetClientPoller(void *param) {
 /* Driver exported functions.                                                */
 /*===========================================================================*/
 
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
 	netPriv	*	priv;
 
 	// Initialise the receiver thread (if it hasn't been done already)
@@ -318,8 +318,8 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 
 		// Initialise the poller
 		gtimerInit(&poller);
-		gtimerStart(&poller, uGFXnetClientPoller, 0, TRUE, 50);
-		uGFXInitDone = TRUE;
+		gtimerStart(&poller, uGFXnetClientPoller, 0, gTrue, 50);
+		uGFXInitDone = gTrue;
 	}
 
 	// Create a private area for this window
@@ -342,7 +342,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	g->g.Width = GDISP_SCREEN_WIDTH;
 	g->g.Height = GDISP_SCREEN_HEIGHT;
 
-	return TRUE;
+	return gTrue;
 }
 
 #if GDISP_HARDWARE_FLUSH
@@ -519,7 +519,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 	LLDSPEC void gdisp_lld_control(GDisplay *g) {
 		netPriv	*	priv;
 		uint16_t	buf[3];
-		bool_t		allgood;
+		gBool		allgood;
 
 		#if GDISP_DONT_WAIT_FOR_NET_DISPLAY
 			if (!(g->flags & GDISP_FLG_CONNECTED))
@@ -563,7 +563,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 			gfxSleepMilliseconds(1);
 
 		// Extract the return status
-		allgood = priv->data[1] ? TRUE : FALSE;
+		allgood = priv->data[1] ? gTrue : gFalse;
 		g->flags &= ~GDISP_FLG_HAVEDATA;
 
 		// Do nothing more if the operation failed
@@ -599,12 +599,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 #endif
 
 #if GINPUT_NEED_MOUSE
-	static bool_t NMouseInit(GMouse *m, unsigned driverinstance) {
+	static gBool NMouseInit(GMouse *m, unsigned driverinstance) {
 		(void)	m;
 		(void)	driverinstance;
-		return TRUE;
+		return gTrue;
 	}
-	static bool_t NMouseRead(GMouse *m, GMouseReading *pt) {
+	static gBool NMouseRead(GMouse *m, GMouseReading *pt) {
 		GDisplay *	g;
 		netPriv	*	priv;
 
@@ -615,7 +615,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 		pt->y = priv->mousey;
 		pt->z = (priv->mousebuttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0;
 		pt->buttons = priv->mousebuttons;
-		return TRUE;
+		return gTrue;
 	}
 #endif /* GINPUT_NEED_MOUSE */