diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:51:39 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:51:39 -0700 |
commit | b3cfeecf2bddbbb120a9c796a4c9fb8fd08e15fc (patch) | |
tree | e278c54a30da052428c4ecaa07941926f2592950 /src | |
parent | eaae07c9c9690228e16ab8dc537a8a0c2ae175bf (diff) |
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/Color.c | 6 | ||||
-rw-r--r-- | src/Composite.c | 2 | ||||
-rw-r--r-- | src/Cursor.c | 6 | ||||
-rw-r--r-- | src/FillRect.c | 8 | ||||
-rw-r--r-- | src/FillRects.c | 10 | ||||
-rw-r--r-- | src/Filter.c | 12 | ||||
-rw-r--r-- | src/Glyph.c | 92 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/Picture.c | 20 | ||||
-rw-r--r-- | src/Poly.c | 14 | ||||
-rw-r--r-- | src/Xrender.c | 62 | ||||
-rw-r--r-- | src/Xrenderint.h | 2 |
12 files changed, 119 insertions, 119 deletions
diff --git a/src/Color.c b/src/Color.c index 4f934f0..9c76e58 100644 --- a/src/Color.c +++ b/src/Color.c @@ -29,14 +29,14 @@ Status XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) { - + if (!strncmp (spec, "rgba:", 5)) { unsigned short elements[4]; unsigned short *pShort; int i, n; char c; - + spec += 5; /* * Attempt to parse the value portion. @@ -76,7 +76,7 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) { XColor coreColor; Colormap colormap; - + colormap = DefaultColormap (dpy, DefaultScreen (dpy)); if (!XParseColor (dpy, colormap, spec, &coreColor)) return 0; diff --git a/src/Composite.c b/src/Composite.c index 07151de..b529088 100644 --- a/src/Composite.c +++ b/src/Composite.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/src/Cursor.c b/src/Cursor.c index 2679a9e..1d44c80 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -45,7 +45,7 @@ XRenderCreateCursor (Display *dpy, req->src = source; req->x = x; req->y = y; - + UnlockDisplay(dpy); SyncHandle(); return cid; @@ -67,12 +67,12 @@ XRenderCreateAnimCursor (Display *dpy, req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCreateAnimCursor; req->cid = cid = XAllocID (dpy); - + len = (long) ncursor * SIZEOF (xAnimCursorElt) >> 2; SetReqLen (req, len, len); len <<= 2; Data32 (dpy, (long *) cursors, len); - + UnlockDisplay(dpy); SyncHandle(); return cid; diff --git a/src/FillRect.c b/src/FillRect.c index 319c35d..04757fe 100644 --- a/src/FillRect.c +++ b/src/FillRect.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -73,10 +73,10 @@ XRenderFillRectangle (Display *dpy, dpy->bufptr += SIZEOF(xRectangle); #endif /* not MUSTCOPY */ } - else + else { GetReqExtra(RenderFillRectangles, SIZEOF(xRectangle), req); - + req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderFillRectangles; req->op = op; @@ -85,7 +85,7 @@ XRenderFillRectangle (Display *dpy, req->color.green = color->green; req->color.blue = color->blue; req->color.alpha = color->alpha; - + #ifdef MUSTCOPY dpy->bufptr -= SIZEOF(xRectangle); #else diff --git a/src/FillRects.c b/src/FillRects.c index 517eeb0..ec88f4b 100644 --- a/src/FillRects.c +++ b/src/FillRects.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -47,10 +47,10 @@ XRenderFillRectangles (Display *dpy, RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - while (n_rects) + while (n_rects) { GetReq(RenderFillRectangles, req); - + req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderFillRectangles; req->op = op; @@ -59,10 +59,10 @@ XRenderFillRectangles (Display *dpy, req->color.green = color->green; req->color.blue = color->blue; req->color.alpha = color->alpha; - + n = n_rects; len = ((long)n) << 1; - if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) + if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { n = (dpy->max_request_size - req->length) >> 1; len = ((long)n) << 1; diff --git a/src/Filter.c b/src/Filter.c index 3ac660a..5fe9df9 100644 --- a/src/Filter.c +++ b/src/Filter.c @@ -25,7 +25,7 @@ #include <config.h> #endif #include "Xrenderint.h" - + XFilters * XRenderQueryFilters (Display *dpy, Drawable drawable) { @@ -38,7 +38,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) char len; int i; long nbytes, nbytesAlias, nbytesName; - + if (!RenderHasExtension (info)) return NULL; @@ -48,7 +48,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) xri = info->info; if (xri->minor_version < 6) return NULL; - + LockDisplay (dpy); GetReq (RenderQueryFilters, req); req->reqType = info->codes->major_opcode; @@ -68,7 +68,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) if (rep.numAliases & 1) nbytesAlias += 2; nbytesName = nbytes - nbytesAlias; - + /* * Allocate one giant block for the whole data structure */ @@ -92,7 +92,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) * numAliases short alias values * nbytesName char strings */ - + filters->nfilter = rep.numFilters; filters->nalias = rep.numAliases; filters->filter = (char **) (filters + 1); @@ -121,7 +121,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) if (i & 3) _XEatData (dpy, 4 - (i & 3)); - + UnlockDisplay (dpy); SyncHandle (); return filters; diff --git a/src/Glyph.c b/src/Glyph.c index 894bb77..dbeb77e 100644 --- a/src/Glyph.c +++ b/src/Glyph.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -135,7 +135,7 @@ XRenderFreeGlyphs (Display *dpy, UnlockDisplay(dpy); SyncHandle(); } - + void XRenderCompositeString8 (Display *dpy, int op, @@ -158,7 +158,7 @@ XRenderCompositeString8 (Display *dpy, if (!nchar) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -171,21 +171,21 @@ XRenderCompositeString8 (Display *dpy, req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * xGlyphElt must be aligned on a 32-bit boundary; this is * easily done by filling no more than 252 glyphs in each * bucket */ - + #define MAX_8 252 len = SIZEOF(xGlyphElt) * ((nchar + MAX_8-1) / MAX_8) + nchar; - + req->length += (len + 3)>>2; /* convert to number of 32-bit words */ - - /* + + /* * If the entire request does not fit into the remaining space in the * buffer, flush the buffer first. */ @@ -206,18 +206,18 @@ XRenderCompositeString8 (Display *dpy, nchar = nchar - MAX_8; string += MAX_8; } - + if (nchar) { nbytes = (nchar + SIZEOF(xGlyphElt) + 3) & ~3; - BufAlloc (xGlyphElt *, elt, nbytes); + BufAlloc (xGlyphElt *, elt, nbytes); elt->len = nchar; elt->deltax = xDst; elt->deltay = yDst; memcpy ((char *) (elt + 1), string, nchar); } #undef MAX_8 - + UnlockDisplay(dpy); SyncHandle(); } @@ -243,10 +243,10 @@ XRenderCompositeString16 (Display *dpy, if (!nchar) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - + GetReq(RenderCompositeGlyphs16, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs16; @@ -256,15 +256,15 @@ XRenderCompositeString16 (Display *dpy, req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; #define MAX_16 254 len = SIZEOF(xGlyphElt) * ((nchar + MAX_16-1) / MAX_16) + nchar * 2; - + req->length += (len + 3)>>2; /* convert to number of 32-bit words */ - - /* + + /* * If the entire request does not fit into the remaining space in the * buffer, flush the buffer first. */ @@ -285,18 +285,18 @@ XRenderCompositeString16 (Display *dpy, nchar = nchar - MAX_16; string += MAX_16; } - + if (nchar) { nbytes = (nchar * 2 + SIZEOF(xGlyphElt) + 3) & ~3; - BufAlloc (xGlyphElt *, elt, nbytes); + BufAlloc (xGlyphElt *, elt, nbytes); elt->len = nchar; elt->deltax = xDst; elt->deltay = yDst; memcpy ((char *) (elt + 1), (char *) string, nchar * 2); } #undef MAX_16 - + UnlockDisplay(dpy); SyncHandle(); } @@ -323,10 +323,10 @@ XRenderCompositeString32 (Display *dpy, if (!nchar) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - + GetReq(RenderCompositeGlyphs32, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs32; @@ -336,15 +336,15 @@ XRenderCompositeString32 (Display *dpy, req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; #define MAX_32 254 len = SIZEOF(xGlyphElt) * ((nchar + MAX_32-1) / MAX_32) + nchar * 4; - + req->length += (len + 3)>>2; /* convert to number of 32-bit words */ - - /* + + /* * If the entire request does not fit into the remaining space in the * buffer, flush the buffer first. */ @@ -365,18 +365,18 @@ XRenderCompositeString32 (Display *dpy, nchar = nchar - MAX_32; string += MAX_32; } - + if (nchar) { nbytes = nchar * 4 + SIZEOF(xGlyphElt); - BufAlloc (xGlyphElt *, elt, nbytes); + BufAlloc (xGlyphElt *, elt, nbytes); elt->len = nchar; elt->deltax = xDst; elt->deltay = yDst; memcpy ((char *) (elt + 1), (char *) string, nchar * 4); } #undef MAX_32 - + UnlockDisplay(dpy); SyncHandle(); } @@ -406,7 +406,7 @@ XRenderCompositeText8 (Display *dpy, if (!nelt) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -419,13 +419,13 @@ XRenderCompositeText8 (Display *dpy, req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = elts[0].glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * Compute the space necessary */ len = 0; - + #define MAX_8 252 glyphset = elts[0].glyphset; @@ -448,7 +448,7 @@ XRenderCompositeText8 (Display *dpy, elen = SIZEOF(xGlyphElt) * ((nchars + MAX_8-1) / MAX_8) + nchars; len += (elen + 3) >> 2; } - + req->length += len; /* @@ -489,7 +489,7 @@ XRenderCompositeText8 (Display *dpy, } } #undef MAX_8 - + UnlockDisplay(dpy); SyncHandle(); } @@ -519,7 +519,7 @@ XRenderCompositeText16 (Display *dpy, if (!nelt) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -532,13 +532,13 @@ XRenderCompositeText16 (Display *dpy, req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = elts[0].glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * Compute the space necessary */ len = 0; - + #define MAX_16 254 glyphset = elts[0].glyphset; @@ -561,7 +561,7 @@ XRenderCompositeText16 (Display *dpy, elen = SIZEOF(xGlyphElt) * ((nchars + MAX_16-1) / MAX_16) + nchars * 2; len += (elen + 3) >> 2; } - + req->length += len; glyphset = elts[0].glyphset; @@ -587,7 +587,7 @@ XRenderCompositeText16 (Display *dpy, { int this_chars = nchars > MAX_16 ? MAX_16 : nchars; int this_bytes = this_chars * 2; - + BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) elt->len = this_chars; elt->deltax = xDst; @@ -600,7 +600,7 @@ XRenderCompositeText16 (Display *dpy, } } #undef MAX_16 - + UnlockDisplay(dpy); SyncHandle(); } @@ -630,11 +630,11 @@ XRenderCompositeText32 (Display *dpy, if (!nelt) return; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - + GetReq(RenderCompositeGlyphs32, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs32; @@ -644,7 +644,7 @@ XRenderCompositeText32 (Display *dpy, req->maskFormat = maskFormat ? maskFormat->id : None; req->glyphset = elts[0].glyphset; req->xSrc = xSrc; - req->ySrc = ySrc; + req->ySrc = ySrc; /* * Compute the space necessary @@ -652,7 +652,7 @@ XRenderCompositeText32 (Display *dpy, len = 0; #define MAX_32 254 - + glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { @@ -668,7 +668,7 @@ XRenderCompositeText32 (Display *dpy, elen = SIZEOF(xGlyphElt) * ((nchars + MAX_32) / MAX_32) + nchars *4; len += (elen + 3) >> 2; } - + req->length += len; glyphset = elts[0].glyphset; @@ -706,7 +706,7 @@ XRenderCompositeText32 (Display *dpy, } } #undef MAX_32 - + UnlockDisplay(dpy); SyncHandle(); } diff --git a/src/Makefile.am b/src/Makefile.am index 7474b43..c453056 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ libXrender_la_SOURCES = AddTrap.c \ libXrender_la_LIBADD = $(RENDER_LIBS) # -version-number requires libtool >= 1.5 -libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined +libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined libXrenderincludedir = $(includedir)/X11/extensions -libXrenderinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrender.h +libXrenderinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrender.h diff --git a/src/Picture.c b/src/Picture.c index 509a835..d9d6913 100644 --- a/src/Picture.c +++ b/src/Picture.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -37,7 +37,7 @@ _XRenderProcessPictureAttributes (Display *dpy, unsigned long values[32]; register unsigned long *value = values; unsigned int nvalues; - + if (valuemask & CPRepeat) *value++ = attributes->repeat; if (valuemask & CPAlphaMap) @@ -108,7 +108,7 @@ XRenderChangePicture (Display *dpy, { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderChangePictureReq *req; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderChangePicture, req); @@ -157,10 +157,10 @@ XRenderSetPictureClipRectangles (Display *dpy, int n) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - _XRenderSetPictureClipRectangles (dpy, info, picture, + _XRenderSetPictureClipRectangles (dpy, info, picture, xOrigin, yOrigin, rects, n); UnlockDisplay (dpy); SyncHandle (); @@ -176,7 +176,7 @@ XRenderSetPictureClipRegion (Display *dpy, XRectangle *xr, *pr; BOX *pb; unsigned long total; - + RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); total = r->numRects * sizeof (XRectangle); @@ -189,13 +189,13 @@ XRenderSetPictureClipRegion (Display *dpy, } } if (xr || !r->numRects) - _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0, + _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0, xr, r->numRects); if (xr) _XFreeTemp(dpy, (char *)xr, total); UnlockDisplay(dpy); SyncHandle(); -} +} void XRenderSetPictureTransform (Display *dpy, @@ -204,7 +204,7 @@ XRenderSetPictureTransform (Display *dpy, { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderSetPictureTransformReq *req; - + RenderSimpleCheckExtension (dpy, info); LockDisplay (dpy); GetReq(RenderSetPictureTransform, req); @@ -222,7 +222,7 @@ XRenderSetPictureTransform (Display *dpy, req->transform.matrix33 = transform->matrix[2][2]; UnlockDisplay(dpy); SyncHandle(); - + } void @@ -56,7 +56,7 @@ XRenderComputeX (XLineFixed *line, XFixed y) static double XRenderComputeInverseSlope (XLineFixed *l) { - return (XFixedToDouble (l->p2.x - l->p1.x) / + return (XFixedToDouble (l->p2.x - l->p1.x) / XFixedToDouble (l->p2.y - l->p1.y)); } @@ -95,9 +95,9 @@ XRenderComputeTrapezoids (Edge *edges, Edge *active; Edge *e, *en, *next; XFixed y, next_y, intersect; - + qsort (edges, nedges, sizeof (Edge), CompareEdge); - + y = edges[0].edge.p1.y; active = NULL; inactive = 0; @@ -120,7 +120,7 @@ XRenderComputeTrapezoids (Edge *edges, /* compute x coordinates along this group */ for (e = active; e; e = e->next) e->current_x = XRenderComputeX (&e->edge, y); - + /* sort active list */ for (e = active; e; e = next) { @@ -177,7 +177,7 @@ XRenderComputeTrapezoids (Edge *edges, next_y = e->edge.p2.y; en = e->next; /* check intersect */ - if (en && e->edge.p2.x > en->edge.p2.x) + if (en && e->edge.p2.x > en->edge.p2.x) { intersect = XRenderComputeIntersect (&e->edge, &e->next->edge); /* make sure this point is below the actual intersection */ @@ -189,7 +189,7 @@ XRenderComputeTrapezoids (Edge *edges, /* check next inactive point */ if (inactive < nedges && edges[inactive].edge.p1.y < next_y) next_y = edges[inactive].edge.p1.y; - + /* walk the list generating trapezoids */ for (e = active; e && (en = e->next); e = en->next) { @@ -202,7 +202,7 @@ XRenderComputeTrapezoids (Edge *edges, } y = next_y; - + /* delete inactive edges from list */ for (e = active; e; e = next) { diff --git a/src/Xrender.c b/src/Xrender.c index fce16ab..769503a 100644 --- a/src/Xrender.c +++ b/src/Xrender.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -38,7 +38,7 @@ static int XRenderCloseDisplay (Display *dpy, XExtCodes *codes); * XextFindDisplay.) */ static XRenderExtDisplayInfo * -XRenderExtFindDisplay (XRenderExtInfo *extinfo, +XRenderExtFindDisplay (XRenderExtInfo *extinfo, Display *dpy) { XRenderExtDisplayInfo *dpyinfo; @@ -46,7 +46,7 @@ XRenderExtFindDisplay (XRenderExtInfo *extinfo, /* * see if this was the most recently accessed display */ - if ((dpyinfo = extinfo->cur) && dpyinfo->display == dpy) + if ((dpyinfo = extinfo->cur) && dpyinfo->display == dpy) return dpyinfo; /* @@ -71,7 +71,7 @@ XRenderExtFindDisplay (XRenderExtInfo *extinfo, */ #define DEPTH_MASK(d) (1U << ((d) - 1)) - + /* * Render requires support for depth 1, 4, 8, 24 and 32 pixmaps */ @@ -81,7 +81,7 @@ XRenderExtFindDisplay (XRenderExtInfo *extinfo, DEPTH_MASK(8) | \ DEPTH_MASK(24) | \ DEPTH_MASK(32)) - + typedef struct _DepthCheckRec { struct _DepthCheckRec *next; Display *dpy; @@ -204,11 +204,11 @@ XRenderExtAddDisplay (XRenderExtInfo *extinfo, dpyinfo->codes = NULL; /* - * if the server has the extension, then we can initialize the + * if the server has the extension, then we can initialize the * appropriate function vectors */ if (dpyinfo->codes) { - XESetCloseDisplay (dpy, dpyinfo->codes->extension, + XESetCloseDisplay (dpy, dpyinfo->codes->extension, XRenderCloseDisplay); } else { /* The server doesn't have this extension. @@ -241,7 +241,7 @@ XRenderExtAddDisplay (XRenderExtInfo *extinfo, * XRenderExtRemoveDisplay - remove the indicated display from the * extension object. (Replaces XextRemoveDisplay.) */ -static int +static int XRenderExtRemoveDisplay (XRenderExtInfo *extinfo, Display *dpy) { XRenderExtDisplayInfo *dpyinfo, *prev; @@ -285,7 +285,7 @@ XRenderFindDisplay (Display *dpy) dpyinfo = XRenderExtFindDisplay (&XRenderExtensionInfo, dpy); if (!dpyinfo) - dpyinfo = XRenderExtAddDisplay (&XRenderExtensionInfo, dpy, + dpyinfo = XRenderExtAddDisplay (&XRenderExtensionInfo, dpy, XRenderExtensionName); return dpyinfo; } @@ -295,10 +295,10 @@ XRenderCloseDisplay (Display *dpy, XExtCodes *codes) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); if (info && info->info) XFree (info->info); - + return XRenderExtRemoveDisplay (&XRenderExtensionInfo, dpy); } - + /**************************************************************************** * * * Render public interfaces * @@ -331,8 +331,8 @@ Status XRenderQueryVersion (Display *dpy, if (!XRenderQueryFormats (dpy)) return 0; - - xri = info->info; + + xri = info->info; *major_versionp = xri->major_version; *minor_versionp = xri->minor_version; return 1; @@ -342,7 +342,7 @@ static XRenderPictFormat * _XRenderFindFormat (XRenderInfo *xri, PictFormat format) { int nf; - + for (nf = 0; nf < xri->nformat; nf++) if (xri->format[nf].id == format) return &xri->format[nf]; @@ -360,7 +360,7 @@ typedef struct _renderVersionState { Bool error; int major_version; int minor_version; - + } _XrenderVersionState; static Bool @@ -413,7 +413,7 @@ XRenderQueryFormats (Display *dpy) int nf, ns, nd, nv; int rlength; int nbytes; - + RenderCheckExtension (dpy, info, 0); LockDisplay (dpy); if (info->info) @@ -426,19 +426,19 @@ XRenderQueryFormats (Display *dpy) vreq->renderReqType = X_RenderQueryVersion; vreq->majorVersion = RENDER_MAJOR; vreq->minorVersion = RENDER_MINOR; - + async_state.version_seq = dpy->request; async_state.error = False; async.next = dpy->async_handlers; async.handler = _XRenderVersionHandler; async.data = (XPointer) &async_state; dpy->async_handlers = &async; - + GetReq (RenderQueryPictFormats, req); req->reqType = info->codes->major_opcode; req->renderReqType = X_RenderQueryPictFormats; - - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { DeqAsyncHandler (dpy, &async); UnlockDisplay (dpy); @@ -457,7 +457,7 @@ XRenderQueryFormats (Display *dpy) */ if (async_state.major_version == 0 && async_state.minor_version < 6) rep.numSubpixel = 0; - + xri = (XRenderInfo *) Xmalloc (sizeof (XRenderInfo) + rep.numFormats * sizeof (XRenderPictFormat) + rep.numScreens * sizeof (XRenderScreen) + @@ -470,7 +470,7 @@ XRenderQueryFormats (Display *dpy) rep.numSubpixel * 4); xData = (void *) Xmalloc (rlength); nbytes = (int) rep.length << 2; - + if (!xri || !xData || nbytes < rlength) { if (xri) Xfree (xri); @@ -538,7 +538,7 @@ XRenderQueryFormats (Display *dpy) xDepth = (xPictDepth *) xVisual; } screen++; - xScreen = (xPictScreen *) xDepth; + xScreen = (xPictScreen *) xDepth; } xSubpixel = (CARD32 *) xScreen; screen = xri->screen; @@ -554,7 +554,7 @@ XRenderQueryFormats (Display *dpy) */ if (nbytes > rlength) _XEatData (dpy, (unsigned long) (nbytes - rlength)); - + UnlockDisplay (dpy); SyncHandle (); Xfree (xData); @@ -696,7 +696,7 @@ XRenderFindStandardFormat (Display *dpy, }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | @@ -725,7 +725,7 @@ XRenderFindStandardFormat (Display *dpy, }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | @@ -753,7 +753,7 @@ XRenderFindStandardFormat (Display *dpy, }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRedMask | PictFormatGreenMask | @@ -779,7 +779,7 @@ XRenderFindStandardFormat (Display *dpy, }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRedMask | PictFormatGreenMask | @@ -805,7 +805,7 @@ XRenderFindStandardFormat (Display *dpy, }, 0, /* colormap */ }, - PictFormatType | + PictFormatType | PictFormatDepth | PictFormatRedMask | PictFormatGreenMask | @@ -816,7 +816,7 @@ XRenderFindStandardFormat (Display *dpy, }; if (0 <= format && format < PictStandardNUM) - return XRenderFindFormat (dpy, + return XRenderFindFormat (dpy, standardFormats[format].mask, &standardFormats[format].templ, 0); @@ -870,7 +870,7 @@ XRenderQueryPictIndexValues(Display *dpy, for(i = 0; i < rep.numIndexValues; i++) { xIndexValue value; - + _XRead (dpy, (char *) &value, SIZEOF (xIndexValue)); values[i].pixel = value.pixel; values[i].red = value.red; diff --git a/src/Xrenderint.h b/src/Xrenderint.h index 9119246..57b13da 100644 --- a/src/Xrenderint.h +++ b/src/Xrenderint.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. |