XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename old symbol PANORAMIX to XINERAMA

Browse Source 
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.

For backwards compatibility with drivers, the old PANORAMIX symbol will
still be set.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1258>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-01-24 20:04:37 +01:00
committed by Marge Bot
parent a0326994cc
commit fb696a7d7b
48 changed files with 278 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
render/render.c
View File

@@ -52,10 +52,10 @@
#include "xace.h"
#include "protocol-versions.h"
#ifdef PANORAMIX
#ifdef XINERAMA
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
#endif /* XINERAMA */
static int ProcRenderQueryVersion(ClientPtr pClient);
static int ProcRenderQueryPictFormats(ClientPtr pClient);
@@ -221,9 +221,9 @@ typedef struct _RenderClient {
#define GetRenderClient(pClient) ((RenderClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RenderClientPrivateKey))
#ifdef PANORAMIX
#ifdef XINERAMA
RESTYPE XRT_PICTURE;
#endif
#endif /* XINERAMA */
void
RenderExtensionInit(void)
@@ -244,10 +244,10 @@ RenderExtensionInit(void)
if (!extEntry)
return;
RenderErrBase = extEntry->errorBase;
#ifdef PANORAMIX
#ifdef XINERAMA
if (XRT_PICTURE)
SetResourceTypeErrorValue(XRT_PICTURE, RenderErrBase + BadPicture);
#endif
#endif /* XINERAMA */
SetResourceTypeErrorValue(PictureType, RenderErrBase + BadPicture);
SetResourceTypeErrorValue(PictFormatType, RenderErrBase + BadPictFormat);
SetResourceTypeErrorValue(GlyphSetType, RenderErrBase + BadGlyphSet);
@@ -332,14 +332,14 @@ ProcRenderQueryPictFormats(ClientPtr client)
REQUEST_SIZE_MATCH(xRenderQueryPictFormatsReq);
#ifdef PANORAMIX
#ifdef XINERAMA
if (noPanoramiXExtension)
numScreens = screenInfo.numScreens;
else
numScreens = ((xConnSetup *) ConnectionInfo)->numRoots;
#else
numScreens = screenInfo.numScreens;
#endif
#endif /* XINERAMA */
ndepth = nformat = nvisual = 0;
for (s = 0; s < numScreens; s++) {
pScreen = screenInfo.screens[s];
@@ -2582,7 +2582,7 @@ SProcRenderDispatch(ClientPtr client)
return BadRequest;
}
#ifdef PANORAMIX
#ifdef XINERAMA
#define VERIFY_XIN_PICTURE(pPicture, pid, client, mode) {\
int rc = dixLookupResourceByType((void **)&(pPicture), pid,\
XRT_PICTURE, client, mode);\
@@ -3330,4 +3330,4 @@ PanoramiXRenderReset(void)
RenderErrBase = 0;
}
#endif /* PANORAMIX */
#endif /* XINERAMA */