Whitespace cleanups.

Yep. Slow day today.

1 files changed, 533 insertions, 533 deletions

diff --git a/XIproto.h b/XIproto.h
index 7238fa6..c6604eb 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -80,7 +80,7 @@ SOFTWARE.
 typedef struct  _XExtEventInfo
     {
     Mask	mask;
-    BYTE 	type;
+    BYTE	type;
     BYTE	word;
     } XExtEventInfo;
 
@@ -133,15 +133,15 @@ struct tmask
 #define X_OpenDevice			3
 #define X_CloseDevice			4
 #define X_SetDeviceMode			5
-#define X_SelectExtensionEvent  	6
+#define X_SelectExtensionEvent		6
 #define X_GetSelectedExtensionEvents	7
 #define X_ChangeDeviceDontPropagateList 8
-#define X_GetDeviceDontPropagateList 	9
-#define X_GetDeviceMotionEvents 	10
+#define X_GetDeviceDontPropagateList	9
+#define X_GetDeviceMotionEvents		10
 #define X_ChangeKeyboardDevice		11
 #define X_ChangePointerDevice		12
-#define X_GrabDevice 			13
-#define X_UngrabDevice  		14
+#define X_GrabDevice			13
+#define X_UngrabDevice			14
 #define X_GrabDeviceKey			15
 #define X_UngrabDeviceKey		16
 #define X_GrabDeviceButton		17
@@ -157,8 +157,8 @@ struct tmask
 #define X_SetDeviceModifierMapping	27
 #define X_GetDeviceButtonMapping	28
 #define X_SetDeviceButtonMapping	29
-#define X_QueryDeviceState 		30
-#define X_SendExtensionEvent 		31
+#define X_QueryDeviceState		30
+#define X_SendExtensionEvent		31
 #define X_DeviceBell			32
 #define X_SetDeviceValuators		33
 #define X_GetDeviceControl		34
@@ -191,27 +191,27 @@ struct tmask
  */
 
 typedef struct {
-    CARD8 	reqType;       /* input extension major code   */
-    CARD8 	ReqType;       /* always X_GetExtensionVersion */
-    CARD16 	length B16;
-    CARD16 	nbytes B16;
+    CARD8	reqType;       /* input extension major code   */
+    CARD8	ReqType;       /* always X_GetExtensionVersion */
+    CARD16	length B16;
+    CARD16	nbytes B16;
     CARD8       majorVersion;  /* As supported by client if nbytes is 0 */
     CARD8       minorVersion;  /* As supported by client if nbytes is 0 */
 } xGetExtensionVersionReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;       	/* always X_GetExtensionVersion */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD16 	major_version B16;
