diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-22 00:26:28 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-03 14:03:23 -0700 |
| commit | e7fae9ecc42ab5e73b89117722dbf4117d928f9a (patch) | |
| tree | b7897e7a64fe01e3989ec1e7a5a7db69797126e6 /mi | |
| parent | 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1 (diff) | |
Move each screen's root-window pointer into ScreenRec.
Many references to the WindowTable array already had the corresponding
screen pointer handy, which meant they usually looked like
"WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of
keeping this information in a parallel array simplifies those
expressions, and eliminates a MAXSCREENS-sized array.
Since dix uses this data, a screen private entry isn't appropriate.
xf86-video-dummy currently uses WindowTable, so it needs to be updated
to reflect this change.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/midispcur.c | 8 | ||||
| -rw-r--r-- | mi/miexpose.c | 2 | ||||
| -rw-r--r-- | mi/mioverlay.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mi/midispcur.c b/mi/midispcur.c index c279010e6..87eb27d4e 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -405,7 +405,7 @@ miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, } pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates, miDCScreenKey); - pWin = WindowTable[pScreen->myNum]; + pWin = pScreen->root; pBuffer = MIDCBUFFER(pDev, pScreen); #ifdef ARGB_CURSOR @@ -448,7 +448,7 @@ miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen, pBuffer = MIDCBUFFER(pDev, pScreen); pSave = pBuffer->pSave; - pWin = WindowTable[pScreen->myNum]; + pWin = pScreen->root; if (!pSave || pSave->drawable.width < w || pSave->drawable.height < h) { if (pSave) @@ -482,7 +482,7 @@ miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen, pBuffer = MIDCBUFFER(pDev, pScreen); pSave = pBuffer->pSave; - pWin = WindowTable[pScreen->myNum]; + pWin = pScreen->root; if (!pSave) return FALSE; @@ -513,7 +513,7 @@ miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) goto failure; dixSetPrivate(&pDev->devPrivates, miDCSpriteKey + pScreen->myNum, pBuffer); - pWin = WindowTable[pScreen->myNum]; + pWin = pScreen->root; pBuffer->pSourceGC = miDCMakeGC(pWin); if (!pBuffer->pSourceGC) diff --git a/mi/miexpose.c b/mi/miexpose.c index 57968dd2a..9249ca9f9 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -426,7 +426,7 @@ miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy) if(!pWin->parent) { x = panoramiXdataPtr[scrnum].x; y = panoramiXdataPtr[scrnum].y; - pWin = WindowTable[0]; + pWin = screenInfo.screens[0]->root; realWin = pWin->drawable.id; } else if (scrnum) { PanoramiXRes *win; diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 1a3ac4185..da3ff4ae7 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -306,7 +306,7 @@ miOverlayReparentWindow(WindowPtr pWin, WindowPtr pPriorParent) { if(IN_UNDERLAY(pWin) || HasUnderlayChildren(pWin)) { /* This could probably be more optimal */ - RebuildTree(WindowTable[pWin->drawable.pScreen->myNum]->firstChild); + RebuildTree(pWin->drawable.pScreen->root->firstChild); } } @@ -1610,7 +1610,7 @@ miOverlayChangeBorderWidth( void miOverlaySetRootClip(ScreenPtr pScreen, Bool enable) { - WindowPtr pRoot = WindowTable[pScreen->myNum]; + WindowPtr pRoot = pScreen->root; miOverlayTreePtr pTree = MIOVERLAY_GET_WINDOW_TREE(pRoot); MARK_UNDERLAY(pRoot); |