summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Staplin <gstaplin@apple.com>2008-11-13 01:27:33 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-13 01:18:49 -0800
commit1f301a0051d65296189248b2529616d9b33276b3 (patch)
treea5d3285ab47b1763ee69d6787cbdcbbf889a149b
parentf5841e96487234df5ead5f5c0fb3c587c418cb46 (diff)
XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
It was returning inverted values in comparison to the 1.4 branch. This resulted in the windows not drawing due to a deep path of: RootlessReorderWindow -> SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow -> AppleWMDoReorderWindow. (cherry picked from commit d1d398db762fe7d5720f9b5fafa2bbe8372fceac)
-rw-r--r--hw/xquartz/applewm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index c5ca8e267..c72540ace 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -165,7 +165,11 @@ AppleWMDoReorderWindow(
atom = xa_apple_no_order_in();
rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
- return (rc == Success) && (prop->type == atom);
+
+ if(Success == rc && prop->type == atom)
+ return 0;
+
+ return 1;
}