diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-05 15:13:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-05 15:13:41 +0000 |
| commit | 78db264e7992131e0781bdfa5ede821305262b2d (patch) | |
| tree | 7461ae9dab5bf69f056250fc233c1ada393dc957 /xorg-server/mi | |
| parent | 1d2fa791e7eb383cf2818bb2e33da546edbeade9 (diff) | |
| parent | 77a4732b0637493966889fe3545966fdc12a1b5e (diff) | |
| download | vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.tar.gz vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.tar.bz2 vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/mieq.c | 3 | ||||
| -rw-r--r-- | xorg-server/mi/miexpose.c | 21 | ||||
| -rw-r--r-- | xorg-server/mi/miinitext.c | 12 |
3 files changed, 35 insertions, 1 deletions
diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c index 4c6c3bdc6..9b6d0c901 100644 --- a/xorg-server/mi/mieq.c +++ b/xorg-server/mi/mieq.c @@ -323,7 +323,8 @@ CopyGetMasterEvent(DeviceIntPtr sdev, CHECKEVENT(original); - if (!sdev->u.master) + /* ET_XQuartz has sdev == NULL */ + if (!sdev || !sdev->u.master) return NULL; switch(original->any.type) diff --git a/xorg-server/mi/miexpose.c b/xorg-server/mi/miexpose.c index 6ce56ee85..1c9c3a436 100644 --- a/xorg-server/mi/miexpose.c +++ b/xorg-server/mi/miexpose.c @@ -518,6 +518,14 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed) REGION_DESTROY( pWin->drawable.pScreen, exposures); } +#ifdef ROOTLESS +/* Ugly, ugly, but we lost our hooks into miPaintWindow... =/ */ +void RootlessSetPixmapOfAncestors(WindowPtr pWin); +void RootlessStartDrawing(WindowPtr pWin); +void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn); +Bool IsFramedWindow(WindowPtr pWin); +#endif + void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) { @@ -543,6 +551,19 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) Bool solid = TRUE; DrawablePtr drawable = &pWin->drawable; +#ifdef ROOTLESS + if(IsFramedWindow(pWin)) { + RootlessStartDrawing(pWin); + RootlessDamageRegion(pWin, prgn); + + if(pWin->backgroundState == ParentRelative) { + if((what == PW_BACKGROUND) || + (what == PW_BORDER && !pWin->borderIsPixel)) + RootlessSetPixmapOfAncestors(pWin); + } + } +#endif + if (what == PW_BACKGROUND) { while (pWin->backgroundState == ParentRelative) diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 7f59126a4..0dca390bb 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -55,6 +55,18 @@ SOFTWARE. #ifdef HAVE_DMX_CONFIG_H #include <dmx-config.h> +#undef MULTIBUFFER +#undef XV +#undef DBE +#undef XF86VIDMODE +#undef XFreeXDGA +#undef XF86DRI +#undef SCREENSAVER +#undef RANDR +#undef XFIXES +#undef DAMAGE +#undef COMPOSITE +#undef MITSHM #endif #ifdef HAVE_XNEST_CONFIG_H |