svn merge ^/branches/released .

3 files changed, 393 insertions, 272 deletions

diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c
index 0461ded11..d7270f10d 100644
--- a/xorg-server/xfixes/region.c
+++ b/xorg-server/xfixes/region.c
@@ -842,3 +842,81 @@ SProcXFixesExpandRegion (ClientPtr client)
     return (*ProcXFixesVector[stuff->xfixesReqType]) (client);

 }

 

+#ifdef PANORAMIX

+#include "panoramiX.h"

+#include "panoramiXsrv.h"

+

+int

+PanoramiXFixesSetGCClipRegion (ClientPtr client)

+{

+    REQUEST(xXFixesSetGCClipRegionReq);

+    int		    result = Success, j;

+    PanoramiXRes    *gc;

+    REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq);

+

+    if ((result = dixLookupResourceByType((void **)&gc, stuff->gc, XRT_GC,

+					  client, DixWriteAccess))) {

+	client->errorValue = stuff->gc;

+	return result;

+    }

+

+    FOR_NSCREENS_BACKWARD(j) {

+        stuff->gc = gc->info[j].id;

+        result = (*PanoramiXSaveXFixesVector[X_XFixesSetGCClipRegion]) (client);

+        if(result != Success) break;

+    }

+

+    return result;

+}

+

+int

+PanoramiXFixesSetWindowShapeRegion (ClientPtr client)

+{

+    int		    result = Success, j;

+    PanoramiXRes    *win;

+    REQUEST(xXFixesSetWindowShapeRegionReq);

+

+    REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);

+

+    if ((result = dixLookupResourceByType((void **)&win, stuff->dest,

+					  XRT_WINDOW, client,

+					  DixWriteAccess))) {

+	client->errorValue = stuff->dest;

+	return result;

+    }

+

+    FOR_NSCREENS_FORWARD(j) {

+	stuff->dest = win->info[j].id;

+	result = (*PanoramiXSaveXFixesVector[X_XFixesSetWindowShapeRegion]) (client);

+        if(result != Success) break;

+    }

+

+    return result;

+}

+

+int

+PanoramiXFixesSetPictureClipRegion (ClientPtr client)

+{

+    REQUEST(xXFixesSetPictureClipRegionReq);

+    int		    result = Success, j;

+    PanoramiXRes    *pict;

+

+    REQUEST_SIZE_MATCH (xXFixesSetPictureClipRegionReq);

+

+    if ((result = dixLookupResourceByType((void **)&pict, stuff->picture,

+					  XRT_PICTURE, client,

+					  DixWriteAccess))) {

+	client->errorValue = stuff->picture;

+	return result;

+    }

+

+    FOR_NSCREENS_BACKWARD(j) {

+        stuff->picture = pict->info[j].id;

+	result = (*PanoramiXSaveXFixesVector[X_XFixesSetPictureClipRegion]) (client);

+        if(result != Success) break;

+    }

+

+    return result;

+}

+

+#endif

diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c
index 67e616417..67b34f346 100644
--- a/xorg-server/xfixes/xfixes.c
+++ b/xorg-server/xfixes/xfixes.c
@@ -262,3 +262,33 @@ XFixesExtensionInit(void)
 	SetResourceTypeErrorValue(RegionResType, XFixesErrorBase + BadRegion);

     }

 }

+

+#ifdef PANORAMIX

+

+int (*PanoramiXSaveXFixesVector[XFixesNumberRequests])(ClientPtr);

+

+void

+PanoramiXFixesInit (void)

+{

+    int i;

+

+    for (i = 0; i < XFixesNumberRequests; i++)

+	PanoramiXSaveXFixesVector[i] = ProcXFixesVector[i];

+    /*

+     * Stuff in Xinerama aware request processing hooks

+     */

+    ProcXFixesVector[X_XFixesSetGCClipRegion] = PanoramiXFixesSetGCClipRegion;

+    ProcXFixesVector[X_XFixesSetWindowShapeRegion] = PanoramiXFixesSetWindowShapeRegion;

+    ProcXFixesVector[X_XFixesSetPictureClipRegion] = PanoramiXFixesSetPictureClipRegion;

+}

+

+void

+PanoramiXFixesReset (void)

+{

+    int i;

+

+    for (i = 0; i < XFixesNumberRequests; i++)

+	ProcXFixesVector[i] = PanoramiXSaveXFixesVector[i];

+}

