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>
This commit is contained in:
parent
36fac0dd1a
commit
6f3332b9f4
|
@ -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;
|
||||
|
|
|
@ -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? */
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue