aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/composite/compwindow.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-01 08:14:05 +0000
committermarha <marha@users.sourceforge.net>2010-12-01 08:14:05 +0000
commit6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (patch)
treefd434665398565d3bb9c68b97c978b63a7756add /xorg-server/composite/compwindow.c
parentd8f61fbb152bca029b56b117c679b03b6a72b467 (diff)
parent30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (diff)
downloadvcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.gz
vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.bz2
vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/composite/compwindow.c')
-rw-r--r--xorg-server/composite/compwindow.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c
index b0afc3f9a..539c1aa23 100644
--- a/xorg-server/composite/compwindow.c
+++ b/xorg-server/composite/compwindow.c
@@ -47,6 +47,10 @@
#include "compint.h"
+#ifdef PANORAMIX
+#include "panoramiXsrv.h"
+#endif
+
#ifdef COMPOSITE_DEBUG
static int
compCheckWindow (WindowPtr pWin, pointer data)
@@ -172,16 +176,26 @@ updateOverlayWindow(ScreenPtr pScreen)
CompScreenPtr cs;
WindowPtr pWin; /* overlay window */
XID vlist[2];
+ int w = pScreen->width;
+ int h = pScreen->height;
+
+#ifdef PANORAMIX
+ if (!noPanoramiXExtension)
+ {
+ w = PanoramiXPixWidth;
+ h = PanoramiXPixHeight;
+ }
+#endif
cs = GetCompScreen(pScreen);
if ((pWin = cs->pOverlayWin) != NULL) {
- if ((pWin->drawable.width == pScreen->width) &&
- (pWin->drawable.height == pScreen->height))
+ if ((pWin->drawable.width == w) &&
+ (pWin->drawable.height == h))
return Success;
/* Let's resize the overlay window. */
- vlist[0] = pScreen->width;
- vlist[1] = pScreen->height;
+ vlist[0] = w;
+ vlist[1] = h;
return ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin));
}