+

+#endif

diff --git a/xorg-server/xfixes/xfixesint.h b/xorg-server/xfixes/xfixesint.h
index f3d53614f..7824ac6ee 100644
--- a/xorg-server/xfixes/xfixesint.h
+++ b/xorg-server/xfixes/xfixesint.h
@@ -1,272 +1,285 @@
-/*
- * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Copyright © 2002 Keith Packard
- *
- * 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, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD 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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _XFIXESINT_H_
-#define _XFIXESINT_H_
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include <X11/extensions/xfixesproto.h>
-#include "windowstr.h"
-#include "selection.h"
-#include "xfixes.h"
-
-extern int		XFixesEventBase;
-
-typedef struct _XFixesClient {
-    CARD32	major_version;
-    CARD32	minor_version;
-} XFixesClientRec, *XFixesClientPtr;
-
-#define GetXFixesClient(pClient) ((XFixesClientPtr)dixLookupPrivate(&(pClient)->devPrivates, XFixesClientPrivateKey))
-
-extern int	(*ProcXFixesVector[XFixesNumberRequests])(ClientPtr);
-
-/* Initialize extension at server startup time */
-
-void
-XFixesExtensionInit(void);
-
-/* Save set */
-int
-ProcXFixesChangeSaveSet(ClientPtr client);
-    
-int
-SProcXFixesChangeSaveSet(ClientPtr client);
-    
-/* Selection events */
-int
-ProcXFixesSelectSelectionInput (ClientPtr client);
-
-int
-SProcXFixesSelectSelectionInput (ClientPtr client);
-
-void
-SXFixesSelectionNotifyEvent (xXFixesSelectionNotifyEvent *from,
-			     xXFixesSelectionNotifyEvent *to);
-Bool
-XFixesSelectionInit (void);
-
-/* Cursor notification */
-Bool
-XFixesCursorInit (void);
-    
-int
-ProcXFixesSelectCursorInput (ClientPtr client);
-
-int
-SProcXFixesSelectCursorInput (ClientPtr client);
-
-void
-SXFixesCursorNotifyEvent (xXFixesCursorNotifyEvent *from,
-			  xXFixesCursorNotifyEvent *to);
-
-int
-ProcXFixesGetCursorImage (ClientPtr client);
-
-int
-SProcXFixesGetCursorImage (ClientPtr client);
-
-/* Cursor names (Version 2) */
-
-int
-ProcXFixesSetCursorName (ClientPtr client);
-
-int
-SProcXFixesSetCursorName (ClientPtr client);
-
-int
-ProcXFixesGetCursorName (ClientPtr client);
-
-int
-SProcXFixesGetCursorName (ClientPtr client);
-
-int
-ProcXFixesGetCursorImageAndName (ClientPtr client);
-
-int
-SProcXFixesGetCursorImageAndName (ClientPtr client);
-
-/* Cursor replacement (Version 2) */
-
-int
-ProcXFixesChangeCursor (ClientPtr client);
-
-int
-SProcXFixesChangeCursor (ClientPtr client);
-
-int
-ProcXFixesChangeCursorByName (ClientPtr client);
-
-int
-SProcXFixesChangeCursorByName (ClientPtr client);
-
-/* Region objects (Version 2* */
-Bool
-XFixesRegionInit (void);
-
-int
-ProcXFixesCreateRegion (ClientPtr client);
-
-int
-SProcXFixesCreateRegion (ClientPtr client);
-
-int
-ProcXFixesCreateRegionFromBitmap (ClientPtr client);
-
-int
-SProcXFixesCreateRegionFromBitmap (ClientPtr client);
-
-int
-ProcXFixesCreateRegionFromWindow (ClientPtr client);
-
-int
-SProcXFixesCreateRegionFromWindow (ClientPtr client);
-
-int
-ProcXFixesCreateRegionFromGC (ClientPtr client);
-
-int
-SProcXFixesCreateRegionFromGC (ClientPtr client);
-
-int
-ProcXFixesCreateRegionFromPicture (ClientPtr client);
-
-int
-SProcXFixesCreateRegionFromPicture (ClientPtr client);
-
-int
-ProcXFixesDestroyRegion (ClientPtr client);
-
-int
-SProcXFixesDestroyRegion (ClientPtr client);
-
-int
-ProcXFixesSetRegion (ClientPtr client);
-
-int
-SProcXFixesSetRegion (ClientPtr client);
-
-int
-ProcXFixesCopyRegion (ClientPtr client);
-
-int
-SProcXFixesCopyRegion (ClientPtr client);
-
-int
-ProcXFixesCombineRegion (ClientPtr client);
-
-int
-SProcXFixesCombineRegion (ClientPtr client);
-
-int
-ProcXFixesInvertRegion (ClientPtr client);
-
-int
-SProcXFixesInvertRegion (ClientPtr client);
-
-int
-ProcXFixesTranslateRegion (ClientPtr client);
-
-int
-SProcXFixesTranslateRegion (ClientPtr client);
-
-int
-ProcXFixesRegionExtents (ClientPtr client);
-
-int
-SProcXFixesRegionExtents (ClientPtr client);
-
-int
-ProcXFixesFetchRegion (ClientPtr client);
-
-int
-SProcXFixesFetchRegion (ClientPtr client);
-
-int
-ProcXFixesSetGCClipRegion (ClientPtr client);
-
-int
-SProcXFixesSetGCClipRegion (ClientPtr client);
-
-int
-ProcXFixesSetWindowShapeRegion (ClientPtr client);
-
-int
-SProcXFixesSetWindowShapeRegion (ClientPtr client);
-
-int
-ProcXFixesSetPictureClipRegion (ClientPtr client);
-
-int
-SProcXFixesSetPictureClipRegion (ClientPtr client);
-
-int
-ProcXFixesExpandRegion (ClientPtr client);
-
-int
-SProcXFixesExpandRegion (ClientPtr client);
-
-/* Cursor Visibility (Version 4) */
-
-int 
-ProcXFixesHideCursor (ClientPtr client);
-
-int 
-SProcXFixesHideCursor (ClientPtr client);
-
-int 
-ProcXFixesShowCursor (ClientPtr client);
-
-int 
-SProcXFixesShowCursor (ClientPtr client);
-
-#endif /* _XFIXESINT_H_ */
+/*

+ * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

+ *

+ * Copyright © 2002 Keith Packard

+ *

+ * 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, and that the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD 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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef _XFIXESINT_H_

+#define _XFIXESINT_H_

+

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include "misc.h"

+#include "os.h"

+#include "dixstruct.h"

+#include "extnsionst.h"

+#include <X11/extensions/xfixesproto.h>

+#include "windowstr.h"

+#include "selection.h"

+#include "xfixes.h"

+

+extern int		XFixesEventBase;

+

+typedef struct _XFixesClient {

+    CARD32	major_version;

+    CARD32	minor_version;

+} XFixesClientRec, *XFixesClientPtr;

+

+#define GetXFixesClient(pClient) ((XFixesClientPtr)dixLookupPrivate(&(pClient)->devPrivates, XFixesClientPrivateKey))

+

+extern int	(*ProcXFixesVector[XFixesNumberRequests])(ClientPtr);

+

+/* Initialize extension at server startup time */

