Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:dreveman:Factory
compiz-fusion-plugins-main
plugins-main-0.7.6-NOMAD.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File plugins-main-0.7.6-NOMAD.diff of Package compiz-fusion-plugins-main
diff --git a/src/animation/animation.c b/src/animation/animation.c index 9660487..e9fcca9 100644 --- a/src/animation/animation.c +++ b/src/animation/animation.c @@ -872,7 +872,7 @@ Bool getMousePointerXY(CompScreen * s, short *x, short *y) unsigned int m; if (XQueryPointer - (s->display->display, s->root, &w1, &w2, &xj, &yj, &xp, &yp, &m)) + (s->display->display, s->root.id, &w1, &w2, &xj, &yj, &xp, &yp, &m)) { *x = xp; *y = yp; @@ -1414,7 +1414,7 @@ static void postAnimationCleanupCustom (CompWindow * w, if (aw->curAnimEffect == AnimEffectFocusFade) { CompWindow *w2; - for (w2 = w->screen->windows; w2; w2 = w2->next) + for (w2 = w->parent->windows; w2; w2 = w2->next) { AnimWindow *aw2; @@ -1595,7 +1595,7 @@ animActivateEvent (CompScreen *s, o[0].type = CompOptionTypeInt; o[0].name = "root"; - o[0].value.i = s->root; + o[0].value.i = s->root.id; o[1].type = CompOptionTypeBool; o[1].name = "active"; @@ -1950,7 +1950,7 @@ restackInfoStillGood(CompScreen *s, RestackInfo *restackInfo) Bool wRestackedGood = FALSE; CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (restackInfo->wStart == w && isWinVisible(w)) wStartGood = TRUE; @@ -1969,7 +1969,7 @@ static void resetStackingInfo (CompScreen *s) { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { ANIM_WINDOW (w); @@ -2042,7 +2042,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint) now: C0001B 36000A5 3205B63 1E0000C 1E00050 1E0005B 600003 */ CompWindow *wOldAbove = NULL; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { ANIM_WINDOW(w); if (aw->restackInfo) @@ -2070,7 +2070,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint) } // do in reverse order so that focus-fading chains are handled // properly - for (w = s->reverseWindows; w; w = w->prev) + for (w = s->root.reverseWindows; w; w = w->prev) { ANIM_WINDOW(w); if (aw->restackInfo) @@ -2130,7 +2130,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint) } } - for (w = s->reverseWindows; w; w = w->prev) + for (w = s->root.reverseWindows; w; w = w->prev) { ANIM_WINDOW(w); @@ -2157,7 +2157,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint) AnimWindow *aw; Bool animStillInProgress = FALSE; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { aw = GET_ANIM_WINDOW(w, as); @@ -2283,7 +2283,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint) } } - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { aw = GET_ANIM_WINDOW(w, as); if (aw && animEffectProperties[aw->curAnimEffect]. @@ -2977,10 +2977,10 @@ getBottommostInFocusChain (CompWindow *w) } static void -resetWalkerMarks (CompScreen *s) +resetWalkerMarks (CompWindow *parent) { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = parent->windows; w; w = w->next) { ANIM_WINDOW(w); aw->walkerOverNewCopy = FALSE; @@ -2989,13 +2989,13 @@ resetWalkerMarks (CompScreen *s) } static CompWindow* -animWalkFirst (CompScreen *s) +animWalkFirst (CompWindow *parent) { - ANIM_SCREEN (s); + ANIM_SCREEN (parent->screen); - resetWalkerMarks (s); + resetWalkerMarks (parent); - CompWindow *w = getBottommostInFocusChain(s->windows); + CompWindow *w = getBottommostInFocusChain(parent->windows); if (w) { AnimWindow *aw = GET_ANIM_WINDOW (w, as); @@ -3005,13 +3005,13 @@ animWalkFirst (CompScreen *s) } static CompWindow* -animWalkLast (CompScreen *s) +animWalkLast (CompWindow *parent) { - ANIM_SCREEN (s); + ANIM_SCREEN (parent->screen); - resetWalkerMarks (s); + resetWalkerMarks (parent); - CompWindow *w = s->reverseWindows; + CompWindow *w = parent->reverseWindows; if (w) { AnimWindow *aw = GET_ANIM_WINDOW (w, as); @@ -3118,12 +3118,13 @@ animWalkPrev (CompWindow *w) static void animInitWindowWalker (CompScreen *s, + CompWindow *w, CompWalker *walker) { ANIM_SCREEN (s); UNWRAP (as, s, initWindowWalker); - (*s->initWindowWalker) (s, walker); + (*s->initWindowWalker) (s, w, walker); WRAP (as, s, initWindowWalker, animInitWindowWalker); if (as->animInProgress) @@ -3603,7 +3604,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event) { XConfigureEvent *ce = &event->xconfigure; w = findWindowAtDisplay (d, ce->window); - if (!w) + if (!w || !w->parent) break; if (w->prev) { @@ -3709,7 +3710,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event) onlyTwo = TRUE; } // Clear all configureNotified's - for (w2 = s->windows; w2; w2 = w2->next) + for (w2 = w->parent->windows; w2; w2 = w2->next) { AnimWindow *aw2 = GET_ANIM_WINDOW(w2, as); aw2->configureNotified = FALSE; @@ -4146,7 +4147,8 @@ animWindowMoveNotify(CompWindow * w, int dx, int dy, Bool immediate) if (as->animInProgress) { Bool animStillInProgress = FALSE; - for (w2 = w->screen->windows; w2; w2 = w2->next) + + for (w2 = w->screen->root.windows; w2; w2 = w2->next) { AnimWindow *aw2; @@ -4221,7 +4223,8 @@ animPaintOutput(CompScreen * s, // Find out if an animation running now uses depth test Bool depthUsed = FALSE; CompWindow *w; - for (w = s->windows; w; w = w->next) + + for (w = s->root.windows; w; w = w->next) { ANIM_WINDOW(w); if (aw->animRemainingTime > 0 && @@ -4256,7 +4259,7 @@ animPaintOutput(CompScreen * s, if (as->markAllWinCreatedCountdown == 1) { // Mark all windows as "created" - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { ANIM_WINDOW(w); aw->created = TRUE; diff --git a/src/animation/polygon.c b/src/animation/polygon.c index 2da9e11..bee2263 100644 --- a/src/animation/polygon.c +++ b/src/animation/polygon.c @@ -968,8 +968,9 @@ void polygonsDrawCustomGeometry(CompScreen * s, CompWindow * w) ANIM_WINDOW(w); // draw windows only on current viewport unless it's on all viewports - if ((s->windowOffsetX != 0 || s->windowOffsetY != 0) && - !windowOnAllViewports (w)) + if (!w->parent || + ((w->parent->viewportOffsetX || w->parent->viewportOffsetY) && + !windowOnAllViewports (w))) { return; // since this is not the viewport the window was drawn diff --git a/src/bs/bs.c b/src/bs/bs.c index f543f9f..5a8e782 100644 --- a/src/bs/bs.c +++ b/src/bs/bs.c @@ -333,7 +333,7 @@ BSSetScreenOption (CompPlugin *p, for (i = 0; i < o->value.list.nValue; i++) matchUpdate (screen->display, &o->value.list.value[i].match); - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) updateWindowSaturation (w); return TRUE; @@ -344,7 +344,7 @@ BSSetScreenOption (CompPlugin *p, { CompWindow *w; - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) updateWindowSaturation (w); return TRUE; @@ -358,7 +358,7 @@ BSSetScreenOption (CompPlugin *p, for (i = 0; i < o->value.list.nValue; i++) matchUpdate (screen->display, &o->value.list.value[i].match); - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) updateWindowBrightness (w); return TRUE; @@ -369,7 +369,7 @@ BSSetScreenOption (CompPlugin *p, { CompWindow *w; - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) updateWindowBrightness (w); return TRUE; diff --git a/src/colorfilter/colorfilter.c b/src/colorfilter/colorfilter.c index 2b7457e..aa190e7 100644 --- a/src/colorfilter/colorfilter.c +++ b/src/colorfilter/colorfilter.c @@ -151,7 +151,7 @@ colorFilterToggleScreen (CompScreen * s) cfs->isFiltered = !cfs->isFiltered; /* Toggle filtering for every window */ - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) if (w) colorFilterToggleWindow (w); } @@ -190,7 +190,7 @@ colorFilterSwitchFilter (CompScreen * s) } /* Damage currently filtered windows */ - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { FILTER_WINDOW (w); if (cfw->isFiltered) @@ -348,7 +348,7 @@ loadFilters (CompScreen *s, CompTexture *texture) cfs->filtersCount = 0; /* Damage currently filtered windows */ - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { FILTER_WINDOW (w); if (cfw->isFiltered) @@ -447,7 +447,7 @@ colorFilterMatchsChanged (CompScreen *s, CompOption *opt, FILTER_SCREEN (s); /* Re-check every window against new match settings */ - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { FILTER_WINDOW (w); if (matchEval (colorfilterGetFilterMatch (s), w) && @@ -470,7 +470,7 @@ colorFilterExcludeMatchsChanged (CompScreen *s, CompOption *opt, FILTER_SCREEN (s); /* Re-check every window against new match settings */ - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { Bool isExcluded; diff --git a/src/expo/expo.c b/src/expo/expo.c index df4a95c..aba71ee 100644 --- a/src/expo/expo.c +++ b/src/expo/expo.c @@ -272,7 +272,7 @@ expoDnDFini (CompDisplay *d, { EXPO_SCREEN (s); - if (xid && (s->root != xid)) + if (xid && (s->root.id != xid)) continue; if (es->dndState == DnDDuring || es->dndState == DnDStart) @@ -1318,10 +1318,12 @@ expoAddWindowGeometry (CompWindow *w, v = w->vertices + (w->vertexStride - 3); v += w->vertexStride * oldVCount; - if (!windowOnAllViewports (w)) + if (!windowOnAllViewports (w) && w->parent) { - getWindowMovementForOffset (w, s->windowOffsetX, - s->windowOffsetY, &offX, &offY); + getWindowMovementForOffset (w, + w->parent->viewportOffsetX, + w->parent->viewportOffsetY, + &offX, &offY); } lastX = -1000000000.0; @@ -1388,10 +1390,12 @@ expoDrawWindowTexture (CompWindow *w, es->winNormSize = w->vCount * 3; } - if (!windowOnAllViewports (w)) + if (!windowOnAllViewports (w) && w->parent) { - getWindowMovementForOffset (w, s->windowOffsetX, - s->windowOffsetY, &offX, &offY); + getWindowMovementForOffset (w, + w->parent->viewportOffsetX, + w->parent->viewportOffsetY, + &offX, &offY); } v = w->vertices + (w->vertexStride - 3); @@ -1556,7 +1560,7 @@ expoDonePaintScreen (CompScreen * s) { CompWindow *w; - for (w = s->reverseWindows; w; w = w->prev) + for (w = s->root.reverseWindows; w; w = w->prev) { Bool inWindow; int xOffset, yOffset; diff --git a/src/ezoom/ezoom.c b/src/ezoom/ezoom.c index f0ec2f2..f328c96 100644 --- a/src/ezoom/ezoom.c +++ b/src/ezoom/ezoom.c @@ -1377,7 +1377,7 @@ cursorZoomInactive (CompScreen *s) if (zs->cursorInfoSelected) { zs->cursorInfoSelected = FALSE; - XFixesSelectCursorInput (s->display->display, s->root, 0); + XFixesSelectCursorInput (s->display->display, s->root.id, 0); } if (zs->cursor.isSet) @@ -1388,7 +1388,7 @@ cursorZoomInactive (CompScreen *s) if (zs->cursorHidden) { zs->cursorHidden = FALSE; - XFixesShowCursor (s->display->display, s->root); + XFixesShowCursor (s->display->display, s->root.id); } } @@ -1411,7 +1411,7 @@ cursorZoomActive (CompScreen *s) if (!zs->cursorInfoSelected) { zs->cursorInfoSelected = TRUE; - XFixesSelectCursorInput (s->display->display, s->root, + XFixesSelectCursorInput (s->display->display, s->root.id, XFixesDisplayCursorNotifyMask); zoomUpdateCursor (s, &zs->cursor); } @@ -1419,7 +1419,7 @@ cursorZoomActive (CompScreen *s) zs->opt[SOPT_HIDE_ORIGINAL_MOUSE].value.b) { zs->cursorHidden = TRUE; - XFixesHideCursor (s->display->display, s->root); + XFixesHideCursor (s->display->display, s->root.id); } } @@ -1705,7 +1705,7 @@ zoomSpecific (CompDisplay *d, w = findWindowAtDisplay(d, d->activeWindow); if (zd->opt[DOPT_SPECIFIC_TARGET_FOCUS].value.b - && w && w->screen->root == s->root) + && w && w->screen->root.id == s->root.id) { zoomAreaToWindow (w); } @@ -1782,7 +1782,7 @@ zoomToWindow (CompDisplay *d, xid = getIntOptionNamed (option, nOption, "window", 0); w = findWindowAtDisplay (d, xid); - if (!w || w->screen->root != s->root) + if (!w || w->screen->root.id != s->root.id) return TRUE; width = w->width + w->input.left + w->input.right; height = w->height + w->input.top + w->input.bottom; @@ -2014,7 +2014,7 @@ zoomTerminate (CompDisplay *d, int out; ZOOM_SCREEN (s); - if (xid && s->root != xid) + if (xid && s->root.id != xid) continue; out = outputDeviceForPoint (s, pointerX, pointerY); diff --git a/src/mousepoll/mousepoll.c b/src/mousepoll/mousepoll.c index 2dd540d..331f26b 100644 --- a/src/mousepoll/mousepoll.c +++ b/src/mousepoll/mousepoll.c @@ -90,12 +90,12 @@ getMousePosition (CompScreen *s) MOUSEPOLL_SCREEN (s); - status = XQueryPointer (s->display->display, s->root, + status = XQueryPointer (s->display->display, s->root.id, &root_return, &child_return, &rootX, &rootY, &winX, &winY, &maskReturn); if (!status || rootX > s->width || rootY > s->height || - s->root != root_return) + s->root.id != root_return) return FALSE; if ((rootX != ms->posX || rootY != ms->posY)) diff --git a/src/neg/neg.c b/src/neg/neg.c index 4535f55..5583976 100644 --- a/src/neg/neg.c +++ b/src/neg/neg.c @@ -104,7 +104,7 @@ NEGToggleScreen (CompScreen *s) ns->isNeg = !ns->isNeg; /* toggle every window */ - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) if (w) NEGToggle (w); } @@ -570,7 +570,7 @@ NEGScreenOptionChanged (CompScreen *s, CompWindow *w; NEG_SCREEN (s); - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { Bool isNeg; NEG_WINDOW (w); diff --git a/src/opacify/opacify.c b/src/opacify/opacify.c index 47f57d7..e861c54 100644 --- a/src/opacify/opacify.c +++ b/src/opacify/opacify.c @@ -169,7 +169,7 @@ passiveWindows (CompScreen *s, OPACIFY_SCREEN (s); - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (w->id == os->active) { @@ -314,7 +314,7 @@ checkDelay (CompScreen *s) return TRUE; if (!opacifyGetTimeout (d)) return TRUE; - if (!os->newActive || (os->newActive->id == s->root)) + if (!os->newActive || (os->newActive->id == s->root.id)) return FALSE; if (os->newActive->type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask)) diff --git a/src/put/put.c b/src/put/put.c index 116b9e2..a36f923 100644 --- a/src/put/put.c +++ b/src/put/put.c @@ -178,7 +178,7 @@ putPreparePaintScreen (CompScreen *s, Window endAnimationWindow = None; ps->moreAdjust = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { PUT_WINDOW (w); diff --git a/src/resizeinfo/resizeinfo.c b/src/resizeinfo/resizeinfo.c index ad88d24..972eba3 100644 --- a/src/resizeinfo/resizeinfo.c +++ b/src/resizeinfo/resizeinfo.c @@ -130,7 +130,7 @@ setupCairoLayer (CompScreen *s, format = XRenderFindStandardFormat (s->display->display, PictStandardARGB32); - il->pixmap = XCreatePixmap (s->display->display, s->root, w, h, 32); + il->pixmap = XCreatePixmap (s->display->display, s->root.id, w, h, 32); if (!bindPixmapToTexture (s, &il->texture, il->pixmap, w, h, 32)) { compLogMessage (s->display, "resizeinfo", CompLogLevelWarn, diff --git a/src/ring/ring.c b/src/ring/ring.c index 33f5f0f..2c13474 100644 --- a/src/ring/ring.c +++ b/src/ring/ring.c @@ -768,7 +768,7 @@ ringCreateWindowList (CompScreen *s) rs->nWindows = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (isRingWin (w)) { @@ -834,7 +834,7 @@ ringCountWindows (CompScreen *s) CompWindow *w; int count = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (isRingWin (w)) count++; @@ -1032,7 +1032,7 @@ ringPreparePaintScreen (CompScreen *s, rs->rotateAdjust = adjustRingRotation (s, chunk); rs->moreAdjust = FALSE; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { RING_WINDOW (w); @@ -1110,7 +1110,7 @@ ringTerminate (CompDisplay *d, { RING_SCREEN (s); - if (xid && s->root != xid) + if (xid && s->root.id != xid) continue; if (rs->grabIndex) @@ -1123,7 +1123,7 @@ ringTerminate (CompDisplay *d, { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { RING_WINDOW (w); @@ -1379,7 +1379,7 @@ ringWindowSelectAt (CompScreen *s, o.type = CompOptionTypeInt; o.name = "root"; - o.value.i = s->root; + o.value.i = s->root.id; ringTerminate (s->display, NULL, 0, &o, 1); } @@ -1443,7 +1443,7 @@ ringWindowRemove (CompDisplay *d, o.type = CompOptionTypeInt; o.name = "root"; - o.value.i = w->screen->root; + o.value.i = w->screen->root.id; ringTerminate (d, NULL, 0, &o, 1); return; diff --git a/src/scaleaddon/scaleaddon.c b/src/scaleaddon/scaleaddon.c index 2b31bd8..e73e031 100644 --- a/src/scaleaddon/scaleaddon.c +++ b/src/scaleaddon/scaleaddon.c @@ -345,7 +345,7 @@ scaleaddonCheckForWindowAt (CompScreen *s, float x1, y1, x2, y2; CompWindow *w; - for (w = s->reverseWindows; w; w = w->prev) + for (w = s->root.reverseWindows; w; w = w->prev) { SCALE_WINDOW (w); @@ -494,7 +494,7 @@ scaleaddonPullWindow (CompDisplay *d, o[0].type = CompOptionTypeInt; o[0].name = "root"; - o[0].value.i = s->root; + o[0].value.i = s->root.id; if (action->terminate) (*action->terminate) (d, action, 0, o, 1); @@ -732,7 +732,7 @@ scaleaddonDonePaintScreen (CompScreen *s) { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) scaleaddonRenderWindowTitle (w); } else if (ss->state == SCALE_STATE_NONE && @@ -740,7 +740,7 @@ scaleaddonDonePaintScreen (CompScreen *s) { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) scaleaddonFreeWindowTitle (w); } @@ -808,7 +808,7 @@ scaleaddonHandleCompizEvent (CompDisplay *d, { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { ADDON_WINDOW (w); aw->rescaled = FALSE; @@ -1261,7 +1261,7 @@ scaleaddonScreenOptionChanged (CompScreen *s, { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { ADDON_WINDOW (w); diff --git a/src/session/session.c b/src/session/session.c index cb4c58a..35756bc 100644 --- a/src/session/session.c +++ b/src/session/session.c @@ -481,7 +481,7 @@ saveState (CompDisplay *d, { CompWindow *w; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (!isSessionWindow (w)) continue; @@ -858,7 +858,7 @@ sessionWindowAddTimeout (void *closure) SESSION_DISPLAY (d); for (s = d->screens; s; s = s->next) - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) sessionWindowAdd (s, w); sd->windowAddTimeout = 0; diff --git a/src/shift/shift.c b/src/shift/shift.c index 84c9401..ebe0443 100644 --- a/src/shift/shift.c +++ b/src/shift/shift.c @@ -203,7 +203,7 @@ shiftActivateEvent (CompScreen *s, o[0].type = CompOptionTypeInt; o[0].name = "root"; - o[0].value.i = s->root; + o[0].value.i = s->root.id; o[1].type = CompOptionTypeBool; o[1].name = "active"; @@ -1148,7 +1148,7 @@ shiftCreateWindowList (CompScreen *s) ss->nWindows = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (isShiftWin (w)) { @@ -1213,7 +1213,7 @@ shiftCountWindows (CompScreen *s) CompWindow *w; int count = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (isShiftWin (w)) count++; @@ -1633,7 +1633,7 @@ shiftPreparePaintScreen (CompScreen *s, { ss->moreAdjust = adjustShiftAnimationAttribs (s, chunk); - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { SHIFT_WINDOW (w); @@ -1691,7 +1691,7 @@ shiftDonePaintScreen (CompScreen *s) { ss->state = ShiftStateNone; shiftActivateEvent(s, FALSE); - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { SHIFT_WINDOW (w); sw->active = FALSE; @@ -1787,7 +1787,7 @@ shiftTerminate (CompDisplay *d, for (s = d->screens; s; s = s->next) { - if (xid && s->root != xid) + if (xid && s->root.id != xid) continue; shiftTerm (s, (state & CompActionStateCancel)); @@ -2129,7 +2129,7 @@ shiftWindowRemove (CompDisplay * d, o.type = CompOptionTypeInt; o.name = "root"; - o.value.i = w->screen->root; + o.value.i = w->screen->root.id; shiftTerminate (d, NULL, 0, &o, 1); return; diff --git a/src/snap/snap.c b/src/snap/snap.c index da316bc..bf0450c 100644 --- a/src/snap/snap.c +++ b/src/snap/snap.c @@ -338,7 +338,7 @@ static void snapUpdateWindowsEdges(CompWindow * w) Bool remove = FALSE; // First add all the windows - c = w->screen->windows; + c = w->screen->root.windows; while (c) { // Just check that we're not trying to snap to current window, @@ -366,7 +366,7 @@ static void snapUpdateWindowsEdges(CompWindow * w) // If an edge has been passed, check if it's in the region window, // if the edge is fully under the window, drop it, or if it's only // partly covered, cut it/split it in one/two smaller visible edges - for (c = w->screen->windows; c; c = c->next) + for (c = w->screen->root.windows; c; c = c->next) { if (c == w || !isSnapWindow(c)) continue; @@ -461,7 +461,7 @@ static void snapUpdateScreenEdges(CompWindow * w) // Drop screen edges parts that are under struts, basically apply the // same strategy than for windows edges visibility - for (c = w->screen->windows; c; c = c->next) + for (c = w->screen->root.windows; c; c = c->next) { if (c == w || !c->struts) continue; diff --git a/src/staticswitcher/staticswitcher.c b/src/staticswitcher/staticswitcher.c index 8d8a98f..b8181b7 100644 --- a/src/staticswitcher/staticswitcher.c +++ b/src/staticswitcher/staticswitcher.c @@ -184,7 +184,7 @@ switchActivateEvent (CompScreen *s, o[0].type = CompOptionTypeInt; o[0].name = "root"; - o[0].value.i = s->root; + o[0].value.i = s->root.id; o[1].type = CompOptionTypeBool; o[1].name = "active"; @@ -322,7 +322,7 @@ switchCreateWindowList (CompScreen *s, ss->nWindows = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) { if (isSwitchWin (w)) switchAddWindowToList (s, w); @@ -377,7 +377,7 @@ switchToWindow (CompScreen *s, xev.xclient.format = 32; xev.xclient.message_type = s->display->desktopViewportAtom; - xev.xclient.window = s->root; + xev.xclient.window = s->root.id; xev.xclient.data.l[0] = x * s->width; xev.xclient.data.l[1] = y * s->height; @@ -385,7 +385,7 @@ switchToWindow (CompScreen *s, xev.xclient.data.l[3] = 0; xev.xclient.data.l[4] = 0; - XSendEvent (s->display->display, s->root, FALSE, + XSendEvent (s->display->display, s->root.id, FALSE, SubstructureRedirectMask | SubstructureNotifyMask, &xev); } @@ -427,7 +427,7 @@ switchCountWindows (CompScreen *s) CompWindow *w; int count = 0; - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) if (isSwitchWin (w)) count++; @@ -536,11 +536,11 @@ switchInitiate (CompScreen *s, attr.background_pixel = 0; attr.border_pixel = 0; - attr.colormap = XCreateColormap (dpy, s->root, visual, + attr.colormap = XCreateColormap (dpy, s->root.id, visual, AllocNone); ss->popupWindow = - XCreateWindow (dpy, s->root, -1, -1, 1, 1, 0, + XCreateWindow (dpy, s->root.id, -1, -1, 1, 1, 0, 32, InputOutput, visual, CWBackPixel | CWBorderPixel | CWColormap, &attr); @@ -624,7 +624,7 @@ switchTerminate (CompDisplay *d, { SWITCH_SCREEN (s); - if (xid && s->root != xid) + if (xid && s->root.id != xid) continue; if (ss->grabIndex) @@ -900,7 +900,7 @@ switchWindowRemove (CompDisplay *d, o.type = CompOptionTypeInt; o.name = "root"; - o.value.i = w->screen->root; + o.value.i = w->screen->root.id; switchTerminate (d, NULL, 0, &o, 1); return; @@ -1131,8 +1131,9 @@ switchPaintOutput (CompScreen *s, for (w = zoomed->prev; w && w->id <= 1; w = w->prev); zoomedAbove = (w) ? w->id : None; - unhookWindowFromScreen (s, zoomed); - insertWindowIntoScreen (s, zoomed, s->reverseWindows->id); + unhookWindow (zoomed->parent, zoomed); + insertWindow (zoomed->parent, zoomed, + s->root.reverseWindows->id); } } else @@ -1147,8 +1148,8 @@ switchPaintOutput (CompScreen *s, if (zoomed) { - unhookWindowFromScreen (s, zoomed); - insertWindowIntoScreen (s, zoomed, zoomedAbove); + unhookWindow (zoomed->parent, zoomed); + insertWindow (zoomed->parent, zoomed, zoomedAbove); } if (switcher) diff --git a/src/text/text.c b/src/text/text.c index dbd7e57..3f3e9d3 100644 --- a/src/text/text.c +++ b/src/text/text.c @@ -216,7 +216,7 @@ textFileToImage (CompDisplay *d, return FALSE; } - pixmap = XCreatePixmap (dpy, textAttrib->screen->root, 1, 1, 32); + pixmap = XCreatePixmap (dpy, textAttrib->screen->root.id, 1, 1, 32); if (!pixmap) { compLogMessage (d, "text", CompLogLevelError, @@ -365,7 +365,8 @@ textFileToImage (CompDisplay *d, pixmap = None; if (w > 0 && h > 0) - pixmap = XCreatePixmap (dpy, textAttrib->screen->root, w, h, 32); + pixmap = XCreatePixmap (dpy, textAttrib->screen->root.id, + w, h, 32); if (!pixmap) { diff --git a/src/thumbnail/thumbnail.c b/src/thumbnail/thumbnail.c index 442ec68..f008c43 100644 --- a/src/thumbnail/thumbnail.c +++ b/src/thumbnail/thumbnail.c @@ -501,7 +501,7 @@ thumbUpdateMouse (void *vs) THUMB_SCREEN (s); - XQueryPointer (s->display->display, s->root, + XQueryPointer (s->display->display, s->root.id, &root_return, &child_return, &rootX, &rootY, &winX, &winY, &mask_return); @@ -509,7 +509,7 @@ thumbUpdateMouse (void *vs) if (w && w->type & CompWindowTypeDockMask) { - CompWindow *cw = s->windows; + CompWindow *cw = s->root.windows; CompWindow *found = NULL; if (ts->dock != w) diff --git a/src/vpswitch/vpswitch.c b/src/vpswitch/vpswitch.c index a88e853..7fc6d51 100644 --- a/src/vpswitch/vpswitch.c +++ b/src/vpswitch/vpswitch.c @@ -71,7 +71,7 @@ typedef struct _VpSwitchDisplay xid = getIntOptionNamed (option, nOption, "window", 0); \ w = findWindowAtDisplay (d, xid); \ if ((!w || (w->type & CompWindowTypeDesktopMask) == 0) && \ - xid != s->root) \ + xid != s->root.id) \ return FALSE; static Bool @@ -177,7 +177,7 @@ vpswitchGoto (CompScreen *s, xev.xclient.format = 32; xev.xclient.message_type = s->display->desktopViewportAtom; - xev.xclient.window = s->root; + xev.xclient.window = s->root.id; xev.xclient.data.l[0] = x * s->width; xev.xclient.data.l[1] = y * s->height; @@ -185,7 +185,7 @@ vpswitchGoto (CompScreen *s, xev.xclient.data.l[3] = 0; xev.xclient.data.l[4] = 0; - XSendEvent (s->display->display, s->root, FALSE, + XSendEvent (s->display->display, s->root.id, FALSE, SubstructureRedirectMask | SubstructureNotifyMask, &xev); } diff --git a/src/wall/wall.c b/src/wall/wall.c index 29f9d56..6f69292 100644 --- a/src/wall/wall.c +++ b/src/wall/wall.c @@ -401,7 +401,7 @@ wallSetupCairoContext (CompScreen *s, format = XRenderFindStandardFormat (s->display->display, PictStandardARGB32); - context->pixmap = XCreatePixmap (s->display->display, s->root, + context->pixmap = XCreatePixmap (s->display->display, s->root.id, width, height, 32); if (!bindPixmapToTexture(s, &context->texture, context->pixmap, diff --git a/src/winrules/winrules.c b/src/winrules/winrules.c index 8e36dfd..be75217 100644 --- a/src/winrules/winrules.c +++ b/src/winrules/winrules.c @@ -403,7 +403,7 @@ winrulesSetScreenOption (CompPlugin *plugin, { CompWindow *w; - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) winrulesSetNoAlpha (w, WINRULES_SCREEN_OPTION_NOARGB_MATCH); return TRUE; @@ -414,7 +414,7 @@ winrulesSetScreenOption (CompPlugin *plugin, { CompWindow *w; - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) winrulesSetNoFocus (w, WINRULES_SCREEN_OPTION_NOFOCUS_MATCH); return TRUE; @@ -441,7 +441,7 @@ winrulesSetScreenOption (CompPlugin *plugin, { CompWindow *w; - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) winrulesUpdateState (w, index, updateStateMask); return TRUE; @@ -451,7 +451,7 @@ winrulesSetScreenOption (CompPlugin *plugin, { CompWindow *w; - for (w = screen->windows; w; w = w->next) + for (w = screen->root.windows; w; w = w->next) winrulesSetAllowedActions (w, index, updateActionsMask); return TRUE; @@ -570,7 +570,7 @@ winrulesMatchExpHandlerChanged (CompDisplay *d) /* match options are up to date after the call to matchExpHandlerChanged */ for (s = d->screens; s; s = s->next) - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) winrulesApplyRules (w); } diff --git a/src/workarounds/workarounds.c b/src/workarounds/workarounds.c index 6f88a4a..8be5438 100644 --- a/src/workarounds/workarounds.c +++ b/src/workarounds/workarounds.c @@ -504,7 +504,7 @@ workaroundsDisplayOptionChanged (CompDisplay *d, for (s = d->screens; s; s = s->next) { ws = GET_WORKAROUNDS_SCREEN (s, GET_WORKAROUNDS_DISPLAY (d)); - for (w = s->windows; w; w = w->next) + for (w = s->root.windows; w; w = w->next) workaroundsUpdateSticky (w); workaroundsUpdateParameterFix (s); if (workaroundsGetFglrxXglFix (d))
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
