(submit/rename-panoramix-sym) rename old symbol PANORAMIX to XINERAMA

PANORAMIX was the original working title of the extension, before it became official standard. Just nobody cared about fixing the symbols to the official naming. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2026-04-14 17:18:09 +00:00 · 2024-01-24 20:04:37 +01:00
parent 77f7e06508
commit f7fdaf814b
49 changed files with 269 additions and 269 deletions
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -52,10 +52,10 @@ in this Software without prior written authorization from the X Consortium.
 #include "colormapst.h"
 #include "xace.h"
 #include "inputstr.h"
-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
@@ -585,9 +585,9 @@ ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force)
            ret = TRUE;

    }
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (noPanoramiXExtension || !pScreen->myNum)
-#endif
+#endif /* XINERAMA */
        SendScreenSaverNotify(pScreen, state, force);
    return ret;
 }
@@ -1065,7 +1065,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
    REQUEST(xScreenSaverSetAttributesReq);
    REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);

-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (!noPanoramiXExtension) {
        PanoramiXRes *draw;
        PanoramiXRes *backPix = NULL;
@@ -1141,7 +1141,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)

        return status;
    }
-#endif
+#endif /* XINERAMA */

    return ScreenSaverSetAttributes(client, stuff);
 }
@@ -1152,7 +1152,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
    REQUEST(xScreenSaverUnsetAttributesReq);
    REQUEST_SIZE_MATCH(xScreenSaverUnsetAttributesReq);

-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (!noPanoramiXExtension) {
        PanoramiXRes *draw;
        int rc, i;
@@ -1169,7 +1169,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)

        stuff->drawable = draw->info[0].id;
    }
-#endif
+#endif /* XINERAMA */

    return ScreenSaverUnsetAttributes(client, stuff->drawable);
 }
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -65,10 +65,10 @@ static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
 * externally by the Xfixes extension and are now defined in window.h
 */

-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */

 Bool noShapeExtension = FALSE;

@@ -297,7 +297,7 @@ ProcShapeRectangles(ClientPtr client)
    REQUEST(xShapeRectanglesReq);
    REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);

-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (noPanoramiXExtension)
        return ShapeRectangles(client, stuff);

@@ -393,7 +393,7 @@ ProcShapeMask(ClientPtr client)
    REQUEST(xShapeMaskReq);
    REQUEST_SIZE_MATCH(xShapeMaskReq);

-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (noPanoramiXExtension)
        return ShapeMask(client, stuff);

@@ -519,7 +519,7 @@ ProcShapeCombine(ClientPtr client)
    REQUEST(xShapeCombineReq);
    REQUEST_AT_LEAST_SIZE(xShapeCombineReq);

-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (noPanoramiXExtension)
        return ShapeCombine(client, stuff);

@@ -588,7 +588,7 @@ ProcShapeOffset(ClientPtr client)
    REQUEST(xShapeOffsetReq);
    REQUEST_AT_LEAST_SIZE(xShapeOffsetReq);

-#ifdef PANORAMIX
+#ifdef XINERAMA
    PanoramiXRes *win;
    int j, result;

--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -89,10 +89,10 @@ in this Software without prior written authorization from The Open Group.
 #define SHMPERM_MODE(p)		p->mode
 #endif

-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */

 typedef struct _ShmScrPrivateRec {
    CloseScreenProcPtr CloseScreen;
@@ -742,7 +742,7 @@ ProcShmPutImage(ClientPtr client)
    if (!client->local)
        return BadRequest;

-#ifdef PANORAMIX
+#ifdef XINERAMA
    int j, result, orig_x, orig_y;
    PanoramiXRes *draw, *gc;
    Bool sendEvent, isRoot;
@@ -782,7 +782,7 @@ ProcShmPutImage(ClientPtr client)
    return result;
 #else
    return ShmPutImage(client, stuff);
-#endif /* PANORAMIX */
+#endif /* XINERAMA */
 }

 static int
@@ -794,7 +794,7 @@ ProcShmGetImage(ClientPtr client)
    if (!client->local)
        return BadRequest;

-#ifdef PANORAMIX
+#ifdef XINERAMA
    PanoramiXRes *draw;
    DrawablePtr *drawables;
    DrawablePtr pDraw;
@@ -932,7 +932,7 @@ ProcShmGetImage(ClientPtr client)
    return Success;
 #else
    return ShmGetImage(client, stuff);
