diff options
| author | Adam Jackson <ajax@redhat.com> | 2015-06-02 13:58:30 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-07-08 16:41:28 -0400 |
| commit | 6f3332b9f411fd7ac9cab0085faa56f6c2ff3323 (patch) | |
| tree | 43d4f026251c6d012e791a0146ae2ad65bb58973 | |
| parent | 36fac0dd1a9a9cf41b631cf7e1ea015bcf920db7 (diff) | |
dix: unifdef pWin->rootlessUnhittable
No reason to vary the dix ABI over this.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | dix/window.c | 5 | ||||
| -rw-r--r-- | include/windowstr.h | 4 | ||||
| -rw-r--r-- | mi/miwindow.c | 5 | ||||
| -rw-r--r-- | miext/rootless/rootlessWindow.c | 8 |
4 files changed, 7 insertions, 15 deletions
diff --git a/dix/window.c b/dix/window.c index d49276c98..1b44305c9 100644 --- a/dix/window.c +++ b/dix/window.c @@ -380,10 +380,7 @@ SetWindowToDefaults(WindowPtr pWin) pWin->forcedBS = FALSE; pWin->redirectDraw = RedirectDrawNone; pWin->forcedBG = FALSE; - -#ifdef ROOTLESS - pWin->rootlessUnhittable = FALSE; -#endif + pWin->unhittable = FALSE; #ifdef COMPOSITE pWin->damagedDescendants = FALSE; diff --git a/include/windowstr.h b/include/windowstr.h index 53eef376e..4383dabdc 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -162,9 +162,7 @@ typedef struct _Window { unsigned forcedBS:1; /* system-supplied backingStore */ unsigned redirectDraw:2; /* COMPOSITE rendering redirect */ unsigned forcedBG:1; /* must have an opaque background */ -#ifdef ROOTLESS - unsigned rootlessUnhittable:1; /* doesn't hit-test */ -#endif + unsigned unhittable:1; /* doesn't hit-test, for rootless */ #ifdef COMPOSITE unsigned damagedDescendants:1; /* some descendants are damaged */ unsigned inhibitBGPaint:1; /* paint the background? */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 7574239f5..2fc7cfb79 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -767,14 +767,11 @@ miSpriteTrace(SpritePtr pSprite, int x, int y) RegionContainsPoint(wInputShape(pWin), x - pWin->drawable.x, y - pWin->drawable.y, &box)) -#ifdef ROOTLESS /* In rootless mode windows may be offscreen, even when * they're in X's stack. (E.g. if the native window system * implements some form of virtual desktop system). */ - && !pWin->rootlessUnhittable -#endif - ) { + && !pWin->unhittable) { if (pSprite->spriteTraceGood >= pSprite->spriteTraceSize) { pSprite->spriteTraceSize += 10; pSprite->spriteTrace = reallocarray(pSprite->spriteTrace, diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 1f78e3f6c..3240acce5 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -92,7 +92,7 @@ RootlessNativeWindowStateChanged(WindowPtr pWin, unsigned int state) winRec->is_offscreen = ((state & XP_WINDOW_STATE_OFFSCREEN) != 0); winRec->is_obscured = ((state & XP_WINDOW_STATE_OBSCURED) != 0); - pWin->rootlessUnhittable = winRec->is_offscreen; + pWin->unhittable = winRec->is_offscreen; } void @@ -569,7 +569,7 @@ RootlessReorderWindow(WindowPtr pWin) newPrevW = pWin->prevSib; while (newPrevW && (WINREC(newPrevW) == NULL || !newPrevW->realized || - newPrevW->rootlessUnhittable != pWin->rootlessUnhittable)) + newPrevW->unhittable != pWin->unhittable)) newPrevW = newPrevW->prevSib; newPrev = newPrevW != NULL ? WINREC(newPrevW) : NULL; @@ -1365,7 +1365,7 @@ RootlessReparentWindow(WindowPtr pWin, WindowPtr pPriorParent) pTopWin = TopLevelParent(pWin); assert(pTopWin != pWin); - pWin->rootlessUnhittable = FALSE; + pWin->unhittable = FALSE; DeleteProperty(serverClient, pWin, xa_native_window_id()); @@ -1503,7 +1503,7 @@ RootlessOrderAllWindows(Bool include_unhitable) continue; if (RootlessEnsureFrame(pWin) == NULL) continue; - if (!include_unhitable && pWin->rootlessUnhittable) + if (!include_unhitable && pWin->unhittable) continue; RootlessReorderWindow(pWin); } |