-    CARD16 	minor_version B16;
-    BOOL 	present;
-    CARD8 	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_GetExtensionVersion */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	major_version B16;
+    CARD16	minor_version B16;
+    BOOL	present;
+    CARD8	pad1, pad2, pad3;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
 } xGetExtensionVersionReply;
 
 /*********************************************************
@@ -221,23 +221,23 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;	/* always X_ListInputDevices 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_ListInputDevices	*/
+    CARD16	length B16;
 } xListInputDevicesReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;        /* always X_ListInputDevices  	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	ndevices;
-    CARD8 	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* always X_ListInputDevices	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	ndevices;
+    CARD8	pad1, pad2, pad3;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xListInputDevicesReply;
 
 typedef struct _xDeviceInfo *xDeviceInfoPtr;
@@ -246,68 +246,68 @@ typedef struct _xAnyClassinfo *xAnyClassPtr;
 
 typedef struct _xAnyClassinfo {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 	c_class;
+    CARD8	c_class;
 #else
-    CARD8 	class;
+    CARD8	class;
 #endif
-    CARD8 	length;
+    CARD8	length;
     } xAnyClassInfo;
 
 typedef struct _xDeviceInfo {
     CARD32	type B32;
     CARD8	id;
-    CARD8 	num_classes;
-    CARD8 	use;      /* IsXPointer | IsXKeyboard | IsXExtension... */
-    CARD8 	attached; /* id of master dev (if IsXExtension..) */
+    CARD8	num_classes;
+    CARD8	use;      /* IsXPointer | IsXKeyboard | IsXExtension... */
+    CARD8	attached; /* id of master dev (if IsXExtension..) */
     } xDeviceInfo;
 
 typedef struct _xKeyInfo *xKeyInfoPtr;
 
 typedef struct _xKeyInfo {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 	c_class;
+    CARD8	c_class;
 #else
-    CARD8 	class;
+    CARD8	class;
 #endif
-    CARD8 	length;
-    KeyCode 	min_keycode; 
-    KeyCode 	max_keycode; 
-    CARD16 	num_keys B16;
-    CARD8 	pad1,pad2;
+    CARD8	length;
+    KeyCode	min_keycode;
+    KeyCode	max_keycode;
+    CARD16	num_keys B16;
+    CARD8	pad1,pad2;
     } xKeyInfo;
 
 typedef struct _xButtonInfo *xButtonInfoPtr;
 
 typedef struct _xButtonInfo {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 	c_class;
+    CARD8	c_class;
 #else
-    CARD8 	class;
+    CARD8	class;
 #endif
-    CARD8 	length;
-    CARD16 	num_buttons B16;
+    CARD8	length;
+    CARD16	num_buttons B16;
     } xButtonInfo;
 
 typedef struct _xValuatorInfo *xValuatorInfoPtr;
 
 typedef struct _xValuatorInfo {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 	c_class;
+    CARD8	c_class;
 #else
-    CARD8 	class;
+    CARD8	class;
 #endif
-    CARD8 	length;
-    CARD8 	num_axes;
-    CARD8 	mode;
-    CARD32 	motion_buffer_size B32;
+    CARD8	length;
+    CARD8	num_axes;
+    CARD8	mode;
+    CARD32	motion_buffer_size B32;
     } xValuatorInfo;
 
 typedef struct _xAxisInfo *xAxisInfoPtr;
 
 typedef struct _xAxisInfo {
-    CARD32 	resolution B32;
-    CARD32 	min_value B32;
-    CARD32 	max_value B32;
+    CARD32	resolution B32;
+    CARD32	min_value B32;
+    CARD32	max_value B32;
     } xAxisInfo;
 
 /*********************************************************
@@ -318,33 +318,33 @@ typedef struct _xAxisInfo {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_OpenDevice 		*/
-    CARD16 	length B16;
+    CARD8	ReqType;        /* always X_OpenDevice		*/
+    CARD16	length B16;
     CARD8       deviceid;
     BYTE	pad1, pad2, pad3;
 } xOpenDeviceReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;       	/* always X_OpenDevice        	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	num_classes;
-    BYTE 	pad1, pad2, pad3;
-    CARD32 	pad00 B32;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_OpenDevice		*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	num_classes;
+    BYTE	pad1, pad2, pad3;
+    CARD32	pad00 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
     } xOpenDeviceReply;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 	c_class;
+    CARD8	c_class;
 #else
-    CARD8 	class;
+    CARD8	class;
 #endif
-    CARD8 	event_type_base;
+    CARD8	event_type_base;
     } xInputClassInfo;
 
 /*********************************************************
@@ -355,8 +355,8 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_CloseDevice 	*/
-    CARD16 	length B16;
+    CARD8	ReqType;        /* always X_CloseDevice	*/
+    CARD16	length B16;
     CARD8       deviceid;
     BYTE	pad1, pad2, pad3;
 } xCloseDeviceReq;
@@ -368,26 +368,26 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_SetDeviceMode 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_SetDeviceMode	*/
+    CARD16	length B16;
     CARD8       deviceid;
     CARD8       mode;
-    BYTE 	pad1, pad2;
+    BYTE	pad1, pad2;
 } xSetDeviceModeReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;     	/* always X_SetDeviceMode  	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_SetDeviceMode	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xSetDeviceModeReply;
 
 /*********************************************************
@@ -398,9 +398,9 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_SelectExtensionEvent */
-    CARD16 	length B16;
-    Window 	window B32;
+    CARD8	ReqType;        /* always X_SelectExtensionEvent */
+    CARD16	length B16;
+    Window	window B32;
     CARD16	count B16;
     CARD16	pad00 B16;
 } xSelectExtensionEventReq;
@@ -413,23 +413,23 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_GetSelectedExtensionEvents */
-    CARD16 	length B16;
+    CARD8	ReqType;        /* X_GetSelectedExtensionEvents */
+    CARD16	length B16;
     Window	window B32;
 } xGetSelectedExtensionEventsReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;       	/* GetSelectedExtensionEvents	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD16 	this_client_count B16;
-    CARD16 	all_clients_count B16;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* GetSelectedExtensionEvents	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	this_client_count B16;
+    CARD16	all_clients_count B16;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xGetSelectedExtensionEventsReply;
 
 /*********************************************************
@@ -440,11 +440,11 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_ChangeDeviceDontPropagateList */
-    CARD16 	length B16;
+    CARD8	ReqType;        /* X_ChangeDeviceDontPropagateList */
+    CARD16	length B16;
     Window	window B32;
-    CARD16 	count B16;
-    CARD8 	mode;
+    CARD16	count B16;
+    CARD8	mode;
     BYTE	pad;
 } xChangeDeviceDontPropagateListReq;
 
@@ -456,23 +456,23 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_GetDeviceDontPropagateList */
-    CARD16 	length B16;
+    CARD8	ReqType;        /* X_GetDeviceDontPropagateList */
+    CARD16	length B16;
     Window	window B32;
 } xGetDeviceDontPropagateListReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;        /* GetDeviceDontPropagateList   */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD16 	count B16;
-    CARD16 	pad00 B16;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* GetDeviceDontPropagateList   */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	count B16;
+    CARD16	pad00 B16;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
     } xGetDeviceDontPropagateListReply;
 
 /*********************************************************
@@ -482,28 +482,28 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_GetDeviceMotionEvents*/
-    CARD16 	length B16;
-    Time 	start B32;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;        /* always X_GetDeviceMotionEvents*/
+    CARD16	length B16;
+    Time	start B32;
     Time	stop B32;
     CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xGetDeviceMotionEventsReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply */
