summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-31 23:28:42 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-31 23:29:18 -0700
commit2a637337713c5c92c44249b88e31696ce9efdf9b (patch)
tree2225bb5610c56e4e3d1e419961cc80c0006991ac /src
parentce4e11143f982234be1076e384b31228f1cc84ae (diff)
Delete trailing whitespace in non *.[ch] source files
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/gram.y56
-rw-r--r--src/lex.l8
3 files changed, 35 insertions, 35 deletions
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
diff --git a/src/gram.y b/src/gram.y
index 241405f..ef0152a 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -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);
}
diff --git a/src/lex.l b/src/lex.l
index f880673..6323250 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -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;