andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix non-Composite builds in PrintWindowTree

Browse Source 
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>
This commit is contained in:
Daniel Stone 2011-07-13 12:08:03 +01:00 committed by Peter Hutterer
parent 01dbf2514a
commit c177a5bcaa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dix/window.c
View File

@ -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)
{