XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename remaining RT_* defines to X11_RESTYPE_*

Browse Source 
Since we already had to rename some of them, in order to fix name clashes
on win32, it's now time to rename all the remaining ones.

The old ones are still present as define's to the new ones, just for
backwards compatibility.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355>
(cherry picked from commit 85d4bd0dba)
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-03-11 11:01:02 +01:00
committed by Alan Coopersmith
parent 0f00dba883
commit 83936985d9
39 changed files with 186 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
render/picture.c
View File

@@ -421,7 +421,7 @@ PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format)
if (format->index.vid == pScreen->rootVisual) {
dixLookupResourceByType((void **) &format->index.pColormap,
pScreen->defColormap, RT_COLORMAP,
pScreen->defColormap, X11_RESTYPE_COLORMAP,
serverClient, DixGetAttrAccess);
}
else {
@@ -589,7 +589,7 @@ GetPictureBytes(void *value, XID id, ResourceSizePtr size)
size->pixmapRefSize = 0;
if (picture->pDrawable && (picture->pDrawable->type == DRAWABLE_PIXMAP))
{
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP);
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(X11_RESTYPE_PIXMAP);
ResourceSizeRec pixmapSize = { 0, 0, 0 };
PixmapPtr pixmap = (PixmapPtr)picture->pDrawable;
pixmapSizeFunc(pixmap, pixmap->drawable.id, &pixmapSize);
@@ -760,7 +760,7 @@ CreatePicture(Picture pid,
/* security creation/labeling check */
*error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture,
RT_PIXMAP, pDrawable, DixCreateAccess | DixSetAttrAccess);
X11_RESTYPE_PIXMAP, pDrawable, DixCreateAccess | DixSetAttrAccess);
if (*error != Success)
goto out;
@@ -1027,7 +1027,7 @@ cpClipMask(void **result, XID id, ScreenPtr screen, ClientPtr client, Mask mode)
id = res->info[screen->myNum].id;
}
#endif
return dixLookupResourceByType(result, id, RT_PIXMAP, client, mode);
return dixLookupResourceByType(result, id, X11_RESTYPE_PIXMAP, client, mode);
}
#define NEXT_VAL(_type) (vlist ? (_type) *vlist++ : (_type) ulist++->val)