diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2011-07-13 12:08:03 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-15 15:44:06 +1000 |
| commit | c177a5bcaa170d24a784540460906cc04ac5c752 (patch) | |
| tree | 79c709830d2ab50909849cf634f9b3c8ab45d848 | |
| parent | 01dbf2514aa0cc8c40a876a24e3cb0737c41da19 (diff) | |
Fix non-Composite builds in PrintWindowTree
The previous patch accidentally introduced a hard dependency on
Composite. Sorry, OS X.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/window.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dix/window.c b/dix/window.c index 556509ac3..1953f025b 100644 --- a/dix/window.c +++ b/dix/window.c @@ -125,7 +125,9 @@ Equipment Corporation. #include "dixevents.h" #include "globals.h" #include "mi.h" /* miPaintWindow */ +#ifdef COMPOSITE #include "compint.h" +#endif #include "privates.h" #include "xace.h" @@ -180,19 +182,23 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind); #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent)) +#ifdef COMPOSITE static const char *overlay_win_name = "<composite overlay>"; +#endif static const char * get_window_name(WindowPtr pWin) { #define WINDOW_NAME_BUF_LEN 512 PropertyPtr prop; - CompScreenPtr comp_screen = GetCompScreen(pWin->drawable.pScreen); static char buf[WINDOW_NAME_BUF_LEN]; int len; +#ifdef COMPOSITE + CompScreenPtr comp_screen = GetCompScreen(pWin->drawable.pScreen); if (comp_screen && pWin == comp_screen->pOverlayWin) return overlay_win_name; +#endif for (prop = wUserProps(pWin); prop; prop = prop->next) { @@ -230,11 +236,13 @@ static void log_window_info(WindowPtr pWin, int depth) if (pWin->overrideRedirect) ErrorF(" (override redirect)"); +#ifdef COMPOSITE if (pWin->redirectDraw) ErrorF(" (%s compositing: pixmap %x)", (pWin->redirectDraw == RedirectDrawAutomatic) ? "automatic" : "manual", pScreen->GetWindowPixmap(pWin)->drawable.id); +#endif switch (pWin->visibility) { |