diff options
| author | Keith Packard <keithp@keithp.com> | 2011-03-23 13:38:37 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-03-23 13:38:37 +0900 |
| commit | 03f45df93469f6aef391e97007b9614e0770cc4c (patch) | |
| tree | 3cfde05ac25184ebdf70c66a51baf8019c69977e /dix | |
| parent | efcb7275ce5de651f91ba4ff8bb227dfb68bb154 (diff) | |
| parent | 5fb329a04a18835ce864d0563f6dfeb3d3c78d69 (diff) | |
Merge remote-tracking branch 'airlied/xinerama-cleanup'
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/events.c | 10 | ||||
| -rw-r--r-- | dix/window.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dix/events.c b/dix/events.c index df62e839b..8835c5e61 100644 --- a/dix/events.c +++ b/dix/events.c @@ -558,7 +558,7 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin) if(pWin == screenInfo.screens[0]->root) { int i; - for (i = 0; i < PanoramiXNumScreens; i++) + FOR_NSCREENS(i) pSprite->windows[i] = screenInfo.screens[i]->root; } else { PanoramiXRes *win; @@ -569,7 +569,7 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin) if (rc != Success) return FALSE; - for(i = 0; i < PanoramiXNumScreens; i++) { + FOR_NSCREENS(i) { rc = dixLookupWindow(pSprite->windows + i, win->info[i].id, serverClient, DixReadAccess); if (rc != Success) /* window is being unmapped */ @@ -2554,7 +2554,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y) SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite; int i; - for(i = 1; i < PanoramiXNumScreens; i++) { + FOR_NSCREENS_FORWARD_SKIP(i) { if(RegionContainsPoint(&pSprite->windows[i]->borderSize, x + screenInfo.screens[0]->x - screenInfo.screens[i]->x, y + screenInfo.screens[0]->y - screenInfo.screens[i]->y, @@ -3153,7 +3153,7 @@ XineramaPointInWindowIsVisible( xoff = x + screenInfo.screens[0]->x; yoff = y + screenInfo.screens[0]->y; - for(i = 1; i < PanoramiXNumScreens; i++) { + FOR_NSCREENS_FORWARD_SKIP(i) { pWin = inputInfo.pointer->spriteInfo->sprite->windows[i]; x = xoff - screenInfo.screens[i]->x; y = yoff - screenInfo.screens[i]->y; @@ -3360,7 +3360,7 @@ BorderSizeNotEmpty(DeviceIntPtr pDev, WindowPtr pWin) if(!noPanoramiXExtension && XineramaSetWindowPntrs(pDev, pWin)) { int i; - for(i = 1; i < PanoramiXNumScreens; i++) { + FOR_NSCREENS_FORWARD_SKIP(i) { if(RegionNotEmpty(&pDev->spriteInfo->sprite->windows[i]->borderSize)) return TRUE; } diff --git a/dix/window.c b/dix/window.c index 9be70649a..3668370b3 100644 --- a/dix/window.c +++ b/dix/window.c @@ -3067,7 +3067,7 @@ SendVisibilityNotify(WindowPtr pWin) switch(visibility) { case VisibilityUnobscured: - for(i = 0; i < PanoramiXNumScreens; i++) { + FOR_NSCREENS(i) { if(i == Scrnum) continue; rc = dixLookupWindow(&pWin2, win->info[i].id, serverClient, @@ -3089,7 +3089,7 @@ SendVisibilityNotify(WindowPtr pWin) } break; case VisibilityFullyObscured: - for(i = 0; i < PanoramiXNumScreens; i++) { + FOR_NSCREENS(i) { if(i == Scrnum) continue; rc = dixLookupWindow(&pWin2, win->info[i].id, serverClient, |