frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "randr: use explicit case statement instead of ProcRandrVector table" 

This reverts commit 42677ae1e3.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012>
This commit is contained in:
Alan Coopersmith 2025-06-11 13:44:30 -07:00
parent bc76e25994
commit c35a285398
3 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
randr/randr.c
View File

@ -50,6 +50,7 @@ static int RRNScreens;
real->mem = priv->mem; \ real->mem = priv->mem; \
} }
static int ProcRRDispatch(ClientPtr pClient);
static int SProcRRDispatch(ClientPtr pClient); static int SProcRRDispatch(ClientPtr pClient);
int RREventBase; int RREventBase;
@ -737,6 +738,16 @@ RRVerticalRefresh(xRRModeInfo * mode)
return (CARD16) refresh; return (CARD16) refresh;
} }
static int
ProcRRDispatch(ClientPtr client)
{
REQUEST(xReq);
if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data])
return BadRequest;
UpdateCurrentTimeIf();
return (*ProcRandrVector[stuff->data]) (client);
}
static int _X_COLD static int _X_COLD
SProcRRDispatch(ClientPtr client) SProcRRDispatch(ClientPtr client)
{ {

3
randr/randrstr_priv.h
View File

@ -33,6 +33,7 @@
extern int RREventBase, RRErrorBase; extern int RREventBase, RRErrorBase;
extern int (*ProcRandrVector[RRNumberRequests]) (ClientPtr);
extern int (*SProcRandrVector[RRNumberRequests]) (ClientPtr); extern int (*SProcRandrVector[RRNumberRequests]) (ClientPtr);
extern RESTYPE RRClientType, RREventType; /* resource types for event masks */ extern RESTYPE RRClientType, RREventType; /* resource types for event masks */
@ -139,6 +140,4 @@ int ProcRRQueryVersion(ClientPtr client);
int ProcRRSelectInput(ClientPtr client); int ProcRRSelectInput(ClientPtr client);
int ProcRRDispatch(ClientPtr client);
#endif /* _XSERVER_RANDRSTR_PRIV_H_ */ #endif /* _XSERVER_RANDRSTR_PRIV_H_ */

113
randr/rrdispatch.c
View File

@ -211,69 +211,60 @@ ProcRRSelectInput(ClientPtr client)
return Success; return Success;
} }
int int (*ProcRandrVector[RRNumberRequests]) (ClientPtr) = {
ProcRRDispatch(ClientPtr client) ProcRRQueryVersion, /* 0 */
{ /* we skip 1 to make old clients fail pretty immediately */
REQUEST(xReq); NULL, /* 1 ProcRandrOldGetScreenInfo */
UpdateCurrentTimeIf(); /* V1.0 apps share the same set screen config request id */
ProcRRSetScreenConfig, /* 2 */
switch (stuff->data) { NULL, /* 3 ProcRandrOldScreenChangeSelectInput */
case X_RRQueryVersion: return ProcRRQueryVersion(client); /* 3 used to be ScreenChangeSelectInput; deprecated */
case X_RRSetScreenConfig: return ProcRRSetScreenConfig(client); ProcRRSelectInput, /* 4 */
case X_RRSelectInput: return ProcRRSelectInput(client); ProcRRGetScreenInfo, /* 5 */
case X_RRGetScreenInfo: return ProcRRGetScreenInfo(client);
/* V1.2 additions */ /* V1.2 additions */
case X_RRGetScreenSizeRange: return ProcRRGetScreenSizeRange(client); ProcRRGetScreenSizeRange, /* 6 */
case X_RRSetScreenSize: return ProcRRSetScreenSize(client); ProcRRSetScreenSize, /* 7 */
case X_RRGetScreenResources: return ProcRRGetScreenResources(client); ProcRRGetScreenResources, /* 8 */
case X_RRGetOutputInfo: return ProcRRGetOutputInfo(client); ProcRRGetOutputInfo, /* 9 */
case X_RRListOutputProperties: return ProcRRListOutputProperties(client); ProcRRListOutputProperties, /* 10 */
case X_RRQueryOutputProperty: return ProcRRQueryOutputProperty(client); ProcRRQueryOutputProperty, /* 11 */
case X_RRConfigureOutputProperty: return ProcRRConfigureOutputProperty(client); ProcRRConfigureOutputProperty, /* 12 */
case X_RRChangeOutputProperty: return ProcRRChangeOutputProperty(client); ProcRRChangeOutputProperty, /* 13 */
case X_RRDeleteOutputProperty: return ProcRRDeleteOutputProperty(client); ProcRRDeleteOutputProperty, /* 14 */
case X_RRGetOutputProperty: return ProcRRGetOutputProperty(client); ProcRRGetOutputProperty, /* 15 */
case X_RRCreateMode: return ProcRRCreateMode(client); ProcRRCreateMode, /* 16 */
case X_RRDestroyMode: return ProcRRDestroyMode(client); ProcRRDestroyMode, /* 17 */
case X_RRAddOutputMode: return ProcRRAddOutputMode(client); ProcRRAddOutputMode, /* 18 */
case X_RRDeleteOutputMode: return ProcRRDeleteOutputMode(client); ProcRRDeleteOutputMode, /* 19 */
case X_RRGetCrtcInfo: return ProcRRGetCrtcInfo(client); ProcRRGetCrtcInfo, /* 20 */
case X_RRSetCrtcConfig: return ProcRRSetCrtcConfig(client); ProcRRSetCrtcConfig, /* 21 */
case X_RRGetCrtcGammaSize: return ProcRRGetCrtcGammaSize(client); ProcRRGetCrtcGammaSize, /* 22 */
case X_RRGetCrtcGamma: return ProcRRGetCrtcGamma(client); ProcRRGetCrtcGamma, /* 23 */
case X_RRSetCrtcGamma: return ProcRRSetCrtcGamma(client); ProcRRSetCrtcGamma, /* 24 */
/* V1.3 additions */ /* V1.3 additions */
case X_RRGetScreenResourcesCurrent: return ProcRRGetScreenResourcesCurrent(client); ProcRRGetScreenResourcesCurrent, /* 25 */
case X_RRSetCrtcTransform: return ProcRRSetCrtcTransform(client); ProcRRSetCrtcTransform, /* 26 */
case X_RRGetCrtcTransform: return ProcRRGetCrtcTransform(client); ProcRRGetCrtcTransform, /* 27 */
case X_RRGetPanning: return ProcRRGetPanning(client); ProcRRGetPanning, /* 28 */
case X_RRSetPanning: return ProcRRSetPanning(client); ProcRRSetPanning, /* 29 */
case X_RRSetOutputPrimary: return ProcRRSetOutputPrimary(client); ProcRRSetOutputPrimary, /* 30 */
case X_RRGetOutputPrimary: return ProcRRGetOutputPrimary(client); ProcRRGetOutputPrimary, /* 31 */
/* V1.4 additions */ /* V1.4 additions */
case X_RRGetProviders: return ProcRRGetProviders(client); ProcRRGetProviders, /* 32 */
case X_RRGetProviderInfo: return ProcRRGetProviderInfo(client); ProcRRGetProviderInfo, /* 33 */
case X_RRSetProviderOffloadSink: return ProcRRSetProviderOffloadSink(client); ProcRRSetProviderOffloadSink, /* 34 */
case X_RRSetProviderOutputSource: return ProcRRSetProviderOutputSource(client); ProcRRSetProviderOutputSource, /* 35 */
case X_RRListProviderProperties: return ProcRRListProviderProperties(client); ProcRRListProviderProperties, /* 36 */
case X_RRQueryProviderProperty: return ProcRRQueryProviderProperty(client); ProcRRQueryProviderProperty, /* 37 */
case X_RRConfigureProviderProperty: return ProcRRConfigureProviderProperty(client); ProcRRConfigureProviderProperty, /* 38 */
case X_RRChangeProviderProperty: return ProcRRChangeProviderProperty(client); ProcRRChangeProviderProperty, /* 39 */
case X_RRDeleteProviderProperty: return ProcRRDeleteProviderProperty(client); ProcRRDeleteProviderProperty, /* 40 */
case X_RRGetProviderProperty: return ProcRRGetProviderProperty(client); ProcRRGetProviderProperty, /* 41 */
/* V1.5 additions */ /* V1.5 additions */
case X_RRGetMonitors: return ProcRRGetMonitors(client); ProcRRGetMonitors, /* 42 */
case X_RRSetMonitor: return ProcRRSetMonitor(client); ProcRRSetMonitor, /* 43 */
case X_RRDeleteMonitor: return ProcRRDeleteMonitor(client); ProcRRDeleteMonitor, /* 44 */
/* V1.6 additions */ /* V1.6 additions */
case X_RRCreateLease: return ProcRRCreateLease(client); ProcRRCreateLease, /* 45 */
case X_RRFreeLease: return ProcRRFreeLease(client); ProcRRFreeLease, /* 46 */
} };
return BadRequest;
}