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

1

Browse Source
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-04-03 17:05:19 +02:00
parent e7751e06a5
commit 87ba2ad61a
4 changed files with 87 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dix/swaprep.c
View File

@@ -1059,13 +1059,3 @@ WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix * pcsp)
SwapConnSetupPrefix(pcsp, &cspT);
WriteToClient(pClient, sizeof(cspT), &cspT);
}
/*
* Dummy entry for ReplySwapVector[]
*/
void _X_COLD
ReplyNotSwappd(ClientPtr pClient, int size, void *pbuf)
{
FatalError("Not implemented");
}

313
dix/tables.c
View File

@@ -716,260 +716,115 @@ EventSwapPtr EventSwapVector[MAXEVENTS] = {
};
ReplySwapPtr ReplySwapVector[256] = {
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
NULL,
NULL,
NULL,
(ReplySwapPtr) SGetWindowAttributesReply,
ReplyNotSwappd,
ReplyNotSwappd, /* 5 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 10 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
NULL,
NULL, /* 5 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 10 */
NULL,
NULL,
NULL,
NULL,
(ReplySwapPtr) SQueryTreeReply, /* 15 */
(ReplySwapPtr) SInternAtomReply,
(ReplySwapPtr) SGetAtomNameReply,
ReplyNotSwappd,
ReplyNotSwappd,
NULL,
NULL,
(ReplySwapPtr) SGetPropertyReply, /* 20 */
(ReplySwapPtr) SListPropertiesReply,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 25 */
NULL,
NULL,
NULL,
NULL, /* 25 */
(ReplySwapPtr) SGenericReply, /* SGrabPointerReply, */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 30 */
NULL,
NULL,
NULL,
NULL, /* 30 */
(ReplySwapPtr) SGenericReply, /* SGrabKeyboardReply, */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 35 */
ReplyNotSwappd,
ReplyNotSwappd,
NULL,
NULL,
NULL,
NULL, /* 35 */
NULL,
NULL,
(ReplySwapPtr) SQueryPointerReply,
ReplyNotSwappd,
ReplyNotSwappd, /* 40 */
ReplyNotSwappd,
ReplyNotSwappd,
NULL,
NULL, /* 40 */
NULL,
NULL,
(ReplySwapPtr) SGetInputFocusReply,
(ReplySwapPtr) SQueryKeymapReply,
ReplyNotSwappd, /* 45 */
ReplyNotSwappd,
NULL, /* 45 */
NULL,
(ReplySwapPtr) SQueryFontReply,
(ReplySwapPtr) SQueryTextExtentsReply,
(ReplySwapPtr) SListFontsReply,
(ReplySwapPtr) SListFontsWithInfoReply, /* 50 */
ReplyNotSwappd,
NULL,
(ReplySwapPtr) SGetFontPathReply,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 55 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 60 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 65 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 70 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 75 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 80 */
ReplyNotSwappd,
ReplyNotSwappd,
NULL,
NULL,
NULL, /* 55 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 60 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 65 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 70 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 75 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 80 */
NULL,
NULL,
(ReplySwapPtr) SListInstalledColormapsReply,
(ReplySwapPtr) SAllocColorReply,
(ReplySwapPtr) SAllocNamedColorReply, /* 85 */
(ReplySwapPtr) SAllocColorCellsReply,
(ReplySwapPtr) SAllocColorPlanesReply,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 90 */
NULL,
NULL,
NULL, /* 90 */
(ReplySwapPtr) SQueryColorsReply,
(ReplySwapPtr) SLookupColorReply,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 95 */
ReplyNotSwappd,
NULL,
NULL,
NULL, /* 95 */
NULL,
(ReplySwapPtr) SQueryBestSizeReply,
(ReplySwapPtr) SGenericReply, /* SQueryExtensionReply, */
(ReplySwapPtr) SListExtensionsReply,
ReplyNotSwappd, /* 100 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 105 */
ReplyNotSwappd,
ReplyNotSwappd,
NULL, /* 100 */
NULL,
NULL,
NULL,
NULL,
NULL, /* 105 */
NULL,
NULL,
(ReplySwapPtr) SGetScreenSaverReply,
ReplyNotSwappd,
(ReplySwapPtr) SListHostsReply, /* 110 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 115 */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd, /* 119 */
ReplyNotSwappd, /* 120 */
ReplyNotSwappd, /* 121 */
ReplyNotSwappd, /* 122 */
ReplyNotSwappd, /* 123 */
ReplyNotSwappd, /* 124 */
ReplyNotSwappd, /* 125 */
ReplyNotSwappd, /* 126 */
ReplyNotSwappd, /* NoOperation */
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd,
ReplyNotSwappd
NULL,
(ReplySwapPtr) SListHostsReply
};

5
include/dix.h
View File

@@ -94,7 +94,8 @@ SOFTWARE.
#define WriteReplyToClient(pClient, size, pReply) \
do { \
if ((pClient)->swapped) \
if ((pClient->swapped) && \
ReplySwapVector[((xReq *)pClient->requestBuffer)->reqType]) \
(*ReplySwapVector[((xReq *)(pClient)->requestBuffer)->reqType]) \
(pClient, (int)(size), pReply); \
else \
@@ -103,7 +104,7 @@ SOFTWARE.
#define WriteSwappedDataToClient(pClient, size, pbuf) \
do { \
if ((pClient)->swapped) \
if (pClient->swapped && pClient->pSwapReplyFunc) \
(*(pClient)->pSwapReplyFunc)(pClient, (int)(size), pbuf); \
else \
WriteToClient(pClient, (int)(size), (pbuf)); \

5
include/dixstruct.h
View File

@@ -50,11 +50,6 @@ typedef void (*ReplySwapPtr) (ClientPtr /* pClient */ ,
int /* size */ ,
void * /* pbuf */ );
extern _X_EXPORT void
ReplyNotSwappd(ClientPtr /* pClient */ ,
int /* size */ ,
void * /* pbuf */ ) _X_NORETURN;
typedef enum { ClientStateInitial,
ClientStateRunning,
ClientStateRetained,