summaryrefslogtreecommitdiff
path: root/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2010-04-16 22:24:38 -0400
committerDenys Dmytriyenko <denis@denix.org>2010-04-19 11:51:11 -0400
commitbdb5416371fd16ee698f744c33a18ef1a0f83d73 (patch)
treec2f59718554d59b5ac0a83d564e5be4f8d8ac89a /recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
parentc1993858d847ac17f4bd00655adf5655fd9d2c6c (diff)
xorg-headers-native: haven't been updated since 2006, do so now
Update the combined headers from the following packages: * xproto-7.0.16 * libx11-1.3.3 * libxau-1.0.5 * libxdmcp-1.0.3 * libxt-1.0.8 For example, GenericEvent is new since xproto-7.0.13 and prevents libx11-native from building on an X-less host. Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'recipes/xorg-lib/xorg-headers-native/X11/Xutil.h')
-rw-r--r--recipes/xorg-lib/xorg-headers-native/X11/Xutil.h30
1 files changed, 14 insertions, 16 deletions
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h b/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
index 9f2ef63048..8ff34d9f06 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xutil.h,v 1.8 2001/02/09 02:03:39 xorgcvs Exp $ */
/***********************************************************
@@ -29,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,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/Xutil.h,v 3.6 2003/04/13 19:22:20 dawes Exp $ */
#ifndef _XUTIL_H_
#define _XUTIL_H_
@@ -55,7 +53,7 @@ SOFTWARE.
#include <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.
*/
@@ -151,7 +149,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 {
@@ -262,16 +260,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
@@ -452,7 +450,7 @@ extern Status XGetStandardColormap(
Display* /* display */,
Window /* w */,
XStandardColormap* /* colormap_return */,
- Atom /* property */
+ Atom /* property */
);
extern Status XGetTextProperty(
@@ -477,7 +475,7 @@ extern Status XGetWMClientMachine(
extern XWMHints *XGetWMHints(
Display* /* display */,
- Window /* w */
+ Window /* w */
);
extern Status XGetWMIconName(
@@ -496,7 +494,7 @@ extern Status XGetWMNormalHints(
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */,
- long* /* supplied_return */
+ long* /* supplied_return */
);
extern Status XGetWMSizeHints(
@@ -584,7 +582,7 @@ extern int XSetIconSizes(
Display* /* display */,
Window /* w */,
XIconSize* /* size_list */,
- int /* count */
+ int /* count */
);
extern int XSetNormalHints(