diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:13:37 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:13:37 -0700 |
commit | 37ffe69b10ae29e8f91de6ef647d06804b9d159b (patch) | |
tree | a9cecc9af28bcb0761f3a9c08527c028fee748ff | |
parent | 6c628c605e4f58be3a84edc5273a0dd88363a770 (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-- | COPYING | 8 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | include/X11/Xaw/SimpleMenP.h | 2 | ||||
-rw-r--r-- | old-doc/CHANGES | 20 | ||||
-rw-r--r-- | old-doc/Changelog | 28 | ||||
-rw-r--r-- | specs/CH1.xml | 4 | ||||
-rw-r--r-- | specs/CH2.xml | 2 | ||||
-rw-r--r-- | specs/CH7.xml | 6 | ||||
-rw-r--r-- | specs/Dialog.xml | 14 | ||||
-rw-r--r-- | specs/Form.xml | 16 | ||||
-rw-r--r-- | specs/Makefile.am | 2 | ||||
-rw-r--r-- | specs/Porthole.xml | 6 | ||||
-rw-r--r-- | specs/SmeBSB.xml | 2 | ||||
-rw-r--r-- | specs/TextFuncs.xml | 4 | ||||
-rw-r--r-- | specs/libXaw.xml | 30 |
15 files changed, 73 insertions, 73 deletions
@@ -72,13 +72,13 @@ SOFTWARE. Copyright 1987-1998 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 diff --git a/Makefile.am b/Makefile.am index 25ad354..d8869f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = include src man specs pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = +pkgconfig_DATA = if BUILD_XAW6 diff --git a/include/X11/Xaw/SimpleMenP.h b/include/X11/Xaw/SimpleMenP.h index 5425468..e01c151 100644 --- a/include/X11/Xaw/SimpleMenP.h +++ b/include/X11/Xaw/SimpleMenP.h @@ -73,7 +73,7 @@ typedef struct _SimpleMenuPart { /* private */ Boolean recursive_set_values; /* contain a possible infinite loop */ - Boolean menu_width; /* If true then force width to remain + Boolean menu_width; /* If true then force width to remain core.width */ Boolean menu_height; /* Just like menu_width, but for height */ SmeObject entry_set; /* The entry that is currently set or diff --git a/old-doc/CHANGES b/old-doc/CHANGES index 2eb316a..a6a95fd 100644 --- a/old-doc/CHANGES +++ b/old-doc/CHANGES @@ -28,11 +28,11 @@ AsciiSrc (Text): Memory leak when freeing pieces in a source of type "ascii String" has been plugged. - Buffer is now updated whenever the "string" resource is set using + Buffer is now updated whenever the "string" resource is set using XtSetValues(). If type is file then the file is read in again. Box: - The public header file now includes Xmu/Converters.h for the + The public header file now includes Xmu/Converters.h for the orientation resources. Clock: @@ -53,7 +53,7 @@ Form: Fixed EdgeTypes to be Xaw* instead of Xt*, but left the old definitions around with #define so that code will still work. - StringToWidget converter no longer caches resources. + StringToWidget converter no longer caches resources. Logo: Made subclass of simple instead of Core. @@ -67,13 +67,13 @@ MenuButton: * The MenuButton widget no longer places a server grab on itself. Instead, PopupMenu is registered as a grab action. As a result of this, clients which popped up menus without using XtMenuPopup - or MenuPopup or PopupMenu in the menu button translations will - fail to have a grab active. They should make a call to - XtRegisterGrabAction on the appropriate action in the application + or MenuPopup or PopupMenu in the menu button translations will + fail to have a grab active. They should make a call to + XtRegisterGrabAction on the appropriate action in the application initialization routine, or use a different translation. Paned: - The public header file now includes Xmu/Converters.h for the + The public header file now includes Xmu/Converters.h for the orientation resources. Panner: This widget is new in R5. @@ -86,14 +86,14 @@ Scrollbar: Made subclass of simple instead of Core Type of thumb resource is XtRBitmap; it used to be XtRPixmap. - However, if applications provide the resource conversion, the + However, if applications provide the resource conversion, the Scrollbar's SetValues can still handle pixmaps of correct depth. Simple: Added a color cursor converter. and the new resource types: XtNpointerColor XtNpointerColorBackground - XtNcursorName + XtNcursorName SmeBSB: Right bitmaps are now painted in the correct location. @@ -132,7 +132,7 @@ TextP.h: #define XawDEL 0x7f #define XawBSLASH '\\' - + Toggle: * Toggle widget state is preserved across changes in sensitivity. diff --git a/old-doc/Changelog b/old-doc/Changelog index 263ae04..cabbb2c 100644 --- a/old-doc/Changelog +++ b/old-doc/Changelog @@ -349,7 +349,7 @@ Moved the code clipping code I have put in Text.c in my previous patch to code is now heavily used by the TextWidget. --- XEDIT -- +-- XEDIT -- Removed a XDefineCursor in xedit.c:main(). There are several ways to specify a cursor for a program (most times inherited from the wm decoration window), so, it is better to let the user choose one. @@ -358,7 +358,7 @@ Before starting the main loop, now xedit sets the keyboard focus to the none was especified in the command line (do not use the new xedit without the new Xaw library, or you will not be able to change the keyboard focus). Updated the Scrollbar configurations in Xedit.ad - + #1788 12 July 1998 @@ -368,7 +368,7 @@ Updated the Scrollbar configurations in Xedit.ad + Automatic resize was removed, it is not required with automatic horizontal scroll, but I will look for programs that rely on it; the only program affected (that I know) is xmh, because it popups dialogs of a small size, - and expects that the text widget (with a warning message) do a geometry + and expects that the text widget (with a warning message) do a geometry request. + Scroll mode set to "WhenNeeded" was removed. It generates several unespected conditions when editing text, and the new feature of automatic scrolling @@ -432,7 +432,7 @@ Fixed problem with the default macro for type conversion, where it was possible to the code tell the wrong size of a string, since it was returning the string size with 'strlen' but making the copy with strcpy. Complete ansification of Xaw (and Xmu). -Corrected some problems caused due to an alteration in the text code, to +Corrected some problems caused due to an alteration in the text code, to make the cursor always visible when the wrap mode is 'line' or 'word'. Text.c:VJump() was made a bit smarter and a problem that would cause it to jump incorrectly was also corrected so that now the jumping should be @@ -510,7 +510,7 @@ also fixed a possible buffer overflow while searching the source of the #1945, 31 Aug 1998 --- XAW -- +-- XAW -- + Corrected bug in Viewport.c:ComputeLayout(), that would put the scrollbar in the incorrect position, if w->viewport.useright == True + Corrected bug in Converters.c:_XawCvtCARD32ToString(), so that now it @@ -531,7 +531,7 @@ also fixed a possible buffer overflow while searching the source of the #2028, 2033, 7 Oct 1998 --- Xaw -- +-- Xaw -- Added a delete translation to the text widget, that deletes the current selection if any, else the backwards char. Corrected bug that would not update correctly the screen if page-up or @@ -550,20 +550,20 @@ Added a 'hack' to be able to type ^U<any-numeric-sequence> to be able Corrected a nasty bug in Text.c:CvtStringToScrollMode(); XtConvertAndStore can't be called from a type converter! added UNDO/REDO to the text widget. Please try it, I think it is very nice. - Undo is enabled by the new resource 'enableUndo', and, by default is + Undo is enabled by the new resource 'enableUndo', and, by default is triggered with 'Ctrl+_'. -- editres -- Resubmitting a patch to editres/handler.c, to make editres work properly. --- xedit -- +-- xedit -- NOTE that with this patch, xedit probably will not work with Xaw3d, neXtaw... this surelly can be fixed, or in the xedit side or the *Xaw* side, but the patch seens to be necessary. Changed the defaults file to be more user friendly and previsible. Added some 'Emacs like' binding translations. Added file completion in the filename prompt. This is a very nice - feature, but I'm not sure if the code is portable to all the XFree86 + feature, but I'm not sure if the code is portable to all the XFree86 supported platforms (surely it will not work 'as is' with OS/2). @@ -577,7 +577,7 @@ Changed the functions {Ascii,Multi}Sink.c:CharWidth and PaintText, to surely be made faster (based on comparition with some popular X editors). Changed the way the AsciiSink prints characters with value bigger than 126 decimal. Now it prints DEL as ^?, and the other characters as \XXX - where 'X' is an octal digit. The MultiSink widget was unchanged in this + where 'X' is an octal digit. The MultiSink widget was unchanged in this respect, i.e. when calling xedit with something like: xedit -xrm '*international: true' Converted all calls to strncpy, in AsciiSrc.c to memcpy, so that the (ascii) @@ -593,14 +593,14 @@ Changed Text.c:TextScroll() to be smarter when calculating the offset of Added a nice feature, to show the matching '(', '[' or '{', when a ')', ']' or '}' is typped. Changed TextAction.c:FormParagraph() to generate only one undo/redo step. - + -- xedit -- Changed the defaults file to enable backups and made the backup suffix the character '~'. Replaced all instances of sprintf by XmuSnprintf. Changed xedit to set the label when saving a file also, to reflect what is being edited correctly. -Corrected a bug in the new action 'file-completion', to replace correctly +Corrected a bug in the new action 'file-completion', to replace correctly the home directory, and keep correctly whatever was after the '~'. This isn't the correct place to this code (xedit/commands.c), since there are several other file name prompt windows in Xaw, but since it is required @@ -742,7 +742,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead' #2544 12 Mar 1999 - + -- Xaw -- Mostly changes to add support to latin-* languages in the text code, when not using the international resource. @@ -826,7 +826,7 @@ xedit.c: without it. Just ifdef'ed again the code to avoid warnings or dead code. -- xedit -- - + Added a ispell interface to xedit. Sorry for not documenting enough about it + + Added a ispell interface to xedit. Sorry for not documenting enough about it the man page, but here is a small explanation of the new funcionality: Replace: Replace's the selected word. All (right side of Replace button): Replaces all occurrences of the selected diff --git a/specs/CH1.xml b/specs/CH1.xml index a4fb08c..3363723 100644 --- a/specs/CH1.xml +++ b/specs/CH1.xml @@ -130,7 +130,7 @@ Format of the Widget Reference Chapters </para> <para> <!-- .LP --> -In addition to the terms already defined for X programming (see +In addition to the terms already defined for X programming (see <emphasis remap='I'>Xlib - C Language Interface</emphasis>), the following terms are specific to the Intrinsics and Athena widget set and used throughout this document. @@ -716,7 +716,7 @@ resource defaults to <function>False</function> in the Intrinsics, but is redefi default to <function>True</function> when an application is using the Athena widget set. An application programmer may override this default and set the resource back to <function>False</function> if the application does not need the window -manager to give it the input focus. See the +manager to give it the input focus. See the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis> for details on the <emphasis remap='I'>input</emphasis> resource. diff --git a/specs/CH2.xml b/specs/CH2.xml index cea1515..5cc8410 100644 --- a/specs/CH2.xml +++ b/specs/CH2.xml @@ -126,7 +126,7 @@ first letter of the application name. For example, the application named Specifies how to parse the command line for any application-specific resources. The options argument is passed as a parameter to -<function>XrmParseCommand</function> . +<function>XrmParseCommand</function> . For further information, see <emphasis remap='I'>Xlib - C Language Interface</emphasis>. </para> diff --git a/specs/CH7.xml b/specs/CH7.xml index 4c49170..62d23bb 100644 --- a/specs/CH7.xml +++ b/specs/CH7.xml @@ -4,7 +4,7 @@ Although the task of creating a new widget may at first appear a little daunting, there is a basic simple pattern that all widgets follow. The Athena Widget library contains a special widget called the -<emphasis remap='I'>Template</emphasis> widget that is intended to assist +<emphasis remap='I'>Template</emphasis> widget that is intended to assist the novice widget programmer in writing a custom widget. </para> <para> @@ -111,10 +111,10 @@ un-necessarily waste many resources. <para> In this section, an outline will be given of the procedure to follow to construct a special-purpose widget to address the items listed above. -The reader should refer to the appropriate sections of the +The reader should refer to the appropriate sections of the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis> for complete details of the material outlined here. Section 1.4 of -the <emphasis remap='I'>Intrinsics</emphasis> should be read in +the <emphasis remap='I'>Intrinsics</emphasis> should be read in conjunction with this section. </para> <para> diff --git a/specs/Dialog.xml b/specs/Dialog.xml index ab09dba..c779d76 100644 --- a/specs/Dialog.xml +++ b/specs/Dialog.xml @@ -431,7 +431,7 @@ tics. One is used when initially laying out the children. The other is used when the Dialog is resized. </para> <para> -The first layout method uses the <function>fromVert</function> mand <function>fromHoriz</function> +The first layout method uses the <function>fromVert</function> mand <function>fromHoriz</function> resources to place the children of the Dialog. A single pass is made through the Dialog widget's children in the order that they were created. Each child is then placed in @@ -450,17 +450,17 @@ The second layout method is used when the Dialog is resized. It does not matter what causes this resize, and it is possi- ble for a resize to happen before the widget becomes visible (due to constraints imposed by the parent of the Dialog). -This layout method uses the <function>bottom</function> , -<function>top</function> , <function>left</function> , and -<function>right</function> +This layout method uses the <function>bottom</function> , +<function>top</function> , <function>left</function> , and +<function>right</function> resources. These resources are used to determine what will happen to each edge of the child when the Dialog is resized. -If a value of <function>XawChain</function> +If a value of <function>XawChain</function> <emphasis remap='I'><something></emphasis> is specified, the the edge of the child will remain a fixed distance from the <emphasis remap='I'>chain</emphasis> -edge of the Dialog. For example if <function>XawChainLeft</function> -mis specified for the <function>right</function> mresource of a child +edge of the Dialog. For example if <function>XawChainLeft</function> +mis specified for the <function>right</function> mresource of a child then the right edge of that child will remain a fixed distance from the left edge of the Dialog widget. If a value of <function>XawRubber</function> mis spec- diff --git a/specs/Form.xml b/specs/Form.xml index cd41ef9..4b02bde 100644 --- a/specs/Form.xml +++ b/specs/Form.xml @@ -380,16 +380,16 @@ One is used when initially laying out the children. The other is used when the Form is resized. </para> <para> -The first layout method uses the <function>fromVert</function> -and <function>fromHoriz</function> +The first layout method uses the <function>fromVert</function> +and <function>fromHoriz</function> resources to place the children of the Form. A single pass is made through the Form widget's children in the order that they were created. Each child is then placed in the Form widget below or to the right of the widget specified by the -<function>fromVert</function> and <function>fromHoriz</function> +<function>fromVert</function> and <function>fromHoriz</function> resources. The distance the new child is placed from its left or upper neighbor is deter- -mined by the <function>horizDistance</function> and +mined by the <function>horizDistance</function> and <function>vertDistance</function> resources. This implies some things about how the order of creation affects the possible placement of the children. The Form widget @@ -401,14 +401,14 @@ The second layout method is used when the Form is resized. It does not matter what causes this resize, and it is possi- ble for a resize to happen before the widget becomes visible (due to constraints imposed by the parent of the Form). -This layout method uses the <function>bottom</function>, -<function>top</function>, <function>left</function>, and +This layout method uses the <function>bottom</function>, +<function>top</function>, <function>left</function>, and <function>right</function> resources. These resources are used to determine what will happen to each edge of the child when the Form is resized. -If a value of <function>XawChain</function> +If a value of <function>XawChain</function> <<emphasis remap='I'>something</emphasis>> is specified, the the edge -of the child will remain a fixed distance from the +of the child will remain a fixed distance from the <emphasis remap='I'>chain</emphasis> edge of the Form. For example if <function>XawChainLeft</function> is specified for the <function>right</function> resource of a child then the right edge of diff --git a/specs/Makefile.am b/specs/Makefile.am index ff0fcfa..8663da2 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -2,7 +2,7 @@ if ENABLE_SPECS # Main DocBook/XML files (DOCTYPE book) -docbook = libXaw.xml +docbook = libXaw.xml # Included chapters, appendix, images chapters = \ diff --git a/specs/Porthole.xml b/specs/Porthole.xml index a0a87c1..2a90815 100644 --- a/specs/Porthole.xml +++ b/specs/Porthole.xml @@ -281,7 +281,7 @@ the managed child changes size or position: Specifies the Porthole widget. </para> </listitem> - </varlistentry> + </varlistentry> <varlistentry> <term>client_data</term> <listitem> @@ -290,7 +290,7 @@ Specifies the Porthole widget. Specifies the client data. </para> </listitem> - </varlistentry> + </varlistentry> <varlistentry> <term>report</term> <listitem> @@ -300,7 +300,7 @@ Specifies a pointer to an <function>XawPannerReport</function> structure contain the location and size of the slider and the size of the canvas. </para> </listitem> - </varlistentry> + </varlistentry> </variablelist> </sect2> </sect1> diff --git a/specs/SmeBSB.xml b/specs/SmeBSB.xml index 539bdcb..68c6fa0 100644 --- a/specs/SmeBSB.xml +++ b/specs/SmeBSB.xml @@ -189,7 +189,7 @@ All callback functions on this list are called when the SimpleMenu <emphasis remap='I'>notifies</emphasis> this entry that the user has selected it. </para> </listitem> - </varlistentry> + </varlistentry> <varlistentry> <term>font</term> <listitem> diff --git a/specs/TextFuncs.xml b/specs/TextFuncs.xml index 9057c33..758b114 100644 --- a/specs/TextFuncs.xml +++ b/specs/TextFuncs.xml @@ -152,7 +152,7 @@ Specifies the character position at which the selection ends. </para> <para> <!-- .LP --> -See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref --> +See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref --> If redisplay is enabled, this function highlights the text and makes it the <function>PRIMARY</function> selection. This function does not have any effect on <function>CUT_BUFFER0</function>. @@ -239,7 +239,7 @@ Returns the end of the text selection. </para> <para> <!-- .LP --> -See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref --> +See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref --> If the returned values are equal, no text is currently selected. </para> </sect2> diff --git a/specs/libXaw.xml b/specs/libXaw.xml index c8ad9d0..39bf7c8 100644 --- a/specs/libXaw.xml +++ b/specs/libXaw.xml @@ -29,33 +29,33 @@ <legalnotice> <para> -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files -(the “Software”), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to permit -persons to whom the Software is furnished to do so, subject to the following +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files +(the “Software”), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the following conditions: </para> <para> -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. </para> <para> -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </para> <para> -Except as contained in this notice, the name of the X Consortium shall not -be used in advertising or otherwise to promote the sale, use or other dealings +Except as contained in this notice, the name of the X Consortium shall not +be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. </para> |