[Pkg-wmaker-commits] [wmtime] 13/101: Remove trailing whitespace.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 23:59:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmtime.
commit 0bcf2c37580e4952b09132c0797fa680cc3f337e
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Oct 5 10:29:59 2014 -0500
Remove trailing whitespace.
---
HINTS | 6 +++---
INSTALL | 10 ++++-----
Imakefile | 2 +-
wmgeneral/list.c | 12 +++++------
wmgeneral/list.h | 2 +-
wmgeneral/misc.c | 24 ++++++++++-----------
wmgeneral/wmgeneral.c | 20 +++++++++---------
wmtime/wmtime.1 | 2 +-
wmtime/wmtime.c | 58 +++++++++++++++++++++++++--------------------------
9 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/HINTS b/HINTS
index dba4a9f..a425dc3 100644
--- a/HINTS
+++ b/HINTS
@@ -4,7 +4,7 @@ Generic
--------------------------------------------------------------
WMTime supports 4 commandline options:
- -h (help);
+ -h (help);
-v (prints);
-d (display);
-digital (digital clock);
@@ -22,7 +22,7 @@ command(s) when you click in the clock display area.
WMtime can realtime 'morph' it's UI from analog <> digital,
simply left click in either the DAY or DATE gadget ;-)
-Be sure to drag WMTime on it's outer edges, WMTime is a bit picky
+Be sure to drag WMTime on it's outer edges, WMTime is a bit picky
due to the large gfx pixmap it keeps ;-)
@@ -41,7 +41,7 @@ Afterstep users put the following in their .steprc
Note: AfterStep's Wharf has a problem with pixmaps that are
larger than 60x60 pixels. Please tell the AfterStep authors
to fix this, this is not our fault, but a Wharf problem!
-
+
Other WindowManagers
--------------------------------------------------------------
diff --git a/INSTALL b/INSTALL
index 04f3fbb..a5616cb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,11 +9,11 @@ Installation
--------------------------------------------------------------
1) % tar -zxvf wmtime-1.1.tar.gz
2) % cd wmtime/wmtime
-3)* xmkmf -a (for *BSD systems needed only!).
+3)* xmkmf -a (for *BSD systems needed only!).
4) % make
5) % make install (as root)
-6)* WMTime uses month and weekday abbreviations from the
+6)* WMTime uses month and weekday abbreviations from the
currently set locale. If these abbreviations do not
use Latin alphabet characters, then WMTime defaults to
US/English.
@@ -22,12 +22,12 @@ Installation
environment variable, e.g.,
% LANG=es_MX.UTF-8 wmtime
-
+
7)* This Imakefile was kindly donated by Pascal Hofstede but
untested by the authors because we don't have a *BSD box
- to test and try it out... we're working on generic
+ to test and try it out... we're working on generic
Imakefiles though ;-)
-
+
Be sure to read the HINTS and TODO files too!
diff --git a/Imakefile b/Imakefile
index 2f7f180..93c8775 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,6 +1,6 @@
XPMLIB = -lXpm -lm
DEPLIBS = $(DEPXLIB)
-
+
LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
SRCS = wmtime.c \
diff --git a/wmgeneral/list.c b/wmgeneral/list.c
index a091c86..8c4d6d2 100644
--- a/wmgeneral/list.c
+++ b/wmgeneral/list.c
@@ -1,11 +1,11 @@
-/* Generic single linked list to keep various information
+/* Generic single linked list to keep various information
Copyright (C) 1993, 1994 Free Software Foundation, Inc.
Author: Kresten Krab Thorup
Many modifications by Alfredo K. Kojima
-
+
This file is part of GNU CC.
@@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA. */
/* Return a cons cell produced from (head . tail) */
-INLINE LinkedList*
+INLINE LinkedList*
list_cons(void* head, LinkedList* tail)
{
LinkedList* cell;
@@ -63,7 +63,7 @@ list_length(LinkedList* list)
return i;
}
-/* Return the Nth element of LIST, where N count from zero. If N
+/* Return the Nth element of LIST, where N count from zero. If N
larger than the list length, NULL is returned */
INLINE void*
@@ -84,7 +84,7 @@ list_nth(int index, LinkedList* list)
INLINE void
list_remove_head(LinkedList** list)
{
- if (!*list) return;
+ if (!*list) return;
if ((*list)->tail)
{
LinkedList* tail = (*list)->tail; /* fetch next */
@@ -116,7 +116,7 @@ INLINE LinkedList *
list_remove_elem(LinkedList* list, void* elem)
{
LinkedList *tmp;
-
+
if (list) {
if (list->head == elem) {
tmp = list->tail;
diff --git a/wmgeneral/list.h b/wmgeneral/list.h
index 24826c5..95fc718 100644
--- a/wmgeneral/list.h
+++ b/wmgeneral/list.h
@@ -1,4 +1,4 @@
-/* Generic single linked list to keep various information
+/* Generic single linked list to keep various information
Copyright (C) 1993, 1994 Free Software Foundation, Inc.
Author: Kresten Krab Thorup
diff --git a/wmgeneral/misc.c b/wmgeneral/misc.c
index 34281e2..c36cdb4 100644
--- a/wmgeneral/misc.c
+++ b/wmgeneral/misc.c
@@ -1,9 +1,9 @@
/* dock.c- built-in Dock module for WindowMaker
- *
+ *
* WindowMaker window manager
- *
+ *
* Copyright (c) 1997 Alfredo K. Kojima
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -28,7 +28,7 @@
*----------------------------------------------------------------------
* parse_command--
* Divides a command line into a argv/argc pair.
- *----------------------------------------------------------------------
+ *----------------------------------------------------------------------
*/
#define PRC_ALPHA 0
#define PRC_BLANK 1
@@ -64,11 +64,11 @@ next_token(char *word, char **next)
t = ret = malloc(strlen(word)+1);
ptr = word;
-
+
state = 0;
*t = 0;
while (1) {
- if (*ptr==0)
+ if (*ptr==0)
ctype = PRC_EOS;
else if (*ptr=='\\')
ctype = PRC_ESCAPE;
@@ -98,12 +98,12 @@ next_token(char *word, char **next)
t = strdup(ret);
free(ret);
-
+
if (ctype==PRC_EOS)
*next = NULL;
else
*next = ptr;
-
+
return t;
}
@@ -118,7 +118,7 @@ parse_command(char *command, char ***argv, int *argc)
line = command;
do {
token = next_token(line, &line);
- if (token) {
+ if (token) {
list = list_cons(token, list);
}
} while (token!=NULL && line!=NULL);
@@ -141,15 +141,15 @@ execCommand(char *command)
int argc;
parse_command(command, &argv, &argc);
-
+
if (argv==NULL) {
return 0;
}
-
+
if ((pid=fork())==0) {
char **args;
int i;
-
+
args = malloc(sizeof(char*)*(argc+1));
if (!args)
exit(10);
diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index d5fdcb6..7e3b508 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -133,7 +133,7 @@ static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) {
err = XpmCreatePixmapFromData(display, Root, pixmap_bytes, &(wmgen->pixmap),
&(wmgen->mask), &(wmgen->attributes));
-
+
if (err != XpmSuccess) {
fprintf(stderr, "Not enough free colorcells.\n");
exit(1);
@@ -180,9 +180,9 @@ static int flush_expose(Window w) {
\*******************************************************************************/
void RedrawWindow(void) {
-
+
flush_expose(iconwin);
- XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
+ XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
0,0, wmgen.attributes.width, wmgen.attributes.height, 0,0);
flush_expose(win);
XCopyArea(display, wmgen.pixmap, win, NormalGC,
@@ -194,9 +194,9 @@ void RedrawWindow(void) {
\*******************************************************************************/
void RedrawWindowXY(int x, int y) {
-
+
flush_expose(iconwin);
- XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
+ XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
x,y, wmgen.attributes.width, wmgen.attributes.height, 0,0);
flush_expose(win);
XCopyArea(display, wmgen.pixmap, win, NormalGC,
@@ -291,14 +291,14 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
int i;
for (i=1; argv[i]; i++) {
- if (!strcmp(argv[i], "-display"))
+ if (!strcmp(argv[i], "-display"))
display_name = argv[++i];
else if (!strcmp(argv[i], "-geometry"))
geometry = argv[++i];
}
if (!(display = XOpenDisplay(display_name))) {
- fprintf(stderr, "%s: can't open display %s\n",
+ fprintf(stderr, "%s: can't open display %s\n",
wname, XDisplayName(display_name));
exit(1);
}
@@ -328,10 +328,10 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
/* Override width/height anyway */
uint_width = 64;
uint_height = 64;
-
+
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
uint_width, uint_height, borderwidth, fore_pix, back_pix);
-
+
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
uint_width, uint_height, borderwidth, fore_pix, back_pix);
@@ -352,7 +352,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XSetWMName(display, win, &name);
/* Create GC for drawing */
-
+
gcm = GCForeground | GCBackground | GCGraphicsExposures;
gcv.foreground = fore_pix;
gcv.background = back_pix;
diff --git a/wmtime/wmtime.1 b/wmtime/wmtime.1
index 07f2c61..8b51e57 100644
--- a/wmtime/wmtime.1
+++ b/wmtime/wmtime.1
@@ -139,7 +139,7 @@ middle: xload
.PP
right: xcalc
.PP
-.PD
+.PD
.RE
If
diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c
index 7425d83..2c4f6e8 100644
--- a/wmtime/wmtime.c
+++ b/wmtime/wmtime.c
@@ -15,7 +15,7 @@
How do I create a not so solid window?
How do I open a window?
How do I use pixmaps?
-
+
------------------------------------------------------------
Author: Martijn Pieterse (pieterse at xs4all.nl)
@@ -37,7 +37,7 @@
* Updated version number and some other minor stuff
16/05/1998 (Antoine Nulle, warp at xs4all.nl)
* Added Locale support, based on original diff supplied
- by Alen Salamun (snowman at hal9000.medinet.si)
+ by Alen Salamun (snowman at hal9000.medinet.si)
04/05/1998 (Martijn Pieterse, pieterse at xs4all.nl)
* Moved the hands one pixel down.
* Removed the RedrawWindow out of the main loop
@@ -53,7 +53,7 @@
21/04/1998 (Martijn Pieterse, pieterse at xs4all.nl)
* Added digital/analog switching support
18/04/1998 (Martijn Pieterse, pieterse at xs4all.nl)
- * Started this project.
+ * Started this project.
* Copied the source from wmmon.
*/
@@ -279,7 +279,7 @@ void wmtime_routine(int argc, char **argv) {
curtime = time(0);
waitpid(0, NULL, WNOHANG);
-
+
time_struct = localtime(&curtime);
@@ -299,7 +299,7 @@ void wmtime_routine(int argc, char **argv) {
}
RedrawWindow();
}
-
+
while (XPending(display)) {
XNextEvent(display, &Event);
@@ -326,7 +326,7 @@ void wmtime_routine(int argc, char **argv) {
DrawTime(time_struct->tm_hour, time_struct->tm_min, time_struct->tm_sec);
DrawDate(time_struct->tm_wday, time_struct->tm_mday, time_struct->tm_mon);
} else {
- copyXPMArea(0, 98, 64, 64, 0, 0);
+ copyXPMArea(0, 98, 64, 64, 0, 0);
DrawWijzer(time_struct->tm_hour, time_struct->tm_min, time_struct->tm_sec);
DrawDate(time_struct->tm_wday, time_struct->tm_mday, time_struct->tm_mon);
}
@@ -411,7 +411,7 @@ void DrawDate(int wkday, int dom, int month) {
k = 5;
for (i=0; i<2; i++) {
- if (*p < 'A')
+ if (*p < 'A')
copyXPMArea((*p-'0')*6, 64, 6, 9, k, 49);
else
copyXPMArea((*p-'A')*6, 74, 6, 9, k, 49);
@@ -427,7 +427,7 @@ void DrawDate(int wkday, int dom, int month) {
copyXPMArea(61, 64, 4, 9, k, 49);
k += 4;
for (i=0; i<3; i++) {
- if (*p < 'A')
+ if (*p < 'A')
copyXPMArea((*p-'0')*6, 64, 6, 9, k, 49);
else
copyXPMArea((*p-'A')*6, 74, 6, 9, k, 49);
@@ -450,7 +450,7 @@ void DrawWijzer(int hr, int min, int sec) {
int k;
int i;
-
+
hr %= 12;
copyXPMArea(5+64, 5, 54, 40, 5, 5);
@@ -464,7 +464,7 @@ void DrawWijzer(int hr, int min, int sec) {
// dx, dy is het punt waar we naar toe moeten.
// Zoek alle punten die ECHT op de lijn liggen:
-
+
ddx = 1;
ddy = 1;
if (dx < 0) ddx = -1;
@@ -474,9 +474,9 @@ void DrawWijzer(int hr, int min, int sec) {
y = 0;
if (abs(dx) > abs(dy)) {
- if (dy != 0)
+ if (dy != 0)
adder = abs(dx) / 2;
- else
+ else
adder = 0;
for (i=0; i<abs(dx); i++) {
// laat de kleur afhangen van de adder.
@@ -489,7 +489,7 @@ void DrawWijzer(int hr, int min, int sec) {
k = 12-k;
copyXPMArea(79+k, 67, 1, 1, x + 31, y + 24 + ddy);
-
+
x += ddx;
@@ -502,7 +502,7 @@ void DrawWijzer(int hr, int min, int sec) {
} else {
if (dx != 0)
adder = abs(dy) / 2;
- else
+ else
adder = 0;
for (i=0; i<abs(dy); i++) {
k = 12 - adder / (abs(dy) / 12.0);
@@ -512,7 +512,7 @@ void DrawWijzer(int hr, int min, int sec) {
k = 12-k;
copyXPMArea(79+k, 67, 1, 1, x + 31 + ddx, y + 24);
-
+
y += ddy;
adder -= abs(dx);
@@ -531,10 +531,10 @@ void DrawWijzer(int hr, int min, int sec) {
// dx, dy is het punt waar we naar toe moeten.
// Zoek alle punten die ECHT op de lijn liggen:
-
+
dx += dx;
dy += dy;
-
+
ddx = 1;
ddy = 1;
if (dx < 0) ddx = -1;
@@ -544,9 +544,9 @@ void DrawWijzer(int hr, int min, int sec) {
y = 0;
if (abs(dx) > abs(dy)) {
- if (dy != 0)
+ if (dy != 0)
adder = abs(dx) / 2;
- else
+ else
adder = 0;
for (i=0; i<abs(dx); i++) {
// laat de kleur afhangen van de adder.
@@ -559,7 +559,7 @@ void DrawWijzer(int hr, int min, int sec) {
k = 12-k;
copyXPMArea(79+k, 67, 1, 1, x + 31, y + 24 + ddy);
-
+
x += ddx;
@@ -572,7 +572,7 @@ void DrawWijzer(int hr, int min, int sec) {
} else {
if (dx != 0)
adder = abs(dy) / 2;
- else
+ else
adder = 0;
for (i=0; i<abs(dy); i++) {
k = 12 - adder / (abs(dy) / 12.0);
@@ -582,7 +582,7 @@ void DrawWijzer(int hr, int min, int sec) {
k = 12-k;
copyXPMArea(79+k, 67, 1, 1, x + 31 + ddx, y + 24);
-
+
y += ddy;
adder -= abs(dx);
@@ -603,12 +603,12 @@ void DrawWijzer(int hr, int min, int sec) {
// dx, dy is het punt waar we naar toe moeten.
// Zoek alle punten die ECHT op de lijn liggen:
-
+
ddx = 1;
ddy = 1;
if (dx < 0) ddx = -1;
if (dy < 0) ddy = -1;
-
+
if (dx == 0) ddx = 0;
if (dy == 0) ddy = 0;
@@ -617,9 +617,9 @@ void DrawWijzer(int hr, int min, int sec) {
if (abs(dx) > abs(dy)) {
- if (dy != 0)
+ if (dy != 0)
adder = abs(dx) / 2;
- else
+ else
adder = 0;
for (i=0; i<abs(dx); i++) {
// laat de kleur afhangen van de adder.
@@ -630,7 +630,7 @@ void DrawWijzer(int hr, int min, int sec) {
k = 12-k;
copyXPMArea(79+k, 70, 1, 1, x + 31, y + 24);
-
+
x += ddx;
@@ -643,7 +643,7 @@ void DrawWijzer(int hr, int min, int sec) {
} else {
if (dx != 0)
adder = abs(dy) / 2;
- else
+ else
adder = 0;
for (i=0; i<abs(dy); i++) {
k = 12 - adder / (abs(dy) / 12.0);
@@ -651,7 +651,7 @@ void DrawWijzer(int hr, int min, int sec) {
k = 12-k;
copyXPMArea(79+k, 70, 1, 1, x + 31, y + 24);
-
+
y += ddy;
adder -= abs(dx);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtime.git
More information about the Pkg-wmaker-commits
mailing list