Commit cf49e537 authored by Alan Coopersmith's avatar Alan Coopersmith

Strip whitespace from end of lines in source files

parent f76fd81d
......@@ -103,7 +103,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; then
AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.la')
fi
AC_MSG_RESULT($XLIB_LOADABLE_I18N)
AM_CONDITIONAL(XLIB_LOADABLE_I18N, test x$XLIB_LOADABLE_I18N = xyes)
AC_MSG_CHECKING([if loadable Xcursor library support should be enabled])
......@@ -117,7 +117,7 @@ if test x$XLIB_LOADABLE_XCURSOR = xyes; then
[Use the X cursor library to load cursors])
fi
AC_MSG_RESULT($XLIB_LOADABLE_XCURSOR)
# Checks for header files.
AC_HEADER_STDC
dnl AC_CHECK_HEADERS([stdio.h stdlib.h math.h])
......@@ -232,7 +232,7 @@ AC_SUBST(KEYSYMDEF)
AM_CONDITIONAL(UDC, test xfalse = xtrue)
AC_ARG_ENABLE(xcms,
AC_ARG_ENABLE(xcms,
AC_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
[XCMS=$enableval],[XCMS=yes])
......@@ -275,18 +275,18 @@ if test "x$XF86BIGFONT" = "xyes"; then
AC_SUBST(BIGFONT_LIBS)
fi
AC_ARG_ENABLE(xkb,
AC_ARG_ENABLE(xkb,
AC_HELP_STRING([--disable-xkb],
[Disable XKB support *EXPERIMENTAL*]),
[XKB=$enableval],[XKB=yes])
XORG_MANPAGE_SECTIONS
AC_ARG_ENABLE(man-pages,
AC_HELP_STRING([--enable-man-pages=section],
AC_ARG_ENABLE(man-pages,
AC_HELP_STRING([--enable-man-pages=section],
[Choose manual section for installing man pages]),
[LIBMAN=$enableval],[LIBMAN=yes])
if test "x$LIBMAN" != "xyes"; then
LIB_MAN_SUFFIX=$LIBMAN
fi
......@@ -308,7 +308,7 @@ AC_SUBST(XKBPROTO_REQUIRES)
AC_FUNC_MMAP()
composecache_default=$ac_cv_func_mmap_fixed_mapped
AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])
AC_ARG_ENABLE(composecache,
AC_ARG_ENABLE(composecache,
AC_HELP_STRING([--disable-composecache],
[Disable compose table cache support]),
[COMPOSECACHE=$enableval],[COMPOSECACHE=$composecache_default])
......@@ -382,7 +382,7 @@ XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
include/Makefile
man/Makefile
man/xkb/Makefile
man/xkb/Makefile
src/Makefile
src/util/Makefile
src/xcms/Makefile
......
......@@ -7,19 +7,19 @@ software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS 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
GRAPHICS 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 CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
......@@ -78,7 +78,7 @@ typedef struct _XkbMapNotifyEvent {
KeyCode first_key_act;
KeyCode first_key_behavior;
KeyCode first_key_explicit;
KeyCode first_modmap_key;
KeyCode first_modmap_key;
KeyCode first_vmodmap_key;
int num_key_syms;
int num_key_acts;
......@@ -215,7 +215,7 @@ typedef struct _XkbActionMessage {
Bool key_event_follows;/* true if key event also generated */
int group; /* effective group */
unsigned int mods; /* effective mods */
char message[XkbActionMessageLength+1];
char message[XkbActionMessageLength+1];
/* message -- leave space for NUL */
} XkbActionMessageEvent;
......@@ -241,8 +241,8 @@ typedef struct _XkbExtensionDeviceNotify {
Time time; /* milliseconds */
int xkb_type; /* XkbExtensionDeviceNotify */
int device; /* device ID */
unsigned int reason; /* reason for the event */
unsigned int supported; /* mask of supported features */
unsigned int reason; /* reason for the event */
unsigned int supported; /* mask of supported features */
unsigned int unsupported; /* mask of unsupported features */
/* that some app tried to use */
int first_btn; /* first button that changed */
......
......@@ -3,7 +3,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
*
*
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
......@@ -11,10 +11,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
*
*
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
*
*
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
......@@ -252,7 +252,7 @@ typedef void (*XcmsScreenFreeProc)(
* XXX: The use of the XcmsConversionProc type is broken. The
* device-independent colour conversion code uses it as:
typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
unsigned int);
* while the device-dependent code uses it as:
......
This diff is collapsed.
......@@ -121,7 +121,7 @@ struct _XDisplay
struct _XExten *ext_procs; /* extensions initialized on this display */
/*
* the following can be fixed size, as the protocol defines how
* much address space is available.
* much address space is available.
* While this could be done using the extension vector, there
* may be MANY events processed, so a search through the extension
* list to find the right procedure for each event might be
......@@ -417,7 +417,7 @@ extern LockInfoPtr _Xglobal_lock;
/*
* GetReq - Get the next available X request packet in the buffer and
* return it.
* return it.
*
* "name" is the name of the request, e.g. CreatePixmap, OpenFont, etc.
* "req" is the name of the request pointer.
......@@ -474,9 +474,9 @@ extern LockInfoPtr _Xglobal_lock;
/*
* GetResReq is for those requests that have a resource ID
* GetResReq is for those requests that have a resource ID
* (Window, Pixmap, GContext, etc.) as their single argument.
* "rid" is the name of the resource.
* "rid" is the name of the resource.
*/
#if !defined(UNIXCPP) || defined(ANSICPP)
......@@ -505,7 +505,7 @@ extern LockInfoPtr _Xglobal_lock;
/*
* GetEmptyReq is for those requests that have no arguments
* at all.
* at all.
*/
#if !defined(UNIXCPP) || defined(ANSICPP)
#define GetEmptyReq(name, req) \
......@@ -611,7 +611,7 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
* "ptr" is the pointer being assigned to.
* "n" is the number of bytes to allocate.
*
* Example:
* Example:
* xTextElt *elt;
* BufAlloc (xTextElt *, elt, nbytes)
*/
......@@ -661,7 +661,7 @@ extern void _XRead32(
(((cs)->rbearing|(cs)->lbearing| \
(cs)->ascent|(cs)->descent) == 0))
/*
/*
* CI_GET_CHAR_INFO_1D - return the charinfo struct for the indicated 8bit
* character. If the character is in the column and exists, then return the
* appropriate metrics (note that fonts with common per-character metrics will
......@@ -687,7 +687,7 @@ extern void _XRead32(
/*
* CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and
* CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and
* column. This is used for fonts that have more than row zero.
*/
#define CI_GET_CHAR_INFO_2D(fs,row,col,def,cs) \
......@@ -1045,7 +1045,7 @@ extern int (*XESetCopyGC(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
) /* proc */
) /* proc */
))(
Display*, GC, XExtCodes*
);
......@@ -1057,7 +1057,7 @@ extern int (*XESetFlushGC(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
) /* proc */
) /* proc */
))(
Display*, GC, XExtCodes*
);
......@@ -1069,7 +1069,7 @@ extern int (*XESetFreeGC(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
) /* proc */
) /* proc */
))(
Display*, GC, XExtCodes*
);
......@@ -1081,7 +1081,7 @@ extern int (*XESetCreateFont(
Display* /* display */,
XFontStruct* /* fs */,
XExtCodes* /* codes */
) /* proc */
) /* proc */
))(
Display*, XFontStruct*, XExtCodes*
);
......@@ -1093,10 +1093,10 @@ extern int (*XESetFreeFont(
Display* /* display */,
XFontStruct* /* fs */,
XExtCodes* /* codes */
) /* proc */
) /* proc */
))(
Display*, XFontStruct*, XExtCodes*
);
);
extern int (*XESetCloseDisplay(
Display* /* display */,
......@@ -1104,7 +1104,7 @@ extern int (*XESetCloseDisplay(
int (*) (
Display* /* display */,
XExtCodes* /* codes */
) /* proc */
) /* proc */
))(
Display*, XExtCodes*
);
......@@ -1117,7 +1117,7 @@ extern int (*XESetError(
xError* /* err */,
XExtCodes* /* codes */,
int* /* ret_code */
) /* proc */
) /* proc */
))(
Display*, xError*, XExtCodes*, int*
);
......@@ -1131,7 +1131,7 @@ extern char* (*XESetErrorString(
XExtCodes* /* codes */,
char* /* buffer */,
int /* nbytes */
) /* proc */
) /* proc */
))(
Display*, int, XExtCodes*, char*, int
);
......@@ -1155,7 +1155,7 @@ extern Bool (*XESetWireToEvent(
Display* /* display */,
XEvent* /* re */,
xEvent* /* event */
) /* proc */
) /* proc */
))(
Display*, XEvent*, xEvent*
);
......@@ -1167,7 +1167,7 @@ extern Status (*XESetEventToWire(
Display* /* display */,
XEvent* /* re */,
xEvent* /* event */
) /* proc */
) /* proc */
))(
Display*, XEvent*, xEvent*
);
......@@ -1179,7 +1179,7 @@ extern Bool (*XESetWireToError(
Display* /* display */,
XErrorEvent* /* he */,
xError* /* we */
) /* proc */
) /* proc */
))(
Display*, XErrorEvent*, xError*
);
......@@ -1192,7 +1192,7 @@ extern void (*XESetBeforeFlush(
XExtCodes* /* codes */,
_Xconst char* /* data */,
long /* len */
) /* proc */
) /* proc */
))(
Display*, XExtCodes*, _Xconst char*, long
);
......@@ -1321,7 +1321,7 @@ Status _XGetWindowAttributes(
XWindowAttributes *attr);
int _XPutBackEvent (
register Display *dpy,
register Display *dpy,
register XEvent *event);
_XFUNCPROTOEND
......
......@@ -28,13 +28,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
......@@ -69,7 +69,7 @@ typedef struct {
#endif
/*
/*
* clip region
*/
......@@ -80,13 +80,13 @@ typedef struct _XRegion {
BOX extents;
} REGION;
/* Xutil.h contains the declaration:
* typedef struct _XRegion *Region;
*/
/* Xutil.h contains the declaration:
* typedef struct _XRegion *Region;
*/
/* 1 if two BOXs overlap.
* 0 if two BOXs do not overlap.
* Remember, x2 and y2 are not in the region
* Remember, x2 and y2 are not in the region
*/
#define EXTENTCHECK(r1, r2) \
((r1)->x2 > (r2)->x1 && \
......
......@@ -29,13 +29,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
......@@ -178,7 +178,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase;
extern void XrmDestroyDatabase(
XrmDatabase /* database */
XrmDatabase /* database */
);
extern void XrmQPutResource(
......@@ -333,7 +333,7 @@ typedef enum {
XrmoptionResArg, /* Resource and value in next argument in argv */
XrmoptionSkipArg, /* Ignore this option and the next argument in argv */
XrmoptionSkipLine, /* Ignore this option and the rest of argv */
XrmoptionSkipNArgs /* Ignore this option and the next
XrmoptionSkipNArgs /* Ignore this option and the next
OptionDescRes.value arguments in argv */
} XrmOptionKind;
......@@ -351,7 +351,7 @@ extern void XrmParseCommand(
int /* table_count */,
_Xconst char* /* name */,
int* /* argc_in_out */,
char** /* argv_in_out */
char** /* argv_in_out */
);
_XFUNCPROTOEND
......
......@@ -29,13 +29,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
......@@ -55,7 +55,7 @@ SOFTWARE.
#include <X11/Xlib.h>
#include <X11/keysym.h>
/*
/*
* Bitmask returned by XParseGeometry(). Each bit tells if the corresponding
* value (x, y, width, height) was found in the parsed string.
*/
......@@ -151,7 +151,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint)
/*
* new structure for manipulating TEXT properties; used with WM_NAME,
* new structure for manipulating TEXT properties; used with WM_NAME,
* WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
*/
typedef struct {
......@@ -262,16 +262,16 @@ typedef struct _XComposeStatus {
|| ((KeySym)(keysym) == XK_Num_Lock))
#endif
/*
* opaque reference to Region data type
* opaque reference to Region data type
*/
typedef struct _XRegion *Region;
typedef struct _XRegion *Region;
/* Return values from XRectInRegion() */
#define RectangleOut 0
#define RectangleIn 1
#define RectanglePart 2
/*
* Information used by the visual utility routines to find desired visual
......@@ -452,7 +452,7 @@ extern Status XGetStandardColormap(
Display* /* display */,
Window /* w */,
XStandardColormap* /* colormap_return */,
Atom /* property */
Atom /* property */
);
extern Status XGetTextProperty(
......@@ -477,7 +477,7 @@ extern Status XGetWMClientMachine(
extern XWMHints *XGetWMHints(
Display* /* display */,
Window /* w */
Window /* w */
);
extern Status XGetWMIconName(
......@@ -496,7 +496,7 @@ extern Status XGetWMNormalHints(
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */,
long* /* supplied_return */
long* /* supplied_return */
);
extern Status XGetWMSizeHints(
......@@ -584,7 +584,7 @@ extern int XSetIconSizes(
Display* /* display */,
Window /* w */,
XIconSize* /* size_list */,
int /* count */
int /* count */
);
extern int XSetNormalHints(
......
......@@ -6,14 +6,14 @@ Copyright 1994 by Sony Corporation
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital, FUJITSU
LIMITED and Sony Corporation not be used in advertising or publicity
pertaining to distribution of the software without specific, written
prior permission.
prior permission.
DIGITAL, FUJITSU LIMITED AND SONY CORPORATION DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
......@@ -30,7 +30,7 @@ PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
Makoto Wakamatsu Sony Corporation
makoto@sm.sony.co.jp
***********************************************************************/
/* $XFree86: xc/lib/X11/imCallbk.c,v 3.9 2003/08/22 13:29:16 pascal Exp $ */
......@@ -70,11 +70,11 @@ extern int _Xmblen ();
#define sz_ximStatusDone 0
typedef enum {
XimCbSuccess,
XimCbNoCallback,
XimCbError,
XimCbQueued,
XimCbBadContextID,
XimCbSuccess,
XimCbNoCallback,
XimCbError,
XimCbQueued,
XimCbBadContextID,
XimCbBadOpcode
} XimCbStatus;
......@@ -113,7 +113,7 @@ Private XimCbStatus _XimPreeditStateNotifyCallback(Xim, Xic, char *, int);
#endif
/* NOTE:
* the table below depends on the protocol number
* the table below depends on the protocol number
* defined in the IM Protocol document.
*/
static RConst XimCb callback_table[] = {
......@@ -151,11 +151,11 @@ _XimProcessPendingCallbacks(Xic ic)
{
XimPendingCallback pcbq;
while (((pcbq = ic->private.proto.pend_cb_que) != (XimPendingCallback)NULL)
while (((pcbq = ic->private.proto.pend_cb_que) != (XimPendingCallback)NULL)
&& _XimIsReadyForProcess(ic)) {
(void) (*callback_table[pcbq->major_opcode])(pcbq->im,
pcbq->ic,
pcbq->proto,
(void) (*callback_table[pcbq->major_opcode])(pcbq->im,
pcbq->ic,
pcbq->proto,
pcbq->proto_len);
ic->private.proto.pend_cb_que = pcbq->next;
Xfree(pcbq->proto); /* free memory of XimPendingCallback */
......@@ -185,9 +185,9 @@ _XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data)
}
Public Bool
_XimCbDispatch(Xim xim,
INT16 len,
XPointer data,
_XimCbDispatch(Xim xim,
INT16 len,
XPointer data,
XPointer call_data)
{
/* `data' points to the beginning of the packet defined in IM Protocol doc.
......@@ -262,16 +262,16 @@ _XimCbDispatch(Xim xim,
}
Private XimCbStatus
_XimGeometryCallback(Xim im,
Xic ic,
char* proto,
_XimGeometryCallback(Xim im,
Xic ic,
char* proto,
int len)
{
XICCallback* cb = &ic->core.geometry_callback;
/* invoke the callack
*/
if (cb && cb->callback) {
if (cb && cb->callback) {
(*cb->callback)((XIC)ic, cb->client_data, (XPointer)NULL);
}
else {
......@@ -285,9 +285,9 @@ _XimGeometryCallback(Xim im,
}
Private XimCbStatus
_XimStrConversionCallback(Xim im,
Xic ic,
char* proto,
_XimStrConversionCallback(Xim im,
Xic ic,
char* proto,
int len)
{
XICCallback* cb = &ic->core.string_conversion_callback; /* check HM */
......@@ -312,10 +312,10 @@ _XimStrConversionCallback(Xim im,
/* no callback registered
*/
_XimError(im, ic,
(CARD16)XIM_BadSomething,
(INT16)len,
(CARD16)XIM_STR_CONVERSION,