aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-15 11:25:17 +0200
committermarha <marha@users.sourceforge.net>2011-07-15 11:25:17 +0200
commit2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (patch)
tree7001b0332aba46855f1d01d7ef8ed80d134453a9 /xorg-server/dix
parentd03a5f20114203fd00e0004659fd2617f4c03a32 (diff)
downloadvcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.gz
vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.bz2
vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.zip
xserver libX11 mesa git update 15 July
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/window.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c
index 556509ac3..1953f025b 100644
--- a/xorg-server/dix/window.c
+++ b/xorg-server/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)
{