-#endif /* PANORAMIX */
+#endif /* XINERAMA */
 }

 static int
@@ -944,7 +944,7 @@ ProcShmCreatePixmap(ClientPtr client)
    if (!client->local)
        return BadRequest;

-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (noPanoramiXExtension)
        return ShmCreatePixmap(client, stuff);

@@ -1055,7 +1055,7 @@ ProcShmCreatePixmap(ClientPtr client)
    return result;
 #else
    return ShmCreatePixmap(client, stuff);
-#endif /* PANORAMIX */
+#endif /* XINERAMA */
 }

 static PixmapPtr
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -79,10 +79,10 @@ static InternalEvent *xtest_evlist;
 */
 DeviceIntPtr xtestpointer, xtestkeyboard;

-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */

 static int XTestSwapFakeInput(ClientPtr /* client */ ,
                              xReq *    /* req */
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -48,12 +48,12 @@ SOFTWARE.

 #include "xvdisp.h"

-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"

 unsigned long XvXRTPort;
-#endif
+#endif /* XINERAMA */

 static int
 SWriteQueryExtensionReply(ClientPtr client, xvQueryExtensionReply * rep)
@@ -485,7 +485,7 @@ static int XineramaXvPutVideo(ClientPtr client);
 static int
 ProcXvPutVideo(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (xvUseXinerama)
        return XineramaXvPutVideo(client);
 #endif
@@ -527,7 +527,7 @@ static int XineramaXvPutStill(ClientPtr client);
 static int
 ProcXvPutStill(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (xvUseXinerama)
        return XineramaXvPutStill(client);
 #endif
@@ -688,7 +688,7 @@ static int XineramaXvStopVideo(ClientPtr client);
 static int
 ProcXvStopVideo(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (xvUseXinerama)
        return XineramaXvStopVideo(client);
 #endif
@@ -727,7 +727,7 @@ static int XineramaXvSetPortAttribute(ClientPtr client);
 static int
 ProcXvSetPortAttribute(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (xvUseXinerama)
        return XineramaXvSetPortAttribute(client);
 #endif
@@ -905,7 +905,7 @@ XineramaXvPutImage(ClientPtr client);
 static int
 ProcXvPutImage(ClientPtr client)
 {
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (xvUseXinerama)
        return XineramaXvPutImage(client);
 #endif
@@ -997,7 +997,7 @@ static int
 ProcXvShmPutImage(ClientPtr client)
 {
 #ifdef MITSHM
-#ifdef PANORAMIX
+#ifdef XINERAMA
    if (xvUseXinerama)
        return XineramaXvShmPutImage(client);
 #endif
@@ -1496,7 +1496,7 @@ SProcXvDispatch(ClientPtr client)
    }
 }

-#ifdef PANORAMIX
+#ifdef XINERAMA
 static int
 XineramaXvStopVideo(ClientPtr client)
 {
@@ -1604,7 +1604,7 @@ XineramaXvShmPutImage(ClientPtr client)
 }
 #else
 #define XineramaXvShmPutImage ProcXvShmPutImage
-#endif
+#endif /* MITSHM */

 static int
 XineramaXvPutImage(ClientPtr client)
@@ -1853,4 +1853,4 @@ XineramifyXv(void)

    xvUseXinerama = 1;
 }
-#endif                          /* PANORAMIX */
+#endif /* XINERAMA */
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -96,10 +96,10 @@ SOFTWARE.
 #include "opaque.h"
 #include "input.h"

-#ifdef PANORAMIX
+#ifdef XINERAMA
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-#endif
+#endif /* XINERAMA */
 #include "xvdisp.h"

 #define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
@@ -176,9 +176,9 @@ XvExtensionInit(void)
            ErrorF("XvExtensionInit: Unable to allocate resource types\n");
            return;
        }
-#ifdef PANORAMIX
+#ifdef XINERAMA
        XineramaRegisterConnectionBlockCallback(XineramifyXv);
-#endif
+#endif /* XINERAMA */
        XvScreenGeneration = serverGeneration;
    }

@@ -269,9 +269,9 @@ XvScreenInit(ScreenPtr pScreen)
            ErrorF("XvScreenInit: Unable to allocate resource types\n");
            return BadAlloc;
        }
-#ifdef PANORAMIX
+#ifdef XINERAMA
        XineramaRegisterConnectionBlockCallback(XineramifyXv);
-#endif
+#endif /* XINERAMA */
        XvScreenGeneration = serverGeneration;
    }