diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-31 23:28:42 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-31 23:29:18 -0700 |
commit | 2a637337713c5c92c44249b88e31696ce9efdf9b (patch) | |
tree | 2225bb5610c56e4e3d1e419961cc80c0006991ac | |
parent | ce4e11143f982234be1076e384b31228f1cc84ae (diff) |
Delete trailing whitespace in non *.[ch] source files
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | man/twm.man | 272 | ||||
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/gram.y | 56 | ||||
-rw-r--r-- | src/lex.l | 8 |
6 files changed, 176 insertions, 176 deletions
diff --git a/Makefile.am b/Makefile.am index ffcb676..d3c525b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # 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. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/configure.ac b/configure.ac index 09657a0..4ea95c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -9,7 +9,7 @@ dnl advertising or publicity pertaining to distribution of the software without dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/man/twm.man b/man/twm.man index 9dbb282..cc8bc5f 100644 --- a/man/twm.man +++ b/man/twm.man @@ -1,16 +1,16 @@ .\" Copyright 1993, 1994, 1998 The Open Group .\" Portions copyright 1988 Evans & Sutherland Computer Corporation. .\" Portions copyright 1989 Hewlett-Packard Company -.\" +.\" .\" 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 .\" copyright notice and this permission notice appear in supporting .\" documentation. -.\" +.\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. -.\" +.\" .\" 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. @@ -18,7 +18,7 @@ .\" 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. -.\" +.\" .\" Except as contained in this notice, the name of The Open Group shall .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization @@ -44,26 +44,26 @@ twm \- Tab Window Manager for the X Window System \fBtwm \fP[ \fB\-display\fP \fIdpy\fP ] [ \fB\-s\fP ] [ \fB\-f\fP \fIinitfile\fP ] [ \fB\-v\fP ] .SH DESCRIPTION -\fITwm\fP is a window manager for the X Window System. It provides +\fITwm\fP is a window manager for the X Window System. It provides titlebars, shaped windows, -several forms of icon management, user-defined macro functions, -click-to-type and pointer-driven keyboard focus, and user-specified +several forms of icon management, user-defined macro functions, +click-to-type and pointer-driven keyboard focus, and user-specified key and pointer button bindings. .PP This program is usually started by the user's session manager or startup script. When used from \fIxdm(__appmansuffix__)\fP or \fIxinit(__appmansuffix__)\fP without a session manager, \fItwm\fP is frequently executed in the foreground -as the last client. When run this way, exiting \fItwm\fP causes the +as the last client. When run this way, exiting \fItwm\fP causes the session to be terminated (i.e., logged out). .PP -By default, application windows are surrounded by a ``frame'' with a -titlebar at the top and a special border around the window. The titlebar +By default, application windows are surrounded by a ``frame'' with a +titlebar at the top and a special border around the window. The titlebar contains the window's name, a rectangle that is lit when the window is receiving keyboard input, and function boxes known as ``titlebuttons'' at the left and right edges of the titlebar. .PP Pressing pointer Button1 (usually the left-most -button unless it has been changed with \fIxmodmap\fP) on a +button unless it has been changed with \fIxmodmap\fP) on a titlebutton will invoke the function associated with the button. In the default interface, windows are iconified by clicking (pressing and then immediately releasing) the left titlebutton (which looks @@ -82,13 +82,13 @@ clicking in the title or highlight region raises the window without moving it. .PP When new windows are created, \fItwm\fP will honor any size and location information requested by the user (usually through \fI-geometry\fP -command line argument or resources for the individual applications). -Otherwise, an outline of the window's default size, its titlebar, and lines -dividing the +command line argument or resources for the individual applications). +Otherwise, an outline of the window's default size, its titlebar, and lines +dividing the window into a 3x3 grid that track the pointer are displayed. Clicking pointer Button1 will position the window at the current position and give it the default -size. Pressing pointer Button2 (usually the middle pointer button) +size. Pressing pointer Button2 (usually the middle pointer button) and dragging the outline will give the window its current position but allow the sides to be resized as described above. Clicking pointer Button3 (usually the right pointer button) @@ -102,14 +102,14 @@ to touch the bottom the screen. This option specifies the X server to use. .TP 8 .B \-s -This option indicates that only the default screen (as specified by +This option indicates that only the default screen (as specified by \fB\-display\fP or by the \fBDISPLAY\fP environment variable) should be managed. By default, \fItwm\fP will attempt to manage all screens on the display. .TP 8 .B \-f \fIfilename\fP This option specifies the name of the startup file to use. By default, -\fItwm\fP will look in the user's home directory for files +\fItwm\fP will look in the user's home directory for files named \fI.twmrc.num\fP (where \fInum\fP is a screen number) or \fI.twmrc\fP. .TP 8 .B \-v @@ -125,8 +125,8 @@ each screen being managed when \fItwm\fP begins): .B "$HOME/.twmrc.\fIscreennumber\fP" The \fIscreennumber\fP is a small positive number (e.g. 0, 1, etc.) representing the screen number (e.g. the last number in the DISPLAY environment -variable \fIhost:displaynum.screennum\fP) that would be used to contact that -screen of the display. This is intended for displays with multiple screens of +variable \fIhost:displaynum.screennum\fP) that would be used to contact that +screen of the display. This is intended for displays with multiple screens of differing visual types. .TP 8 .B "$HOME/.twmrc" @@ -134,25 +134,25 @@ This is the usual name for an individual user's startup file. .TP 8 .B __projectroot__/lib/X11/twm/system.twmrc If neither of the preceding files are found, \fItwm\fP will look in this -file for a +file for a default configuration. This is often tailored by the site administrator to provide convenient menus or familiar bindings for novice users. .PP If no startup files are found, \fItwm\fP will use the built-in defaults -described above. The only resource used by \fItwm\fP is +described above. The only resource used by \fItwm\fP is \fIbitmapFilePath\fP for a colon-separated list of directories to search when looking for bitmap files (for more information, see the \fIAthena Widgets\fP manual and \fIxrdb(__appmansuffix__)\fP). .PP -\fITwm\fP startup files are logically broken up into three types of -specifications: \fIVariables\fP, \fIBindings\fP, \fIMenus\fP. The +\fITwm\fP startup files are logically broken up into three types of +specifications: \fIVariables\fP, \fIBindings\fP, \fIMenus\fP. The \fIVariables\fP section must come first and is used to describe the fonts, colors, cursors, border widths, icon and window placement, highlighting, autoraising, layout of titles, warping, use of the icon manager. The \fIBindings\fP section usually comes second and is used to specify the functions that should be to be invoked when keyboard and pointer buttons are pressed in -windows, icons, titles, and frames. The \fIMenus\fP section gives any +windows, icons, titles, and frames. The \fIMenus\fP section gives any user-defined menus (containing functions to be invoked or commands to be executed). .PP @@ -182,22 +182,22 @@ or "Xmh" } .EE -When a variable containing a list of strings representing windows is searched +When a variable containing a list of strings representing windows is searched (e.g. to determine whether or not to enable autoraise as shown above), a string must be an exact, case-sensitive match to -the window's name (given by the WM_NAME window property), resource name +the window's name (given by the WM_NAME window property), resource name or class name (both given by the WM_CLASS window property). The preceding example would enable autoraise on windows named ``emacs'' as well as any -\fIxterm\fP (since they are of class ``XTerm'') or xmh windows +\fIxterm\fP (since they are of class ``XTerm'') or xmh windows (which are of class ``Xmh''). .PP String arguments that are interpreted as filenames (see the \fBPixmaps\fP, -\fBCursors\fP, and \fBIconDirectory\fP below) will +\fBCursors\fP, and \fBIconDirectory\fP below) will prepend the user's directory (specified by the \fBHOME\fP environment variable) if the first character is a tilde (~). If, instead, the first character is a colon (:), the name is assumed to refer to one of the internal bitmaps that are used to -create the default titlebars symbols: \fB:xlogo\fP +create the default titlebars symbols: \fB:xlogo\fP or \fB:delete\fP (both refer to the X logo), \fB:dot\fP or \fB:iconify\fP (both refer to the dot), \fB:resize\fP (the nested squares used by the resize button), @@ -215,21 +215,21 @@ interactively enabled or disabled on individual windows using the function \fBf.autoraise\fP. .IP "\fBAutoRelativeResize\fP" 8 This variable indicates that dragging out a window size (either when -initially sizing the window with pointer Button2 or when resizing it) +initially sizing the window with pointer Button2 or when resizing it) should not wait until the pointer has crossed the window edges. Instead, moving the pointer automatically causes the nearest edge or edges to move by the -same amount. This allows the resizing of windows that extend off +same amount. This allows the resizing of windows that extend off the edge of the screen. If the pointer is -in the center of the window, or if the resize is begun by pressing a +in the center of the window, or if the resize is begun by pressing a titlebutton, \fItwm\fP will still wait for the pointer to cross a window edge (to prevent accidents). This option is particularly useful for people who like the press-drag-release method of sweeping out window sizes. .IP "\fBBorderColor\fP \fIstring\fP [{ \fIwincolorlist\fP }]" 8 -This variable specifies the default color of the border to be placed around -all +This variable specifies the default color of the border to be placed around +all non-iconified windows, and may only be given within a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwincolorlist\fP specifies a list @@ -244,7 +244,7 @@ different types of windows. For example: .EE The default is "black". .IP "\fBBorderTileBackground\fP \fIstring\fP [{ \fIwincolorlist\fP }]" 8 -This variable specifies the default background color in the gray pattern +This variable specifies the default background color in the gray pattern used in unhighlighted borders (only if \fBNoHighlight\fP hasn't been set), and may only be given within a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwincolorlist\fP allows per-window colors to be specified. @@ -252,7 +252,7 @@ The default is "white". .IP "\fBBorderTileForeground\fP \fIstring\fP [{ \fIwincolorlist\fP }]" 8 This variable specifies the default foreground color in the gray pattern used in unhighlighted borders (only -if \fBNoHighlight\fP hasn't been set), and may only be given within a +if \fBNoHighlight\fP hasn't been set), and may only be given within a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwincolorlist\fP allows per-window colors to be specified. The default is "black". .IP "\fBBorderWidth\fP \fIpixels\fP" 8 @@ -261,7 +261,7 @@ all client window frames if \fBClientBorderWidth\fP has not been specified. This value is also used to set the border size of windows created by \fItwm\fP (such as the icon manager). The default is 2. .IP "\fBButtonIndent\fP \fIpixels\fP" 8 -This variable specifies the amount by which titlebuttons should be +This variable specifies the amount by which titlebuttons should be indented on all sides. Positive values cause the buttons to be smaller than the window text and highlight area so that they stand out. Setting this and the \fBTitleButtonBorderWidth\fP variables to 0 makes titlebuttons be as @@ -309,7 +309,7 @@ For example: TitleBackground "blue" } .EE -All of these color variables may also be specified for the \fBMonochrome\fP +All of these color variables may also be specified for the \fBMonochrome\fP variable, allowing the same initialization file to be used on both color and monochrome displays. .IP "\fBConstrainedMoveTime\fP \fImilliseconds\fP" 8 @@ -357,8 +357,8 @@ The following example shows the default cursor definitions: } .EE .IP "\fBDecorateTransients\fP" 8 -This variable indicates that transient windows (those containing a -WM_TRANSIENT_FOR property) should have titlebars. By default, transients +This variable indicates that transient windows (those containing a +WM_TRANSIENT_FOR property) should have titlebars. By default, transients are not reparented. .IP "\fBDefaultBackground\fP \fIstring\fP" 8 This variable specifies the background color to be used for sizing and @@ -375,7 +375,7 @@ as icons while other windows are handled by the icon manager. This variable indicates that windows should not be allowed to be moved off the screen. It can be overridden by the \fBf.forcemove\fP function. .IP "\fBDontSqueezeTitle\fP [{ \fIwin-list\fP }] " 8 -This variable indicates that titlebars should not be squeezed to their +This variable indicates that titlebars should not be squeezed to their minimum size as described under \fBSqueezeTitle\fP below. If the optional window list is supplied, only those windows will be prevented from being squeezed. @@ -400,13 +400,13 @@ This variable specifies the color of the border used for icon windows, and may only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. See the \fBBorderColor\fP -variable for a complete description of the \fIwin-list\fP. +variable for a complete description of the \fIwin-list\fP. The default is "black". .IP "\fBIconBorderWidth\fP \fIpixels\fP" 8 This variable specifies the width in pixels of the border surrounding icon windows. The default is 2. .IP "\fBIconDirectory\fP \fIstring\fP" 8 -This variable specifies the directory that should be searched if +This variable specifies the directory that should be searched if if a bitmap file cannot be found in any of the directories in the \fBbitmapFilePath\fP resource. .IP "\fBIconFont\fP \fIstring\fP" 8 @@ -414,7 +414,7 @@ This variable specifies the font to be used to display icon names within icons. The default is "variable". .IP "\fBIconForeground\fP \fIstring\fP [{ \fIwin-list\fP }]" 8 This variable specifies the foreground color to be used when displaying icons, -and may only be specified inside of a +and may only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. See the \fBBorderColor\fP @@ -422,7 +422,7 @@ variable for a complete description of the \fIwin-list\fP. The default is "black". .IP "\fBIconifyByUnmapping [{ \fIwin-list\fP }]\fP" 8 This variable indicates that windows should be iconified by being unmapped -without trying to map any icons. This assumes that the user will +without trying to map any icons. This assumes that the user will remap the window through the icon manager, the \fBf.warpto\fP function, or the \fITwmWindows\fP menu. If the optional \fIwin-list\fP is provided, only those windows will be @@ -431,7 +431,7 @@ iconified by simply unmapping. Windows that have both this and the to the \fITwmWindows\fP menu is set in the user's startup file. .IP "\fBIconManagerBackground\fP \fIstring\fP [{ \fIwin-list\fP }]" 8 This variable specifies the background color to use for icon manager entries, -and may only be specified inside of a +and may only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. See the \fBBorderColor\fP @@ -448,15 +448,15 @@ This variable specifies the font to be used when displaying icon manager entries. The default is "variable". .IP "\fBIconManagerForeground\fP \fIstring\fP [{ \fIwin-list\fP }]" 8 This variable specifies the foreground color to be used when displaying -icon manager entries, and may only be specified inside of a +icon manager entries, and may only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. See the \fBBorderColor\fP variable for a complete description of the \fIwin-list\fP. The default is "black". .IP "\fBIconManagerGeometry\fP \fIstring\fP [ \fIcolumns\fP ]" 8 -This variable specifies the geometry of the icon manager window. The -\fIstring\fP argument is standard geometry specification that indicates +This variable specifies the geometry of the icon manager window. The +\fIstring\fP argument is standard geometry specification that indicates the initial full size of the icon manager. The icon manager window is then broken into \fIcolumns\fP pieces and scaled according to the number of entries in the icon manager. Extra entries are wrapped to form @@ -464,7 +464,7 @@ additional rows. The default number of columns is 1. .IP "\fBIconManagerHighlight\fP \fIstring\fP [{ \fIwin-list\fP }]" 8 This variable specifies the border color to be used when highlighting the icon manager entry that currently has the focus, -and can only be specified inside of a +and can only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. See the \fBBorderColor\fP @@ -477,7 +477,7 @@ This variable specifies a list of icon managers to create. Each item in the "\fIwinname\fP" ["\fIiconname\fP"] "\fIgeometry\fP" \fIcolumns\fP .EE where \fIwinname\fP is the name of the windows that should be put into this -icon manager, \fIiconname\fP is the name of that icon manager window's icon, +icon manager, \fIiconname\fP is the name of that icon manager window's icon, \fIgeometry\fP is a standard geometry specification, and \fIcolumns\fP is the number of columns in this icon manager as described in \fBIconManagerGeometry\fP. For example: @@ -507,7 +507,7 @@ control and is used to control whether icons are first filled in from the top or bottom of the icon region. Similarly, the \fIhgrav\fP argument should be either \fBEast\fP or \fBWest\fP and is used to control whether icons should be filled in from left from the right. Icons are laid out within the region -in a grid with cells \fIgridwidth\fP pixels wide and \fIgridheight\fP pixels +in a grid with cells \fIgridwidth\fP pixels wide and \fIgridheight\fP pixels high. .IP "\fBIcons\fP { \fIwin-list\fP }" 8 This variable specifies a list of window names and the bitmap filenames that @@ -519,8 +519,8 @@ should be used as their icons. For example: "xfd" "xfd_icon" } .EE -Windows that match ``XTerm'' and would not be iconified by unmapping, and -would try to use +Windows that match ``XTerm'' and would not be iconified by unmapping, and +would try to use the icon bitmap in the file ``xterm.icon''. If \fBForceIcons\fP is specified, this bitmap will be used even if the client has requested its own icon pixmap. @@ -548,16 +548,16 @@ and is used to request titles on specific windows when \fBNoTitle\fP has been set. .IP "\fBMaxWindowSize\fP \fIstring\fP" 8 This variable specifies a geometry in which the width and height -give the maximum size for a given window. This is typically used to +give the maximum size for a given window. This is typically used to restrict windows to the size of the screen. The default width is 32767 - -screen width. The default height is 32767 - screen height. +screen width. The default height is 32767 - screen height. .IP "\fBMenuBackground\fP \fIstring\fP" 8 This variable specifies the background color used for menus, -and can only be specified inside of a +and can only be specified inside of a \fBColor\fP or \fBMonochrome\fP list. The default is "white". .IP "\fBMenuBorderColor\fP \fIstring\fP" 8 This variable specifies the color of the menu border and can only be specified -inside of a +inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The default is "black". .IP "\fBMenuBorderWidth\fP \fIpixels\fP" 8 This variable specifies the width in pixels of the border surrounding @@ -567,21 +567,21 @@ This variable specifies the font to use when displaying menus. The default is "variable". .IP "\fBMenuForeground\fP \fIstring\fP" 8 This variable specifies the foreground color used for menus, -and can only be specified inside of a +and can only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The default is "black". .IP "\fBMenuShadowColor\fP \fIstring\fP" 8 This variable specifies the color of the shadow behind pull-down menus -and can only be specified inside of a +and can only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The default is "black". .IP "\fBMenuTitleBackground\fP \fIstring\fP" 8 This variable specifies the background color for \fBf.title\fP entries in menus, and -can only be specified inside of a +can only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The default is "white". .IP "\fBMenuTitleForeground\fP \fIstring\fP" 8 This variable specifies the foreground color for \fBf.title\fP entries in menus and -can only be specified inside of a +can only be specified inside of a \fBColor\fP or \fBMonochrome\fP list. The default is "black". .IP "\fBMonochrome\fP { \fIcolors\fP }" 8 This variable specifies a list of color assignments that should be made if @@ -596,10 +596,10 @@ store to minimize repainting of menus. This is typically used with servers that can repaint faster than they can handle backing store. .IP "\fBNoCaseSensitive\fP" 8 This variable indicates that case should be ignored when sorting icon names -in an icon manager. This option is typically used with applications that +in an icon manager. This option is typically used with applications that capitalize the first letter of their icon name. .IP "\fBNoDefaults\fP" 8 -This variable indicates that \fItwm\fP should not supply the default +This variable indicates that \fItwm\fP should not supply the default titlebuttons and bindings. This option should only be used if the startup file contains a completely new set of bindings and definitions. .IP "\fBNoGrabServer\fP" 8 @@ -620,7 +620,7 @@ This variable indicates that menus should not have drop shadows drawn behind them. This is typically used with slower servers since it speeds up menu drawing at the expense of making the menu slightly harder to read. .IP "\fBNoRaiseOnDeiconify\fP" 8 -This variable indicates that windows that are deiconified should not be +This variable indicates that windows that are deiconified should not be raised. .IP "\fBNoRaiseOnMove\fP" 8 This variable indicates that windows should not be raised when moved. This @@ -633,18 +633,18 @@ This variable indicates that windows should not be raised when the pointer is warped into them with the \fBf.warpto\fP function. If this option is set, warping to an occluded window may result in the pointer ending up in the occluding window instead the desired window (which causes unexpected behavior -with \fBf.warpring\fP). +with \fBf.warpring\fP). .IP "\fBNoSaveUnders\fP" 8 This variable indicates that menus should not request save-unders to minimize window repainting following menu selection. It is typically used with displays that can repaint faster than they can handle save-unders. .IP "\fBNoStackMode\fP [{ \fIwin-list\fP }]" 8 -This variable indicates that client window requests to change stacking order -should be ignored. If the optional \fIwin-list\fP is given, only requests on +This variable indicates that client window requests to change stacking order +should be ignored. If the optional \fIwin-list\fP is given, only requests on those windows will be ignored. This is typically used to prevent applications from relentlessly popping themselves to the front of the window stack. .IP "\fBNoTitle\fP [{ \fIwin-list\fP }] " 8 -This variable indicates that windows should not have titlebars. If the +This variable indicates that windows should not have titlebars. If the optional \fIwin-list\fP is given, only those windows will not have titlebars. \fBMakeTitle\fP may be used with this option to force titlebars to be put on specific windows. @@ -655,7 +655,7 @@ so that focus and key events from the titlebar and icon managers are delivered to the application. If the pointer is moved quickly and \fItwm\fP is slow to respond, input can be directed to the old window instead of the new. This option is typically -used to prevent this ``input lag'' and to +used to prevent this ``input lag'' and to work around bugs in older applications that have problems with focus events. .IP "\fBNoTitleHighlight\fP [{ \fIwin-list\fP }]" 8 This variable indicates that the highlight area of the titlebar, which is @@ -671,8 +671,8 @@ what the window will look like in the new position. This option is typically used on fast displays (particularly if \fBNoGrabServer\fP is set). .IP "\fBPixmaps\fP { \fIpixmaps\fP }" 8 This variable specifies a list of pixmaps that define the appearance of various -images. Each entry is a keyword indicating the pixmap to set, followed by a -string giving the name of the bitmap file. The following pixmaps +images. Each entry is a keyword indicating the pixmap to set, followed by a +string giving the name of the bitmap file. The following pixmaps may be specified: .EX 0 \fBPixmaps\fP @@ -683,17 +683,17 @@ may be specified: The default for \fITitleHighlight\fP is to use an even stipple pattern. .IP "\fBPriority\fP \fIpriority\fP" 8 This variable sets \fItwm\fP's priority. \fIpriority\fP should be an -unquoted, signed number (e.g. 999). This variable has an effect only +unquoted, signed number (e.g. 999). This variable has an effect only if the server supports the SYNC extension. .IP "\fBRandomPlacement\fP" 8 -This variable indicates that windows with no specified geometry should +This variable indicates that windows with no specified geometry should be placed in a pseudo-random location instead of having the user drag out an outline. .IP "\fBResizeFont\fP \fIstring\fP" 8 This variable specifies the font to be used for in the dimensions window when resizing windows. The default is "fixed". .IP "\fBRestartPreviousState\fP" 8 -This variable indicates that +This variable indicates that \fItwm\fP should attempt to use the WM_STATE property on client windows to tell which windows should be iconified and which should be left visible. This is typically used to try to regenerate the state that the screen @@ -702,7 +702,7 @@ was in before the previous window manager was shutdown. This variable indicates a list of color assignments to be stored as pixel values in the root window property _MIT_PRIORITY_COLORS. Clients may elect to preserve these values when installing their own colormap. Note that -use of this mechanism is a way an for application to avoid the "technicolor" +use of this mechanism is a way an for application to avoid the "technicolor" problem, whereby useful screen objects such as window borders and titlebars disappear when a programs custom colors are installed by the window manager. @@ -725,8 +725,8 @@ This variable indicates that the icon manager window should be displayed when \fItwm\fP is started. It can always be brought up using the \fBf.showiconmgr\fP function. .IP "\fBSortIconManager\fP" 8 -This variable indicates that entries in the icon manager should be -sorted alphabetically rather than by simply appending new windows to +This variable indicates that entries in the icon manager should be +sorted alphabetically rather than by simply appending new windows to the end. .IP "\fBSqueezeTitle\fP [{ \fIsqueeze-list\fP }] " 8 This variable indicates that \fItwm\fP should attempt to use the SHAPE @@ -743,7 +743,7 @@ where \fIname\fP is a window name, \fIjustification\fP is either \fBleft\fP, are numbers specifying a ratio giving the relative position about which the titlebar is justified. The ratio is measured from left to right if the numerator is positive, and right to left if negative. A denominator -of 0 indicates that the numerator should be measured in pixels. For +of 0 indicates that the numerator should be measured in pixels. For convenience, the ratio 0/0 is the same as 1/2 for \fBcenter\fP and -1/1 for \fBright\fP. For example: .EX 0 @@ -756,7 +756,7 @@ for \fBright\fP. For example: "emacs" right 0 0 } .EE -The \fBDontSqueezeTitle\fP list can be used to turn off squeezing on +The \fBDontSqueezeTitle\fP list can be used to turn off squeezing on certain titles. .IP "\fBStartIconified\fP [{ \fIwin-list\fP }] " 8 This variable indicates that client windows should initially be left as @@ -766,7 +766,7 @@ programs that do not support an \fI-iconic\fP command line option or resource. .IP "\fBTitleBackground\fP \fIstring\fP [{ \fIwin-list\fP }]" 8 This variable specifies the background color used in titlebars, -and may only be specified inside of a +and may only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. @@ -781,7 +781,7 @@ This variable specifies the font to be used for displaying window names in titlebars. The default is "variable". .IP "\fBTitleForeground\fP \fIstring\fP [{ \fIwin-list\fP }]" 8 This variable specifies the foreground color used in titlebars, and -may only be specified inside of a +may only be specified inside of a \fBColor\fP, \fBGrayscale\fP or \fBMonochrome\fP list. The optional \fIwin-list\fP is a list of window names and colors so that per-window colors may be specified. @@ -795,24 +795,24 @@ used as the default icon. This bitmap will be used as the icon of all clients which do not provide an icon bitmap and are not listed in the \fBIcons\fP list. .IP "\fBUsePPosition\fP \fIstring\fP" 8 -This variable specifies whether or not \fItwm\fP should honor +This variable specifies whether or not \fItwm\fP should honor program-requested locations (given by the \fBPPosition\fP flag in the WM_NORMAL_HINTS property) in the absence of a user-specified position. The argument \fIstring\fP may have one of three values: \fB"off"\fP -(the default) +(the default) indicating that \fItwm\fP -should ignore the program-supplied position, +should ignore the program-supplied position, \fB"on"\fP indicating that the position -should be used, and +should be used, and \fB"non-zero"\fP indicating that the position should used if -it is other than (0,0). The latter option is for working around a bug in +it is other than (0,0). The latter option is for working around a bug in older toolkits. .IP "\fBWarpCursor\fP [{ \fIwin-list\fP }]" 8 This variable indicates that the pointer should be warped into windows when they are deiconified. If the optional \fIwin-list\fP is given, the pointer will only be warped when those windows are deiconified. .IP "\fBWindowRing\fP { \fIwin-list\fP }" 8 -This variable specifies a list of windows along which the \fBf.warpring\fP +This variable specifies a list of windows along which the \fBf.warpring\fP function cycles. .IP "\fBWarpUnmapped\fP" 8 This variable indicates that the \fBf.warpto\fP function should deiconify @@ -821,12 +821,12 @@ binding that will pop a particular window (such as \fIxmh\fP), no matter where it is. The default is for \fBf.warpto\fP to ignore iconified windows. .IP "\fBXorValue\fP \fInumber\fP" 8 This variable specifies the value to use when drawing window outlines for -moving and resizing. This should be set to a value that will result in a +moving and resizing. This should be set to a value that will result in a variety of of distinguishable colors when exclusive-or'ed with the contents of the user's typical screen. Setting this variable to 1 often gives nice results -if adjacent colors in the default colormap are distinct. By default, -\fItwm\fP will attempt to cause temporary lines to appear at the opposite +if adjacent colors in the default colormap are distinct. By default, +\fItwm\fP will attempt to cause temporary lines to appear at the opposite end of the colormap from the graphics. .IP "\fBZoom\fP [ \fIcount\fP ]" 8 This variable indicates that outlines suggesting movement of a window @@ -842,20 +842,20 @@ This variable specifies the function to be executed when a key or button event is received for which no binding is provided. This is typically bound to \fBf.nop\fP, \fBf.beep\fP, or a menu containing window operations. .IP "\fBWindowFunction\fP \fIfunction\fP" 8 -This variable specifies the function to execute when a window is selected +This variable specifies the function to execute when a window is selected from the \fBTwmWindows\fP menu. If this variable is not set, the window will be deiconified and raised. .SH BINDINGS .PP -After the desired variables have been set, functions may be attached +After the desired variables have been set, functions may be attached titlebuttons and key and pointer buttons. Titlebuttons may be added -from the left or right side and appear in the titlebar from left-to-right +from the left or right side and appear in the titlebar from left-to-right according to the order in which they are specified. Key and pointer button bindings may be given in any order. .PP Titlebuttons specifications must include the name of the pixmap to use in -the button box and the function to be invoked when a pointer button is +the button box and the function to be invoked when a pointer button is pressed within them: .EX 0 \fBLeftTitleButton\fP "\fIbitmapname\fP" = \fIfunction\fP @@ -870,7 +870,7 @@ colon-prefixed name described above. .PP Key and pointer button specifications must give the modifiers that must be pressed, over which parts of the screen the pointer must be, and what -function is to be invoked. Keys are given as strings containing the +function is to be invoked. Keys are given as strings containing the appropriate keysym name; buttons are given as the keywords \fBButton1\fP-\fBButton5\fP: .EX 0 @@ -879,10 +879,10 @@ keysym name; buttons are given as the keywords \fBButton1\fP-\fBButton5\fP: .EE The \fImodlist\fP is any combination of the modifier names \fBshift\fP, \fBcontrol\fP, \fBlock\fP, \fBmeta\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP, -\fBmod4\fP, or \fBmod5\fP (which may be abbreviated as -\fBs\fP, \fBc\fP, \fBl\fP, \fBm\fP, \fBm1\fP, \fBm2\fP, \fBm3\fP, \fBm4\fP, +\fBmod4\fP, or \fBmod5\fP (which may be abbreviated as +\fBs\fP, \fBc\fP, \fBl\fP, \fBm\fP, \fBm1\fP, \fBm2\fP, \fBm3\fP, \fBm4\fP, \fBm5\fP, respectively) separated by a vertical bar (\(or). -Similarly, the \fIcontext\fP is any combination of +Similarly, the \fIcontext\fP is any combination of \fBwindow\fP, \fBtitle\fP, \fBicon\fP, @@ -890,7 +890,7 @@ Similarly, the \fIcontext\fP is any combination of \fBframe\fP, \fBiconmgr\fP, their first letters (\fBiconmgr\fP abbreviation is \fBm\fP), or \fBall\fP, -separated by a vertical bar. The \fIfunction\fP is any of the \fBf.\fP +separated by a vertical bar. The \fIfunction\fP is any of the \fBf.\fP keywords described below. For example, the default startup file contains the following bindings: .EX 0 @@ -923,12 +923,12 @@ use the following bindings: .EE \fITwm\fP provides many more window manipulation primitives than can be conveniently stored in a titlebar, menu, or set of key bindings. Although -a small set of defaults are supplied (unless the \fBNoDefaults\fP is +a small set of defaults are supplied (unless the \fBNoDefaults\fP is specified), most users will want to have their most common operations bound to key and button strokes. To do this, \fItwm\fP associates names with each of the primitives and provides \fIuser-defined functions\fP for -building higher level primitives and \fImenus\fP for interactively selecting -among groups of functions. +building higher level primitives and \fImenus\fP for interactively selecting +among groups of functions. .PP User-defined functions contain the name by which they are referenced in calls to \fBf.function\fP and a list of other functions to execute. For @@ -939,7 +939,7 @@ Function "move-or-raise" { f.move f.deltastop f.raise } Function "move-or-iconify" { f.move f.deltastop f.iconify } Function "restore-colormap" { f.colormap "default" f.lower } .EE -The function name must be used in \fBf.function\fP exactly as it appears in +The function name must be used in \fBf.function\fP exactly as it appears in the function specification. .PP In the descriptions below, if the function is said to operate on the selected @@ -955,7 +955,7 @@ This is an abbreviation for \fBf.exec\fP \fIstring\fP. This function toggles whether or not the selected window is raised whenever entered by the pointer. See the description of the variable \fBAutoRaise\fP. .IP "\fBf.backiconmgr\fI" 8 -This function warps the pointer to the previous column in the +This function warps the pointer to the previous column in the current icon manager, wrapping back to the previous row if necessary. .IP "\fBf.beep\fP" 8 This function sounds the keyboard bell. @@ -969,7 +969,7 @@ This function raises the bottom-most window that is occluded by another window. .IP "\fBf.colormap\fP \fIstring\fP" 8 This function rotates the colormaps (obtained from the WM_COLORMAP_WINDOWS property on the window) that \fItwm\fP will display when the pointer -is in this window. The argument \fIstring\fP may have one of the following +is in this window. The argument \fIstring\fP may have one of the following values: \fB"next"\fP, \fB"prev"\fP, and \fB"default"\fP. It should be noted here that in general, the installed colormap is determined by keyboard focus. A pointer driven keyboard focus will install a private colormap upon entry @@ -979,29 +979,29 @@ the target window. .\"OBSOLETE - should go away and use a clipboard. .\".IP "\fBf.cut\fP \fIstring\fP" 8 .\"This function places the specified \fIstring\fP (followed by a newline -.\"character) into the root window property CUT_BUFFER0. +.\"character) into the root window property CUT_BUFFER0. .\".IP "\fBf.cutfile\fP" 8 .\"This function reads the file indicated by the contents of the CUT_BUFFER0 .\"window property and replaces the cut buffer. .IP "\fBf.deiconify\fP" 8 -This function deiconifies the selected window. If the window is not an icon, +This function deiconifies the selected window. If the window is not an icon, this function does nothing. .IP "\fBf.delete\fP" 8 This function sends the WM_DELETE_WINDOW message to the selected window if the client application has requested it through the WM_PROTOCOLS window property. The application is supposed to respond to the message by removing the indicated window. If the window has not requested -WM_DELETE_WINDOW messages, the keyboard bell will be rung indicating that +WM_DELETE_WINDOW messages, the keyboard bell will be rung indicating that the user should choose an alternative method. Note this is very different -from f.destroy. The intent here is to delete a single window, not +from f.destroy. The intent here is to delete a single window, not necessarily the entire application. .IP "\fBf.deltastop\fP" 8 -This function allows a user-defined function to be aborted if the pointer has +This function allows a user-defined function to be aborted if the pointer has been moved more than \fIMoveDelta\fP pixels. See the example definition given for \fBFunction "move-or-raise"\fP at the beginning of the section. .IP "\fBf.destroy\fP" 8 This function instructs the X server to close the display connection of the -client that created the selected window. This should only be used as a last +client that created the selected window. This should only be used as a last resort for shutting down runaway clients. See also f.delete. .IP "\fBf.downiconmgr\fI" 8 This function warps the pointer to the next row in the current icon manger, @@ -1018,7 +1018,7 @@ which this function was invoked. This function toggles the keyboard focus of the server to the selected window, changing the focus rule from pointer-driven if necessary. If the selected window already was focused, this function executes an -\fBf.unfocus\fP. +\fBf.unfocus\fP. .IP "\fBf.forcemove\fP" 8 This function is like \fBf.move\fP except that it ignores the \fBDontMoveOff\fP variable. @@ -1030,20 +1030,20 @@ This function resizes the selected window to the full size of the display or else restores the original size if the window was already zoomed. .IP "\fBf.function\fP \fIstring\fP" 8 This function executes the user-defined function whose name is specified -by the argument \fIstring\fP. +by the argument \fIstring\fP. .IP "\fBf.hbzoom\fP" 8 This function is a synonym for \fBf.bottomzoom\fP. .IP "\fBf.hideiconmgr\fP" 8 This function unmaps the current icon manager. .IP "\fBf.horizoom\fP" 8 -This variable is similar to the \fBf.zoom\fP function except that the +This variable is similar to the \fBf.zoom\fP function except that the selected window is resized to the full width of the display. .IP "\fBf.htzoom\fP" 8 This function is a synonym for \fBf.topzoom\fP. .IP "\fBf.hzoom\fP" 8 This function is a synonym for \fBf.horizoom\fP. .IP "\fBf.iconify\fP" 8 -This function iconifies or deiconifies the selected window or icon, +This function iconifies or deiconifies the selected window or icon, respectively. .IP "\fBf.identify\fP" 8 This function displays a summary of the name and geometry of the @@ -1083,8 +1083,8 @@ This function warps the pointer to the previous icon manager containing any windows on the current or preceding screens. .IP "\fBf.priority\fP \fIstring\fP" 8 This function sets the priority of the client owning the selected window to -the numeric value of the argument \fIstring\fP, which should be a signed -integer in double quotes (e.g. "999" ). This function has an effect only +the numeric value of the argument \fIstring\fP, which should be a signed +integer in double quotes (e.g. "999" ). This function has an effect only if the server supports the SYNC extension. .IP "\fBf.quit\fP" 8 This function causes \fItwm\fP to restore the window's borders and exit. If @@ -1099,7 +1099,7 @@ it is occluded by any windows, otherwise the window will be lowered. This function causes all windows to be refreshed. .IP "\fBf.resize\fP" 8 This function displays an outline of the selected window. Crossing a border -(or setting \fBAutoRelativeResize\fP) will cause the outline to begin to +(or setting \fBAutoRelativeResize\fP) will cause the outline to begin to rubber band until the invoking button is released. To abort a resize, press another button before releasing the first button. .IP "\fBf.restart\fP" 8 @@ -1126,7 +1126,7 @@ This function maps the current icon manager. This function sorts the entries in the current icon manager alphabetically. See the variable \fBSortIconManager\fP. .\".IP "\fBf.source\fP \fIstring\fP" 8 -.\"This function assumes \fIstring\fP is a file name. The file is read +.\"This function assumes \fIstring\fP is a file name. The file is read .\"and parsed as a \fItwm\fP startup file. .\"This .\"function is intended to be used only to re-build pull-down menus. None @@ -1135,7 +1135,7 @@ See the variable \fBSortIconManager\fP. This function provides a centered, unselectable item in a menu definition. It should not be used in any other context. .IP "\fBf.topzoom\fP" 8 -This variable is similar to the \fBf.bottomzoom\fP function except that +This variable is similar to the \fBf.bottomzoom\fP function except that the selected window is only resized to the top half of the display. .\".IP "\fBf.twmrc\fP" 8 .\"This function causes the startup customization file to be re-read. This @@ -1157,14 +1157,14 @@ This function is a synonym for \fBf.leftzoom\fP. This function is a synonym for \fBf.rightzoom\fP. .IP "\fBf.warpring\fP \fIstring\fP" 8 This function warps the pointer to the next or previous window (as indicated -by the argument \fIstring\fP, which may be \fB"next"\fP or \fB"prev"\fP) +by the argument \fIstring\fP, which may be \fB"next"\fP or \fB"prev"\fP) specified in the \fBWindowRing\fP variable. .IP "\fBf.warpto\fP \fIstring\fP" 8 -This function warps the pointer to the window which has a name or class +This function warps the pointer to the window which has a name or class that matches \fIstring\fP. If the window is iconified, it will be deiconified if the variable \fBWarpUnmapped\fP is set or else ignored. .IP "\fBf.warptoiconmgr\fP \fIstring\fP" 8 -This function warps the pointer to the icon manager entry +This function warps the pointer to the icon manager entry associated with the window containing the pointer in the icon manager specified by the argument \fIstring\fP. If \fIstring\fP is empty (i.e. ""), the current icon manager is chosen. @@ -1172,7 +1172,7 @@ the current icon manager is chosen. This function warps the pointer to the screen specified by the argument \fIstring\fP. \fIString\fP may be a number (e.g. \fB"0"\fP or \fB"1"\fP), the word \fB"next"\fP (indicating the current screen plus 1, -skipping over any unmanaged screens), +skipping over any unmanaged screens), the word \fB"back"\fP (indicating the current screen minus 1, skipping over any unmanaged screens), or the word \fB"prev"\fP (indicating the last screen visited. @@ -1186,10 +1186,10 @@ the only the height of the selected window is changed. .PP Functions may be grouped and interactively selected using pop-up (when bound to a pointer button) or pull-down (when associated -with a titlebutton) menus. Each menu specification contains the name of the -menu as it will be referred to by \fBf.menu\fP, optional default +with a titlebutton) menus. Each menu specification contains the name of the +menu as it will be referred to by \fBf.menu\fP, optional default foreground and background colors, the list of item names and the functions -they should invoke, and optional foreground and background colors for +they should invoke, and optional foreground and background colors for individual items: .EX 0 \fBMenu\fP "\fImenuname\fP" [ ("\fIdeffore\fP":"\fIdefback\fP") ] @@ -1205,14 +1205,14 @@ individual items: .PP The \fImenuname\fP is case-sensitive. The optional \fIdeffore\fP and \fIdefback\fP arguments specify the foreground -and background colors used on a color display +and background colors used on a color display to highlight menu entries. The \fIstring\fP portion of each menu entry will be the text which will appear in the menu. The optional \fIfore\fP and \fIback\fP arguments specify the foreground and background colors of the menu entry when the pointer is not in the entry. These colors will only be used on a color display. The -default is to use the colors specified by the +default is to use the colors specified by the \fBMenuForeground\fP and \fBMenuBackground\fP variables. The \fIfunction\fP portion of the menu entry is one of the functions, including any user-defined functions, or additional menus. @@ -1232,10 +1232,10 @@ the keyboard. .PP An icon manager is a window that contains names of selected or all windows currently on the display. In addition to the window name, -a small button using the default iconify symbol will be displayed to the -left of the name when the window is iconified. By default, clicking on an +a small button using the default iconify symbol will be displayed to the +left of the name when the window is iconified. By default, clicking on an entry in the icon manager performs \fBf.iconify\fP. -To change the actions taken in the icon manager, use the +To change the actions taken in the icon manager, use the the \fBiconmgr\fP context when specifying button and keyboard bindings. .PP Moving the pointer into the icon manager also directs keyboard focus to @@ -1254,9 +1254,9 @@ The \fBIconRegion\fP variable should take a list. Double clicking very fast to get the constrained move function will sometimes cause the window to move, even though the pointer is not moved. .PP -If \fBIconifyByUnmapping\fP is on and windows are listed in -\fBIconManagerDontShow\fP but not in \fBDontIconifyByUnmapping\fP, -they may be lost if they are iconified and no bindings to +If \fBIconifyByUnmapping\fP is on and windows are listed in +\fBIconManagerDontShow\fP but not in \fBDontIconifyByUnmapping\fP, +they may be lost if they are iconified and no bindings to \fBf.menu "TwmWindows"\fP or \fBf.warpto\fP are setup. .SH FILES .PP diff --git a/src/Makefile.am b/src/Makefile.am index 9e5312c..092d8ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # 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. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -110,19 +110,19 @@ static void yyerror ( const char *s ); }; %token <num> LB RB LP RP MENUS MENU BUTTON DEFAULT_FUNCTION PLUS MINUS -%token <num> ALL OR CURSORS PIXMAPS ICONS COLOR SAVECOLOR MONOCHROME FUNCTION +%token <num> ALL OR CURSORS PIXMAPS ICONS COLOR SAVECOLOR MONOCHROME FUNCTION %token <num> ICONMGR_SHOW ICONMGR WINDOW_FUNCTION ZOOM ICONMGRS %token <num> ICONMGR_GEOMETRY ICONMGR_NOSHOW MAKE_TITLE GRAYSCALE -%token <num> ICONIFY_BY_UNMAPPING DONT_ICONIFY_BY_UNMAPPING -%token <num> NO_TITLE AUTO_RAISE NO_HILITE ICON_REGION -%token <num> META SHIFT LOCK CONTROL WINDOW TITLE ICON ROOT FRAME +%token <num> ICONIFY_BY_UNMAPPING DONT_ICONIFY_BY_UNMAPPING +%token <num> NO_TITLE AUTO_RAISE NO_HILITE ICON_REGION +%token <num> META SHIFT LOCK CONTROL WINDOW TITLE ICON ROOT FRAME %token <num> COLON EQUALS SQUEEZE_TITLE DONT_SQUEEZE_TITLE %token <num> START_ICONIFIED NO_TITLE_HILITE TITLE_HILITE -%token <num> MOVE RESIZE WAIT SELECT KILL LEFT_TITLEBUTTON RIGHT_TITLEBUTTON -%token <num> NUMBER KEYWORD NKEYWORD CKEYWORD CLKEYWORD FKEYWORD FSKEYWORD +%token <num> MOVE RESIZE WAIT SELECT KILL LEFT_TITLEBUTTON RIGHT_TITLEBUTTON +%token <num> NUMBER KEYWORD NKEYWORD CKEYWORD CLKEYWORD FKEYWORD FSKEYWORD %token <num> SKEYWORD DKEYWORD JKEYWORD WINDOW_RING WARP_CURSOR ERRORTOKEN %token <num> NO_STACKMODE -%token <ptr> STRING +%token <ptr> STRING %type <ptr> string %type <num> pixmap_list cursor_list color_list save_color_list stmt @@ -130,7 +130,7 @@ static void yyerror ( const char *s ); %type <num> noarg sarg error narg squeeze color_entry %type <num> action button number signed_number full fullkey -%start twmrc +%start twmrc %% twmrc : stmts @@ -162,18 +162,18 @@ stmt : error Scr->ZoomCount = $2; } } - | ZOOM { if (Scr->FirstTime) + | ZOOM { if (Scr->FirstTime) Scr->DoZoom = TRUE; } | PIXMAPS pixmap_list {} | CURSORS cursor_list {} | ICONIFY_BY_UNMAPPING { list = &Scr->IconifyByUn; } win_list - | ICONIFY_BY_UNMAPPING { if (Scr->FirstTime) + | ICONIFY_BY_UNMAPPING { if (Scr->FirstTime) Scr->IconifyByUnmapping = TRUE; } - | LEFT_TITLEBUTTON string EQUALS action { + | LEFT_TITLEBUTTON string EQUALS action { GotTitleButton ($2, $4, False); } - | RIGHT_TITLEBUTTON string EQUALS action { + | RIGHT_TITLEBUTTON string EQUALS action { GotTitleButton ($2, $4, True); } | button string { root = GetRoot($2, NULLSTR, NULLSTR); @@ -189,7 +189,7 @@ stmt : error else { root = GetRoot(TWM_ROOT,NULLSTR,NULLSTR); - Scr->Mouse[$1][C_ROOT][0].item = + Scr->Mouse[$1][C_ROOT][0].item = AddToMenu(root,"x",Action, NULL,$2,NULLSTR,NULLSTR); } @@ -242,7 +242,7 @@ stmt : error color_list | GRAYSCALE { color = GRAYSCALE; } color_list - | SAVECOLOR + | SAVECOLOR save_color_list | MONOCHROME { color = MONOCHROME; } color_list @@ -255,7 +255,7 @@ stmt : error else { root = GetRoot(TWM_ROOT,NULLSTR,NULLSTR); - Scr->DefaultFunction.item = + Scr->DefaultFunction.item = AddToMenu(root,"x",Action, NULL,$2, NULLSTR, NULLSTR); } @@ -264,7 +264,7 @@ stmt : error } | WINDOW_FUNCTION action { Scr->WindowFunction.func = $2; root = GetRoot(TWM_ROOT,NULLSTR,NULLSTR); - Scr->WindowFunction.item = + Scr->WindowFunction.item = AddToMenu(root,"x",Action, NULL,$2, NULLSTR, NULLSTR); Action = ""; @@ -272,7 +272,7 @@ stmt : error } | WARP_CURSOR { list = &Scr->WarpCursorL; } win_list - | WARP_CURSOR { if (Scr->FirstTime) + | WARP_CURSOR { if (Scr->FirstTime) Scr->WarpCursor = TRUE; } | WINDOW_RING { list = &Scr->WindowRingL; } win_list @@ -327,7 +327,7 @@ key : META { mods |= Mod1Mask; } | CONTROL { mods |= ControlMask; } | META number { if ($2 < 1 || $2 > 5) { twmrc_error_prefix(); - fprintf (stderr, + fprintf (stderr, "bad modifier number (%d), must be 1-5\n", $2); ParseError = 1; @@ -473,11 +473,11 @@ color_entry : CLKEYWORD string { if (!do_colorlist_keyword ($1, color, } ; -save_color_list : LB s_color_entries RB +save_color_list : LB s_color_entries RB ; s_color_entries : /* Empty */ - | s_color_entries s_color_entry + | s_color_entries s_color_entry ; s_color_entry : string { do_string_savecolor(color, $1); } @@ -496,10 +496,10 @@ win_color_entry : string string { if (Scr->FirstTime && AddToList(list, $1, $2); } ; -squeeze : SQUEEZE_TITLE { +squeeze : SQUEEZE_TITLE { if (HasShape) Scr->SqueezeTitle = TRUE; } - | SQUEEZE_TITLE { list = &Scr->SqueezeTitleL; + | SQUEEZE_TITLE { list = &Scr->SqueezeTitleL; if (HasShape && Scr->SqueezeTitle == -1) Scr->SqueezeTitle = TRUE; } @@ -613,8 +613,8 @@ action : FKEYWORD { $$ = $1; } case F_WARPTOSCREEN: if (!CheckWarpScreenArg (Action)) { twmrc_error_prefix(); - fprintf (stderr, - "ignoring invalid f.warptoscreen argument \"%s\"\n", + fprintf (stderr, + "ignoring invalid f.warptoscreen argument \"%s\"\n", Action); $$ = F_NOP; } @@ -625,7 +625,7 @@ action : FKEYWORD { $$ = $1; } } else { twmrc_error_prefix(); fprintf (stderr, - "ignoring invalid f.colormap argument \"%s\"\n", + "ignoring invalid f.colormap argument \"%s\"\n", Action); $$ = F_NOP; } @@ -811,9 +811,9 @@ static void GotKey(char *key, int func) for (i = 0; i < NUM_CONTEXTS; i++) { - if ((cont & (1 << i)) == 0) + if ((cont & (1 << i)) == 0) continue; - if (!AddFuncKey(key, i, mods, func, Name, Action)) + if (!AddFuncKey(key, i, mods, func, Name, Action)) break; } @@ -829,7 +829,7 @@ static void GotTitleButton (char *bitmapname, int func, Bool rightside) { if (!CreateTitleButton (bitmapname, func, Action, pull, rightside, True)) { twmrc_error_prefix(); - fprintf (stderr, + fprintf (stderr, "unable to create %s titlebutton \"%s\"\n", rightside ? "right" : "left", bitmapname); } @@ -103,15 +103,15 @@ number [0-9]+ "-" { return MINUS; } "|" { return OR; } -[a-zA-Z\.]+ { int token = parse_keyword ((char *)yytext, +[a-zA-Z\.]+ { int token = parse_keyword ((char *)yytext, &yylval.num); if (token == ERRORTOKEN) { twmrc_error_prefix(); fprintf (stderr, - "ignoring unknown keyword: %s\n", + "ignoring unknown keyword: %s\n", yytext); ParseError = 1; - } else + } else return token; } @@ -126,7 +126,7 @@ number [0-9]+ [\r\n\t ] {;} . { twmrc_error_prefix(); - fprintf (stderr, + fprintf (stderr, "ignoring character \"%s\"\n", yytext); ParseError = 1; |