Remove widget structure members when they are not needed for input tracking

Also doco update for Enabled Flag

include/gwin/button.h

@@ -55,7 +55,9 @@ typedef struct GButtonColors {
  */
 typedef struct GButtonObject_t {
 	GWidgetObject		w;
+	#if GINPUT_NEED_TOGGLE
 		uint16_t			toggle;
+	#endif
 	GButtonColors		c_up;
 	GButtonColors		c_dn;
 	GButtonColors		c_dis;

include/gwin/checkbox.h

@@ -50,7 +50,9 @@ typedef struct GCheckboxColors {
 /* A Checkbox window */
 typedef struct GCheckboxObject_t {
 	GWidgetObject			w;
+	#if GINPUT_NEED_TOGGLE
 		uint16_t			toggle;
+	#endif
 	GCheckboxColors			c;
 } GCheckboxObject;
 

include/gwin/class_gwin.h

@@ -31,8 +31,8 @@
 #define GWIN_FLG_VISIBLE				0x0002			// @< The window is visible
 #define GWIN_FLG_MINIMIZED				0x0004			// @< The window is minimized
 #define GWIN_FLG_MAXIMIZED				0x0008			// @< The window is maximized
-#define GWIN_FLG_WIDGET					0x0010			// @< This is a widget
+#define GWIN_FLG_ENABLED				0x0010			// @< The window is enabled
-#define GWIN_FLG_ENABLED				0x0020			// @< The widget is enabled
+#define GWIN_FLG_WIDGET					0x0020			// @< This is a widget
 #define GWIN_FLG_ALLOCTXT				0x0040			// @< The widget text is allocated
 #define GWIN_FLG_MOUSECAPTURE			0x0080			// @< The widget has captured the mouse
 #define GWIN_FIRST_WM_FLAG				0x0100			// @< 4 bits free for the window manager to use
@@ -76,11 +76,14 @@ typedef struct gwinVMT {
 	typedef struct gwidgetVMT {
 		struct gwinVMT				g;														// @< This is still a GWIN
 		void (*DefaultDraw)			(GWidgetObject *gw, void *param);						// @< The default drawing routine (mandatory)
+		#if GINPUT_NEED_MOUSE
 			struct {
 				void (*MouseDown)		(GWidgetObject *gw, coord_t x, coord_t y);				// @< Process mouse down events (optional)
 				void (*MouseUp)			(GWidgetObject *gw, coord_t x, coord_t y);				// @< Process mouse up events (optional)
 				void (*MouseMove)		(GWidgetObject *gw, coord_t x, coord_t y);				// @< Process mouse move events (optional)
 			};
+		#endif
+		#if GINPUT_NEED_TOGGLE
 			struct {
 				uint16_t				toggleroles;											// @< The roles supported for toggles (0->toggleroles-1)
 				void (*ToggleAssign)	(GWidgetObject *gw, uint16_t role, uint16_t instance);	// @< Assign a toggle to a role (optional)
@@ -88,12 +91,15 @@ typedef struct gwinVMT {
 				void (*ToggleOff)		(GWidgetObject *gw, uint16_t role);						// @< Process toggle off events (optional)
 				void (*ToggleOn)		(GWidgetObject *gw, uint16_t role);						// @< Process toggle on events (optional)
 			};
+		#endif
+		#if GINPUT_NEED_TOGGLE
 			struct {
 				uint16_t				dialroles;												// @< The roles supported for dials (0->dialroles-1)
 				void (*DialAssign)		(GWidgetObject *gw, uint16_t role, uint16_t instance);	// @< Test the role and save the dial instance handle (optional)
 				uint16_t (*DialGet)		(GWidgetObject *gw, uint16_t role);						// @< Return the instance for a particular role (optional)
 				void (*DialMove)		(GWidgetObject *gw, uint16_t role, uint16_t value, uint16_t max);	// @< Process dial move events (optional)
 			};
+		#endif
 	} gwidgetVMT;
 	/* @} */
 #endif

include/gwin/slider.h

@@ -45,9 +45,13 @@ typedef struct GSliderColors {
 // A slider window
 typedef struct GSliderObject_t {
 	GWidgetObject		w;
+	#if GINPUT_NEED_TOGGLE
 		uint16_t		t_dn;
 		uint16_t		t_up;
+	#endif
+	#if GINPUT_NEED_DIAL
 		uint16_t		dial;
+	#endif
 	coord_t				dpos;
 	int					min;
 	int					max;

src/gwin/button.c

@@ -17,7 +17,7 @@
 
 #include "gfx.h"
 
-#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__)
+#if GFX_USE_GWIN && GWIN_NEED_BUTTON
 
 #include "gwin/class_gwin.h"
 
@@ -29,44 +29,6 @@
 // Our pressed state
 #define GBUTTON_FLG_PRESSED		(GWIN_FIRST_CONTROL_FLAG<<0)
 
-// Prototypes for button VMT functions
-static void MouseDown(GWidgetObject *gw, coord_t x, coord_t y);
-static void MouseUp(GWidgetObject *gw, coord_t x, coord_t y);
-static void ToggleOff(GWidgetObject *gw, uint16_t role);
-static void ToggleOn(GWidgetObject *gw, uint16_t role);
-static void ToggleAssign(GWidgetObject *gw, uint16_t role, uint16_t instance);
-static uint16_t ToggleGet(GWidgetObject *gw, uint16_t role);
-
-// The button VMT table
-static const gwidgetVMT buttonVMT = {
-	{
-		"Button",				// The classname
-		sizeof(GButtonObject),	// The object size
-		_gwidgetDestroy,		// The destroy routine
-		_gwidgetRedraw,			// The redraw routine
-		0,						// The after-clear routine
-	},
-	gwinButtonDraw_3D,			// The default drawing routine
-	{
-		MouseDown,				// Process mouse down events
-		MouseUp,				// Process mouse up events
-		0,						// Process mouse move events (NOT USED)
-	},
-	{
-		1,						// 1 toggle role
-		ToggleAssign,			// Assign Toggles
-		ToggleGet,				// Get Toggles
-		ToggleOff,				// Process toggle off events
-		ToggleOn,				// Process toggle on events
-	},
-	{
-		0,						// No dial roles
-		0,						// Assign Dials (NOT USED)
-		0,						// Get Dials (NOT USED)
-		0,						// Process dial move events (NOT USED)
-	}
-};
-
 // Default color scheme
 static const GButtonColors GButtonDefaultColorsUp = {
 	HTML2COLOR(0x404040),		// color_up_edge;
@@ -103,6 +65,7 @@ static void SendButtonEvent(GWidgetObject *gw) {
 	#undef pbe
 }
 
+#if GINPUT_NEED_MOUSE
 	// A mouse down has occurred over the button
 	static void MouseDown(GWidgetObject *gw, coord_t x, coord_t y) {
 		(void) x; (void) y;
@@ -124,7 +87,9 @@ static void MouseUp(GWidgetObject *gw, coord_t x, coord_t y) {
 
 		SendButtonEvent(gw);
 	}
+#endif
 
+#if GINPUT_NEED_TOGGLE
 	// A toggle off has occurred
 	static void ToggleOff(GWidgetObject *gw, uint16_t role) {
 		(void) role;
@@ -150,12 +115,51 @@ static uint16_t ToggleGet(GWidgetObject *gw, uint16_t role) {
 		(void) role;
 		return ((GButtonObject *)gw)->toggle;
 	}
+#endif
+
+// The button VMT table
+static const gwidgetVMT buttonVMT = {
+	{
+		"Button",				// The classname
+		sizeof(GButtonObject),	// The object size
+		_gwidgetDestroy,		// The destroy routine
+		_gwidgetRedraw,			// The redraw routine
+		0,						// The after-clear routine
+	},
+	gwinButtonDraw_3D,			// The default drawing routine
+	#if GINPUT_NEED_MOUSE
+		{
+			MouseDown,				// Process mouse down events
+			MouseUp,				// Process mouse up events
+			0,						// Process mouse move events (NOT USED)
+		},
+	#endif
+	#if GINPUT_NEED_TOGGLE
+		{
+			1,						// 1 toggle role
+			ToggleAssign,			// Assign Toggles
+			ToggleGet,				// Get Toggles
+			ToggleOff,				// Process toggle off events
+			ToggleOn,				// Process toggle on events
+		},
+	#endif
+	#if GINPUT_NEED_DIAL
+		{
+			0,						// No dial roles
+			0,						// Assign Dials (NOT USED)
+			0,						// Get Dials (NOT USED)
+			0,						// Process dial move events (NOT USED)
+		},
+	#endif
+};
 
 GHandle gwinCreateButton(GButtonObject *gw, const GWidgetInit *pInit) {
 	if (!(gw = (GButtonObject *)_gwidgetCreate(&gw->w, pInit, &buttonVMT)))
 		return 0;
 
+	#if GINPUT_NEED_TOGGLE
 		gw->toggle = GWIDGET_NO_INSTANCE;
+	#endif
 	gw->c_up = GButtonDefaultColorsUp;
 	gw->c_dn = GButtonDefaultColorsDown;
 	gw->c_dis = GButtonDefaultColorsDisabled;

src/gwin/checkbox.c

@@ -24,42 +24,6 @@
 // Our checked state
 #define GCHECKBOX_FLG_CHECKED		(GWIN_FIRST_CONTROL_FLAG<<0)
 
-// Prototypes for button VMT functions
-static void MouseDown(GWidgetObject *gw, coord_t x, coord_t y);
-static void ToggleOn(GWidgetObject *gw, uint16_t role);
-static void ToggleAssign(GWidgetObject *gw, uint16_t role, uint16_t instance);
-static uint16_t ToggleGet(GWidgetObject *gw, uint16_t role);
-
-// The button VMT table
-static const gwidgetVMT checkboxVMT = {
-	{
-		"Checkbox",				// The classname
-		sizeof(GCheckboxObject),// The object size
-		_gwidgetDestroy,		// The destroy routine
-		_gwidgetRedraw,			// The redraw routine
-		0,						// The after-clear routine
-	},
-	gwinCheckboxDraw_CheckOnLeft,	// The default drawing routine
-	{
-		MouseDown,				// Process mouse down events
-		0,						// Process mouse up events (NOT USED)
-		0,						// Process mouse move events (NOT USED)
-	},
-	{
-		1,						// 1 toggle role
-		ToggleAssign,			// Assign Toggles
-		ToggleGet,				// Get Toggles
-		0,						// Process toggle off events (NOT USED)
-		ToggleOn,				// Process toggle on events
-	},
-	{
-		0,						// No dial roles
-		0,						// Assign Dials (NOT USED)
-		0,						// Get Dials (NOT USED)
-		0,						// Process dial move events (NOT USED)
-	}
-};
-
 static const GCheckboxColors defaultColors = {
 	Black,	// border
 	Grey,	// selected
@@ -87,15 +51,16 @@ static void SendCheckboxEvent(GWidgetObject *gw) {
 	#undef pce
 }
 
-// A mouse down has occurred over the checkbox
+#if GINPUT_NEED_MOUSE
 	static void MouseDown(GWidgetObject *gw, coord_t x, coord_t y) {
 		(void) x; (void) y;
 		gw->g.flags ^= GCHECKBOX_FLG_CHECKED;
 		_gwidgetRedraw((GHandle)gw);
 		SendCheckboxEvent(gw);
 	}
+#endif
 
-// A toggle on has occurred
+#if GINPUT_NEED_TOGGLE
 	static void ToggleOn(GWidgetObject *gw, uint16_t role) {
 		(void) role;
 		gw->g.flags ^= GCHECKBOX_FLG_CHECKED;
@@ -112,12 +77,51 @@ static uint16_t ToggleGet(GWidgetObject *gw, uint16_t role) {
 		(void) role;
 		return ((GCheckboxObject *)gw)->toggle;
 	}
+#endif
+
+// The checkbox VMT table
+static const gwidgetVMT checkboxVMT = {
+	{
+		"Checkbox",				// The classname
+		sizeof(GCheckboxObject),// The object size
+		_gwidgetDestroy,		// The destroy routine
+		_gwidgetRedraw,			// The redraw routine
+		0,						// The after-clear routine
+	},
+	gwinCheckboxDraw_CheckOnLeft,	// The default drawing routine
+	#if GINPUT_NEED_MOUSE
+		{
+			MouseDown,				// Process mouse down events
+			0,						// Process mouse up events (NOT USED)
+			0,						// Process mouse move events (NOT USED)
+		},
+	#endif
+	#if GINPUT_NEED_TOGGLE
+		{
+			1,						// 1 toggle role
+			ToggleAssign,			// Assign Toggles
+			ToggleGet,				// Get Toggles
+			0,						// Process toggle off events (NOT USED)
+			ToggleOn,				// Process toggle on events
+		},
+	#endif
+	#if GINPUT_NEED_DIAL
+		{
+			0,						// No dial roles
+			0,						// Assign Dials (NOT USED)
+			0,						// Get Dials (NOT USED)
+			0,						// Process dial move events (NOT USED)
+		},
+	#endif
+};
 
 GHandle gwinCreateCheckbox(GCheckboxObject *gb, const GWidgetInit *pInit) {
 	if (!(gb = (GCheckboxObject *)_gwidgetCreate(&gb->w, pInit, &checkboxVMT)))
 		return 0;
 
-	gb->toggle = (uint16_t) -1;
+	#if GINPUT_NEED_TOGGLE
+		gb->toggle = GWIDGET_NO_INSTANCE;
+	#endif
 	gb->c = defaultColors;			// assign the default colors
 	gwinSetVisible((GHandle)gb, pInit->g.show);
 	return (GHandle)gb;

src/gwin/label.c

@@ -62,11 +62,14 @@ static const gwidgetVMT labelVMT = {
 		0,						// The after-clear routine
 	},
 	gwinLabelDefaultDraw,		// default drawing routine
+	#if GINPUT_NEED_MOUSE
 		{
 			0,						// Process mose down events (NOT USED)
 			0,						// Process mouse up events (NOT USED)
 			0,						// Process mouse move events (NOT USED)
 		},
+	#endif
+	#if GINPUT_NEED_TOGGLE
 		{
 			0,						// No toggle role
 			0,						// Assign Toggles (NOT USED)
@@ -74,12 +77,15 @@ static const gwidgetVMT labelVMT = {
 			0,						// Process toggle off event (NOT USED)
 			0,						// Process toggle on event (NOT USED)
 		},
+	#endif
+	#if GINPUT_NEED_DIAL
 		{
 			0,						// No dial roles
 			0,						// Assign Dials (NOT USED)
 			0, 						// Get Dials (NOT USED)
 			0,						// Procees dial move events (NOT USED)
-	}
+		},
+	#endif
 };
 
 GHandle gwinLabelCreate(GLabelWidget *widget, GWidgetInit *pInit) {

src/gwin/slider.c

@@ -29,46 +29,6 @@
 	#define GWIN_SLIDER_TOGGLE_INC	20			// How many toggles to go from minimum to maximum
 #endif
 
-// Prototypes for slider VMT functions
-static void MouseUp(GWidgetObject *gw, coord_t x, coord_t y);
-static void MouseMove(GWidgetObject *gw, coord_t x, coord_t y);
-static void ToggleOn(GWidgetObject *gw, uint16_t role);
-static void DialMove(GWidgetObject *gw, uint16_t role, uint16_t value, uint16_t max);
-static void ToggleAssign(GWidgetObject *gw, uint16_t role, uint16_t instance);
-static void DialAssign(GWidgetObject *gw, uint16_t role, uint16_t instance);
-static uint16_t ToggleGet(GWidgetObject *gw, uint16_t role);
-static uint16_t DialGet(GWidgetObject *gw, uint16_t role);
-
-// The button VMT table
-static const gwidgetVMT sliderVMT = {
-	{
-		"Slider",				// The classname
-		sizeof(GSliderObject),	// The object size
-		_gwidgetDestroy,		// The destroy routine
-		_gwidgetRedraw,			// The redraw routine
-		0,						// The after-clear routine
-	},
-	gwinSliderDraw_Std,			// The default drawing routine
-	{
-		0,						// Process mouse down events (NOT USED)
-		MouseUp,				// Process mouse up events
-		MouseMove,				// Process mouse move events
-	},
-	{
-		2,						// 1 toggle role
-		ToggleAssign,			// Assign Toggles
-		ToggleGet,				// Get Toggles
-		0,						// Process toggle off events (NOT USED)
-		ToggleOn,				// Process toggle on events
-	},
-	{
-		1,						// 1 dial roles
-		DialAssign,				// Assign Dials
-		DialGet,				// Get Dials
-		DialMove,				// Process dial move events
-	}
-};
-
 static const GSliderColors GSliderDefaultColors = {
 	HTML2COLOR(0x404040),		// color_edge
 	HTML2COLOR(0x000000),		// color_thumb
@@ -105,6 +65,7 @@ static void ResetDisplayPos(GSliderObject *gsw) {
 		gsw->dpos = ((gsw->w.g.width-1)*(gsw->pos-gsw->min))/(gsw->max-gsw->min);
 }
 
+#if GINPUT_NEED_MOUSE
 	// A mouse up event
 	static void MouseUp(GWidgetObject *gw, coord_t x, coord_t y) {
 		#define gsw		((GSliderObject *)gw)
@@ -177,7 +138,9 @@ static void MouseMove(GWidgetObject *gw, coord_t x, coord_t y) {
 		_gwidgetRedraw(&gw->g);
 		#undef gsw
 	}
+#endif
 
+#if GINPUT_NEED_TOGGLE
 	// A toggle on has occurred
 	static void ToggleOn(GWidgetObject *gw, uint16_t role) {
 		#define gsw		((GSliderObject *)gw)
@@ -192,26 +155,6 @@ static void ToggleOn(GWidgetObject *gw, uint16_t role) {
 		#undef gsw
 	}
 
-// A dial move event
-static void DialMove(GWidgetObject *gw, uint16_t role, uint16_t value, uint16_t max) {
-#if GFX_USE_GINPUT && GINPUT_NEED_DIAL
-	#define gsw		((GSliderObject *)gw)
-	(void)			role;
-
-	// Set the new position
-	gsw->pos = (uint16_t)((uint32_t)value*(gsw->max-gsw->min)/max + gsw->min);
-
-	ResetDisplayPos(gsw);
-	gwinDraw(&gw->g);
-
-	// Generate the event
-	SendSliderEvent(gw);
-	#undef gsw
-#else
-	(void)gw; (void)role; (void)value; (void)max;
-#endif
-}
-
 	static void ToggleAssign(GWidgetObject *gw, uint16_t role, uint16_t instance) {
 		if (role)
 			((GSliderObject *)gw)->t_up = instance;
@@ -222,6 +165,24 @@ static void ToggleAssign(GWidgetObject *gw, uint16_t role, uint16_t instance) {
 	static uint16_t ToggleGet(GWidgetObject *gw, uint16_t role) {
 		return role ? ((GSliderObject *)gw)->t_up : ((GSliderObject *)gw)->t_dn;
 	}
+#endif
+
+#if GINPUT_NEED_DIAL
+	// A dial move event
+	static void DialMove(GWidgetObject *gw, uint16_t role, uint16_t value, uint16_t max) {
+		#define gsw		((GSliderObject *)gw)
+		(void)			role;
+
+		// Set the new position
+		gsw->pos = (uint16_t)((uint32_t)value*(gsw->max-gsw->min)/max + gsw->min);
+
+		ResetDisplayPos(gsw);
+		_gwidgetRedraw((GHandle)gw);
+
+		// Generate the event
+		SendSliderEvent(gw);
+		#undef gsw
+	}
 
 	static void DialAssign(GWidgetObject *gw, uint16_t role, uint16_t instance) {
 		(void) role;
@@ -232,13 +193,54 @@ static uint16_t DialGet(GWidgetObject *gw, uint16_t role) {
 		(void) role;
 		return ((GSliderObject *)gw)->dial;
 	}
+#endif
+
+// The slider VMT table
+static const gwidgetVMT sliderVMT = {
+	{
+		"Slider",				// The classname
+		sizeof(GSliderObject),	// The object size
+		_gwidgetDestroy,		// The destroy routine
+		_gwidgetRedraw,			// The redraw routine
+		0,						// The after-clear routine
+	},
+	gwinSliderDraw_Std,			// The default drawing routine
+	#if GINPUT_NEED_MOUSE
+		{
+			0,						// Process mouse down events (NOT USED)
+			MouseUp,				// Process mouse up events
+			MouseMove,				// Process mouse move events
+		},
+	#endif
+	#if GINPUT_NEED_TOGGLE
+		{
+			2,						// 1 toggle role
+			ToggleAssign,			// Assign Toggles
+			ToggleGet,				// Get Toggles
+			0,						// Process toggle off events (NOT USED)
+			ToggleOn,				// Process toggle on events
+		},
+	#endif
+	#if GINPUT_NEED_DIAL
+		{
+			1,						// 1 dial roles
+			DialAssign,				// Assign Dials
+			DialGet,				// Get Dials
+			DialMove,				// Process dial move events
+		},
+	#endif
+};
 
 GHandle gwinCreateSlider(GSliderObject *gs, const GWidgetInit *pInit) {
 	if (!(gs = (GSliderObject *)_gwidgetCreate(&gs->w, pInit, &sliderVMT)))
 		return 0;
-	gs->t_dn = (uint16_t) -1;
+	#if GINPUT_NEED_TOGGLE
-	gs->t_up = (uint16_t) -1;
+		gs->t_dn = GWIDGET_NO_INSTANCE;
-	gs->dial = (uint16_t) -1;
+		gs->t_up = GWIDGET_NO_INSTANCE;
+	#endif
+	#if GINPUT_NEED_DIAL
+		gs->dial = GWIDGET_NO_INSTANCE;
+	#endif
 	gs->c = GSliderDefaultColors;
 	gs->min = 0;
 	gs->max = 100;