+

+void

+XFixesExtensionInit(void);

+

+/* Save set */

+int

+ProcXFixesChangeSaveSet(ClientPtr client);

+    

+int

+SProcXFixesChangeSaveSet(ClientPtr client);

+    

+/* Selection events */

+int

+ProcXFixesSelectSelectionInput (ClientPtr client);

+

+int

+SProcXFixesSelectSelectionInput (ClientPtr client);

+

+void

+SXFixesSelectionNotifyEvent (xXFixesSelectionNotifyEvent *from,

+			     xXFixesSelectionNotifyEvent *to);

+Bool

+XFixesSelectionInit (void);

+

+/* Cursor notification */

+Bool

+XFixesCursorInit (void);

+    

+int

+ProcXFixesSelectCursorInput (ClientPtr client);

+

+int

+SProcXFixesSelectCursorInput (ClientPtr client);

+

+void

+SXFixesCursorNotifyEvent (xXFixesCursorNotifyEvent *from,

+			  xXFixesCursorNotifyEvent *to);

+

+int

+ProcXFixesGetCursorImage (ClientPtr client);

+

+int

+SProcXFixesGetCursorImage (ClientPtr client);

+

+/* Cursor names (Version 2) */

+

+int

+ProcXFixesSetCursorName (ClientPtr client);

