diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-20 10:04:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-20 10:04:14 +0000 |
| commit | 27c59460b6c8c0cd5e1eb89b5b62c6600b9d4c6a (patch) | |
| tree | f875dc6b413d097cb12df024dff0f7744856df78 /xorg-server | |
| parent | 8fb9d7f4ca923dc7f640a0df6c871348a3e554ab (diff) | |
| parent | eee32e88a91aef246b8148f2efeb9c21f1316b2e (diff) | |
| download | vcxsrv-27c59460b6c8c0cd5e1eb89b5b62c6600b9d4c6a.tar.gz vcxsrv-27c59460b6c8c0cd5e1eb89b5b62c6600b9d4c6a.tar.bz2 vcxsrv-27c59460b6c8c0cd5e1eb89b5b62c6600b9d4c6a.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/configure.ac | 4 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index c89eb3f30..979f4db86 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.8.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-07-01"
+AC_INIT([xorg-server], 1.8.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-07-14"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 723d2b491..6711239f9 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -1321,6 +1321,13 @@ RootlessResizeWindow(WindowPtr pWin, int x, int y, RegionCopy(&pWin->clipList, &pWin->winSize);
RegionCopy(&pWin->borderClip, &pWin->winSize);
+ if (winRec) {
+ SCREENREC(pScreen)->imp->ResizeFrame(winRec->wid, pScreen,
+ x + SCREEN_TO_GLOBAL_X,
+ y + SCREEN_TO_GLOBAL_Y,
+ w, h, RL_GRAVITY_NONE);
+ }
+
miSendExposures(pWin, &pWin->borderClip,
pWin->drawable.x, pWin->drawable.y);
}
|