diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /xorg-server/composite/compwindow.c | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'xorg-server/composite/compwindow.c')
| -rw-r--r-- | xorg-server/composite/compwindow.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c index d0bcd183f..0be7a1b34 100644 --- a/xorg-server/composite/compwindow.c +++ b/xorg-server/composite/compwindow.c @@ -208,7 +208,8 @@ updateOverlayWindow(ScreenPtr pScreen) return ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin)); } - /* Let's be on the safe side and not assume an overlay window is always allocated. */ + /* Let's be on the safe side and not assume an overlay window is + always allocated. */ return Success; } @@ -678,7 +679,8 @@ compWindowUpdateAutomatic(WindowPtr pWin) /* * And paint */ - CompositePicture(PictOpSrc, pSrcPicture, 0, pDstPicture, 0, 0, /* src_x, src_y */ + CompositePicture(PictOpSrc, pSrcPicture, 0, pDstPicture, + 0, 0, /* src_x, src_y */ 0, 0, /* msk_x, msk_y */ pSrcPixmap->screen_x - pParent->drawable.x, pSrcPixmap->screen_y - pParent->drawable.y, |