xserver: Branch 'master'
Alan Coopersmith
alanc at kemper.freedesktop.org
Sat Jun 16 16:18:30 UTC 2018
include/GL/glxint.h | 4
include/GL/glxmd.h | 2
include/GL/glxproto.h | 8
include/GL/glxtokens.h | 14 -
include/GL/internal/glcore.h | 6
include/X11/DECkeysym.h | 8
include/X11/X.h | 88 ++++----
include/X11/XWDFile.h | 8
include/X11/Xdefs.h | 6
include/X11/Xfuncs.h | 2
include/X11/Xproto.h | 320 +++++++++++++++----------------
include/X11/Xprotostr.h | 8
include/X11/Xw32defs.h | 2
include/X11/Xwinsock.h | 2
include/X11/ap_keysym.h | 10
include/X11/extensions/XKB.h | 52 ++---
include/X11/extensions/XKBgeom.h | 16 -
include/X11/extensions/XKBproto.h | 16 -
include/X11/extensions/XKBsrv.h | 22 +-
include/X11/extensions/XKBstr.h | 26 +-
include/X11/extensions/XResproto.h | 24 +-
include/X11/extensions/compositeproto.h | 2
include/X11/extensions/damageproto.h | 2
include/X11/extensions/lgewire.h | 34 +--
include/X11/extensions/panoramiXproto.h | 24 +-
include/X11/extensions/presentproto.h | 2
include/X11/extensions/randrproto.h | 32 +--
include/X11/extensions/recordconst.h | 14 -
include/X11/extensions/saverproto.h | 2
include/X11/extensions/syncstr.h | 10
include/X11/extensions/xcalibrateproto.h | 2
include/X11/extensions/xf86dga1proto.h | 2
include/X11/extensions/xf86dgaconst.h | 4
include/X11/extensions/xf86dgaproto.h | 14 -
include/X11/extensions/xf86mscstr.h | 2
include/X11/extensions/xf86rush.h | 2
include/X11/extensions/xf86vm.h | 6
include/X11/extensions/xf86vmproto.h | 8
include/X11/extensions/xfixesproto.h | 4
include/X11/extensions/xtrapbits.h | 10
include/X11/extensions/xtrapddmi.h | 10
include/X11/extensions/xtrapdi.h | 42 ++--
include/X11/extensions/xtrapemacros.h | 12 -
include/X11/extensions/xtraplib.h | 16 -
include/X11/extensions/xtraplibp.h | 20 -
include/X11/extensions/xtrapproto.h | 8
include/X11/fonts/FS.h | 6
include/X11/fonts/FSproto.h | 10
include/X11/fonts/fontproto.h | 26 +-
include/X11/fonts/fsmasks.h | 6
include/X11/keysym.h | 8
include/X11/keysymdef.h | 6
52 files changed, 495 insertions(+), 495 deletions(-)
New commits:
commit eb28f0378fadd0d143aad7ec16f7b91814faae9a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Jun 16 09:16:52 2018 -0700
Remove trailing whitespace from header files
Performed with:
find include -name '*.h' | xargs perl -i -p -e 's{[ \t]+$}{}'
"git diff -w" shows no changes from this changeset.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/include/GL/glxint.h b/include/GL/glxint.h
index 9da4910..44c9e9e 100644
--- a/include/GL/glxint.h
+++ b/include/GL/glxint.h
@@ -73,7 +73,7 @@ struct __GLXvisualConfigRec {
** we require 2 words across the wire. In order to maintain backwards
** compatibility, we need to send the total number of words that the
** VisualConfigs are sent back in so old libraries can simply "ignore"
-** the new properties.
+** the new properties.
*/
#define __GLX_TOTAL_CONFIG (__GLX_MIN_CONFIG_PROPS + \
2 * __GLX_EXT_CONFIG_PROPS)
@@ -98,7 +98,7 @@ struct __GLXFBConfigRec {
int visualSelectGroup; /* visuals grouped by select priority */
- unsigned int id;
+ unsigned int id;
GLboolean rgbMode;
GLboolean colorIndexMode;
diff --git a/include/GL/glxmd.h b/include/GL/glxmd.h
index 96c07db..8ff9c1b 100644
--- a/include/GL/glxmd.h
+++ b/include/GL/glxmd.h
@@ -45,7 +45,7 @@ typedef double FLOAT64;
/*
** Like B32, but this is used to store floats in a request.
**
-** NOTE: Machines that have a native 32-bit IEEE float can define this as
+** NOTE: Machines that have a native 32-bit IEEE float can define this as
** nothing. Machines that don't might mimic the float with an integer,
** and then define this to :32.
*/
diff --git a/include/GL/glxproto.h b/include/GL/glxproto.h
index 066db45..2766bf8 100644
--- a/include/GL/glxproto.h
+++ b/include/GL/glxproto.h
@@ -1303,7 +1303,7 @@ typedef struct {
* CARD32 versions[4] = { 2, 1, 3, 0 };
*
* says that the client supports OpenGL 2.1 and OpenGL 3.0.
- *
+ *
* These are followed by \c numGLExtensionBytes bytes of \c STRING8 containing
* the OpenGL extension string supported by the client and up to 3 bytes of
* padding.
@@ -1744,7 +1744,7 @@ typedef struct {
* order:
* - Render or RenderLarge header
* - CompressedTexImage header
- *
+ *
* When a \c glCompressedTexImage1D call is made, the \c height field is
* not examined by the server and is considered padding.
*/
@@ -1786,7 +1786,7 @@ typedef struct {
* order:
* - Render or RenderLarge header
* - CompressedTexSubImage header
- *
+ *
* When a \c glCompressedTexSubImage1D call is made, the \c yoffset and
* \c height fields are not examined by the server and are considered padding.
*/
@@ -2105,7 +2105,7 @@ typedef struct {
#define GLX_VIDEO_SOURCE_TYPE 3
#define GLX_PBUFFER_TYPE 4
/* 5 is for DM_PBUFFER */
-#define GLX_GLXWINDOW_TYPE 6
+#define GLX_GLXWINDOW_TYPE 6
/*****************************************************************************/
diff --git a/include/GL/glxtokens.h b/include/GL/glxtokens.h
index a95082e..ff3bd45 100644
--- a/include/GL/glxtokens.h
+++ b/include/GL/glxtokens.h
@@ -264,14 +264,14 @@ extern "C" {
#define GLX_FRONT_EXT GLX_FRONT_LEFT_EXT
#define GLX_BACK_EXT GLX_BACK_LEFT_EXT
#define GLX_AUX0_EXT 0x20E2
-#define GLX_AUX1_EXT 0x20E3
-#define GLX_AUX2_EXT 0x20E4
-#define GLX_AUX3_EXT 0x20E5
-#define GLX_AUX4_EXT 0x20E6
-#define GLX_AUX5_EXT 0x20E7
+#define GLX_AUX1_EXT 0x20E3
+#define GLX_AUX2_EXT 0x20E4
+#define GLX_AUX3_EXT 0x20E5
+#define GLX_AUX4_EXT 0x20E6
+#define GLX_AUX5_EXT 0x20E7
#define GLX_AUX6_EXT 0x20E8
-#define GLX_AUX7_EXT 0x20E9
-#define GLX_AUX8_EXT 0x20EA
+#define GLX_AUX7_EXT 0x20E9
+#define GLX_AUX8_EXT 0x20EA
#define GLX_AUX9_EXT 0x20EB
/*
diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h
index 547b111..3879727 100644
--- a/include/GL/internal/glcore.h
+++ b/include/GL/internal/glcore.h
@@ -58,11 +58,11 @@ typedef struct __GLcontextRec __GLcontext;
* kept around in the context so that values can be used during
* command execution, and for returning information about the
* context to the application.
- *
+ *
* Instances of this structure are shared by the driver and the loader. To
* maintain binary compatability, new fields \b must be added only to the
* end of the structure.
- *
+ *
* \sa _gl_context_modes_create
*/
typedef struct __GLcontextModesRec {
@@ -95,7 +95,7 @@ typedef struct __GLcontextModesRec {
/* GLX */
GLint visualID;
- GLint visualType; /**< One of the GLX X visual types. (i.e.,
+ GLint visualType; /**< One of the GLX X visual types. (i.e.,
* \c GLX_TRUE_COLOR, etc.)
*/
diff --git a/include/X11/DECkeysym.h b/include/X11/DECkeysym.h
index 0730716..d9e23c4 100644
--- a/include/X11/DECkeysym.h
+++ b/include/X11/DECkeysym.h
@@ -27,13 +27,13 @@ Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/X.h b/include/X11/X.h
index 5cf695d..4df7d22 100644
--- a/include/X11/X.h
+++ b/include/X11/X.h
@@ -32,13 +32,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -140,39 +140,39 @@ typedef unsigned char KeyCode;
#define NoSymbol 0L /* special KeySym */
-/*****************************************************************
- * EVENT DEFINITIONS
+/*****************************************************************
+ * EVENT DEFINITIONS
*****************************************************************/
/* Input Event Masks. Used as event-mask window attribute and as arguments
to Grab requests. Not to be confused with event names. */
#define NoEventMask 0L
-#define KeyPressMask (1L<<0)
-#define KeyReleaseMask (1L<<1)
-#define ButtonPressMask (1L<<2)
-#define ButtonReleaseMask (1L<<3)
-#define EnterWindowMask (1L<<4)
-#define LeaveWindowMask (1L<<5)
-#define PointerMotionMask (1L<<6)
-#define PointerMotionHintMask (1L<<7)
-#define Button1MotionMask (1L<<8)
-#define Button2MotionMask (1L<<9)
-#define Button3MotionMask (1L<<10)
-#define Button4MotionMask (1L<<11)
-#define Button5MotionMask (1L<<12)
-#define ButtonMotionMask (1L<<13)
+#define KeyPressMask (1L<<0)
+#define KeyReleaseMask (1L<<1)
+#define ButtonPressMask (1L<<2)
+#define ButtonReleaseMask (1L<<3)
+#define EnterWindowMask (1L<<4)
+#define LeaveWindowMask (1L<<5)
+#define PointerMotionMask (1L<<6)
+#define PointerMotionHintMask (1L<<7)
+#define Button1MotionMask (1L<<8)
+#define Button2MotionMask (1L<<9)
+#define Button3MotionMask (1L<<10)
+#define Button4MotionMask (1L<<11)
+#define Button5MotionMask (1L<<12)
+#define ButtonMotionMask (1L<<13)
#define KeymapStateMask (1L<<14)
-#define ExposureMask (1L<<15)
-#define VisibilityChangeMask (1L<<16)
-#define StructureNotifyMask (1L<<17)
-#define ResizeRedirectMask (1L<<18)
-#define SubstructureNotifyMask (1L<<19)
-#define SubstructureRedirectMask (1L<<20)
-#define FocusChangeMask (1L<<21)
-#define PropertyChangeMask (1L<<22)
-#define ColormapChangeMask (1L<<23)
-#define OwnerGrabButtonMask (1L<<24)
+#define ExposureMask (1L<<15)
+#define VisibilityChangeMask (1L<<16)
+#define StructureNotifyMask (1L<<17)
+#define ResizeRedirectMask (1L<<18)
+#define SubstructureNotifyMask (1L<<19)
+#define SubstructureRedirectMask (1L<<20)
+#define FocusChangeMask (1L<<21)
+#define PropertyChangeMask (1L<<22)
+#define ColormapChangeMask (1L<<23)
+#define OwnerGrabButtonMask (1L<<24)
/* Event names. Used in "type" field in XEvent structures. Not to be
confused with event masks above. They start from 2 because 0 and 1
@@ -270,7 +270,7 @@ are reserved in the protocol for errors and replies. */
#define NotifyWhileGrabbed 3
#define NotifyHint 1 /* for MotionNotify events */
-
+
/* Notify detail */
#define NotifyAncestor 0
@@ -344,7 +344,7 @@ are reserved in the protocol for errors and replies. */
#define RevertToParent 2
/*****************************************************************
- * ERROR CODES
+ * ERROR CODES
*****************************************************************/
#define Success 0 /* everything's okay */
@@ -359,9 +359,9 @@ are reserved in the protocol for errors and replies. */
#define BadDrawable 9 /* parameter not a Pixmap or Window */
#define BadAccess 10 /* depending on context:
- key/button already grabbed
- - attempt to free an illegal
- cmap entry
- - attempt to store into a read-only
+ - attempt to free an illegal
+ cmap entry
+ - attempt to store into a read-only
color map entry.
- attempt to modify the access control
list from other than the local host.
@@ -378,7 +378,7 @@ are reserved in the protocol for errors and replies. */
#define LastExtensionError 255
/*****************************************************************
- * WINDOW DEFINITIONS
+ * WINDOW DEFINITIONS
*****************************************************************/
/* Window classes used by CreateWindow */
@@ -570,7 +570,7 @@ are reserved in the protocol for errors and replies. */
#define GCCapStyle (1L<<6)
#define GCJoinStyle (1L<<7)
#define GCFillStyle (1L<<8)
-#define GCFillRule (1L<<9)
+#define GCFillRule (1L<<9)
#define GCTile (1L<<10)
#define GCStipple (1L<<11)
#define GCTileStipXOrigin (1L<<12)
@@ -587,7 +587,7 @@ are reserved in the protocol for errors and replies. */
#define GCLastBit 22
/*****************************************************************
- * FONTS
+ * FONTS
*****************************************************************/
/* used in QueryFont -- draw direction */
@@ -598,7 +598,7 @@ are reserved in the protocol for errors and replies. */
#define FontChange 255
/*****************************************************************
- * IMAGING
+ * IMAGING
*****************************************************************/
/* ImageFormat -- PutImage, GetImage */
@@ -608,7 +608,7 @@ are reserved in the protocol for errors and replies. */
#define ZPixmap 2 /* depth == drawable depth */
/*****************************************************************
- * COLOR MAP STUFF
+ * COLOR MAP STUFF
*****************************************************************/
/* For CreateColormap */
@@ -633,7 +633,7 @@ are reserved in the protocol for errors and replies. */
#define TileShape 1 /* size tiled fastest */
#define StippleShape 2 /* size stippled fastest */
-/*****************************************************************
+/*****************************************************************
* KEYBOARD/POINTER STUFF
*****************************************************************/
@@ -664,7 +664,7 @@ are reserved in the protocol for errors and replies. */
#define MappingPointer 2
/*****************************************************************
- * SCREEN SAVER STUFF
+ * SCREEN SAVER STUFF
*****************************************************************/
#define DontPreferBlanking 0
@@ -694,10 +694,10 @@ are reserved in the protocol for errors and replies. */
/* for ChangeAccessControl */
-#define EnableAccess 1
+#define EnableAccess 1
#define DisableAccess 0
-/* Display classes used in opening the connection
+/* Display classes used in opening the connection
* Note that the statically allocated ones are even numbered and the
* dynamically changeable ones are odd numbered */
diff --git a/include/X11/XWDFile.h b/include/X11/XWDFile.h
index 50e17df..1e53749 100644
--- a/include/X11/XWDFile.h
+++ b/include/X11/XWDFile.h
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Tony Della Fera, DEC
* 27-Jun-85
- *
+ *
* Modifier: William F. Wyatt, SAO
* 18-Nov-86 - version 6 for saving/restoring color maps
*/
@@ -51,7 +51,7 @@ typedef CARD32 xwdval; /* for old broken programs */
typedef struct _xwd_file_header {
/* header_size = SIZEOF(XWDheader) + length of null-terminated
* window name. */
- CARD32 header_size B32;
+ CARD32 header_size B32;
CARD32 file_version B32; /* = XWD_FILE_VERSION above */
CARD32 pixmap_format B32; /* ZPixmap or XYPixmap */
@@ -63,13 +63,13 @@ typedef struct _xwd_file_header {
/* bitmap_unit applies to bitmaps (depth 1 format XY) only.
* It is the number of bits that each scanline is padded to. */
- CARD32 bitmap_unit B32;
+ CARD32 bitmap_unit B32;
CARD32 bitmap_bit_order B32; /* bitmaps only: MSBFirst, LSBFirst */
/* bitmap_pad applies to pixmaps (non-bitmaps) only.
* It is the number of bits that each scanline is padded to. */
- CARD32 bitmap_pad B32;
+ CARD32 bitmap_pad B32;
CARD32 bits_per_pixel B32; /* Bits per pixel */
diff --git a/include/X11/Xdefs.h b/include/X11/Xdefs.h
index e25a208..f58946d 100644
--- a/include/X11/Xdefs.h
+++ b/include/X11/Xdefs.h
@@ -22,7 +22,7 @@ authorization from The XFree86 Project Inc..
*/
/**
- ** Types definitions shared between server and clients
+ ** Types definitions shared between server and clients
**/
#ifndef _XDEFS_H
@@ -30,7 +30,7 @@ authorization from The XFree86 Project Inc..
#ifdef _XSERVER64
#include <X11/Xmd.h>
-#endif
+#endif
#ifndef _XTYPEDEF_ATOM
# define _XTYPEDEF_ATOM
@@ -96,7 +96,7 @@ typedef CARD32 FSID;
typedef FSID AccContext;
-/* OS independent time value
+/* OS independent time value
XXX Should probably go in Xos.h */
typedef struct timeval **OSTimePtr;
diff --git a/include/X11/Xfuncs.h b/include/X11/Xfuncs.h
index b7c4029..b23c283 100644
--- a/include/X11/Xfuncs.h
+++ b/include/X11/Xfuncs.h
@@ -1,5 +1,5 @@
/*
- *
+ *
Copyright 1990, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/include/X11/Xproto.h b/include/X11/Xproto.h
index 6cdea89..640288d 100644
--- a/include/X11/Xproto.h
+++ b/include/X11/Xproto.h
@@ -51,13 +51,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -258,7 +258,7 @@ restoring the definitions in X.h. */
typedef CARD16 KeyButMask;
-/*****************
+/*****************
Connection setup structures. See Chapter 8: Connection Setup
of the X Window System Protocol specification for details.
*****************/
@@ -288,7 +288,7 @@ typedef struct {
typedef struct {
CARD8 success;
BYTE lengthReason; /*num bytes in string following if failure */
- CARD16 majorVersion B16,
+ CARD16 majorVersion B16,
minorVersion B16;
CARD16 length B16; /* 1/4 additional bytes in setup info */
} xConnSetupPrefix;
@@ -296,7 +296,7 @@ typedef struct {
typedef struct {
CARD32 release B32;
- CARD32 ridBase B32,
+ CARD32 ridBase B32,
ridMask B32;
CARD32 motionBufferSize B32;
CARD16 nbytesVendor B16; /* number of bytes in vendor string */
@@ -345,7 +345,7 @@ typedef struct {
Window windowId B32;
Colormap defaultColormap B32;
CARD32 whitePixel B32, blackPixel B32;
- CARD32 currentInputMask B32;
+ CARD32 currentInputMask B32;
CARD16 pixWidth B16, pixHeight B16;
CARD16 mmWidth B16, mmHeight B16;
CARD16 minInstalledMaps B16, maxInstalledMaps B16;
@@ -359,7 +359,7 @@ typedef struct {
/*****************************************************************
* Structure Defns
- * Structures needed for replies
+ * Structures needed for replies
*****************************************************************/
/* Used in GetMotionEvents */
@@ -399,7 +399,7 @@ typedef struct { /* followed by string */
} xTextElt;
-typedef struct {
+typedef struct {
CARD32 pixel B32;
CARD16 red B16, green B16, blue B16;
CARD8 flags; /* DoRed, DoGreen, DoBlue booleans */
@@ -416,13 +416,13 @@ typedef CARD8 KEYCODE;
/*****************
* XRep:
- * meant to be 32 byte quantity
+ * meant to be 32 byte quantity
*****************/
/* GenericReply is the common format of all replies. The "data" items
are specific to each individual reply type. */
-typedef struct {
+typedef struct {
BYTE type; /* X_Reply */
BYTE data1; /* depends on reply type */
CARD16 sequenceNumber B16; /* of last request received by server */
@@ -637,9 +637,9 @@ typedef struct _xQueryFontReply {
BYTE pad1;
CARD16 sequenceNumber B16;
CARD32 length B32; /* definitely > 0, even if "nCharInfos" is 0 */
- xCharInfo minBounds;
+ xCharInfo minBounds;
CARD32 walign1 B32;
- xCharInfo maxBounds;
+ xCharInfo maxBounds;
CARD32 walign2 B32;
CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
CARD16 defaultChar B16;
@@ -682,9 +682,9 @@ typedef struct {
CARD8 nameLength; /* 0 indicates end-of-reply-sequence */
CARD16 sequenceNumber B16;
CARD32 length B32; /* definitely > 0, even if "nameLength" is 0 */
- xCharInfo minBounds;
+ xCharInfo minBounds;
CARD32 walign1 B32;
- xCharInfo maxBounds;
+ xCharInfo maxBounds;
CARD32 walign2 B32;
CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
CARD16 defaultChar B16;
@@ -895,7 +895,7 @@ typedef struct {
CARD32 pad5 B32;
CARD32 pad6 B32;
CARD32 pad7 B32;
-} xGetKeyboardMappingReply;
+} xGetKeyboardMappingReply;
typedef struct {
BYTE type;
@@ -970,7 +970,7 @@ typedef struct {
/*****************************************************************
* Xerror
- * All errors are 32 bytes
+ * All errors are 32 bytes
*****************************************************************/
typedef struct {
@@ -1006,7 +1006,7 @@ typedef struct _xEvent {
Window root B32, event B32, child B32;
INT16 rootX B16, rootY B16, eventX B16, eventY B16;
KeyButMask state B16;
- BOOL sameScreen;
+ BOOL sameScreen;
BYTE pad1;
} keyButtonPointer;
struct {
@@ -1103,7 +1103,7 @@ typedef struct _xEvent {
Window event B32, window B32, aboveSibling B32;
INT16 x B16, y B16;
CARD16 width B16, height B16, borderWidth B16;
- BOOL override;
+ BOOL override;
BYTE bpad;
} configureNotify;
struct {
@@ -1144,19 +1144,19 @@ typedef struct _xEvent {
} property;
struct {
CARD32 pad00 B32;
- Time time B32;
+ Time time B32;
Window window B32;
Atom atom B32;
} selectionClear;
struct {
CARD32 pad00 B32;
- Time time B32;
+ Time time B32;
Window owner B32, requestor B32;
Atom selection B32, target B32, property B32;
} selectionRequest;
struct {
CARD32 pad00 B32;
- Time time B32;
+ Time time B32;
Window requestor B32;
Atom selection B32, target B32, property B32;
} selectionNotify;
@@ -1208,7 +1208,7 @@ typedef struct _xEvent {
Atom type B32;
INT8 bytes[20];
} b;
- } u;
+ } u;
} clientMessage;
} u;
} xEvent;
@@ -1216,19 +1216,19 @@ typedef struct _xEvent {
/*********************************************************
*
* Generic event
- *
+ *
* Those events are not part of the core protocol spec and can be used by
* various extensions.
* type is always GenericEvent
* extension is the minor opcode of the extension the event belongs to.
- * evtype is the actual event type, unique __per extension__.
+ * evtype is the actual event type, unique __per extension__.
*
* GenericEvents can be longer than 32 bytes, with the length field
- * specifying the number of 4 byte blocks after the first 32 bytes.
+ * specifying the number of 4 byte blocks after the first 32 bytes.
*
*
*/
-typedef struct
+typedef struct
{
BYTE type;
CARD8 extension;
@@ -1258,7 +1258,7 @@ typedef struct {
/* XReply is the union of all the replies above whose "fixed part"
fits in 32 bytes. It does NOT include GetWindowAttributesReply,
-QueryFontReply, QueryKeymapReply, or GetKeyboardControlReply
+QueryFontReply, QueryKeymapReply, or GetKeyboardControlReply
ListFontsWithInfoReply */
typedef union {
@@ -1314,15 +1314,15 @@ typedef union {
typedef struct _xReq {
CARD8 reqType;
CARD8 data; /* meaning depends on request type */
- CARD16 length B16; /* length in 4 bytes quantities
+ CARD16 length B16; /* length in 4 bytes quantities
of whole request, including this header */
} xReq;
/*****************************************************************
- * structures that follow request.
+ * structures that follow request.
*****************************************************************/
-/* ResourceReq is used for any request which has a resource ID
+/* ResourceReq is used for any request which has a resource ID
(or Atom or Time) as its one and only argument. */
typedef struct {
@@ -1338,7 +1338,7 @@ typedef struct {
CARD16 length B16;
Window wid B32, parent B32;
INT16 x B16, y B16;
- CARD16 width B16, height B16, borderWidth B16;
+ CARD16 width B16, height B16, borderWidth B16;
#if defined(__cplusplus) || defined(c_plusplus)
CARD16 c_class B16;
#else
@@ -1353,7 +1353,7 @@ typedef struct {
BYTE pad;
CARD16 length B16;
Window window B32;
- CARD32 valueMask B32;
+ CARD32 valueMask B32;
} xChangeWindowAttributesReq;
typedef struct {
@@ -1427,7 +1427,7 @@ typedef struct {
CARD32 longOffset B32;
CARD32 longLength B32;
} xGetPropertyReq;
-
+
typedef struct {
CARD8 reqType;
BYTE pad;
@@ -1506,7 +1506,7 @@ typedef struct {
CARD16 length B16;
Window grabWindow B32;
Time time B32;
- BYTE pointerMode, keyboardMode;
+ BYTE pointerMode, keyboardMode;
CARD16 pad B16;
} xGrabKeyboardReq;
@@ -1517,7 +1517,7 @@ typedef struct {
Window grabWindow B32;
CARD16 modifiers B16;
CARD8 key;
- BYTE pointerMode, keyboardMode;
+ BYTE pointerMode, keyboardMode;
BYTE pad1, pad2, pad3;
} xGrabKeyReq;
@@ -1629,7 +1629,7 @@ typedef struct {
CARD16 length B16;
GContext gc B32;
CARD32 mask B32;
-} xChangeGCReq;
+} xChangeGCReq;
typedef struct {
CARD8 reqType;
@@ -1637,7 +1637,7 @@ typedef struct {
CARD16 length B16;
GContext srcGC B32, dstGC B32;
CARD32 mask B32;
-} xCopyGCReq;
+} xCopyGCReq;
typedef struct {
CARD8 reqType;
@@ -1646,7 +1646,7 @@ typedef struct {
GContext gc B32;
CARD16 dashOffset B16;
CARD16 nDashes B16; /* length LISTofCARD8 of values following */
-} xSetDashesReq;
+} xSetDashesReq;
typedef struct {
CARD8 reqType;
@@ -1654,7 +1654,7 @@ typedef struct {
CARD16 length B16;
GContext gc B32;
INT16 xOrigin B16, yOrigin B16;
-} xSetClipRectanglesReq;
+} xSetClipRectanglesReq;
typedef struct {
CARD8 reqType;
@@ -1673,7 +1673,7 @@ typedef struct {
GContext gc B32;
INT16 srcX B16, srcY B16, dstX B16, dstY B16;
CARD16 width B16, height B16;
-} xCopyAreaReq;
+} xCopyAreaReq;
typedef struct {
CARD8 reqType;
@@ -1684,7 +1684,7 @@ typedef struct {
INT16 srcX B16, srcY B16, dstX B16, dstY B16;
CARD16 width B16, height B16;
CARD32 bitPlane B32;
-} xCopyPlaneReq;
+} xCopyPlaneReq;
typedef struct {
CARD8 reqType;
@@ -1692,7 +1692,7 @@ typedef struct {
CARD16 length B16;
Drawable drawable B32;
GContext gc B32;
-} xPolyPointReq;
+} xPolyPointReq;
typedef xPolyPointReq xPolyLineReq; /* same request structure */
@@ -1704,7 +1704,7 @@ typedef struct {
CARD16 length B16;
Drawable drawable B32;
GContext gc B32;
-} xPolySegmentReq;
+} xPolySegmentReq;
typedef xPolySegmentReq xPolyArcReq;
typedef xPolySegmentReq xPolyRectangleReq;
@@ -1720,7 +1720,7 @@ typedef struct _FillPolyReq {
BYTE shape;
BYTE coordMode;
CARD16 pad1 B16;
-} xFillPolyReq;
+} xFillPolyReq;
typedef struct _PutImageReq {
@@ -1734,7 +1734,7 @@ typedef struct _PutImageReq {
CARD8 leftPad;
CARD8 depth;
CARD16 pad B16;
-} xPutImageReq;
+} xPutImageReq;
typedef struct {
CARD8 reqType;
@@ -1744,7 +1744,7 @@ typedef struct {
INT16 x B16, y B16;
CARD16 width B16, height B16;
CARD32 planeMask B32;
-} xGetImageReq;
+} xGetImageReq;
/* the following used by PolyText8 and PolyText16 */
@@ -1755,7 +1755,7 @@ typedef struct {
Drawable drawable B32;
GContext gc B32;
INT16 x B16, y B16; /* items (xTextElt) start after struct */
-} xPolyTextReq;
+} xPolyTextReq;
typedef xPolyTextReq xPolyText8Req;
typedef xPolyTextReq xPolyText16Req;
@@ -1767,7 +1767,7 @@ typedef struct {
Drawable drawable B32;
GContext gc B32;
INT16 x B16, y B16;
-} xImageTextReq;
+} xImageTextReq;
typedef xImageTextReq xImageText8Req;
typedef xImageTextReq xImageText16Req;
@@ -1779,7 +1779,7 @@ typedef struct {
Colormap mid B32;
Window window B32;
VisualID visual B32;
-} xCreateColormapReq;
+} xCreateColormapReq;
typedef struct {
CARD8 reqType;
@@ -1787,7 +1787,7 @@ typedef struct {
CARD16 length B16;
Colormap mid B32;
Colormap srcCmap B32;
-} xCopyColormapAndFreeReq;
+} xCopyColormapAndFreeReq;
typedef struct {
CARD8 reqType;
@@ -1796,7 +1796,7 @@ typedef struct {
Colormap cmap B32;
CARD16 red B16, green B16, blue B16;
CARD16 pad2 B16;
-} xAllocColorReq;
+} xAllocColorReq;
typedef struct {
CARD8 reqType;
@@ -1805,7 +1805,7 @@ typedef struct {
Colormap cmap B32;
CARD16 nbytes B16; /* followed by structure */
BYTE pad1, pad2;
-} xAllocNamedColorReq;
+} xAllocNamedColorReq;
typedef struct {
CARD8 reqType;
@@ -1813,7 +1813,7 @@ typedef struct {
CARD16 length B16;
Colormap cmap B32;
CARD16 colors B16, planes B16;
-} xAllocColorCellsReq;
+} xAllocColorCellsReq;
typedef struct {
CARD8 reqType;
@@ -1821,7 +1821,7 @@ typedef struct {
CARD16 length B16;
Colormap cmap B32;
CARD16 colors B16, red B16, green B16, blue B16;
-} xAllocColorPlanesReq;
+} xAllocColorPlanesReq;
typedef struct {
CARD8 reqType;
@@ -1829,14 +1829,14 @@ typedef struct {
CARD16 length B16;
Colormap cmap B32;
CARD32 planeMask B32;
-} xFreeColorsReq;
+} xFreeColorsReq;
typedef struct {
CARD8 reqType;
BYTE pad;
CARD16 length B16;
Colormap cmap B32;
-} xStoreColorsReq;
+} xStoreColorsReq;
typedef struct {
CARD8 reqType;
@@ -1853,7 +1853,7 @@ typedef struct {
BYTE pad;
CARD16 length B16;
Colormap cmap B32;
-} xQueryColorsReq;
+} xQueryColorsReq;
typedef struct { /* followed by string of length len */
CARD8 reqType;
@@ -1862,7 +1862,7 @@ typedef struct { /* followed by string of length len */
Colormap cmap B32;
CARD16 nbytes B16; /* number of string bytes following structure*/
BYTE pad1, pad2;
-} xLookupColorReq;
+} xLookupColorReq;
typedef struct {
CARD8 reqType;
@@ -1873,7 +1873,7 @@ typedef struct {
CARD16 foreRed B16, foreGreen B16, foreBlue B16;
CARD16 backRed B16, backGreen B16, backBlue B16;
CARD16 x B16, y B16;
-} xCreateCursorReq;
+} xCreateCursorReq;
typedef struct {
CARD8 reqType;
@@ -1884,7 +1884,7 @@ typedef struct {
CARD16 sourceChar B16, maskChar B16;
CARD16 foreRed B16, foreGreen B16, foreBlue B16;
CARD16 backRed B16, backGreen B16, backBlue B16;
-} xCreateGlyphCursorReq;
+} xCreateGlyphCursorReq;
typedef struct {
CARD8 reqType;
@@ -1893,7 +1893,7 @@ typedef struct {
Cursor cursor B32;
CARD16 foreRed B16, foreGreen B16, foreBlue B16;
CARD16 backRed B16, backGreen B16, backBlue B16;
-} xRecolorCursorReq;
+} xRecolorCursorReq;
typedef struct {
CARD8 reqType;
@@ -1905,7 +1905,7 @@ typedef struct {
CARD16 length B16;
Drawable drawable B32;
CARD16 width B16, height B16;
-} xQueryBestSizeReq;
+} xQueryBestSizeReq;
typedef struct {
CARD8 reqType;
@@ -1934,7 +1934,7 @@ typedef struct {
KeyCode firstKeyCode;
CARD8 count;
CARD16 pad1 B16;
-} xGetKeyboardMappingReq;
+} xGetKeyboardMappingReq;
typedef struct {
CARD8 reqType;
@@ -1950,31 +1950,31 @@ typedef struct {
BYTE pad;
CARD16 length B16;
CARD32 mask B32;
-} xChangeKeyboardControlReq;
+} xChangeKeyboardControlReq;
typedef struct {
CARD8 reqType;
INT8 percent; /* -100 to 100 */
CARD16 length B16;
-} xBellReq;
+} xBellReq;
typedef struct {
CARD8 reqType;
BYTE pad;
CARD16 length B16;
INT16 accelNum B16, accelDenum B16;
- INT16 threshold B16;
+ INT16 threshold B16;
BOOL doAccel, doThresh;
-} xChangePointerControlReq;
+} xChangePointerControlReq;
typedef struct {
CARD8 reqType;
BYTE pad;
CARD16 length B16;
INT16 timeout B16, interval B16;
- BYTE preferBlank, allowExpose;
+ BYTE preferBlank, allowExpose;
CARD16 pad2 B16;
-} xSetScreenSaverReq;
+} xSetScreenSaverReq;
typedef struct {
CARD8 reqType;
@@ -1983,7 +1983,7 @@ typedef struct {
CARD8 hostFamily;
BYTE pad;
CARD16 hostLength B16;
-} xChangeHostsReq;
+} xChangeHostsReq;
typedef struct {
CARD8 reqType;
@@ -2009,7 +2009,7 @@ typedef struct { /* followed by LIST of ATOM */
CARD16 nAtoms B16;
INT16 nPositions B16;
} xRotatePropertiesReq;
-
+
/* Reply codes */
@@ -2019,119 +2019,119 @@ typedef struct { /* followed by LIST of ATOM */
/* Request codes */
-#define X_CreateWindow 1
-#define X_ChangeWindowAttributes 2
-#define X_GetWindowAttributes 3
+#define X_CreateWindow 1
+#define X_ChangeWindowAttributes 2
+#define X_GetWindowAttributes 3
#define X_DestroyWindow 4
-#define X_DestroySubwindows 5
+#define X_DestroySubwindows 5
#define X_ChangeSaveSet 6
#define X_ReparentWindow 7
#define X_MapWindow 8
#define X_MapSubwindows 9
#define X_UnmapWindow 10
-#define X_UnmapSubwindows 11
-#define X_ConfigureWindow 12
-#define X_CirculateWindow 13
+#define X_UnmapSubwindows 11
+#define X_ConfigureWindow 12
+#define X_CirculateWindow 13
#define X_GetGeometry 14
#define X_QueryTree 15
#define X_InternAtom 16
#define X_GetAtomName 17
-#define X_ChangeProperty 18
-#define X_DeleteProperty 19
+#define X_ChangeProperty 18
+#define X_DeleteProperty 19
#define X_GetProperty 20
-#define X_ListProperties 21
-#define X_SetSelectionOwner 22
-#define X_GetSelectionOwner 23
-#define X_ConvertSelection 24
+#define X_ListProperties 21
+#define X_SetSelectionOwner 22
+#define X_GetSelectionOwner 23
+#define X_ConvertSelection 24
#define X_SendEvent 25
#define X_GrabPointer 26
#define X_UngrabPointer 27
#define X_GrabButton 28
#define X_UngrabButton 29
-#define X_ChangeActivePointerGrab 30
+#define X_ChangeActivePointerGrab 30
#define X_GrabKeyboard 31
-#define X_UngrabKeyboard 32
+#define X_UngrabKeyboard 32
#define X_GrabKey 33
#define X_UngrabKey 34
-#define X_AllowEvents 35
-#define X_GrabServer 36
-#define X_UngrabServer 37
-#define X_QueryPointer 38
-#define X_GetMotionEvents 39
-#define X_TranslateCoords 40
-#define X_WarpPointer 41
-#define X_SetInputFocus 42
-#define X_GetInputFocus 43
-#define X_QueryKeymap 44
-#define X_OpenFont 45
-#define X_CloseFont 46
+#define X_AllowEvents 35
+#define X_GrabServer 36
+#define X_UngrabServer 37
+#define X_QueryPointer 38
+#define X_GetMotionEvents 39
+#define X_TranslateCoords 40
+#define X_WarpPointer 41
+#define X_SetInputFocus 42
+#define X_GetInputFocus 43
+#define X_QueryKeymap 44
+#define X_OpenFont 45
+#define X_CloseFont 46
#define X_QueryFont 47
-#define X_QueryTextExtents 48
-#define X_ListFonts 49
-#define X_ListFontsWithInfo 50
-#define X_SetFontPath 51
-#define X_GetFontPath 52
-#define X_CreatePixmap 53
-#define X_FreePixmap 54
-#define X_CreateGC 55
-#define X_ChangeGC 56
-#define X_CopyGC 57
-#define X_SetDashes 58
-#define X_SetClipRectangles 59
-#define X_FreeGC 60
-#define X_ClearArea 61
-#define X_CopyArea 62
-#define X_CopyPlane 63
-#define X_PolyPoint 64
-#define X_PolyLine 65
-#define X_PolySegment 66
-#define X_PolyRectangle 67
-#define X_PolyArc 68
-#define X_FillPoly 69
-#define X_PolyFillRectangle 70
-#define X_PolyFillArc 71
-#define X_PutImage 72
-#define X_GetImage 73
-#define X_PolyText8 74
-#define X_PolyText16 75
-#define X_ImageText8 76
-#define X_ImageText16 77
-#define X_CreateColormap 78
-#define X_FreeColormap 79
-#define X_CopyColormapAndFree 80
-#define X_InstallColormap 81
-#define X_UninstallColormap 82
-#define X_ListInstalledColormaps 83
-#define X_AllocColor 84
-#define X_AllocNamedColor 85
-#define X_AllocColorCells 86
-#define X_AllocColorPlanes 87
-#define X_FreeColors 88
-#define X_StoreColors 89
-#define X_StoreNamedColor 90
-#define X_QueryColors 91
-#define X_LookupColor 92
-#define X_CreateCursor 93
-#define X_CreateGlyphCursor 94
-#define X_FreeCursor 95
-#define X_RecolorCursor 96
-#define X_QueryBestSize 97
-#define X_QueryExtension 98
-#define X_ListExtensions 99
+#define X_QueryTextExtents 48
+#define X_ListFonts 49
+#define X_ListFontsWithInfo 50
+#define X_SetFontPath 51
+#define X_GetFontPath 52
+#define X_CreatePixmap 53
+#define X_FreePixmap 54
+#define X_CreateGC 55
+#define X_ChangeGC 56
+#define X_CopyGC 57
+#define X_SetDashes 58
+#define X_SetClipRectangles 59
+#define X_FreeGC 60
+#define X_ClearArea 61
+#define X_CopyArea 62
+#define X_CopyPlane 63
+#define X_PolyPoint 64
+#define X_PolyLine 65
+#define X_PolySegment 66
+#define X_PolyRectangle 67
+#define X_PolyArc 68
+#define X_FillPoly 69
+#define X_PolyFillRectangle 70
+#define X_PolyFillArc 71
+#define X_PutImage 72
+#define X_GetImage 73
+#define X_PolyText8 74
+#define X_PolyText16 75
+#define X_ImageText8 76
+#define X_ImageText16 77
+#define X_CreateColormap 78
+#define X_FreeColormap 79
+#define X_CopyColormapAndFree 80
+#define X_InstallColormap 81
+#define X_UninstallColormap 82
+#define X_ListInstalledColormaps 83
+#define X_AllocColor 84
+#define X_AllocNamedColor 85
+#define X_AllocColorCells 86
+#define X_AllocColorPlanes 87
+#define X_FreeColors 88
+#define X_StoreColors 89
+#define X_StoreNamedColor 90
+#define X_QueryColors 91
+#define X_LookupColor 92
+#define X_CreateCursor 93
+#define X_CreateGlyphCursor 94
+#define X_FreeCursor 95
+#define X_RecolorCursor 96
+#define X_QueryBestSize 97
+#define X_QueryExtension 98
+#define X_ListExtensions 99
#define X_ChangeKeyboardMapping 100
#define X_GetKeyboardMapping 101
-#define X_ChangeKeyboardControl 102
-#define X_GetKeyboardControl 103
+#define X_ChangeKeyboardControl 102
+#define X_GetKeyboardControl 103
#define X_Bell 104
#define X_ChangePointerControl 105
#define X_GetPointerControl 106
-#define X_SetScreenSaver 107
-#define X_GetScreenSaver 108
-#define X_ChangeHosts 109
-#define X_ListHosts 110
-#define X_SetAccessControl 111
+#define X_SetScreenSaver 107
+#define X_GetScreenSaver 108
+#define X_ChangeHosts 109
+#define X_ListHosts 110
+#define X_SetAccessControl 111
#define X_SetCloseDownMode 112
-#define X_KillClient 113
+#define X_KillClient 113
#define X_RotateProperties 114
#define X_ForceScreenSaver 115
#define X_SetPointerMapping 116
diff --git a/include/X11/Xprotostr.h b/include/X11/Xprotostr.h
index a9e854d..21e39fd 100644
--- a/include/X11/Xprotostr.h
+++ b/include/X11/Xprotostr.h
@@ -30,13 +30,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/Xw32defs.h b/include/X11/Xw32defs.h
index b2e4b33..683b588 100644
--- a/include/X11/Xw32defs.h
+++ b/include/X11/Xw32defs.h
@@ -2,7 +2,7 @@
# define _XW32DEFS_H
# ifdef __GNUC__ /* mingw is more close to unix than msvc */
-# if !defined(__daddr_t_defined)
+# if !defined(__daddr_t_defined)
typedef char *caddr_t;
# endif
# define lstat stat
diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h
index a81dd7a..624047d 100644
--- a/include/X11/Xwinsock.h
+++ b/include/X11/Xwinsock.h
@@ -34,7 +34,7 @@ The Open Group.
*/
#undef _XFree86Server
-#ifdef XFree86Server
+#ifdef XFree86Server
# define _XFree86Server
# undef XFree86Server
#endif
diff --git a/include/X11/ap_keysym.h b/include/X11/ap_keysym.h
index 9a11971..76cbde2 100644
--- a/include/X11/ap_keysym.h
+++ b/include/X11/ap_keysym.h
@@ -13,11 +13,11 @@ Consortium not be used in advertising or publicity pertaining to
distribution of the software without written prior permission.
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
+TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. Hewlett-Packard shall not be liable for errors
+contained herein or direct, indirect, special, incidental or
+consequential damages in connection with the furnishing,
performance, or use of this material.
This software is not subject to any license of the American
diff --git a/include/X11/extensions/XKB.h b/include/X11/extensions/XKB.h
index ee4f740..b46be8a 100644
--- a/include/X11/extensions/XKB.h
+++ b/include/X11/extensions/XKB.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -67,10 +67,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbNumberEvents (XkbEventCode+1)
/*
- * XKB has a minor event code so it can use one X event code for
- * multiple purposes.
+ * XKB has a minor event code so it can use one X event code for
+ * multiple purposes.
* - reported in the xkbType field of all XKB events.
- * - XkbSelectEventDetails: Indicates the event for which event details
+ * - XkbSelectEventDetails: Indicates the event for which event details
* are being changed
*/
#define XkbNewKeyboardNotify 0
@@ -158,7 +158,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
* A further reason for the error is encoded into to most significant
* byte of the resourceID for the error:
* XkbErr_BadDevice - the device in question was not found
- * XkbErr_BadClass - the device was found but it doesn't belong to
+ * XkbErr_BadClass - the device was found but it doesn't belong to
* the appropriate class.
* XkbErr_BadId - the device was found and belongs to the right
* class, but not feedback with a matching id was
@@ -212,11 +212,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*
* Controls detail masks:
* The controls specified in XkbAllControlsMask:
- * - The 'changed' field of ControlsNotify events reports which of
+ * - The 'changed' field of ControlsNotify events reports which of
* the keyboard controls have changed.
* - The 'changeControls' field of the SetControls request specifies
* the controls for which values are to be changed.
- * - Used as an event detail mask to limit the conditions under
+ * - Used as an event detail mask to limit the conditions under
* which ControlsNotify events are reported.
*
* The controls specified in the XkbAllBooleanCtrlsMask:
@@ -229,7 +229,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
* - The 'accessXTimeoutMask' and 'accessXTimeoutValues' fields of
* an XkbControlsRec specify the controls to be changed if the keyboard
* times out and the values to which they should be changed.
- * - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags
+ * - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags
* request specifies the specify the controls to be reset when the
* client exits and the values to which they should be reset.
* - The 'ctrls' field of an indicator map specifies the controls
@@ -267,8 +267,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
* - The 'accessXOptions' field of an XkbControlsRec specifies the
* AccessX options that are currently in effect.
* - The 'accessXTimeoutOptionsMask' and 'accessXTimeoutOptionsValues'
- * fields of an XkbControlsRec specify the Access X options to be
- * changed if the keyboard times out and the values to which they
+ * fields of an XkbControlsRec specify the Access X options to be
+ * changed if the keyboard times out and the values to which they
* should be changed.
*/
#define XkbAX_SKPressFBMask (1L << 0)
@@ -293,7 +293,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
* XkbUseCorePtr is used to specify the core pointer without having
* to look up its X input extension identifier.
* XkbDfltXIClass is used to specify "don't care" any place that the
- * XKB protocol is looking for an X Input Extension
+ * XKB protocol is looking for an X Input Extension
* device class.
* XkbDfltXIId is used to specify "don't care" any place that the
* XKB protocol is looking for an X Input Extension
@@ -309,9 +309,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
* XkbExplicitXIDevice(d) True if 'd' explicitly specifies a device
* XkbExplicitXIClass(c) True if 'c' explicitly specifies a device class
* XkbExplicitXIId(c) True if 'i' explicitly specifies a device id
- * XkbSingleXIClass(c) True if 'c' specifies exactly one device class,
+ * XkbSingleXIClass(c) True if 'c' specifies exactly one device class,
* including the default.
- * XkbSingleXIId(i) True if 'i' specifies exactly one device
+ * XkbSingleXIId(i) True if 'i' specifies exactly one device
* identifier, including the default.
*/
#define XkbUseCoreKbd 0x0100
@@ -456,9 +456,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbSA_SwitchAbsolute (1L << 2)
/*
- * The following values apply to the SA_DeviceValuator
- * action only. Valuator operations specify the action
- * to be taken. Values specified in the action are
+ * The following values apply to the SA_DeviceValuator
+ * action only. Valuator operations specify the action
+ * to be taken. Values specified in the action are
* multiplied by 2^scale before they are applied.
*/
#define XkbSA_IgnoreVal (0x00)
@@ -510,7 +510,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
(1<<XkbSA_Terminate)|(1<<XkbSA_SwitchScreen)|(1<<XkbSA_SetControls)|\
(1<<XkbSA_LockControls)|(1<<XkbSA_ActionMessage)|\
(1<<XkbSA_RedirectKey)|(1<<XkbSA_DeviceBtn)|(1<<XkbSA_LockDeviceBtn))
-
+
/*
* Macros to classify key actions
*/
@@ -524,7 +524,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
* KB_Permanent indicates that the behavior describes an unalterable
* characteristic of the keyboard, not an XKB software-simulation of
* the listed behavior.
- * Key Behavior Types:
+ * Key Behavior Types:
* Specifies the behavior of the underlying key.
*/
#define XkbKB_Permanent 0x80
@@ -645,7 +645,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*
* Symbol interpretations match specification:
- * - Used in the match field of a symbol interpretation to specify
+ * - Used in the match field of a symbol interpretation to specify
* the conditions under which an interpretation is used.
*/
#define XkbSI_LevelOneOnly (0x80)
diff --git a/include/X11/extensions/XKBgeom.h b/include/X11/extensions/XKBgeom.h
index cef78fa..380fa18 100644
--- a/include/X11/extensions/XKBgeom.h
+++ b/include/X11/extensions/XKBgeom.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/include/X11/extensions/XKBproto.h b/include/X11/extensions/XKBproto.h
index b867659..de0eee8 100644
--- a/include/X11/extensions/XKBproto.h
+++ b/include/X11/extensions/XKBproto.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/include/X11/extensions/XKBsrv.h b/include/X11/extensions/XKBsrv.h
index be7e978..deb7197 100644
--- a/include/X11/extensions/XKBsrv.h
+++ b/include/X11/extensions/XKBsrv.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -532,7 +532,7 @@ extern void XkbUpdateKeyTypesFromCore(
XkbChangesPtr /* pChanges */
);
-extern void XkbUpdateDescActions(
+extern void XkbUpdateDescActions(
XkbDescPtr /* xkb */,
KeyCode /* first */,
CARD8 /* num */,
@@ -626,7 +626,7 @@ extern void XkbUpdateLedAutoState(
XkbEventCausePtr /* cause */
);
-extern void XkbFlushLedEvents(
+extern void XkbFlushLedEvents(
DeviceIntPtr /* dev */,
DeviceIntPtr /* kbd */,
XkbSrvLedInfoPtr /* sli */,
@@ -990,7 +990,7 @@ extern void XkbConvertCase(
KeySym * /* upper */
);
-extern Status XkbChangeKeycodeRange(
+extern Status XkbChangeKeycodeRange(
XkbDescPtr /* xkb */,
int /* minKC */,
int /* maxKC */,
diff --git a/include/X11/extensions/XKBstr.h b/include/X11/extensions/XKBstr.h
index 893a04b..ef26911 100644
--- a/include/X11/extensions/XKBstr.h
+++ b/include/X11/extensions/XKBstr.h
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -393,7 +393,7 @@ typedef struct _XkbIndicatorMapRec {
((i)->ctrls)))
#define XkbIM_InUse(i) (((i)->flags)||((i)->which_groups)||\
((i)->which_mods)||((i)->ctrls))
-
+
typedef struct _XkbIndicatorRec {
unsigned long phys_indicators;
@@ -410,7 +410,7 @@ typedef struct _XkbKeyAliasRec {
} XkbKeyAliasRec,*XkbKeyAliasPtr;
/*
- * Names for everything
+ * Names for everything
*/
typedef struct _XkbNamesRec {
Atom keycodes;
@@ -548,7 +548,7 @@ typedef struct _XkbChanges {
} XkbChangesRec, *XkbChangesPtr;
/*
- * These data structures are used to construct a keymap from
+ * These data structures are used to construct a keymap from
* a set of components or to list components in the server
* database.
*/
@@ -582,8 +582,8 @@ typedef struct _XkbComponentList {
} XkbComponentListRec, *XkbComponentListPtr;
/*
- * The following data structures describe and track changes to a
- * non-keyboard extension device
+ * The following data structures describe and track changes to a
+ * non-keyboard extension device
*/
typedef struct _XkbDeviceLedInfo {
unsigned short led_class;
diff --git a/include/X11/extensions/XResproto.h b/include/X11/extensions/XResproto.h
index d7e20b1..13b5cdb 100644
--- a/include/X11/extensions/XResproto.h
+++ b/include/X11/extensions/XResproto.h
@@ -40,26 +40,26 @@ typedef struct {
typedef struct _XResQueryVersion {
CARD8 reqType;
- CARD8 XResReqType;
+ CARD8 XResReqType;
CARD16 length B16;
CARD8 client_major;
CARD8 client_minor;
- CARD16 unused B16;
+ CARD16 unused B16;
} xXResQueryVersionReq;
#define sz_xXResQueryVersionReq 8
typedef struct {
CARD8 type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
+ CARD16 sequenceNumber B16;
CARD32 length B32;
- CARD16 server_major B16;
- CARD16 server_minor B16;
+ CARD16 server_major B16;
+ CARD16 server_minor B16;
CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad6 B32;
} xXResQueryVersionReply;
#define sz_xXResQueryVersionReply 32
@@ -67,22 +67,22 @@ typedef struct {
typedef struct _XResQueryClients {
CARD8 reqType;
- CARD8 XResReqType;
+ CARD8 XResReqType;
CARD16 length B16;
} xXResQueryClientsReq;
#define sz_xXResQueryClientsReq 4
typedef struct {
CARD8 type;
- CARD8 pad1;
- CARD16 sequenceNumber B16;
+ CARD8 pad1;
+ CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 num_clients B32;
CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD32 pad6 B32;
} xXResQueryClientsReply;
#define sz_xXResQueryClientsReply 32
@@ -98,8 +98,8 @@ typedef struct _XResQueryClientResources {
typedef struct {
CARD8 type;
- CARD8 pad1;
- CARD16 sequenceNumber B16;
+ CARD8 pad1;
+ CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 num_types B32;
CARD32 pad2 B32;
diff --git a/include/X11/extensions/compositeproto.h b/include/X11/extensions/compositeproto.h
index 0417f2c..c9ffb74 100644
--- a/include/X11/extensions/compositeproto.h
+++ b/include/X11/extensions/compositeproto.h
@@ -52,7 +52,7 @@
#define Region CARD32
#define Pixmap CARD32
-/*
+/*
* requests and replies
*/
typedef struct {
diff --git a/include/X11/extensions/damageproto.h b/include/X11/extensions/damageproto.h
index 107e192..7497d74 100644
--- a/include/X11/extensions/damageproto.h
+++ b/include/X11/extensions/damageproto.h
@@ -52,7 +52,7 @@ typedef struct {
CARD16 length B16;
} xDamageReq;
-/*
+/*
* requests and replies
*/
diff --git a/include/X11/extensions/lgewire.h b/include/X11/extensions/lgewire.h
index 75ec0a4..4e5a036 100644
--- a/include/X11/extensions/lgewire.h
+++ b/include/X11/extensions/lgewire.h
@@ -1,6 +1,6 @@
/************************************************************
-Copyright (c) 2004, Sun Microsystems, Inc.
+Copyright (c) 2004, Sun Microsystems, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
/*
* lge.h - Looking Glass Extension Definitions
*/
-
+
#ifndef _LGEWIRE_H
#define _LGEWIRE_H
@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
#define LGE_NAME "LGE"
/* Current interface version numbers */
-#define LGE_MAJOR_VERSION 5
+#define LGE_MAJOR_VERSION 5
#define LGE_MINOR_VERSION 0
/* Display Server is alive */
@@ -52,7 +52,7 @@ in this Software without prior written authorization from The Open Group.
#define LGE_CLIENT_EVENT_DELIVERER 2
typedef struct {
- CARD8 reqType;
+ CARD8 reqType;
CARD8 lgeReqType;
CARD16 length B16;
} xLgeQueryVersionReq;
@@ -61,7 +61,7 @@ typedef struct {
typedef struct {
/* Always X_Reply */
- BYTE type;
+ BYTE type;
CARD8 unused;
CARD16 sequenceNumber B16;
CARD32 length B32;
@@ -91,28 +91,28 @@ typedef struct {
CARD8 lgeReqType;
CARD16 length B16;
/* The pseudo-root window of the screen */
- Window prw;
+ Window prw;
} xLgeRegisterScreenReq;
#define sz_xLgeRegisterScreenReq sizeof(xLgeRegisterScreenReq)
-typedef struct {
- CARD8 reqType;
- CARD8 lgeReqType;
- CARD16 length B16;
+typedef struct {
+ CARD8 reqType;
+ CARD8 lgeReqType;
+ CARD16 length B16;
BOOL enable;
CARD8 pad1;
CARD16 pad2 B16;
-} xLgeControlLgModeReq;
+} xLgeControlLgModeReq;
#define sz_xLgeControlLgModeReq sizeof(xLgeControlLgModeReq)
-typedef struct {
- CARD8 reqType;
- CARD8 lgeReqType;
- CARD16 length B16;
- xEvent event;
-} xLgeSendEventReq;
+typedef struct {
+ CARD8 reqType;
+ CARD8 lgeReqType;
+ CARD16 length B16;
+ xEvent event;
+} xLgeSendEventReq;
#define sz_xLgeSendEventReq sizeof(xLgeSendEventReq)
diff --git a/include/X11/extensions/panoramiXproto.h b/include/X11/extensions/panoramiXproto.h
index 6fd1a02..ee1c246 100644
--- a/include/X11/extensions/panoramiXproto.h
+++ b/include/X11/extensions/panoramiXproto.h
@@ -47,7 +47,7 @@ typedef struct _PanoramiXQueryVersion {
CARD16 length B16;
CARD8 clientMajor;
CARD8 clientMinor;
- CARD16 unused B16;
+ CARD16 unused B16;
} xPanoramiXQueryVersionReq;
#define sz_xPanoramiXQueryVersionReq 8
@@ -57,8 +57,8 @@ typedef struct {
CARD8 pad1; /* unused */
CARD16 sequenceNumber B16; /* last sequence number */
CARD32 length B32; /* 0 */
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 majorVersion B16;
+ CARD16 minorVersion B16;
CARD32 pad2 B32; /* unused */
CARD32 pad3 B32; /* unused */
CARD32 pad4 B32; /* unused */
@@ -75,7 +75,7 @@ typedef struct _PanoramiXGetState {
CARD16 length B16;
CARD32 window B32;
} xPanoramiXGetStateReq;
-#define sz_xPanoramiXGetStateReq 8
+#define sz_xPanoramiXGetStateReq 8
typedef struct {
BYTE type;
@@ -121,11 +121,11 @@ typedef struct _PanoramiXGetScreenSize {
CARD32 window B32;
CARD32 screen B32;
} xPanoramiXGetScreenSizeReq;
-#define sz_xPanoramiXGetScreenSizeReq 12
+#define sz_xPanoramiXGetScreenSizeReq 12
typedef struct {
BYTE type;
- CARD8 pad1;
+ CARD8 pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 width B32;
@@ -135,7 +135,7 @@ typedef struct {
CARD32 pad2 B32; /* unused */
CARD32 pad3 B32; /* unused */
} xPanoramiXGetScreenSizeReply;
-#define sz_panoramiXGetScreenSizeReply 32
+#define sz_panoramiXGetScreenSizeReply 32
/************ Alternate protocol ******************/
@@ -148,7 +148,7 @@ typedef struct {
typedef struct {
BYTE type;
- CARD8 pad1;
+ CARD8 pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 state B32;
@@ -158,7 +158,7 @@ typedef struct {
CARD32 pad5 B32;
CARD32 pad6 B32;
} xXineramaIsActiveReply;
-#define sz_XineramaIsActiveReply 32
+#define sz_XineramaIsActiveReply 32
typedef struct {
@@ -170,7 +170,7 @@ typedef struct {
typedef struct {
BYTE type;
- CARD8 pad1;
+ CARD8 pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 number B32;
@@ -180,7 +180,7 @@ typedef struct {
CARD32 pad5 B32;
CARD32 pad6 B32;
} xXineramaQueryScreensReply;
-#define sz_XineramaQueryScreensReply 32
+#define sz_XineramaQueryScreensReply 32
typedef struct {
INT16 x_org B16;
@@ -190,4 +190,4 @@ typedef struct {
} xXineramaScreenInfo;
#define sz_XineramaScreenInfo 8
-#endif
+#endif
diff --git a/include/X11/extensions/presentproto.h b/include/X11/extensions/presentproto.h
index 08ddc05..eb2bb96 100644
--- a/include/X11/extensions/presentproto.h
+++ b/include/X11/extensions/presentproto.h
@@ -210,7 +210,7 @@ typedef struct {
Window window B32;
Pixmap pixmap B32;
CARD32 serial B32;
-
+
/* 32-byte boundary */
Region valid_region B32;
diff --git a/include/X11/extensions/randrproto.h b/include/X11/extensions/randrproto.h
index b0fd7f0..0966b4b 100644
--- a/include/X11/extensions/randrproto.h
+++ b/include/X11/extensions/randrproto.h
@@ -68,7 +68,7 @@ typedef struct {
} xScreenSizes;
#define sz_xScreenSizes 8
-/*
+/*
* requests and replies
*/
@@ -103,7 +103,7 @@ typedef struct {
} xRRGetScreenInfoReq;
#define sz_xRRGetScreenInfoReq 8
-/*
+/*
* the xRRScreenInfoReply structure is followed by:
*
* the size information
@@ -158,7 +158,7 @@ typedef struct {
CARD8 status;
CARD16 sequenceNumber B16;
CARD32 length B32;
- Time newTimestamp B32;
+ Time newTimestamp B32;
Time newConfigTimestamp B32;
Window root;
CARD16 subpixelOrder B16;
@@ -292,7 +292,7 @@ typedef struct {
CARD8 randrReqType;
CARD16 length B16;
RROutput output B32;
-} xRRListOutputPropertiesReq;
+} xRRListOutputPropertiesReq;
#define sz_xRRListOutputPropertiesReq 8
typedef struct {
@@ -316,7 +316,7 @@ typedef struct {
CARD16 length B16;
RROutput output B32;
Atom property B32;
-} xRRQueryOutputPropertyReq;
+} xRRQueryOutputPropertyReq;
#define sz_xRRQueryOutputPropertyReq 12
typedef struct {
@@ -345,7 +345,7 @@ typedef struct {
BOOL pending;
BOOL range;
CARD16 pad B16;
-} xRRConfigureOutputPropertyReq;
+} xRRConfigureOutputPropertyReq;
#define sz_xRRConfigureOutputPropertyReq 16
typedef struct {
@@ -410,7 +410,7 @@ typedef struct {
CARD16 length B16;
Window window B32;
xRRModeInfo modeInfo;
-} xRRCreateModeReq;
+} xRRCreateModeReq;
#define sz_xRRCreateModeReq 40
typedef struct {
@@ -459,7 +459,7 @@ typedef struct {
CARD16 length B16;
RRCrtc crtc B32;
Time configTimestamp B32;
-} xRRGetCrtcInfoReq;
+} xRRGetCrtcInfoReq;
#define sz_xRRGetCrtcInfoReq 12
typedef struct {
@@ -492,7 +492,7 @@ typedef struct {
RRMode mode B32;
Rotation rotation B16;
CARD16 pad B16;
-} xRRSetCrtcConfigReq;
+} xRRSetCrtcConfigReq;
#define sz_xRRSetCrtcConfigReq 28
typedef struct {
@@ -514,7 +514,7 @@ typedef struct {
CARD8 randrReqType;
CARD16 length B16;
RRCrtc crtc B32;
-} xRRGetCrtcGammaSizeReq;
+} xRRGetCrtcGammaSizeReq;
#define sz_xRRGetCrtcGammaSizeReq 8
typedef struct {
@@ -537,7 +537,7 @@ typedef struct {
CARD8 randrReqType;
CARD16 length B16;
RRCrtc crtc B32;
-} xRRGetCrtcGammaReq;
+} xRRGetCrtcGammaReq;
#define sz_xRRGetCrtcGammaReq 8
typedef struct {
@@ -724,7 +724,7 @@ typedef struct {
CARD8 randrReqType;
CARD16 length B16;
RRProvider provider B32;
-} xRRListProviderPropertiesReq;
+} xRRListProviderPropertiesReq;
#define sz_xRRListProviderPropertiesReq 8
typedef struct {
@@ -748,7 +748,7 @@ typedef struct {
CARD16 length B16;
RRProvider provider B32;
Atom property B32;
-} xRRQueryProviderPropertyReq;
+} xRRQueryProviderPropertyReq;
#define sz_xRRQueryProviderPropertyReq 12
typedef struct {
@@ -777,7 +777,7 @@ typedef struct {
BOOL pending;
BOOL range;
CARD16 pad B16;
-} xRRConfigureProviderPropertyReq;
+} xRRConfigureProviderPropertyReq;
#define sz_xRRConfigureProviderPropertyReq 16
typedef struct {
@@ -1010,7 +1010,7 @@ typedef struct {
CARD8 randrReqType;
CARD16 length B16;
RRCrtc crtc B32;
-} xRRGetPanningReq;
+} xRRGetPanningReq;
#define sz_xRRGetPanningReq 8
typedef struct {
@@ -1052,7 +1052,7 @@ typedef struct {
INT16 border_top B16;
INT16 border_right B16;
INT16 border_bottom B16;
-} xRRSetPanningReq;
+} xRRSetPanningReq;
#define sz_xRRSetPanningReq 36
typedef struct {
diff --git a/include/X11/extensions/recordconst.h b/include/X11/extensions/recordconst.h
index 4819de7..ecdd81b 100644
--- a/include/X11/extensions/recordconst.h
+++ b/include/X11/extensions/recordconst.h
@@ -5,16 +5,16 @@
* its documentation for any purpose is hereby granted without fee, provided
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices
+ * documentation, and that the name of Network Computing Devices
* not be used in advertising or publicity pertaining to distribution
* of the software without specific, written prior permission.
*
- * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**************************************************************************/
diff --git a/include/X11/extensions/saverproto.h b/include/X11/extensions/saverproto.h
index b3e5653..f0879af 100644
--- a/include/X11/extensions/saverproto.h
+++ b/include/X11/extensions/saverproto.h
@@ -51,7 +51,7 @@ typedef struct _ScreenSaverQueryVersion {
CARD16 length B16;
CARD8 clientMajor;
CARD8 clientMinor;
- CARD16 unused B16;
+ CARD16 unused B16;
} xScreenSaverQueryVersionReq;
#define sz_xScreenSaverQueryVersionReq 8
diff --git a/include/X11/extensions/syncstr.h b/include/X11/extensions/syncstr.h
index 25a4827..95bc2ac 100644
--- a/include/X11/extensions/syncstr.h
+++ b/include/X11/extensions/syncstr.h
@@ -30,13 +30,13 @@ and Olivetti Research Limited, Cambridge, England.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or Olivetti
not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -162,7 +162,7 @@ extern pointer SyncCreateSystemCounter(
pointer /* pCounter */,
CARD64 * /* pValue_return */), /* XXX prototype */
void (* /*BracketValues*/) (
- pointer /* pCounter */,
+ pointer /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */)
);
diff --git a/include/X11/extensions/xcalibrateproto.h b/include/X11/extensions/xcalibrateproto.h
index feded32..2301754 100644
--- a/include/X11/extensions/xcalibrateproto.h
+++ b/include/X11/extensions/xcalibrateproto.h
@@ -25,7 +25,7 @@
#ifndef XCALIBRATEPROTO_H
#define XCALIBRATEPROTO_H
-/*
+/*
* requests and replies
*/
typedef struct {
diff --git a/include/X11/extensions/xf86dga1proto.h b/include/X11/extensions/xf86dga1proto.h
index 5c53cb2..c724ba3 100644
--- a/include/X11/extensions/xf86dga1proto.h
+++ b/include/X11/extensions/xf86dga1proto.h
@@ -46,7 +46,7 @@ typedef struct _XF86DGAInstallColormap{
CARD8 dgaReqType;
CARD16 length B16;
CARD16 screen B16;
- CARD16 pad2;
+ CARD16 pad2;
CARD32 id B32; /* colormap. */
} xXF86DGAInstallColormapReq;
#define sz_xXF86DGAInstallColormapReq 12
diff --git a/include/X11/extensions/xf86dgaconst.h b/include/X11/extensions/xf86dgaconst.h
index 63829bc..b21e84f 100644
--- a/include/X11/extensions/xf86dgaconst.h
+++ b/include/X11/extensions/xf86dgaconst.h
@@ -66,9 +66,9 @@ typedef struct {
int imageHeight;
int pixmapWidth; /* Xlib accessible portion (pixels) */
int pixmapHeight; /* both fields ignored if no concurrent access */
- int bytesPerScanline;
+ int bytesPerScanline;
int byteOrder; /* MSBFirst, LSBFirst */
- int depth;
+ int depth;
int bitsPerPixel;
unsigned long redMask;
unsigned long greenMask;
diff --git a/include/X11/extensions/xf86dgaproto.h b/include/X11/extensions/xf86dgaproto.h
index 8b7f13d..8d2fb64 100644
--- a/include/X11/extensions/xf86dgaproto.h
+++ b/include/X11/extensions/xf86dgaproto.h
@@ -130,7 +130,7 @@ typedef struct {
BOOL pad1;
CARD16 sequenceNumber B16;
CARD32 length B32; /* device name size if there is one */
- CARD32 mem1 B32; /* physical memory */
+ CARD32 mem1 B32; /* physical memory */
CARD32 mem2 B32; /* spillover for _alpha_ */
CARD32 size B32; /* size of map in bytes */
CARD32 offset B32; /* optional offset into device */
@@ -232,8 +232,8 @@ typedef struct _XDGAGetViewportStatus {
#define sz_xXDGAGetViewportStatusReq 8
typedef struct {
- BYTE type;
- BOOL pad1;
+ BYTE type;
+ BOOL pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 status B32;
@@ -254,8 +254,8 @@ typedef struct _XDGASync {
#define sz_xXDGASyncReq 8
typedef struct {
- BYTE type;
- BOOL pad1;
+ BYTE type;
+ BOOL pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 pad2 B32;
@@ -289,8 +289,8 @@ typedef struct {
#define sz_xXDGAChangePixmapModeReq 16
typedef struct {
- BYTE type;
- BOOL pad1;
+ BYTE type;
+ BOOL pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD16 x B16;
diff --git a/include/X11/extensions/xf86mscstr.h b/include/X11/extensions/xf86mscstr.h
index 637d3a5..9eab965 100644
--- a/include/X11/extensions/xf86mscstr.h
+++ b/include/X11/extensions/xf86mscstr.h
@@ -42,7 +42,7 @@ typedef struct {
typedef struct _XF86MiscGetSaver {
CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscGetSaver */
- CARD16 length B16;
+ CARD16 length B16;
CARD16 screen B16;
CARD16 pad B16;
} xXF86MiscGetSaverReq;
diff --git a/include/X11/extensions/xf86rush.h b/include/X11/extensions/xf86rush.h
index 1db7d13..5cf0c16 100644
--- a/include/X11/extensions/xf86rush.h
+++ b/include/X11/extensions/xf86rush.h
@@ -56,7 +56,7 @@ Bool XF86RushUnlockPixmap(
Display * /* dpy */,
int /* screen */,
Pixmap /* Pixmap */
-);
+);
Bool XF86RushUnlockAllPixmaps(
Display * /* dpy */
diff --git a/include/X11/extensions/xf86vm.h b/include/X11/extensions/xf86vm.h
index ddf4dac..a874ab5 100644
--- a/include/X11/extensions/xf86vm.h
+++ b/include/X11/extensions/xf86vm.h
@@ -16,13 +16,13 @@ included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY
diff --git a/include/X11/extensions/xf86vmproto.h b/include/X11/extensions/xf86vmproto.h
index 0d3955c..4c7966f 100644
--- a/include/X11/extensions/xf86vmproto.h
+++ b/include/X11/extensions/xf86vmproto.h
@@ -16,13 +16,13 @@ included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY
@@ -514,7 +514,7 @@ typedef struct _XF86VidModeSetGammaRamp {
CARD16 screen B16;
CARD16 size B16;
} xXF86VidModeSetGammaRampReq;
-#define sz_xXF86VidModeSetGammaRampReq 8
+#define sz_xXF86VidModeSetGammaRampReq 8
typedef struct _XF86VidModeGetGammaRamp {
CARD8 reqType; /* always XF86VidModeReqCode */
diff --git a/include/X11/extensions/xfixesproto.h b/include/X11/extensions/xfixesproto.h
index fcf409a..6a1c3a5 100644
--- a/include/X11/extensions/xfixesproto.h
+++ b/include/X11/extensions/xfixesproto.h
@@ -72,7 +72,7 @@ typedef struct {
CARD16 length B16;
} xXFixesReq;
-/*
+/*
* requests and replies
*/
typedef struct {
@@ -310,7 +310,7 @@ typedef struct {
} xXFixesTranslateRegionReq;
#define sz_xXFixesTranslateRegionReq 12
-
+
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
diff --git a/include/X11/extensions/xtrapbits.h b/include/X11/extensions/xtrapbits.h
index 1189dc7..794cc9e 100644
--- a/include/X11/extensions/xtrapbits.h
+++ b/include/X11/extensions/xtrapbits.h
@@ -7,16 +7,16 @@
#define __XTRAPBITS__ "@(#)xtrapbits.h 1.6 - 90/09/18 "
/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation,
+Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation,
Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/extensions/xtrapddmi.h b/include/X11/extensions/xtrapddmi.h
index c187a3a..12283f7 100644
--- a/include/X11/extensions/xtrapddmi.h
+++ b/include/X11/extensions/xtrapddmi.h
@@ -6,13 +6,13 @@
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -78,7 +78,7 @@ typedef struct
#define XETrapSetHeaderReply(phdr) ((phdr)->type = 0x5L)
#ifndef vaxc
-#define globaldef
+#define globaldef
#define globalref extern
#endif
diff --git a/include/X11/extensions/xtrapdi.h b/include/X11/extensions/xtrapdi.h
index 34aa94c..a0d8a88 100644
--- a/include/X11/extensions/xtrapdi.h
+++ b/include/X11/extensions/xtrapdi.h
@@ -3,16 +3,16 @@
#define __XTRAPDI__
/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp.,
+Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp.,
Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -89,7 +89,7 @@ typedef CARD8 ReqFlags[XETrapMaxRequest];
/* This is used as flags to indicate desired event traps
* Until events become *fully vectored*, we'll have to fake it
- * by defining an array of 5 events (KeyPress, KeyRelease,
+ * by defining an array of 5 events (KeyPress, KeyRelease,
* ButtonPress, ButtonRelease, and MotionNotify. The extra 2
* are required as the event types start with "2" (errors and
* replies are 0 & 1). The event type is the index into the
@@ -108,7 +108,7 @@ typedef CARD8 EventFlags[XETrapMaxEvent];
/* This structure is used in a request to specify the types of
* configuration information that should be changed or updated.
*/
-typedef struct
+typedef struct
{
CARD8 valid[4L]; /* Bits TRUE indicates data field is used */
CARD8 data[4L]; /* Bits looked at if corresponding valid bit set */
@@ -138,8 +138,8 @@ typedef struct /* used by XEConfigRequest */
XETrapFlags flags; /* Flags to specify what should be chg'd */
CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */
CARD8 cmd_key; /* Keyboard command_key (KeyCode) */
-/*
- * cmd_key is intentionally *not* defined KeyCode since it's definition is
+/*
+ * cmd_key is intentionally *not* defined KeyCode since it's definition is
* ambiguous (int in Intrinsic.h and unsigned char in X.h.
*/
CARD8 pad[1L]; /* pad out to a quadword */
@@ -180,7 +180,7 @@ typedef struct /* used by XESimulateXEventRequest for synthesizing core evts */
/* The following are formats of a request to the XTRAP
* extension. The data-less XTrap requests all use xXTrapReq
*/
-typedef struct
+typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
@@ -190,7 +190,7 @@ typedef struct
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapReq (sizeof(xXTrapReq))
/* For retrieving version/available info (passes lib-side protocol number) */
-typedef struct
+typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
@@ -201,7 +201,7 @@ typedef struct
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_xXTrapGetReq (sizeof(xXTrapGetReq))
-typedef struct
+typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
@@ -222,8 +222,8 @@ typedef struct
/* End Shadow (XETrapFlags)*/
CARD16 config_max_pkt_size B16; /* Max number of bytes in a packet */
CARD8 config_cmd_key; /* Keyboard command_key (KeyCode) */
-/*
- * cmd_key is intentionally *not* defined KeyCode since it's definition is
+/*
+ * cmd_key is intentionally *not* defined KeyCode since it's definition is
* ambiguous (int in Intrinsic.h and unsigned char in X.h.
*/
CARD8 config_pad[1L]; /* pad out to a quadword */
@@ -234,7 +234,7 @@ typedef struct
#define sz_xXTrapConfigReq (sizeof(xXTrapConfigReq))
#ifndef _XINPUT
-typedef struct
+typedef struct
{
CARD8 reqType;
CARD8 minor_opcode;
@@ -339,7 +339,7 @@ typedef struct
#define PF_SunSparc 112L /* server on Sun Sparc system */
/* reply sent back by XETrapGetAvailable request */
-typedef struct
+typedef struct
{
XETrapRepHdr hdr;
XETrapGetAvailRep data;
@@ -348,7 +348,7 @@ typedef struct
#define sz_xXTrapGetAvailReply sizeof(xXTrapGetAvailReply)
/* reply sent back by XETrapGetVersion request */
-typedef struct
+typedef struct
{
XETrapRepHdr hdr;
XETrapGetVersRep data;
@@ -379,7 +379,7 @@ typedef struct
#define sz_xXTrapGetLITimReply sizeof(xXTrapGetLITimReply)
/* reply sent back by XETrapGetCurrent request */
-typedef struct
+typedef struct
{
XETrapRepHdr hdr;
/*
@@ -396,8 +396,8 @@ typedef struct
EventFlags data_config_flags_event;
CARD16 data_config_max_pkt_size B16; /* Max num of bytes in a pkt */
CARD8 data_config_cmd_key; /* Keyboard cmd_key (KeyCode) */
-/*
- * cmd_key is intentionally *not* defined KeyCode since it's definition is
+/*
+ * cmd_key is intentionally *not* defined KeyCode since it's definition is
* ambiguous (int in Intrinsic.h and unsigned char in X.h.
*/
CARD8 data_config_pad[1L]; /* pad out to a quadword */
@@ -414,7 +414,7 @@ typedef struct
* reading arrays of CARD32s without using the _Read32 macro (see XERqsts.c).
* This requires that none of the data be in the _Reply area.
*/
-typedef struct
+typedef struct
{
CARD8 type;
CARD8 detail;
diff --git a/include/X11/extensions/xtrapemacros.h b/include/X11/extensions/xtrapemacros.h
index f59ea33..89c8f63 100644
--- a/include/X11/extensions/xtrapemacros.h
+++ b/include/X11/extensions/xtrapemacros.h
@@ -3,16 +3,16 @@
#define __XTRAPEMACROS__ "@(#)xtrapemacros.h 1.9 - 90/09/18 "
/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
+Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -37,7 +37,7 @@ SOFTWARE.
* Ken Miller
*
* DESCRIPTION:
- * This include file is designed to provide the *visible*
+ * This include file is designed to provide the *visible*
* interface to XTrap data structures. Fields can be set
* using these macros by client programs unless otherwise
* specified; however, use of Trap Context convenience
diff --git a/include/X11/extensions/xtraplib.h b/include/X11/extensions/xtraplib.h
index db0289f..68c5892 100644
--- a/include/X11/extensions/xtraplib.h
+++ b/include/X11/extensions/xtraplib.h
@@ -1,19 +1,19 @@
/* $XFree86$ */
#ifndef __XTRAPLIB__
-#define __XTRAPLIB__
+#define __XTRAPLIB__
/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
+Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -105,7 +105,7 @@ typedef struct {
} XETrapDataEvent;
/* Trap Context structure for maintaining XTrap State for client */
-struct _XETC
+struct _XETC
{
struct _XETC *next; /* Ptr to next linked-listed TC */
Display *dpy; /* Display ptr of current TC */
@@ -115,7 +115,7 @@ struct _XETC
BYTE *xbuff; /* Pointer to buffer for XLib Communications */
CARD16 xmax_size /*B16*/; /* Max Size of a request */
XExtData *ext_data; /* hook for extension to hang data */
- /*
+ /*
* The following are initialized with the client-side version number
* However, when either a GetAvailable or GetVersion reply is received,
* these values are updated with the *oldest* version numbers.
diff --git a/include/X11/extensions/xtraplibp.h b/include/X11/extensions/xtraplibp.h
index 0c6ced2..aeb6b31 100644
--- a/include/X11/extensions/xtraplibp.h
+++ b/include/X11/extensions/xtraplibp.h
@@ -4,16 +4,16 @@
/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
+Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -53,7 +53,7 @@ XETC *XECreateTC (Display *dpy , CARD32 valuemask , XETCValues *value );
int XEChangeTC (XETC *tc , CARD32 mask , XETCValues *values );
void XEFreeTC (XETC *tc );
int XETrapSetMaxPacket (XETC *tc , Bool set_flag , CARD16 size );
-int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key ,
+int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key ,
Bool mod_flag );
int XETrapSetTimestamps (XETC *tc , Bool set_flag , Bool delta_flag );
int XETrapSetWinXY (XETC *tc , Bool set_flag );
@@ -64,7 +64,7 @@ int XETrapSetGrabServer (XETC *tc , Bool set_flag );
int XETrapSetStatistics (XETC *tc , Bool set_flag );
int XETrapSetRequests (XETC *tc , Bool set_flag , ReqFlags requests );
int XETrapSetEvents (XETC *tc , Bool set_flag , EventFlags events );
-Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed ,
+Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed ,
CARD8 *next_key , Bool *key_ignore );
/* XERqsts.c */
@@ -75,17 +75,17 @@ int XEGetLastInpTimeRequest (XETC *tc , XETrapGetLastInpTimeRep *ret );
int XEGetAvailableRequest (XETC *tc , XETrapGetAvailRep *ret );
int XEStartTrapRequest (XETC *tc );
int XEStopTrapRequest (XETC *tc );
-int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail ,
+int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail ,
CARD16 x , CARD16 y , CARD8 screen );
int XEGetCurrentRequest (XETC *tc , XETrapGetCurRep *ret );
int XEGetStatisticsRequest (XETC *tc , XETrapGetStatsRep *ret );
/* XECallBcks.c */
int XEAddRequestCB (XETC *tc , CARD8 req , void_function func , BYTE *data );
-int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func ,
+int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func ,
BYTE *data );
int XEAddEventCB (XETC *tc , CARD8 evt , void_function func , BYTE *data );
-int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func ,
+int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func ,
BYTE *data );
/* The following seem to never be used. Perhaps they should be removed */
diff --git a/include/X11/extensions/xtrapproto.h b/include/X11/extensions/xtrapproto.h
index b3e29cf..49614fd 100644
--- a/include/X11/extensions/xtrapproto.h
+++ b/include/X11/extensions/xtrapproto.h
@@ -6,13 +6,13 @@
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/fonts/FS.h b/include/X11/fonts/FS.h
index 605b5a8..2ea6cd7 100644
--- a/include/X11/fonts/FS.h
+++ b/include/X11/fonts/FS.h
@@ -1,6 +1,6 @@
/*
* Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
+ * Portions Copyright 1987 by Digital Equipment Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
@@ -9,8 +9,8 @@
* documentation, and that the names of Network Computing Devices or Digital
* not be used in advertising or publicity pertaining to distribution
* of the software without specific, written prior permission.
- * Network Computing Devices and Digital make no representations
- * about the suitability of this software for any purpose. It is provided
+ * Network Computing Devices and Digital make no representations
+ * about the suitability of this software for any purpose. It is provided
* "as is" without express or implied warranty.
*
* NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
diff --git a/include/X11/fonts/FSproto.h b/include/X11/fonts/FSproto.h
index 028156f..1144285 100644
--- a/include/X11/fonts/FSproto.h
+++ b/include/X11/fonts/FSproto.h
@@ -1,5 +1,5 @@
/*
-
+
Copyright 1990, 1991, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
* Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
+ * Portions Copyright 1987 by Digital Equipment Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
@@ -131,7 +131,7 @@ typedef CARD32 fsTimestamp;
typedef CARD32 fsBitmapFormat;
typedef CARD32 fsBitmapFormatMask;
#endif
-
+
#define sz_fsBitmapFormat 4
typedef struct {
@@ -186,7 +186,7 @@ typedef struct {
CARD16 point_size B16;
} fsResolution;
-
+
typedef struct {
CARD32 flags B32;
CARD8 char_range_min_char_high;
@@ -528,7 +528,7 @@ typedef struct {
/* propinfo */
/* name */
} fsListFontsWithXInfoReply;
-
+
typedef struct {
BYTE type;
CARD8 otherid_valid;
diff --git a/include/X11/fonts/fontproto.h b/include/X11/fonts/fontproto.h
index ca341da..23b8df6 100644
--- a/include/X11/fonts/fontproto.h
+++ b/include/X11/fonts/fontproto.h
@@ -29,19 +29,19 @@ authorization from The XFree86 Project Inc..
extern _X_EXPORT int RegisterFPEFunctions (
NameCheckFunc name_func,
- InitFpeFunc init_func,
- FreeFpeFunc free_func,
- ResetFpeFunc reset_func,
- OpenFontFunc open_func,
- CloseFontFunc close_func,
- ListFontsFunc list_func,
- StartLfwiFunc start_lfwi_func,
- NextLfwiFunc next_lfwi_func,
- WakeupFpeFunc wakeup_func,
- ClientDiedFunc client_died,
- LoadGlyphsFunc load_glyphs,
- StartLaFunc start_list_alias_func,
- NextLaFunc next_list_alias_func,
+ InitFpeFunc init_func,
+ FreeFpeFunc free_func,
+ ResetFpeFunc reset_func,
+ OpenFontFunc open_func,
+ CloseFontFunc close_func,
+ ListFontsFunc list_func,
+ StartLfwiFunc start_lfwi_func,
+ NextLfwiFunc next_lfwi_func,
+ WakeupFpeFunc wakeup_func,
+ ClientDiedFunc client_died,
+ LoadGlyphsFunc load_glyphs,
+ StartLaFunc start_list_alias_func,
+ NextLaFunc next_list_alias_func,
SetPathFunc set_path_func);
extern _X_EXPORT int GetDefaultPointSize ( void );
diff --git a/include/X11/fonts/fsmasks.h b/include/X11/fonts/fsmasks.h
index c86be83..8617902 100644
--- a/include/X11/fonts/fsmasks.h
+++ b/include/X11/fonts/fsmasks.h
@@ -1,6 +1,6 @@
/*
* Copyright 1990, 1991 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
+ * Portions Copyright 1987 by Digital Equipment Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
@@ -9,8 +9,8 @@
* documentation, and that the names of Network Computing Devices or Digital
* not be used in advertising or publicity pertaining to distribution
* of the software without specific, written prior permission.
- * Network Computing Devices and Digital make no representations
- * about the suitability of this software for any purpose. It is provided
+ * Network Computing Devices and Digital make no representations
+ * about the suitability of this software for any purpose. It is provided
* "as is" without express or implied warranty.
*
* NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
diff --git a/include/X11/keysym.h b/include/X11/keysym.h
index 4f58488..0ffdde4 100644
--- a/include/X11/keysym.h
+++ b/include/X11/keysym.h
@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/keysymdef.h b/include/X11/keysymdef.h
index 147ecf5..189f3f3 100644
--- a/include/X11/keysymdef.h
+++ b/include/X11/keysymdef.h
@@ -73,7 +73,7 @@ SOFTWARE.
* Unicode number plus 0x01000000. The keysym values in the range
* 0x01000100 to 0x0110ffff are reserved to represent Unicode
* characters in the range U+0100 to U+10FFFF.
- *
+ *
* While most newer Unicode-based X11 clients do already accept
* Unicode-mapped keysyms in the range 0x01000100 to 0x0110ffff, it
* will remain necessary for clients -- in the interest of
@@ -1990,7 +1990,7 @@ SOFTWARE.
/*
* Vietnamese
*/
-
+
#ifdef XK_VIETNAMESE
#define XK_Abelowdot 0x1001ea0 /* U+1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW */
#define XK_abelowdot 0x1001ea1 /* U+1EA1 LATIN SMALL LETTER A WITH DOT BELOW */
@@ -2136,7 +2136,7 @@ SOFTWARE.
#define XK_approxeq 0x1002248 /* U+2245 ALMOST EQUAL TO */
#define XK_notapproxeq 0x1002247 /* U+2247 NOT ALMOST EQUAL TO */
#define XK_notidentical 0x1002262 /* U+2262 NOT IDENTICAL TO */
-#define XK_stricteq 0x1002263 /* U+2263 STRICTLY EQUIVALENT TO */
+#define XK_stricteq 0x1002263 /* U+2263 STRICTLY EQUIVALENT TO */
#endif /* XK_MATHEMATICAL */
#ifdef XK_BRAILLE
More information about the xorg-commit
mailing list