libX11 xserver pixman mesa git update 16 Apr 2012

1 files changed, 74 insertions, 73 deletions

diff --git a/xorg-server/hw/xnest/XNWindow.h b/xorg-server/hw/xnest/XNWindow.h
index c620767aa..02b0f3f36 100644
--- a/xorg-server/hw/xnest/XNWindow.h
+++ b/xorg-server/hw/xnest/XNWindow.h
@@ -1,73 +1,74 @@
-/*

-

-Copyright 1993 by Davor Matic

-

-Permission to use, copy, modify, distribute, and sell this software

-and 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.  Davor Matic makes no representations about

-the suitability of this software for any purpose.  It is provided "as

-is" without express or implied warranty.

-

-*/

-

-#ifndef XNESTWINDOW_H

-#define XNESTWINDOW_H

-

-typedef struct {

-  Window window;

-  Window parent;

-  int x;

-  int y;

-  unsigned int width;

-  unsigned int height;

-  unsigned int border_width;

-  Window sibling_above;

-  RegionPtr bounding_shape;

-  RegionPtr clip_shape;

-} xnestPrivWin;

-

-typedef struct {

-  WindowPtr pWin;

-  Window window;

-} xnestWindowMatch;

-

-extern DevPrivateKeyRec xnestWindowPrivateKeyRec;

-#define xnestWindowPrivateKey (&xnestWindowPrivateKeyRec)

-

-#define xnestWindowPriv(pWin) ((xnestPrivWin *) \

-    dixLookupPrivate(&(pWin)->devPrivates, xnestWindowPrivateKey))

-

-#define xnestWindow(pWin) (xnestWindowPriv(pWin)->window)

-

-#define xnestWindowParent(pWin) \

-  ((pWin)->parent ? \

-   xnestWindow((pWin)->parent) : \

-   xnestDefaultWindows[pWin->drawable.pScreen->myNum])

-

-#define xnestWindowSiblingAbove(pWin) \

-  ((pWin)->prevSib ? xnestWindow((pWin)->prevSib) : None)

-

-#define xnestWindowSiblingBelow(pWin) \

-  ((pWin)->nextSib ? xnestWindow((pWin)->nextSib) : None)

-

-#define CWParent CWSibling

-#define CWStackingOrder CWStackMode

-

-WindowPtr xnestWindowPtr(Window window);

-Bool xnestCreateWindow(WindowPtr pWin);

-Bool xnestDestroyWindow(WindowPtr pWin);

-Bool xnestPositionWindow(WindowPtr pWin, int x, int y);

-void xnestConfigureWindow(WindowPtr pWin, unsigned int mask);

-Bool xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask);

-Bool xnestRealizeWindow(WindowPtr pWin);

-Bool xnestUnrealizeWindow(WindowPtr pWin);

-void xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion);

-void xnestClipNotify(WindowPtr pWin, int dx, int dy);

-void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn,

-			  RegionPtr other_exposed);

-void xnestSetShape(WindowPtr pWin, int kind);

-void xnestShapeWindow(WindowPtr pWin);

-

-#endif /* XNESTWINDOW_H */

+/*
+
+Copyright 1993 by Davor Matic
+
+Permission to use, copy, modify, distribute, and sell this software
+and 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.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+*/
+
+#ifndef XNESTWINDOW_H
+#define XNESTWINDOW_H
+
+typedef struct {
+    Window window;
+    Window parent;
+    int x;
+    int y;
+    unsigned int width;
+    unsigned int height;
+    unsigned int border_width;
+    Window sibling_above;
+    RegionPtr bounding_shape;
+    RegionPtr clip_shape;
+} xnestPrivWin;
+
+typedef struct {
+    WindowPtr pWin;
+    Window window;
+} xnestWindowMatch;
+
+extern DevPrivateKeyRec xnestWindowPrivateKeyRec;
+
+#define xnestWindowPrivateKey (&xnestWindowPrivateKeyRec)
+
+#define xnestWindowPriv(pWin) ((xnestPrivWin *) \
+    dixLookupPrivate(&(pWin)->devPrivates, xnestWindowPrivateKey))
+
+#define xnestWindow(pWin) (xnestWindowPriv(pWin)->window)
+
+#define xnestWindowParent(pWin) \
+  ((pWin)->parent ? \
+   xnestWindow((pWin)->parent) : \
+   xnestDefaultWindows[pWin->drawable.pScreen->myNum])
+
+#define xnestWindowSiblingAbove(pWin) \
+  ((pWin)->prevSib ? xnestWindow((pWin)->prevSib) : None)
+
+#define xnestWindowSiblingBelow(pWin) \
+  ((pWin)->nextSib ? xnestWindow((pWin)->nextSib) : None)
+
+#define CWParent CWSibling
+#define CWStackingOrder CWStackMode
+
+WindowPtr xnestWindowPtr(Window window);
+Bool xnestCreateWindow(WindowPtr pWin);
+Bool xnestDestroyWindow(WindowPtr pWin);
+Bool xnestPositionWindow(WindowPtr pWin, int x, int y);
+void xnestConfigureWindow(WindowPtr pWin, unsigned int mask);
+Bool xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
+Bool xnestRealizeWindow(WindowPtr pWin);
+Bool xnestUnrealizeWindow(WindowPtr pWin);
+void xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion);
+void xnestClipNotify(WindowPtr pWin, int dx, int dy);
+void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn,
+                          RegionPtr other_exposed);
+void xnestSetShape(WindowPtr pWin, int kind);
+void xnestShapeWindow(WindowPtr pWin);
+
+#endif                          /* XNESTWINDOW_H */