frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panoramiX: macro checking if drawable is root (v2) 

this code appears in quite a few places, consolidate it into
a macro in a header.

v2: align braces with macro just above it, and with
lines removed

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dave Airlie 2011-03-09 15:11:42 +10:00
parent 628d16a92a
commit c48c530e54
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xext/panoramiX.h
View File

@ -75,4 +75,5 @@ typedef struct {
#define IS_SHARED_PIXMAP(r) (((r)->type == XRT_PIXMAP) && (r)->u.pix.shared) #define IS_SHARED_PIXMAP(r) (((r)->type == XRT_PIXMAP) && (r)->u.pix.shared)
#define IS_ROOT_DRAWABLE(d) (((d)->type == XRT_WINDOW) && (d)->u.win.root)
#endif /* _PANORAMIX_H_ */ #endif /* _PANORAMIX_H_ */

26
Xext/panoramiXprocs.c
View File

@ -1334,7 +1334,7 @@ int PanoramiXPolyLine(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq)); npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq));
if (npoint > 0){ if (npoint > 0){
origPts = malloc(npoint * sizeof(xPoint)); origPts = malloc(npoint * sizeof(xPoint));
@ -1394,7 +1394,7 @@ int PanoramiXPolySegment(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq); nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq);
if(nsegs & 4) return BadLength; if(nsegs & 4) return BadLength;
@ -1457,7 +1457,7 @@ int PanoramiXPolyRectangle(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq); nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq);
if(nrects & 4) return BadLength; if(nrects & 4) return BadLength;
@ -1519,7 +1519,7 @@ int PanoramiXPolyArc(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
narcs = (client->req_len << 2) - sizeof(xPolyArcReq); narcs = (client->req_len << 2) - sizeof(xPolyArcReq);
if(narcs % sizeof(xArc)) return BadLength; if(narcs % sizeof(xArc)) return BadLength;
@ -1579,7 +1579,7 @@ int PanoramiXFillPoly(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
count = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq)); count = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq));
if (count > 0){ if (count > 0){
@ -1640,7 +1640,7 @@ int PanoramiXPolyFillRectangle(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq); things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq);
if(things & 4) return BadLength; if(things & 4) return BadLength;
@ -1701,7 +1701,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq); narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
if (narcs % sizeof(xArc)) return BadLength; if (narcs % sizeof(xArc)) return BadLength;
@ -1761,7 +1761,7 @@ int PanoramiXPutImage(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
orig_x = stuff->dstX; orig_x = stuff->dstX;
orig_y = stuff->dstY; orig_y = stuff->dstY;
@ -1824,7 +1824,7 @@ int PanoramiXGetImage(ClientPtr client)
format = stuff->format; format = stuff->format;
planemask = stuff->planeMask; planemask = stuff->planeMask;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
if(isRoot) { if(isRoot) {
if( /* check for being onscreen */ if( /* check for being onscreen */
@ -1962,7 +1962,7 @@ PanoramiXPolyText8(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
orig_x = stuff->x; orig_x = stuff->x;
orig_y = stuff->y; orig_y = stuff->y;
@ -2003,7 +2003,7 @@ PanoramiXPolyText16(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
orig_x = stuff->x; orig_x = stuff->x;
orig_y = stuff->y; orig_y = stuff->y;
@ -2044,7 +2044,7 @@ int PanoramiXImageText8(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
orig_x = stuff->x; orig_x = stuff->x;
orig_y = stuff->y; orig_y = stuff->y;
@ -2085,7 +2085,7 @@ int PanoramiXImageText16(ClientPtr client)
if (result != Success) if (result != Success)
return result; return result;
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; isRoot = IS_ROOT_DRAWABLE(draw);
orig_x = stuff->x; orig_x = stuff->x;
orig_y = stuff->y; orig_y = stuff->y;