diff options
Diffstat (limited to 'xorg-server/Xext/panoramiXprocs.c')
-rw-r--r-- | xorg-server/Xext/panoramiXprocs.c | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c index 83a2e0856..87a2a176c 100644 --- a/xorg-server/Xext/panoramiXprocs.c +++ b/xorg-server/Xext/panoramiXprocs.c @@ -566,18 +566,17 @@ PanoramiXGetGeometry(ClientPtr client) if (rc != Success) return rc; - rep = (xGetGeometryReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .root = screenInfo.screens[0]->root->drawable.id, - .depth = pDraw->depth, - .width = pDraw->width, - .height = pDraw->height, - .x = 0, - .y = 0, - .borderWidth = 0 - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.root = screenInfo.screens[0]->root->drawable.id; + rep.depth = pDraw->depth; + rep.width = pDraw->width; + rep.height = pDraw->height; + rep.x = 0; + rep.y = 0; + rep.borderWidth = 0; if (stuff->id == rep.root) { xWindowRoot *root = (xWindowRoot *) @@ -621,13 +620,12 @@ PanoramiXTranslateCoords(ClientPtr client) rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixReadAccess); if (rc != Success) return rc; - rep = (xTranslateCoordsReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .sameScreen = xTrue, - .child = None - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.sameScreen = xTrue; + rep.child = None; if ((pWin == screenInfo.screens[0]->root) || (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid)) { @@ -1960,12 +1958,12 @@ PanoramiXGetImage(ClientPtr client) return rc; } - xgi = (xGetImageReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .visual = wVisual(((WindowPtr) pDraw)), - .depth = pDraw->depth - }; + + xgi.type = X_Reply; + xgi.sequenceNumber = client->sequence; + xgi.visual = wVisual(((WindowPtr) pDraw)); + xgi.depth = pDraw->depth; + if (format == ZPixmap) { widthBytesLine = PixmapBytePad(w, pDraw->depth); length = widthBytesLine * h; |