-    CARD8 	RepType;        /* always X_GetDeviceMotionEvents  */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD32 	nEvents B32;
-    CARD8  	axes;
-    CARD8  	mode;
+    CARD8	repType;	/* X_Reply */
+    CARD8	RepType;        /* always X_GetDeviceMotionEvents  */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	nEvents B32;
+    CARD8	axes;
+    CARD8	mode;
     BYTE	pad1, pad2;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
 } xGetDeviceMotionEventsReply;
 
 /*********************************************************
@@ -514,24 +514,24 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_ChangeKeyboardDevice 	*/
-    CARD16 	length B16;
-    CARD8 	deviceid;
+    CARD8	ReqType;        /* X_ChangeKeyboardDevice	*/
+    CARD16	length B16;
+    CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xChangeKeyboardDeviceReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;        /* always X_ChangeKeyboardDevice*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;  /* 0 */
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* always X_ChangeKeyboardDevice*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;  /* 0 */
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
     } xChangeKeyboardDeviceReply;
 
 /*********************************************************
@@ -542,26 +542,26 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_ChangePointerDevice 	*/
-    CARD16 	length B16;
-    CARD8 	xaxis;
-    CARD8 	yaxis;
-    CARD8 	deviceid;
+    CARD8	ReqType;        /* X_ChangePointerDevice	*/
+    CARD16	length B16;
+    CARD8	xaxis;
+    CARD8	yaxis;
+    CARD8	deviceid;
     BYTE	pad1;
 } xChangePointerDeviceReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;        /* always X_ChangePointerDevice */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;  /* 0 */
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* always X_ChangePointerDevice */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;  /* 0 */
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
     } xChangePointerDeviceReply;
 
 /*********************************************************
@@ -572,30 +572,30 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_GrabDevice */
-    CARD16 	length B16;
-    Window 	grabWindow B32;
-    Time 	time B32;
+    CARD8	ReqType;        /* always X_GrabDevice */
+    CARD16	length B16;
+    Window	grabWindow B32;
+    Time	time B32;
     CARD16	event_count B16;
     CARD8	this_device_mode;
     CARD8	other_devices_mode;
-    BOOL 	ownerEvents;
-    CARD8 	deviceid;
-    CARD16 	pad01 B16;
+    BOOL	ownerEvents;
+    CARD8	deviceid;
+    CARD16	pad01 B16;
 } xGrabDeviceReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;        /* always X_GrabDevice  	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;  /* 0 */
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* always X_GrabDevice	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;  /* 0 */
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
     } xGrabDeviceReply;
 
 /*********************************************************
@@ -606,10 +606,10 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_UnGrabDevice 	*/
-    CARD16 	length B16;
-    Time 	time B32;
-    CARD8 	deviceid;
+    CARD8	ReqType;        /* always X_UnGrabDevice	*/
+    CARD16	length B16;
+    Time	time B32;
+    CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xUngrabDeviceReq;
 
@@ -621,17 +621,17 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_GrabDeviceKey 	*/
-    CARD16 	length B16;
-    Window 	grabWindow B32;
+    CARD8	ReqType;        /* always X_GrabDeviceKey	*/
+    CARD16	length B16;
+    Window	grabWindow B32;
     CARD16	event_count B16;
-    CARD16 	modifiers B16;
+    CARD16	modifiers B16;
     CARD8	modifier_device;
     CARD8	grabbed_device;
     CARD8	key;
-    BYTE 	this_device_mode;  
-    BYTE 	other_devices_mode;  
-    BOOL 	ownerEvents;
+    BYTE	this_device_mode;
+    BYTE	other_devices_mode;
+    BOOL	ownerEvents;
     BYTE	pad1, pad2;
 } xGrabDeviceKeyReq;
 
@@ -643,11 +643,11 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_UngrabDeviceKey 	*/
-    CARD16 	length B16;
-    Window 	grabWindow B32;
+    CARD8	ReqType;        /* always X_UngrabDeviceKey	*/
+    CARD16	length B16;
+    Window	grabWindow B32;
     CARD16	modifiers B16;
-    CARD8 	modifier_device;
+    CARD8	modifier_device;
     CARD8	key;
     CARD8	grabbed_device;
     BYTE	pad1, pad2, pad3;
@@ -661,17 +661,17 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_GrabDeviceButton 	*/
-    CARD16 	length B16;
-    Window 	grabWindow B32;
+    CARD8	ReqType;        /* always X_GrabDeviceButton	*/
+    CARD16	length B16;
+    Window	grabWindow B32;
     CARD8	grabbed_device;
     CARD8	modifier_device;
-    CARD16 	event_count B16;
-    CARD16 	modifiers B16;
-    BYTE 	this_device_mode;  
-    BYTE 	other_devices_mode;  
-    CARD8 	button;
-    BOOL 	ownerEvents;
+    CARD16	event_count B16;
+    CARD16	modifiers B16;
+    BYTE	this_device_mode;
+    BYTE	other_devices_mode;
+    CARD8	button;
+    BOOL	ownerEvents;
     BYTE	pad1, pad2;
 } xGrabDeviceButtonReq;
 
