mirror of
https://github.com/X11Libre/xserver.git
synced 2026-01-26 14:03:17 +00:00
pseudoramiX: inline SProc*()
The few LoC for the bytes-wapping are so trivial that we can easily inline them instead of having a whole bunch of extra functions. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
5cdfe6e5ab
commit
13451e602e
@ -61,8 +61,6 @@ ProcPanoramiXQueryVersion(ClientPtr client);
|
||||
static void
|
||||
PseudoramiXResetProc(ExtensionEntry *extEntry);
|
||||
|
||||
static int
|
||||
ProcPseudoramiXQueryVersion(ClientPtr client);
|
||||
static int
|
||||
ProcPseudoramiXGetState(ClientPtr client);
|
||||
static int
|
||||
@ -76,21 +74,6 @@ ProcPseudoramiXQueryScreens(ClientPtr client);
|
||||
static int
|
||||
ProcPseudoramiXDispatch(ClientPtr client);
|
||||
|
||||
static int
|
||||
SProcPseudoramiXQueryVersion(ClientPtr client);
|
||||
static int
|
||||
SProcPseudoramiXGetState(ClientPtr client);
|
||||
static int
|
||||
SProcPseudoramiXGetScreenCount(ClientPtr client);
|
||||
static int
|
||||
SProcPseudoramiXGetScreenSize(ClientPtr client);
|
||||
static int
|
||||
SProcPseudoramiXIsActive(ClientPtr client);
|
||||
static int
|
||||
SProcPseudoramiXQueryScreens(ClientPtr client);
|
||||
static int
|
||||
SProcPseudoramiXDispatch(ClientPtr client);
|
||||
|
||||
typedef struct {
|
||||
int x;
|
||||
int y;
|
||||
@ -155,7 +138,7 @@ PseudoramiXExtensionInit(void)
|
||||
if (pseudoramiXGeneration != serverGeneration) {
|
||||
extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
|
||||
ProcPseudoramiXDispatch,
|
||||
SProcPseudoramiXDispatch,
|
||||
ProcPseudoramiXDispatch,
|
||||
PseudoramiXResetProc,
|
||||
StandardMinorOpcode);
|
||||
if (!extEntry) {
|
||||
@ -193,26 +176,21 @@ PseudoramiXResetProc(ExtensionEntry *extEntry)
|
||||
PseudoramiXResetScreens();
|
||||
}
|
||||
|
||||
// was PanoramiX
|
||||
static int
|
||||
ProcPseudoramiXQueryVersion(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
return ProcPanoramiXQueryVersion(client);
|
||||
}
|
||||
|
||||
// was PanoramiX
|
||||
static int
|
||||
ProcPseudoramiXGetState(ClientPtr client)
|
||||
{
|
||||
REQUEST(xPanoramiXGetStateReq);
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
||||
|
||||
if (client->swapped)
|
||||
swapl(&stuff->window);
|
||||
|
||||
WindowPtr pWin;
|
||||
register int rc;
|
||||
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
||||
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
@ -234,12 +212,16 @@ static int
|
||||
ProcPseudoramiXGetScreenCount(ClientPtr client)
|
||||
{
|
||||
REQUEST(xPanoramiXGetScreenCountReq);
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
||||
|
||||
if (client->swapped)
|
||||
swapl(&stuff->window);
|
||||
|
||||
WindowPtr pWin;
|
||||
register int rc;
|
||||
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
||||
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
@ -261,13 +243,18 @@ static int
|
||||
ProcPseudoramiXGetScreenSize(ClientPtr client)
|
||||
{
|
||||
REQUEST(xPanoramiXGetScreenSizeReq);
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
|
||||
|
||||
if (client->swapped) {
|
||||
swapl(&stuff->window);
|
||||
swapl(&stuff->screen);
|
||||
}
|
||||
|
||||
WindowPtr pWin;
|
||||
register int rc;
|
||||
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
|
||||
|
||||
if (stuff->screen >= pseudoramiXNumScreens)
|
||||
return BadMatch;
|
||||
|
||||
@ -354,7 +341,7 @@ ProcPseudoramiXDispatch(ClientPtr client)
|
||||
TRACE;
|
||||
switch (stuff->data) {
|
||||
case X_PanoramiXQueryVersion:
|
||||
return ProcPseudoramiXQueryVersion(client);
|
||||
return ProcPanoramiXQueryVersion(client);
|
||||
|
||||
case X_PanoramiXGetState:
|
||||
return ProcPseudoramiXGetState(client);
|
||||
@ -373,86 +360,3 @@ ProcPseudoramiXDispatch(ClientPtr client)
|
||||
}
|
||||
return BadRequest;
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXQueryVersion(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
|
||||
return ProcPseudoramiXQueryVersion(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXGetState(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
||||
return ProcPseudoramiXGetState(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXGetScreenCount(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
||||
return ProcPseudoramiXGetScreenCount(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXGetScreenSize(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
|
||||
return ProcPseudoramiXGetScreenSize(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXIsActive(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
|
||||
return ProcPseudoramiXIsActive(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXQueryScreens(ClientPtr client)
|
||||
{
|
||||
TRACE;
|
||||
|
||||
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
|
||||
return ProcPseudoramiXQueryScreens(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcPseudoramiXDispatch(ClientPtr client)
|
||||
{
|
||||
REQUEST(xReq);
|
||||
|
||||
TRACE;
|
||||
|
||||
switch (stuff->data) {
|
||||
case X_PanoramiXQueryVersion:
|
||||
return SProcPseudoramiXQueryVersion(client);
|
||||
|
||||
case X_PanoramiXGetState:
|
||||
return SProcPseudoramiXGetState(client);
|
||||
|
||||
case X_PanoramiXGetScreenCount:
|
||||
return SProcPseudoramiXGetScreenCount(client);
|
||||
|
||||
case X_PanoramiXGetScreenSize:
|
||||
return SProcPseudoramiXGetScreenSize(client);
|
||||
|
||||
case X_XineramaIsActive:
|
||||
return SProcPseudoramiXIsActive(client);
|
||||
|
||||
case X_XineramaQueryScreens:
|
||||
return SProcPseudoramiXQueryScreens(client);
|
||||
}
|
||||
return BadRequest;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user