diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:57:40 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:57:40 -0700 |
| commit | da69add8425b1bd098a96c9873a2e7ed2bd1bae0 (patch) | |
| tree | 4ea8401259d8cb2146bffc4a946b708cf626ca9d | |
| parent | cf3d37b193895268106418e6fdb58a078abe7a3f (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>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | man/XF86Misc.man | 6 | ||||
| -rw-r--r-- | src/XF86Misc.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 87e54e2..f52c128 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xxf86misc.pc MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = xxf86misc.pc.in +EXTRA_DIST = xxf86misc.pc.in .PHONY: ChangeLog INSTALL diff --git a/man/XF86Misc.man b/man/XF86Misc.man index fe4f3d7..708460a 100644 --- a/man/XF86Misc.man +++ b/man/XF86Misc.man @@ -4,7 +4,7 @@ .\" .\" .\" Copyright (c) 1996 Joe Moss, The XFree86 Project -.\" +.\" .\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man,v 3.12 2002/12/22 00:46:54 dawes Exp $ .de ZN .ie t \fB\^\\$1\^\fR\\$2 @@ -163,7 +163,7 @@ The device can not be changed .IP 2) 3 The protocol can not be changed to or from Xqueue or OsMouse .IP 3) 3 -The buttons field can not be changed +The buttons field can not be changed .IP 4) 3 Invalid combinations of parameters are not allowed .RE @@ -172,7 +172,7 @@ The server will generate an error if any of the above is attempted, except the first \- the contents of the device field are simply ignored. .PP A change of the protocol causes the device to be closed and reopened. -Changes to the baud rate, sample rate, resolution or flags, +Changes to the baud rate, sample rate, resolution or flags, when applicable to the selected protocol, also cause a reopen of the device. A reopen can be forced by using the MF_REOPEN flag, except in the diff --git a/src/XF86Misc.c b/src/XF86Misc.c index 193224f..3287602 100644 --- a/src/XF86Misc.c +++ b/src/XF86Misc.c @@ -42,9 +42,9 @@ static /* const */ XExtensionHooks xf86misc_extension_hooks = { NULL, /* error_string */ }; -static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86misc_info, - xf86misc_extension_name, - &xf86misc_extension_hooks, +static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86misc_info, + xf86misc_extension_name, + &xf86misc_extension_hooks, 0, NULL) static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info) @@ -91,7 +91,7 @@ Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion) SyncHandle(); if (*majorVersion > 0 || *minorVersion > 5) XF86MiscSetClientVersion(dpy); - + return True; } @@ -191,13 +191,13 @@ Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo) XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetMouseSettingsReq *req; int majorVersion, minorVersion; - + XF86MiscCheckExtension (dpy, info, False); XF86MiscQueryVersion(dpy, &majorVersion, &minorVersion); - + LockDisplay(dpy); GetReq(XF86MiscSetMouseSettings, req); - + req->reqType = info->codes->major_opcode; req->xf86miscReqType = X_XF86MiscSetMouseSettings; req->mousetype = mouseinfo->type; @@ -218,7 +218,7 @@ Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo) Data(dpy, mouseinfo->device, req->devnamelen); } } - + UnlockDisplay(dpy); SyncHandle(); return True; |