@@ -683,13 +683,13 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_UngrabDeviceButton 	*/
-    CARD16 	length B16;
-    Window 	grabWindow B32;
-    CARD16 	modifiers B16;
-    CARD8 	modifier_device;
-    CARD8 	button;
-    CARD8 	grabbed_device;
+    CARD8	ReqType;        /* always X_UngrabDeviceButton	*/
+    CARD16	length B16;
+    Window	grabWindow B32;
+    CARD16	modifiers B16;
+    CARD8	modifier_device;
+    CARD8	button;
+    CARD8	grabbed_device;
     BYTE	pad1, pad2, pad3;
 } xUngrabDeviceButtonReq;
 
@@ -701,11 +701,11 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* always X_AllowDeviceEvents 	*/
-    CARD16 	length B16;
-    Time 	time B32;
+    CARD8	ReqType;        /* always X_AllowDeviceEvents	*/
+    CARD16	length B16;
+    Time	time B32;
     CARD8	mode;
-    CARD8 	deviceid;
+    CARD8	deviceid;
     BYTE	pad1, pad2;
 } xAllowDeviceEventsReq;
 
@@ -716,25 +716,25 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;        /* input extension major code   */
-    CARD8 	ReqType;        /* always X_GetDeviceFocus 	*/
-    CARD16 	length B16;
-    CARD8 	deviceid;
-    BYTE 	pad1, pad2, pad3;
+    CARD8	reqType;        /* input extension major code   */
+    CARD8	ReqType;        /* always X_GetDeviceFocus	*/
+    CARD16	length B16;
+    CARD8	deviceid;
+    BYTE	pad1, pad2, pad3;
 } xGetDeviceFocusReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;        /* always X_GetDeviceFocus  	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD32 	focus B32;
-    Time 	time B32;
-    CARD8  	revertTo;
-    BYTE 	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* always X_GetDeviceFocus	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	focus B32;
+    Time	time B32;
+    CARD8	revertTo;
+    BYTE	pad1, pad2, pad3;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
     } xGetDeviceFocusReply;
 
 /*********************************************************
@@ -744,14 +744,14 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;        /* input extension major code   */
-    CARD8 	ReqType;        /* always X_SetDeviceFocus 	*/
-    CARD16 	length B16;
-    Window 	focus B32;
-    Time   	time B32;
-    CARD8  	revertTo;
-    CARD8  	device;
-    CARD16 	pad01 B16;
+    CARD8	reqType;        /* input extension major code   */
+    CARD8	ReqType;        /* always X_SetDeviceFocus	*/
+    CARD16	length B16;
+    Window	focus B32;
+    Time	time B32;
+    CARD8	revertTo;
+    CARD8	device;
+    CARD16	pad01 B16;
 } xSetDeviceFocusReq;
 
 /*********************************************************
@@ -762,17 +762,17 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_GetFeedbackControl  	*/
-    CARD16 	length B16;
-    CARD8 	deviceid;
+    CARD8	ReqType;        /* X_GetFeedbackControl	*/
+    CARD16	length B16;
+    CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xGetFeedbackControlReq;
 
 typedef struct {
-    CARD8  	repType;  	/* X_Reply 			*/
-    CARD8  	RepType;        /* always X_GetFeedbackControl 	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;        /* always X_GetFeedbackControl	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
     CARD16	num_feedbacks B16;
     CARD16	pad01 B16;
     CARD32	pad02 B32;
@@ -784,12 +784,12 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class; 	/* feedback class		*/
+    CARD8	c_class;	/* feedback class		*/
 #else
-    CARD8  	class; 		/* feedback class		*/
+    CARD8	class;		/* feedback class		*/
 #endif
-    CARD8  	id; 		/* feedback id    		*/
-    CARD16  	length B16; 	/* feedback length		*/
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
 } xFeedbackState;
 
 typedef struct {
@@ -827,12 +827,12 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8   	id;
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD8	id;
+    CARD16	length B16;	/* feedback length		*/
     CARD32	resolution B32;
     INT32	min_value B32;
     INT32	max_value B32;
@@ -840,24 +840,24 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8   	id;
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD8	id;
+    CARD16	length B16;	/* feedback length		*/
     CARD16	max_symbols B16;
     CARD16	num_syms_supported B16;
 } xStringFeedbackState;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
     CARD8	id;
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD16	length B16;	/* feedback length		*/
     CARD8	percent;
     BYTE	pad1, pad2, pad3;
     CARD16	pitch B16;
@@ -866,12 +866,12 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
     CARD8	id;
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD16	length B16;	/* feedback length		*/
     CARD32	led_mask B32;
     CARD32	led_values B32;
 } xLedFeedbackState;
@@ -884,33 +884,33 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_ChangeFeedbackControl  	*/
-    CARD16 	length B16;
+    CARD8	ReqType;        /* X_ChangeFeedbackControl	*/
+    CARD16	length B16;
     CARD32	mask B32;
