aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nx-X11/lib/X11/XKBlib.h26
-rw-r--r--nx-X11/lib/X11/Xcms.h8
-rw-r--r--nx-X11/lib/X11/Xregion.h18
-rw-r--r--nx-X11/lib/X11/Xresource.h14
-rw-r--r--nx-X11/lib/X11/Xutil.h29
5 files changed, 48 insertions, 47 deletions
diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h
index b34054872..dd2841e9a 100644
--- a/nx-X11/lib/X11/XKBlib.h
+++ b/nx-X11/lib/X11/XKBlib.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.
@@ -77,7 +77,7 @@ typedef struct _XkbMapNotifyEvent {
KeyCode first_key_act;
KeyCode first_key_behavior;
KeyCode first_key_explicit;
- KeyCode first_modmap_key;
+ KeyCode first_modmap_key;
KeyCode first_vmodmap_key;
int num_key_syms;
int num_key_acts;
@@ -214,7 +214,7 @@ typedef struct _XkbActionMessage {
Bool key_event_follows;/* true if key event also generated */
int group; /* effective group */
unsigned int mods; /* effective mods */
- char message[XkbActionMessageLength+1];
+ char message[XkbActionMessageLength+1];
/* message -- leave space for NUL */
} XkbActionMessageEvent;
@@ -240,8 +240,8 @@ typedef struct _XkbExtensionDeviceNotify {
Time time; /* milliseconds */
int xkb_type; /* XkbExtensionDeviceNotify */
int device; /* device ID */
- unsigned int reason; /* reason for the event */
- unsigned int supported; /* mask of supported features */
+ unsigned int reason; /* reason for the event */
+ unsigned int supported; /* mask of supported features */
unsigned int unsupported; /* mask of unsupported features */
/* that some app tried to use */
int first_btn; /* first button that changed */
@@ -530,7 +530,7 @@ extern Bool XkbSetIndicatorMap(
#define XkbNoteIndicatorStateChanges(o,n,w)\
((o)->state_changes|=((n)->state_changes&(w)))
#define XkbGetIndicatorMapChanges(d,x,c) \
- (XkbGetIndicatorMap((d),(c)->map_changes,x)
+ (XkbGetIndicatorMap((d),(c)->map_changes,x))
#define XkbChangeIndicatorMaps(d,x,c) \
(XkbSetIndicatorMap((d),(c)->map_changes,x))
diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h
index 70166cbbd..7f7c1553a 100644
--- a/nx-X11/lib/X11/Xcms.h
+++ b/nx-X11/lib/X11/Xcms.h
@@ -2,7 +2,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
- *
+ *
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
@@ -10,10 +10,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
- *
+ *
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
- *
+ *
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
@@ -251,7 +251,7 @@ typedef void (*XcmsScreenFreeProc)(
* XXX: The use of the XcmsConversionProc type is broken. The
* device-independent colour conversion code uses it as:
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
+typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
unsigned int);
* while the device-dependent code uses it as:
diff --git a/nx-X11/lib/X11/Xregion.h b/nx-X11/lib/X11/Xregion.h
index 40bc3a75e..1c36db144 100644
--- a/nx-X11/lib/X11/Xregion.h
+++ b/nx-X11/lib/X11/Xregion.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
@@ -69,7 +69,7 @@ typedef struct {
#endif
-/*
+/*
* clip region
*/
@@ -80,13 +80,13 @@ typedef struct _XRegion {
BOX extents;
} REGION;
-/* Xutil.h contains the declaration:
- * typedef struct _XRegion *Region;
- */
+/* Xutil.h contains the declaration:
+ * typedef struct _XRegion *Region;
+ */
/* 1 if two BOXs overlap.
* 0 if two BOXs do not overlap.
- * Remember, x2 and y2 are not in the region
+ * Remember, x2 and y2 are not in the region
*/
#define EXTENTCHECK(r1, r2) \
((r1)->x2 > (r2)->x1 && \
diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h
index 4a2e8d044..f3977a209 100644
--- a/nx-X11/lib/X11/Xresource.h
+++ b/nx-X11/lib/X11/Xresource.h
@@ -28,13 +28,13 @@ Copyright 1987, 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
@@ -177,7 +177,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase;
extern void XrmDestroyDatabase(
- XrmDatabase /* database */
+ XrmDatabase /* database */
);
extern void XrmQPutResource(
@@ -332,7 +332,7 @@ typedef enum {
XrmoptionResArg, /* Resource and value in next argument in argv */
XrmoptionSkipArg, /* Ignore this option and the next argument in argv */
XrmoptionSkipLine, /* Ignore this option and the rest of argv */
- XrmoptionSkipNArgs /* Ignore this option and the next
+ XrmoptionSkipNArgs /* Ignore this option and the next
OptionDescRes.value arguments in argv */
} XrmOptionKind;
@@ -350,7 +350,7 @@ extern void XrmParseCommand(
int /* table_count */,
_Xconst char* /* name */,
int* /* argc_in_out */,
- char** /* argv_in_out */
+ char** /* argv_in_out */
);
_XFUNCPROTOEND
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h
index 99a6dccf7..13ccfe67c 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.h
@@ -28,13 +28,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
@@ -52,8 +52,9 @@ SOFTWARE.
/* You must include <nx-X11/Xlib.h> before including this file */
#include <nx-X11/Xlib.h>
+#include <X11/keysym.h>
-/*
+/*
* Bitmask returned by XParseGeometry(). Each bit tells if the corresponding
* value (x, y, width, height) was found in the parsed string.
*/
@@ -149,7 +150,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint)
/*
- * new structure for manipulating TEXT properties; used with WM_NAME,
+ * new structure for manipulating TEXT properties; used with WM_NAME,
* WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
*/
typedef struct {
@@ -260,16 +261,16 @@ typedef struct _XComposeStatus {
|| ((KeySym)(keysym) == XK_Num_Lock))
#endif
/*
- * opaque reference to Region data type
+ * opaque reference to Region data type
*/
-typedef struct _XRegion *Region;
+typedef struct _XRegion *Region;
/* Return values from XRectInRegion() */
-
+
#define RectangleOut 0
#define RectangleIn 1
#define RectanglePart 2
-
+
/*
* Information used by the visual utility routines to find desired visual
@@ -450,7 +451,7 @@ extern Status XGetStandardColormap(
Display* /* display */,
Window /* w */,
XStandardColormap* /* colormap_return */,
- Atom /* property */
+ Atom /* property */
);
extern Status XGetTextProperty(
@@ -475,7 +476,7 @@ extern Status XGetWMClientMachine(
extern XWMHints *XGetWMHints(
Display* /* display */,
- Window /* w */
+ Window /* w */
);
extern Status XGetWMIconName(
@@ -494,7 +495,7 @@ extern Status XGetWMNormalHints(
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */,
- long* /* supplied_return */
+ long* /* supplied_return */
);
extern Status XGetWMSizeHints(
@@ -582,7 +583,7 @@ extern int XSetIconSizes(
Display* /* display */,
Window /* w */,
XIconSize* /* size_list */,
- int /* count */
+ int /* count */
);
extern int XSetNormalHints(
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 07:59:28 +0000