hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-01 22:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Separate out screen size and screen pixmap sizes in RRScreenSizeSet"

Browse source 
This reverts commit 752c368421.
This commit is contained in:
Keith Packard 2011-02-23 11:17:24 -08:00
commit fd9331f6eb
6 changed files with 41 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

6
randr/rrscreen.c
View file

@ -168,8 +168,6 @@ Bool
RRScreenSizeSet (ScreenPtr pScreen,
CARD16 width,
CARD16 height,
CARD16 pixWidth,
CARD16 pixHeight,
CARD32 mmWidth,
CARD32 mmHeight)
{
@ -180,7 +178,6 @@ RRScreenSizeSet (ScreenPtr pScreen,
{
return (*pScrPriv->rrScreenSetSize) (pScreen,
width, height,
pixWidth, pixHeight,
mmWidth, mmHeight);
}
#endif
@ -320,7 +317,6 @@ ProcRRSetScreenSize (ClientPtr client)
return BadValue;
}
if (!RRScreenSizeSet (pScreen,
stuff->width, stuff->height,
stuff->width, stuff->height,
stuff->widthInMillimeters,
stuff->heightInMillimeters))
@ -965,7 +961,7 @@ ProcRRSetScreenConfig (ClientPtr client)
goto sendReply;
}
}
if (!RRScreenSizeSet (pScreen, width, height, width, height,
if (!RRScreenSizeSet (pScreen, width, height,
pScreen->mmWidth, pScreen->mmHeight))
{
rep.status = RRSetConfigFailed;