-    CARD8  	deviceid;
-    CARD8  	feedbackid;
+    CARD8	deviceid;
+    CARD8	feedbackid;
     BYTE	pad1, pad2;
 } xChangeFeedbackControlReq;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback id      		*/
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
 } xFeedbackCtl;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback length  		*/
-    CARD16  	length B16; 	/* feedback length  		*/
-    KeyCode 	key; 
+    CARD8	id;		/* feedback length		*/
+    CARD16	length B16;	/* feedback length		*/
+    KeyCode	key;
     CARD8	auto_repeat_mode;
     INT8	click;
     INT8	percent;
@@ -922,13 +922,13 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback id      		*/
-    CARD16  	length B16; 	/* feedback length  		*/
-    CARD8  	pad1,pad2;
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
+    CARD8	pad1,pad2;
     INT16	num B16;
     INT16	denom B16;
     INT16	thresh B16;
@@ -936,35 +936,35 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback id      		*/
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
     INT32	int_to_display B32;
 } xIntegerFeedbackCtl;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback id      		*/
-    CARD16  	length B16; 	/* feedback length  		*/
-    CARD8  	pad1,pad2;
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
+    CARD8	pad1,pad2;
     CARD16	num_keysyms B16;
 } xStringFeedbackCtl;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback id      		*/
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
     INT8	percent;
     BYTE	pad1, pad2, pad3;
     INT16	pitch B16;
@@ -973,12 +973,12 @@ typedef struct {
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;  	/* feedback class id		*/
+    CARD8	c_class;	/* feedback class id		*/
 #else
-    CARD8  	class;  	/* feedback class id		*/
+    CARD8	class;		/* feedback class id		*/
 #endif
-    CARD8  	id; 		/* feedback id      		*/
-    CARD16  	length B16; 	/* feedback length  		*/
+    CARD8	id;		/* feedback id		*/
+    CARD16	length B16;	/* feedback length		*/
     CARD32	led_mask B32;
     CARD32	led_values B32;
 } xLedFeedbackCtl;
