svn merge ^/branches/released .

3 files changed, 101 insertions, 92 deletions

diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h
index 632ed4f32..2c4510a6e 100644
--- a/xorg-server/include/callback.h
+++ b/xorg-server/include/callback.h
@@ -1,87 +1,98 @@
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be 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 THE
-OPEN GROUP 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 The Open Group shall not be
-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 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,
-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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-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
-DIGITAL 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.
-
-******************************************************************/
-
-#ifndef CALLBACK_H
-#define CALLBACK_H
-
-#include <X11/X.h>	/* for GContext, Mask */
-#include <X11/Xdefs.h>	/* for Bool */
-#include <X11/Xproto.h>
-#include <X11/Xfuncproto.h>
-
-/*
- *  callback manager stuff
- */
-
-#ifndef _XTYPEDEF_CALLBACKLISTPTR
-typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
-#define _XTYPEDEF_CALLBACKLISTPTR
-#endif
-
-typedef void (*CallbackProcPtr) (
-    CallbackListPtr *, pointer, pointer);
-
-extern _X_EXPORT Bool AddCallback(
-    CallbackListPtr * /*pcbl*/,
-    CallbackProcPtr /*callback*/,
-    pointer /*data*/);
-
-extern _X_EXPORT Bool DeleteCallback(
-    CallbackListPtr * /*pcbl*/,
-    CallbackProcPtr /*callback*/,
-    pointer /*data*/);
-
-extern _X_EXPORT void CallCallbacks(
-    CallbackListPtr * /*pcbl*/,
-    pointer /*call_data*/);
-
-extern _X_EXPORT void DeleteCallbackList(
-    CallbackListPtr * /*pcbl*/);
-
-extern _X_EXPORT void InitCallbackManager(void);
-
-#endif /* CALLBACK_H */
+/***********************************************************

+

+Copyright 1987, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be 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 THE

+OPEN GROUP 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 The Open Group shall not be

+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 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,

+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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+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

+DIGITAL 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.

+

+******************************************************************/

+

+#ifndef CALLBACK_H

+#define CALLBACK_H

+

+#include <X11/X.h>	/* for GContext, Mask */

+#include <X11/Xdefs.h>	/* for Bool */

+#include <X11/Xproto.h>

+#include <X11/Xfuncproto.h>

+

+#ifdef _MSC_VER

+#define inline __inline

+#endif

+

+/*

+ *  callback manager stuff

+ */

+

+#ifndef _XTYPEDEF_CALLBACKLISTPTR

+typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */

+#define _XTYPEDEF_CALLBACKLISTPTR

+#endif

+

+typedef void (*CallbackProcPtr) (

+    CallbackListPtr *, pointer, pointer);

+

+extern _X_EXPORT Bool AddCallback(

+    CallbackListPtr * /*pcbl*/,

+    CallbackProcPtr /*callback*/,

+    pointer /*data*/);

+

+extern _X_EXPORT Bool DeleteCallback(

+    CallbackListPtr * /*pcbl*/,

+    CallbackProcPtr /*callback*/,

+    pointer /*data*/);

+

+extern _X_EXPORT void _CallCallbacks(

+    CallbackListPtr * /*pcbl*/,

+    pointer /*call_data*/);

+

+static inline void

+CallCallbacks(CallbackListPtr *pcbl, pointer call_data)

+{

+    if (!pcbl || !*pcbl) return;

+    _CallCallbacks(pcbl, call_data);

+}

+

+extern _X_EXPORT void DeleteCallbackList(

+    CallbackListPtr * /*pcbl*/);

+

+extern _X_EXPORT void InitCallbackManager(void);

+

+#endif /* CALLBACK_H */

diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index e5a0d5c51..ac19a9536 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -401,7 +401,7 @@ extern _X_EXPORT void WindowHasNewCursor(
 extern Bool CheckDeviceGrabs(

     DeviceIntPtr /* device */,

     DeviceEvent* /* event */,

-    int /* checkFirst */);

+    WindowPtr /* ancestor */);

 

 extern void DeliverFocusedEvent(

     DeviceIntPtr /* keybd */,

diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h
index 9761ce48c..dc76a5b54 100644
--- a/xorg-server/include/pixmap.h
+++ b/xorg-server/include/pixmap.h
@@ -55,16 +55,14 @@ SOFTWARE.
 #define DRAWABLE_WINDOW 0

 #define DRAWABLE_PIXMAP 1

 #define UNDRAWABLE_WINDOW 2

-#define DRAWABLE_BUFFER 3

 

 /* corresponding type masks for dixLookupDrawable() */

 #define M_DRAWABLE_WINDOW	(1<<0)

 #define M_DRAWABLE_PIXMAP	(1<<1)

 #define M_UNDRAWABLE_WINDOW	(1<<2)

-#define M_DRAWABLE_BUFFER	(1<<3)

 #define M_ANY			(-1)

 #define M_WINDOW	(M_DRAWABLE_WINDOW|M_UNDRAWABLE_WINDOW)

-#define M_DRAWABLE	(M_DRAWABLE_WINDOW|M_DRAWABLE_PIXMAP|M_DRAWABLE_BUFFER)

+#define M_DRAWABLE	(M_DRAWABLE_WINDOW|M_DRAWABLE_PIXMAP)

 #define M_UNDRAWABLE	(M_UNDRAWABLE_WINDOW)

 

 /* flags to PaintWindow() */

@@ -88,7 +86,7 @@ typedef union _PixUnion {
     ((as) == (bs) && (SamePixUnion (a, b, as)))

 

 #define OnScreenDrawable(type) \

-	((type == DRAWABLE_WINDOW) || (type == DRAWABLE_BUFFER))

+	(type == DRAWABLE_WINDOW)

 

 #define WindowDrawable(type) \

 	((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))