From ca7b0066fe6f315d2499338cd133e5b1e9d11236 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 16 Sep 2011 22:19:59 -0700 Subject: 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 --- Makefile.am | 6 +++--- include/X11/extensions/Xfixes.h | 6 +++--- man/Xfixes.man | 4 ++-- src/Cursor.c | 2 +- src/Makefile.am | 2 +- src/Region.c | 6 +++--- src/SaveSet.c | 2 +- src/Selection.c | 2 +- src/Xfixes.c | 26 +++++++++++++------------- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index d6a90e3..b5d567d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright © 2003 Keith Packard, Noah Levitt -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Keith Packard makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h index 10a7e2e..8995d14 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.h @@ -133,7 +133,7 @@ XFixesChangeSaveSet (Display *dpy, void XFixesSelectSelectionInput (Display *dpy, Window win, - Atom selection, + Atom selection, unsigned long eventMask); void @@ -198,12 +198,12 @@ XRectangle * XFixesFetchRegion (Display *dpy, XserverRegion region, int *nrectanglesRet); XRectangle * -XFixesFetchRegionAndBounds (Display *dpy, XserverRegion region, +XFixesFetchRegionAndBounds (Display *dpy, XserverRegion region, int *nrectanglesRet, XRectangle *bounds); void -XFixesSetGCClipRegion (Display *dpy, GC gc, +XFixesSetGCClipRegion (Display *dpy, GC gc, int clip_x_origin, int clip_y_origin, XserverRegion region); diff --git a/man/Xfixes.man b/man/Xfixes.man index 075b78f..754ee72 100644 --- a/man/Xfixes.man +++ b/man/Xfixes.man @@ -31,9 +31,9 @@ XFixes \- Augmented versions of core protocol requests .SH SYNTAX \&#include -.nf +.nf .sp -Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, +Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^); .sp Status XFixesQueryVersion \^(\^Display *\fIdpy\fP, diff --git a/src/Cursor.c b/src/Cursor.c index 0d656f7..b3dfed1 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -106,7 +106,7 @@ XFixesGetCursorImage (Display *dpy) /* bytes of actual data in the reply */ nread = (npixels << 2) + nbytes_name; /* size of data returned to application */ - rlength = (sizeof (XFixesCursorImage) + + rlength = (sizeof (XFixesCursorImage) + npixels * sizeof (unsigned long) + nbytes_name + 1); diff --git a/src/Makefile.am b/src/Makefile.am index 544230f..672e08a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,5 +16,5 @@ INCLUDES = -I$(top_srcdir)/include/X11/extensions libXfixes_la_LDFLAGS = -version-number 3:1:0 -no-undefined libXfixesincludedir = $(includedir)/X11/extensions -libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h +libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h diff --git a/src/Region.c b/src/Region.c index 842da06..94c5403 100644 --- a/src/Region.c +++ b/src/Region.c @@ -303,8 +303,8 @@ XFixesFetchRegion (Display *dpy, XserverRegion region, int *nrectanglesRet) } XRectangle * -XFixesFetchRegionAndBounds (Display *dpy, - XserverRegion region, +XFixesFetchRegionAndBounds (Display *dpy, + XserverRegion region, int *nrectanglesRet, XRectangle *bounds) { @@ -357,7 +357,7 @@ XFixesFetchRegionAndBounds (Display *dpy, } void -XFixesSetGCClipRegion (Display *dpy, GC gc, +XFixesSetGCClipRegion (Display *dpy, GC gc, int clip_x_origin, int clip_y_origin, XserverRegion region) { diff --git a/src/SaveSet.c b/src/SaveSet.c index c57ae73..cf050a0 100644 --- a/src/SaveSet.c +++ b/src/SaveSet.c @@ -26,7 +26,7 @@ #endif #include "Xfixesint.h" -void +void XFixesChangeSaveSet (Display *dpy, Window win, int mode, int target, int map) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); diff --git a/src/Selection.c b/src/Selection.c index 708d583..7f4769c 100644 --- a/src/Selection.c +++ b/src/Selection.c @@ -29,7 +29,7 @@ void XFixesSelectSelectionInput (Display *dpy, Window win, - Atom selection, + Atom selection, unsigned long eventMask) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); diff --git a/src/Xfixes.c b/src/Xfixes.c index 7d3af84..c32ee39 100644 --- a/src/Xfixes.c +++ b/src/Xfixes.c @@ -31,7 +31,7 @@ char XFixesExtensionName[] = XFIXES_NAME; static int XFixesCloseDisplay (Display *dpy, XExtCodes *codes); - + static Bool XFixesWireToEvent(Display *dpy, XEvent *event, xEvent *wire); @@ -57,13 +57,13 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo, info->codes = XInitExtension (dpy, ext_name); /* - * 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 (info->codes) { xXFixesQueryVersionReply rep; xXFixesQueryVersionReq *req; - XESetCloseDisplay (dpy, info->codes->extension, + XESetCloseDisplay (dpy, info->codes->extension, XFixesCloseDisplay); for (ev = info->codes->first_event; ev < info->codes->first_event + XFixesNumberEvents; @@ -81,7 +81,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo, req->xfixesReqType = X_XFixesQueryVersion; req->majorVersion = XFIXES_MAJOR; req->minorVersion = XFIXES_MINOR; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) + if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); SyncHandle (); @@ -123,7 +123,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo, * XFixesExtRemoveDisplay - remove the indicated display from the * extension object. (Replaces XextRemoveDisplay.) */ -static int +static int XFixesExtRemoveDisplay (XFixesExtInfo *extinfo, Display *dpy) { XFixesExtDisplayInfo *info, *prev; @@ -164,7 +164,7 @@ XFixesExtRemoveDisplay (XFixesExtInfo *extinfo, Display *dpy) * XextFindDisplay.) */ static XFixesExtDisplayInfo * -XFixesExtFindDisplay (XFixesExtInfo *extinfo, +XFixesExtFindDisplay (XFixesExtInfo *extinfo, Display *dpy) { XFixesExtDisplayInfo *info; @@ -172,7 +172,7 @@ XFixesExtFindDisplay (XFixesExtInfo *extinfo, /* * see if this was the most recently accessed display */ - if ((info = extinfo->cur) && info->display == dpy) + if ((info = extinfo->cur) && info->display == dpy) return info; /* @@ -198,11 +198,11 @@ XFixesFindDisplay (Display *dpy) info = XFixesExtFindDisplay (&XFixesExtensionInfo, dpy); if (!info) - info = XFixesExtAddDisplay (&XFixesExtensionInfo, dpy, + info = XFixesExtAddDisplay (&XFixesExtensionInfo, dpy, XFixesExtensionName); return info; } - + static int XFixesCloseDisplay (Display *dpy, XExtCodes *codes) { @@ -296,24 +296,24 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent *wire) return False; } -Bool +Bool XFixesQueryExtension (Display *dpy, int *event_base_return, int *error_base_return) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); - if (XFixesHasExtension(info)) + if (XFixesHasExtension(info)) { *event_base_return = info->codes->first_event; *error_base_return = info->codes->first_error; return True; - } + } else return False; } -Status +Status XFixesQueryVersion (Display *dpy, int *major_version_return, int *minor_version_return) -- cgit v1.2.3