frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Adam Jackson 2015-06-02 13:58:30 -04:00
parent 36fac0dd1a
commit 6f3332b9f4
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dix/window.c
View File

@ -380,10 +380,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->forcedBS = FALSE; pWin->forcedBS = FALSE;
pWin->redirectDraw = RedirectDrawNone; pWin->redirectDraw = RedirectDrawNone;
pWin->forcedBG = FALSE; pWin->forcedBG = FALSE;
pWin->unhittable = FALSE;
#ifdef ROOTLESS
pWin->rootlessUnhittable = FALSE;
#endif
#ifdef COMPOSITE #ifdef COMPOSITE
pWin->damagedDescendants = FALSE; pWin->damagedDescendants = FALSE;

4
include/windowstr.h
View File

@ -162,9 +162,7 @@ typedef struct _Window {
unsigned forcedBS:1; /* system-supplied backingStore */ unsigned forcedBS:1; /* system-supplied backingStore */
unsigned redirectDraw:2; /* COMPOSITE rendering redirect */ unsigned redirectDraw:2; /* COMPOSITE rendering redirect */
unsigned forcedBG:1; /* must have an opaque background */ unsigned forcedBG:1; /* must have an opaque background */
#ifdef ROOTLESS unsigned unhittable:1; /* doesn't hit-test, for rootless */
unsigned rootlessUnhittable:1; /* doesn't hit-test */
#endif
#ifdef COMPOSITE #ifdef COMPOSITE
unsigned damagedDescendants:1; /* some descendants are damaged */ unsigned damagedDescendants:1; /* some descendants are damaged */
unsigned inhibitBGPaint:1; /* paint the background? */ unsigned inhibitBGPaint:1; /* paint the background? */

5
mi/miwindow.c
View File

@ -767,14 +767,11 @@ miSpriteTrace(SpritePtr pSprite, int x, int y)
RegionContainsPoint(wInputShape(pWin), RegionContainsPoint(wInputShape(pWin),
x - pWin->drawable.x, x - pWin->drawable.x,
y - pWin->drawable.y, &box)) y - pWin->drawable.y, &box))
#ifdef ROOTLESS
/* In rootless mode windows may be offscreen, even when /* In rootless mode windows may be offscreen, even when
* they're in X's stack. (E.g. if the native window system * they're in X's stack. (E.g. if the native window system
* implements some form of virtual desktop system). * implements some form of virtual desktop system).
*/ */
&& !pWin->rootlessUnhittable && !pWin->unhittable) {
#endif
) {
if (pSprite->spriteTraceGood >= pSprite->spriteTraceSize) { if (pSprite->spriteTraceGood >= pSprite->spriteTraceSize) {
pSprite->spriteTraceSize += 10; pSprite->spriteTraceSize += 10;
pSprite->spriteTrace = reallocarray(pSprite->spriteTrace, pSprite->spriteTrace = reallocarray(pSprite->spriteTrace,

8
miext/rootless/rootlessWindow.c
View File

@ -92,7 +92,7 @@ RootlessNativeWindowStateChanged(WindowPtr pWin, unsigned int state)
winRec->is_offscreen = ((state & XP_WINDOW_STATE_OFFSCREEN) != 0); winRec->is_offscreen = ((state & XP_WINDOW_STATE_OFFSCREEN) != 0);
winRec->is_obscured = ((state & XP_WINDOW_STATE_OBSCURED) != 0); winRec->is_obscured = ((state & XP_WINDOW_STATE_OBSCURED) != 0);
pWin->rootlessUnhittable = winRec->is_offscreen; pWin->unhittable = winRec->is_offscreen;
} }
void void
@ -569,7 +569,7 @@ RootlessReorderWindow(WindowPtr pWin)
newPrevW = pWin->prevSib; newPrevW = pWin->prevSib;
while (newPrevW && while (newPrevW &&
(WINREC(newPrevW) == NULL || !newPrevW->realized || (WINREC(newPrevW) == NULL || !newPrevW->realized ||
newPrevW->rootlessUnhittable != pWin->rootlessUnhittable)) newPrevW->unhittable != pWin->unhittable))
newPrevW = newPrevW->prevSib; newPrevW = newPrevW->prevSib;
newPrev = newPrevW != NULL ? WINREC(newPrevW) : NULL; newPrev = newPrevW != NULL ? WINREC(newPrevW) : NULL;
@ -1365,7 +1365,7 @@ RootlessReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
pTopWin = TopLevelParent(pWin); pTopWin = TopLevelParent(pWin);
assert(pTopWin != pWin); assert(pTopWin != pWin);
pWin->rootlessUnhittable = FALSE; pWin->unhittable = FALSE;
DeleteProperty(serverClient, pWin, xa_native_window_id()); DeleteProperty(serverClient, pWin, xa_native_window_id());
@ -1503,7 +1503,7 @@ RootlessOrderAllWindows(Bool include_unhitable)
continue; continue;
if (RootlessEnsureFrame(pWin) == NULL) if (RootlessEnsureFrame(pWin) == NULL)
continue; continue;
if (!include_unhitable && pWin->rootlessUnhittable) if (!include_unhitable && pWin->unhittable)
continue; continue;
RootlessReorderWindow(pWin); RootlessReorderWindow(pWin);
} }