+

+int

+SProcXFixesSetCursorName (ClientPtr client);

+

+int

+ProcXFixesGetCursorName (ClientPtr client);

+

+int

+SProcXFixesGetCursorName (ClientPtr client);

+

+int

+ProcXFixesGetCursorImageAndName (ClientPtr client);

+

+int

+SProcXFixesGetCursorImageAndName (ClientPtr client);

+

+/* Cursor replacement (Version 2) */

+

+int

+ProcXFixesChangeCursor (ClientPtr client);

+

+int

+SProcXFixesChangeCursor (ClientPtr client);

+

+int

+ProcXFixesChangeCursorByName (ClientPtr client);

+

+int

+SProcXFixesChangeCursorByName (ClientPtr client);

+

+/* Region objects (Version 2* */

+Bool

+XFixesRegionInit (void);

+

+int

+ProcXFixesCreateRegion (ClientPtr client);

+

+int

+SProcXFixesCreateRegion (ClientPtr client);

+

+int

+ProcXFixesCreateRegionFromBitmap (ClientPtr client);

+

+int

+SProcXFixesCreateRegionFromBitmap (ClientPtr client);

+

+int

+ProcXFixesCreateRegionFromWindow (ClientPtr client);

+

+int

+SProcXFixesCreateRegionFromWindow (ClientPtr client);

+

+int

+ProcXFixesCreateRegionFromGC (ClientPtr client);

+

+int

+SProcXFixesCreateRegionFromGC (ClientPtr client);

+

+int

+ProcXFixesCreateRegionFromPicture (ClientPtr client);

+

+int

+SProcXFixesCreateRegionFromPicture (ClientPtr client);

+

+int

+ProcXFixesDestroyRegion (ClientPtr client);

+

+int

+SProcXFixesDestroyRegion (ClientPtr client);

+

+int

+ProcXFixesSetRegion (ClientPtr client);

+

+int

+SProcXFixesSetRegion (ClientPtr client);

+

+int

+ProcXFixesCopyRegion (ClientPtr client);

+

+int

+SProcXFixesCopyRegion (ClientPtr client);

+

+int

+ProcXFixesCombineRegion (ClientPtr client);

+

+int

+SProcXFixesCombineRegion (ClientPtr client);

+

+int

+ProcXFixesInvertRegion (ClientPtr client);

+

+int

+SProcXFixesInvertRegion (ClientPtr client);

+

+int

+ProcXFixesTranslateRegion (ClientPtr client);

+

+int

+SProcXFixesTranslateRegion (ClientPtr client);

+

+int

+ProcXFixesRegionExtents (ClientPtr client);

+

+int

+SProcXFixesRegionExtents (ClientPtr client);

+

+int

+ProcXFixesFetchRegion (ClientPtr client);

+

+int

+SProcXFixesFetchRegion (ClientPtr client);

+

+int

+ProcXFixesSetGCClipRegion (ClientPtr client);

+

+int

+SProcXFixesSetGCClipRegion (ClientPtr client);

+

+int

+ProcXFixesSetWindowShapeRegion (ClientPtr client);

+

+int

+SProcXFixesSetWindowShapeRegion (ClientPtr client);

+

+int

+ProcXFixesSetPictureClipRegion (ClientPtr client);

+

+int

+SProcXFixesSetPictureClipRegion (ClientPtr client);

+

+int

+ProcXFixesExpandRegion (ClientPtr client);

+

+int

+SProcXFixesExpandRegion (ClientPtr client);

+

+int

+PanoramiXFixesSetGCClipRegion (ClientPtr client);

+

+int

+PanoramiXFixesSetWindowShapeRegion (ClientPtr client);

+

+int

+PanoramiXFixesSetPictureClipRegion (ClientPtr client);

+

+/* Cursor Visibility (Version 4) */

+

+int 

+ProcXFixesHideCursor (ClientPtr client);

+

+int 

+SProcXFixesHideCursor (ClientPtr client);

+

+int 

+ProcXFixesShowCursor (ClientPtr client);

+

+int 

+SProcXFixesShowCursor (ClientPtr client);

+

+extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests])(ClientPtr);

+void PanoramiXFixesInit (void);

+void PanoramiXFixesReset (void);

+

+#endif /* _XFIXESINT_H_ */