diff options
Diffstat (limited to 'nx-X11/lib/X11/Xutil.h')
| -rw-r--r-- | nx-X11/lib/X11/Xutil.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h index f42721244..2b90005d7 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 @@ -46,14 +46,15 @@ SOFTWARE. ******************************************************************/ -#if !defined(_XUTIL_H_) && !defined(_X11_XUTIL_H_) -#define _XUTIL_H_ +#if !defined(_X11_XUTIL_H_) && !defined(_XUTIL_H_) #define _X11_XUTIL_H_ +#define _XUTIL_H_ /* You must include <nx-X11/Xlib.h> before including this file */ #include <nx-X11/Xlib.h> +#include <nx-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( @@ -823,4 +824,4 @@ extern int XXorRegion( _XFUNCPROTOEND -#endif /* _XUTIL_H_ */ +#endif /* !defined(_X11_XUTIL_H_) && !defined(_XUTIL_H_) */ |