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 | |
| 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')
| -rw-r--r-- | xorg-server/composite/compext.c | 9 | ||||
| -rw-r--r-- | xorg-server/composite/compint.h | 7 | ||||
| -rw-r--r-- | xorg-server/composite/compwindow.c | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c index 1d4d8bf97..b0a70510b 100644 --- a/xorg-server/composite/compext.c +++ b/xorg-server/composite/compext.c @@ -48,6 +48,7 @@ #include "compint.h" #include "xace.h" #include "protocol-versions.h" +#include "extinit.h" static CARD8 CompositeReqCode; static DevPrivateKeyRec CompositeClientPrivateKeyRec; @@ -131,7 +132,7 @@ ProcCompositeQueryVersion(ClientPtr client) swapl(&rep.majorVersion); swapl(&rep.minorVersion); } - WriteToClient(client, sizeof(xCompositeQueryVersionReply), (char *) &rep); + WriteToClient(client, sizeof(xCompositeQueryVersionReply), &rep); return Success; } @@ -321,8 +322,7 @@ ProcCompositeGetOverlayWindow(ClientPtr client) swapl(&rep.length); swapl(&rep.overlayWin); } - (void) WriteToClient(client, sz_xCompositeGetOverlayWindowReply, - (char *) &rep); + WriteToClient(client, sz_xCompositeGetOverlayWindowReply, &rep); return Success; } @@ -853,8 +853,7 @@ PanoramiXCompositeGetOverlayWindow(ClientPtr client) swapl(&rep.length); swapl(&rep.overlayWin); } - (void) WriteToClient(client, sz_xCompositeGetOverlayWindowReply, - (char *) &rep); + WriteToClient(client, sz_xCompositeGetOverlayWindowReply, &rep); return Success; } diff --git a/xorg-server/composite/compint.h b/xorg-server/composite/compint.h index 30b724e3e..45b5824a9 100644 --- a/xorg-server/composite/compint.h +++ b/xorg-server/composite/compint.h @@ -229,13 +229,6 @@ compReallocPixmap(WindowPtr pWin, int x, int y, unsigned int w, unsigned int h, int bw); /* - * compext.c - */ - -void - CompositeExtensionInit(void); - -/* * compinit.c */ 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, |