@@ -990,28 +990,28 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;        /* input extension major code   */
-    CARD8 	ReqType;     	/* always X_GetDeviceKeyMapping */
-    CARD16 	length B16;
-    CARD8   	deviceid;
-    KeyCode 	firstKeyCode; 
-    CARD8 	count;
+    CARD8	reqType;        /* input extension major code   */
+    CARD8	ReqType;	/* always X_GetDeviceKeyMapping */
+    CARD16	length B16;
+    CARD8	deviceid;
+    KeyCode	firstKeyCode;
+    CARD8	count;
     BYTE	pad1;
 } xGetDeviceKeyMappingReq;
 
 typedef struct {
-    CARD8  	repType;  	/* X_Reply 			*/
-    CARD8  	RepType;       	/* always X_GetDeviceKeyMapping */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8  	keySymsPerKeyCode;
-    CARD8  	pad0;
-    CARD16 	pad1 B16;
-    CARD32 	pad2 B32;
-    CARD32 	pad3 B32;
-    CARD32 	pad4 B32;
-    CARD32 	pad5 B32;
-    CARD32 	pad6 B32;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_GetDeviceKeyMapping */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	keySymsPerKeyCode;
+    CARD8	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xGetDeviceKeyMappingReply;
 
 /*********************************************************
@@ -1021,13 +1021,13 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;        /* input extension major code   */
-    CARD8 	ReqType;        /* always X_ChangeDeviceKeyMapping */
-    CARD16 	length B16;
-    CARD8   	deviceid;
-    KeyCode 	firstKeyCode;
-    CARD8 	keySymsPerKeyCode;
-    CARD8 	keyCodes;
+    CARD8	reqType;        /* input extension major code   */
+    CARD8	ReqType;        /* always X_ChangeDeviceKeyMapping */
+    CARD16	length B16;
+    CARD8	deviceid;
+    KeyCode	firstKeyCode;
+    CARD8	keySymsPerKeyCode;
+    CARD8	keyCodes;
 } xChangeDeviceKeyMappingReq;
 
 /*********************************************************
@@ -1037,26 +1037,26 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;        /* input extension major code   */
-    CARD8 	ReqType;        /* always X_GetDeviceModifierMapping */
-    CARD16 	length B16;
-    CARD8   	deviceid;
+    CARD8	reqType;        /* input extension major code   */
+    CARD8	ReqType;        /* always X_GetDeviceModifierMapping */
+    CARD16	length B16;
+    CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xGetDeviceModifierMappingReq;
 
 typedef struct {
-    CARD8  	repType;  	/* X_Reply */
-    CARD8  	RepType;        /* always X_GetDeviceModifierMapping */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8  	numKeyPerModifier;
-    CARD8  	pad0;
-    CARD16 	pad1 B16;
-    CARD32 	pad2 B32;
-    CARD32 	pad3 B32;
-    CARD32 	pad4 B32;
-    CARD32 	pad5 B32;
-    CARD32 	pad6 B32;
+    CARD8	repType;	/* X_Reply */
+    CARD8	RepType;        /* always X_GetDeviceModifierMapping */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	numKeyPerModifier;
+    CARD8	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xGetDeviceModifierMappingReply;
 
 /*********************************************************
@@ -1066,27 +1066,27 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;        /* input extension major code   */
-    CARD8 	ReqType;        /* always X_SetDeviceModifierMapping */
-    CARD16 	length B16;
-    CARD8   	deviceid;
-    CARD8   	numKeyPerModifier;
-    CARD16  	pad1 B16;
+    CARD8	reqType;        /* input extension major code   */
+    CARD8	ReqType;        /* always X_SetDeviceModifierMapping */
+    CARD16	length B16;
+    CARD8	deviceid;
+    CARD8	numKeyPerModifier;
+    CARD16	pad1 B16;
 } xSetDeviceModifierMappingReq;
 
 typedef struct {
-    CARD8  	repType;  	/* X_Reply */
-    CARD8  	RepType;        /* always X_SetDeviceModifierMapping */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8  	success;
-    CARD8  	pad0;
-    CARD16 	pad1 B16;
-    CARD32 	pad2 B32;
-    CARD32 	pad3 B32;
-    CARD32 	pad4 B32;
-    CARD32 	pad5 B32;
-    CARD32 	pad6 B32;
+    CARD8	repType;	/* X_Reply */
+    CARD8	RepType;        /* always X_SetDeviceModifierMapping */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	success;
+    CARD8	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xSetDeviceModifierMappingReply;
 
 /*********************************************************
@@ -1097,24 +1097,24 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_GetDeviceButtonMapping     */
-    CARD16 	length B16;
-    CARD8   	deviceid;
+    CARD8	ReqType;        /* X_GetDeviceButtonMapping     */
+    CARD16	length B16;
+    CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xGetDeviceButtonMappingReq;
 
 typedef struct {
-    CARD8  	repType;  	/* X_Reply */
-    CARD8  	RepType;        /* always X_GetDeviceButtonMapping */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	nElts;
+    CARD8	repType;	/* X_Reply */
+    CARD8	RepType;        /* always X_GetDeviceButtonMapping */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	nElts;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xGetDeviceButtonMappingReply;
 
 /*********************************************************
@@ -1125,26 +1125,26 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;        /* X_SetDeviceButtonMapping     */
-    CARD16 	length B16;
-    CARD8   	deviceid;
-    CARD8   	map_length;
+    CARD8	ReqType;        /* X_SetDeviceButtonMapping     */
+    CARD16	length B16;
+    CARD8	deviceid;
+    CARD8	map_length;
     BYTE	pad1, pad2;
 } xSetDeviceButtonMappingReq;
 
 typedef struct {
-    CARD8  	repType;  		/* X_Reply */
-    CARD8  	RepType;        	/* always X_SetDeviceButtonMapping */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	status;
-    BYTE 	pad0;
-    CARD16 	pad1 B16;
-    CARD32 	pad2 B32;
-    CARD32 	pad3 B32;
-    CARD32 	pad4 B32;
-    CARD32 	pad5 B32;
-    CARD32 	pad6 B32;
+    CARD8	repType;		/* X_Reply */
+    CARD8	RepType;	/* always X_SetDeviceButtonMapping */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	status;
+    BYTE	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xSetDeviceButtonMappingReply;
 
 /*********************************************************
@@ -1155,59 +1155,59 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;
-    CARD8 	ReqType;        /* always X_QueryDeviceState */
-    CARD16 	length B16;
-    CARD8   	deviceid;
+    CARD8	ReqType;        /* always X_QueryDeviceState */
+    CARD16	length B16;
+    CARD8	deviceid;
     BYTE	pad1, pad2, pad3;
 } xQueryDeviceStateReq;
 
 typedef struct {
-    CARD8  	repType;  		/* X_Reply */
-    CARD8  	RepType;        	/* always X_QueryDeviceState	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	num_classes;
-    BYTE 	pad0;
-    CARD16 	pad1 B16;
-    CARD32 	pad2 B32;
-    CARD32 	pad3 B32;
-    CARD32 	pad4 B32;
-    CARD32 	pad5 B32;
-    CARD32 	pad6 B32;
+    CARD8	repType;		/* X_Reply */
+    CARD8	RepType;	/* always X_QueryDeviceState	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	num_classes;
+    BYTE	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xQueryDeviceStateReply;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;
+    CARD8	c_class;
 #else
-    CARD8  	class;
+    CARD8	class;
 #endif
-    CARD8  	length;
+    CARD8	length;
     CARD8	num_keys;
-    BYTE   	pad1;
-    CARD8  	keys[32];
+    BYTE	pad1;
+    CARD8	keys[32];
 } xKeyState;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;
+    CARD8	c_class;
 #else
-    CARD8  	class;
+    CARD8	class;
 #endif
-    CARD8  	length;
+    CARD8	length;
     CARD8	num_buttons;
-    BYTE   	pad1;
-    CARD8  	buttons[32];
+    BYTE	pad1;
+    CARD8	buttons[32];
 } xButtonState;
 
 typedef struct {
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD8  	c_class;
+    CARD8	c_class;
 #else
-    CARD8  	class;
+    CARD8	class;
 #endif
-    CARD8  	length;
-    CARD8  	num_valuators;
+    CARD8	length;
+    CARD8	num_valuators;
     CARD8	mode;
 } xValuatorState;
 
@@ -1221,11 +1221,11 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;
-    CARD8 	ReqType;        /* always X_SendExtensionEvent */
-    CARD16 	length B16;
+    CARD8	ReqType;        /* always X_SendExtensionEvent */
+    CARD16	length B16;
     Window	destination B32;
-    CARD8   	deviceid;
-    BOOL   	propagate;
+    CARD8	deviceid;
+    BOOL	propagate;
     CARD16	count B16;
     CARD8	num_events;
     BYTE	pad1,pad2,pad3;
@@ -1239,9 +1239,9 @@ typedef struct {
 
 typedef struct {
     CARD8	reqType;
-    CARD8 	ReqType;        /* always X_DeviceBell */
-    CARD16 	length B16;
-    CARD8   	deviceid;
+    CARD8	ReqType;        /* always X_DeviceBell */
+    CARD16	length B16;
+    CARD8	deviceid;
     CARD8	feedbackid;
     CARD8	feedbackclass;
     INT8	percent;
@@ -1254,27 +1254,27 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_SetDeviceValuators 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_SetDeviceValuators	*/
+    CARD16	length B16;
     CARD8       deviceid;
     CARD8       first_valuator;
     CARD8       num_valuators;
-    BYTE 	pad1;
+    BYTE	pad1;
 } xSetDeviceValuatorsReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;     	/* always X_SetDeviceValuators 	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_SetDeviceValuators	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xSetDeviceValuatorsReply;
 
 /*********************************************************
@@ -1284,37 +1284,37 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_GetDeviceControl 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_GetDeviceControl	*/
+    CARD16	length B16;
     CARD16      control B16;
     CARD8       deviceid;
-    BYTE 	pad2;
+    BYTE	pad2;
 } xGetDeviceControlReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;     	/* always X_GetDeviceControl 	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_GetDeviceControl	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xGetDeviceControlReply;
 
 typedef struct {
-    CARD16  	control B16; 	/* control type     	 	*/
-    CARD16  	length B16; 	/* control length  		*/
+    CARD16	control B16;	/* control type		*/
+    CARD16	length B16;	/* control length		*/
 } xDeviceState;
 
 typedef struct {
-    CARD16  	control B16; 		/* control type     	 	*/
-    CARD16  	length B16; 		/* control length  		*/
-    CARD32  	num_valuators B32; 	/* number of valuators		*/
+    CARD16	control B16;		/* control type		*/
+    CARD16	length B16;		/* control length		*/
+    CARD32	num_valuators B32;	/* number of valuators		*/
 } xDeviceResolutionState;
 
 typedef struct {
@@ -1364,39 +1364,39 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_ChangeDeviceControl */
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_ChangeDeviceControl */
+    CARD16	length B16;
     CARD16      control B16;
     CARD8       deviceid;
     BYTE        pad0;
 } xChangeDeviceControlReq;
 
 typedef struct {
-    CARD8 	repType;  	/* X_Reply 			*/
-    CARD8 	RepType;     	/* always X_ChangeDeviceControl	*/
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    CARD8 	status;
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_ChangeDeviceControl	*/
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	status;
     BYTE	pad1, pad2, pad3;
-    CARD32 	pad01 B32;
-    CARD32 	pad02 B32;
-    CARD32 	pad03 B32;
-    CARD32 	pad04 B32;
-    CARD32 	pad05 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+    CARD32	pad05 B32;
 } xChangeDeviceControlReply;
 
 typedef struct {
-    CARD16  	control B16; 	/* control type     	 	*/
-    CARD16  	length B16; 	/* control length  		*/
+    CARD16	control B16;	/* control type		*/
+    CARD16	length B16;	/* control length		*/
 } xDeviceCtl;
 
 typedef struct {
-    CARD16  	control B16; 		/* control type     	 	*/
-    CARD16  	length B16; 		/* control length  		*/
-    CARD8  	first_valuator; 	/* first valuator to change     */
-    CARD8  	num_valuators; 		/* number of valuators to change*/
-    CARD8  	pad1,pad2;
+    CARD16	control B16;		/* control type		*/
+    CARD16	length B16;		/* control length		*/
+    CARD8	first_valuator;		/* first valuator to change     */
+    CARD8	num_valuators;		/* number of valuators to change*/
+    CARD8	pad1,pad2;
 } xDeviceResolutionCtl;
 
 typedef struct {
@@ -1553,9 +1553,9 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_QueryDevicePointer 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_QueryDevicePointer	*/
+    CARD16	length B16;
     Window      win;
     CARD8       deviceid;
     CARD8 	pad0;
@@ -1564,12 +1564,12 @@ typedef struct {
 
 
 typedef struct {
-    CARD8  	repType;  		/* X_Reply */
-    CARD8  	RepType;        	/* always X_QueryDevicePointer */
-    CARD16 	sequenceNumber B16;
-    CARD32 	length B32;
-    Window 	root B32;
-    Window 	child B32;
+    CARD8	repType;		/* X_Reply */
+    CARD8	RepType;	/* always X_QueryDevicePointer */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    Window	root B32;
+    Window	child B32;
     INT16       rootX B16;
     INT16       rootY B16;
     INT16       winX B16;
@@ -1588,9 +1588,9 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_WarpDevicePointer 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_WarpDevicePointer	*/
+    CARD16	length B16;
     Window      src_win B32;
     Window      dst_win B32;
     INT16       src_x B16;
@@ -1611,9 +1611,9 @@ typedef struct {
  */
 
 typedef struct {
-    CARD8 	reqType;	/* input extension major code	*/
-    CARD8 	ReqType;     	/* always X_ChangeDeviceCursor 	*/
-    CARD16 	length B16;
+    CARD8	reqType;	/* input extension major code	*/
+    CARD8	ReqType;	/* always X_ChangeDeviceCursor	*/
+    CARD16	length B16;
     Window      win B32;
     Cursor      cursor B32;
     CARD8       deviceid;
@@ -1641,7 +1641,7 @@ typedef struct {
     CARD16      length  B16;     /* in bytes */
 } xAnyHierarchyChangeInfo;
 
-/* Create a new master device. 
+/* Create a new master device.
  * Name of new master follows struct (4-byte padded)
  */
 typedef struct {
@@ -1653,7 +1653,7 @@ typedef struct {
 } xCreateMasterInfo;
 
 /* Delete a master device. Will automatically delete the master device paired
- * with the given master device. 
+ * with the given master device.
  */
 typedef struct {
     CARD16      type    B16;     /* Always CH_RemoveMasterDevice */
@@ -1664,7 +1664,7 @@ typedef struct {
     CARD8       returnKeyboard; /* keyboard to attach slave keybd devices to*/
 } xRemoveMasterInfo;
 
-/* Change a device's attachment. 
+/* Change a device's attachment.
  * NewMaster has to be of same type (pointer->pointer, keyboard->keyboard);
  */
 typedef struct {
@@ -1792,18 +1792,18 @@ typedef struct {
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     CARD8       deviceid;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     KeyButMask  device_state B16;
     CARD8	num_valuators;
     CARD8       first_valuator;
-    INT32 	valuator0 B32;
-    INT32 	valuator1 B32;
-    INT32 	valuator2 B32;
-    INT32 	valuator3 B32;
-    INT32 	valuator4 B32;
-    INT32 	valuator5 B32;
+    INT32	valuator0 B32;
+    INT32	valuator1 B32;
+    INT32	valuator2 B32;
+    INT32	valuator3 B32;
+    INT32	valuator4 B32;
+    INT32	valuator5 B32;
     }  deviceValuator;
 
 /**********************************************************
@@ -1814,14 +1814,14 @@ typedef struct
  *	     DeviceButtonPress, DeviceButtonRelease,
  *	     ProximityIn, ProximityOut
  *	     DeviceMotionNotify,
- * 
+ *
  */
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        detail;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     Time        time B32;
     Window      root B32;
     Window      event B32;
@@ -1843,9 +1843,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        detail;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     Time        time B32;
     Window      window B32;
     BYTE	mode;
@@ -1869,9 +1869,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        deviceid;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     Time        time B32;
     CARD8	num_keys;
     CARD8	num_buttons;
@@ -1892,9 +1892,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        deviceid;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     CARD8       keys[28];
     }  deviceKeyStateNotify;
 
@@ -1906,9 +1906,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        deviceid;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     CARD8       buttons[28];
     }  deviceButtonStateNotify;
 
@@ -1921,9 +1921,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        deviceid;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     CARD8       request;
     KeyCode     firstKeyCode;
     CARD8       count;
@@ -1944,9 +1944,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        deviceid;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     Time        time B32;
     CARD8       request;
     BYTE        pad1, pad2, pad3;
@@ -1965,9 +1965,9 @@ typedef struct
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        pad00;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     Time        time B32;
     BYTE        devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */
     BYTE        deviceid;
@@ -1984,14 +1984,14 @@ typedef struct
  *
  * deviceEnterNotify.
  * This has a slightly different layout than the core event.
- * 
+ *
  */
 
 typedef struct
     {
-    BYTE 	type;
+    BYTE	type;
     BYTE        detail;
-    CARD16 	sequenceNumber B16;
+    CARD16	sequenceNumber B16;
     Time        time B32;
     Window      root B32;
     Window      event B32;
@@ -2035,12 +2035,12 @@ typedef struct
 
 /*********************************************************
  * DeviceHierarchyChangedEvent.
- * 
+ *
  * Intended as a notification event only, the client is expected to query the
  * server for input devices after receipt of this event.
  */
 
-typedef struct 
+typedef struct
     {
     BYTE        type;                          /* always GenericEvent */
     BYTE        extension;                     /* XI extension offset */