diff options
author | Keith Packard <keithp@neko.keithp.com> | 2006-10-25 09:48:23 -0700 |
---|---|---|
committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-25 09:48:23 -0700 |
commit | e21604914dccece6bc64c69b55512d1f1a969235 (patch) | |
tree | 82cae2b1cc1df0931e9ca42e978cc504027c41af /randr/randr.c | |
parent | 59511974db843fa7e11133894cfc10c20fdaf60f (diff) |
Merge master back in and clean up some unfinished code (closes 8745)
Diffstat (limited to 'randr/randr.c')
-rw-r--r-- | randr/randr.c | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/randr/randr.c b/randr/randr.c index 5494428fc..7b39e8045 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -42,9 +42,6 @@ int RRGeneration; int RRNScreens; -static int ProcRRDispatch (ClientPtr pClient); -static int SProcRRDispatch (ClientPtr pClient); - #define wrap(priv,real,mem,func) {\ priv->mem = real->mem; \ real->mem = func; \ @@ -54,6 +51,9 @@ static int SProcRRDispatch (ClientPtr pClient); real->mem = priv->mem; \ } +static int ProcRRDispatch (ClientPtr pClient); +static int SProcRRDispatch (ClientPtr pClient); + int RREventBase; int RRErrorBase; RESTYPE RRClientType, RREventType; /* resource types for event masks */ @@ -467,54 +467,6 @@ ProcRRDispatch (ClientPtr client) } static int -SProcRRGetScreenInfo (ClientPtr client) -{ - register int n; - REQUEST(xRRGetScreenInfoReq); - - swaps(&stuff->length, n); - swapl(&stuff->window, n); - return ProcRRGetScreenInfo(client); -} - -static int -SProcRRSetScreenConfig (ClientPtr client) -{ - register int n; - REQUEST(xRRSetScreenConfigReq); - - if (RRClientKnowsRates (client)) - { - REQUEST_SIZE_MATCH (xRRSetScreenConfigReq); - swaps (&stuff->rate, n); - } - else - { - REQUEST_SIZE_MATCH (xRR1_0SetScreenConfigReq); - } - - swaps(&stuff->length, n); - swapl(&stuff->drawable, n); - swapl(&stuff->timestamp, n); - swaps(&stuff->sizeID, n); - swaps(&stuff->rotation, n); - return ProcRRSetScreenConfig(client); -} - -static int -SProcRRSelectInput (ClientPtr client) -{ - register int n; - REQUEST(xRRSelectInputReq); - - swaps(&stuff->length, n); - swapl(&stuff->window, n); - swaps(&stuff->enable, n); - return ProcRRSelectInput(client); -} - - -static int SProcRRDispatch (ClientPtr client) { REQUEST(xReq); |