aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/composite
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/composite')
-rw-r--r--xorg-server/composite/compalloc.c2
-rw-r--r--xorg-server/composite/compext.c29
-rw-r--r--xorg-server/composite/compoverlay.c4
-rw-r--r--xorg-server/composite/makefile9
4 files changed, 26 insertions, 18 deletions
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index b7d731e33..baf59c5d9 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -169,7 +169,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update)
* Now make sure there's a per-window structure to hang this from
*/
if (!cw) {
- cw = malloc(sizeof(CompWindowRec));
+ cw = calloc(1,sizeof(CompWindowRec));
if (!cw) {
free(ccw);
return BadAlloc;
diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c
index e4821c5fc..2ca3db334 100644
--- a/xorg-server/composite/compext.c
+++ b/xorg-server/composite/compext.c
@@ -108,15 +108,14 @@ static int
ProcCompositeQueryVersion(ClientPtr client)
{
CompositeClientPtr pCompositeClient = GetCompositeClient(client);
- xCompositeQueryVersionReply rep = {
- .type = X_Reply,
- .sequenceNumber = client->sequence,
- .length = 0
- };
+ xCompositeQueryVersionReply rep;
REQUEST(xCompositeQueryVersionReq);
REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) {
rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion;
@@ -313,12 +312,10 @@ ProcCompositeGetOverlayWindow(ClientPtr client)
return rc;
}
- rep = (xCompositeGetOverlayWindowReply) {
- .type = X_Reply,
- .sequenceNumber = client->sequence,
- .length = 0,
- .overlayWin = cs->pOverlayWin->drawable.id
- };
+ rep.type = X_Reply;
+ rep.sequenceNumber = client->sequence;
+ rep.length = 0;
+ rep.overlayWin = cs->pOverlayWin->drawable.id;
if (client->swapped) {
swaps(&rep.sequenceNumber);
@@ -851,12 +848,10 @@ PanoramiXCompositeGetOverlayWindow(ClientPtr client)
cs = GetCompScreen(screenInfo.screens[0]);
- rep = (xCompositeGetOverlayWindowReply) {
- .type = X_Reply,
- .sequenceNumber = client->sequence,
- .length = 0,
- .overlayWin = cs->pOverlayWin->drawable.id
- };
+ rep.type = X_Reply;
+ rep.sequenceNumber = client->sequence;
+ rep.length = 0;
+ rep.overlayWin = cs->pOverlayWin->drawable.id;
if (client->swapped) {
swaps(&rep.sequenceNumber);
diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c
index bf5434ccb..ae3dcb61d 100644
--- a/xorg-server/composite/compoverlay.c
+++ b/xorg-server/composite/compoverlay.c
@@ -45,6 +45,10 @@
#include <dix-config.h>
#endif
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
#include "compint.h"
#include "xace.h"
diff --git a/xorg-server/composite/makefile b/xorg-server/composite/makefile
new file mode 100644
index 000000000..1ab95ebba
--- /dev/null
+++ b/xorg-server/composite/makefile
@@ -0,0 +1,9 @@
+
+LIBRARY=libcomposite
+
+CSRCS = \
+ compalloc.c \
+ compext.c \
+ compinit.c \
+ compoverlay.c \
+ compwindow.c