[Pkg-wmaker-commits] [wmitime] 104/127: Remove trailing whitespace.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Aug 22 01:34:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmitime.
commit c410160bb0adbcdbf926e0ad091eeb590fb7c0fd
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Oct 5 10:29:59 2014 -0500
Remove trailing whitespace.
---
BUGS | 2 +-
CHANGES | 2 +-
README | 4 ++--
wmgeneral/list.c | 12 +++++------
wmgeneral/list.h | 2 +-
wmgeneral/misc.c | 24 ++++++++++-----------
wmgeneral/wmgeneral.c | 26 +++++++++++-----------
wmitime/wmitime.c | 60 +++++++++++++++++++++++++--------------------------
8 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/BUGS b/BUGS
index c7ff910..27ed6e1 100644
--- a/BUGS
+++ b/BUGS
@@ -4,6 +4,6 @@ wmitime 0.2
-------------------------------------------------------------
* analog clock still quirky, but whaddya gonna do...
-wmitime 0.1
+wmitime 0.1
-------------------------------------------------------------
* First initial BETA release, analog clock little quirky.
diff --git a/CHANGES b/CHANGES
index b856079..dd7749a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,5 +13,5 @@ Version Description
* Fixed potentially fatal (but rare) /0 bug...
wheee :)
-0.1
+0.1
* First initial public release.
diff --git a/README b/README
index ea9922a..1b8caf2 100644
--- a/README
+++ b/README
@@ -37,11 +37,11 @@ README This file.
BUGS Things you don't want to know ;-)
CHANGES Description of changes.
COPYING GNU General Public License Version 2.
-
+
Bugs
--------------------------------------------------------------
-If you discover any bugs in this software, please send a
+If you discover any bugs in this software, please send a
bugreport to clarkd at skynet.ca and describe the
problem as detailed! as you can.
diff --git a/wmgeneral/list.c b/wmgeneral/list.c
index be7464f..a63562f 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 4b6b86f..92c3454 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 f86481e..1f3bb2e 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 56b7bd6..c064b39 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -17,7 +17,7 @@
* Now supports >256 colors
11/09/1998 (Martijn Pieterse, pieterse at xs4all.nl)
* Removed a bug from parse_rcfile. You could
- not use "start" in a command if a label was
+ not use "start" in a command if a label was
also start.
* Changed the needed geometry string.
We don't use window size, and don't support
@@ -177,7 +177,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);
@@ -224,9 +224,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,
@@ -238,9 +238,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,
@@ -296,7 +296,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
unsigned char bwrite;
int bcount;
int curpixel;
-
+
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth);
@@ -305,7 +305,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
zero <<=8;
zero |= xpm[1][k];
}
-
+
for (i=numcol+1; i < numcol+sy+1; i++) {
bcount = 0;
bwrite = 0;
@@ -318,7 +318,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
curpixel <<=8;
curpixel |= xpm[i][j+k];
}
-
+
if ( curpixel != zero ) {
bwrite += 128;
}
@@ -394,7 +394,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
}
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);
}
@@ -419,10 +419,10 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
mysizehints.width = 64;
mysizehints.height = 64;
-
+
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
-
+
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
@@ -443,7 +443,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/wmitime/wmitime.c b/wmitime/wmitime.c
index c280547..c4b87f3 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -95,13 +95,13 @@ int main(int argc, char *argv[]) {
int i;
uconfig_file[0] = 0;
-
+
/* Parse Command Line */
ProgName = argv[0];
if (strlen(ProgName) >= 5)
ProgName += (strlen(ProgName) - 5);
-
+
for (i=1; i<argc; i++) {
char *arg = argv[i];
@@ -164,13 +164,13 @@ void wmitime_routine(int argc, char **argv)
// char config_file[512];
createXBMfromXPM(wmitime_mask_bits, wmitime_master_xpm, wmitime_mask_width, wmitime_mask_height);
-
+
openXwindow(argc, argv, wmitime_master_xpm, wmitime_mask_bits, wmitime_mask_width, wmitime_mask_height);
AddMouseRegion(0, 5, 6, 58, 16);
// We don't need a config file (yet)...
-
+
#if 0
// Read config file
@@ -188,20 +188,20 @@ void wmitime_routine(int argc, char **argv)
{
// Fall back to /etc/wminetrc
sprintf(config_file, "/etc/wmitimerc");
-
+
Read_Config_File(config_file);
}
}
#endif
-
+
RedrawWindow();
prevtime = time(0) - 1;
-
+
while (1)
{
curtime = time(0);
-
+
if ( curtime > prevtime)
{
prevtime = curtime;
@@ -223,7 +223,7 @@ void wmitime_routine(int argc, char **argv)
RedrawWindow();
}
-
+
// X Events
while (XPending(display))
{
@@ -322,11 +322,11 @@ void DrawStdTime(void)
{
sprintf(blitstr, "%02i:%02i:%02i", i, clk->tm_min, clk->tm_sec);
}
-
+
len = strlen(blitstr);
-
+
// Set starting co-ordinates...
xoff = 6;
yoff = 6;
@@ -344,7 +344,7 @@ void DrawStdTime(void)
j = blitstr[i] - '0';
srcx = 68;
srcy = 23;
-
+
while (j)
{
j--;
@@ -372,7 +372,7 @@ void DrawDate(void)
#ifdef fr
- // French date model
+ // French date model
sprintf(BlitStr, "%s", monthnames[clk->tm_mon]);
BlitString( BlitStr, 40, 50);
@@ -419,7 +419,7 @@ void DrawInetWheel(void)
xoff=67;
xoff+=19;
-
+
while(i)
{
xoff +=19;
@@ -427,7 +427,7 @@ void DrawInetWheel(void)
}
copyXPMArea(xoff, yoff, 19, 19, 39, 29);
-
+
}
@@ -467,7 +467,7 @@ void DrawStdWheel(void)
prevhoury=dy;
DrawLine(cx, cy, dx, dy, sx, sy);
-
+
// Minute Hand...
DrawLine(cx, cy, prevminx, prevminy, 66, 9); // erase old line
@@ -489,7 +489,7 @@ void DrawStdWheel(void)
prevminx = dx;
prevminy = dy;
-
+
DrawLine(cx, cy, dx, dy, sx, sy);
}
@@ -501,7 +501,7 @@ void DrawLine(int x1, int y1, int x2, int y2, int sourcex, int sourcey)
float xd=0, yd=0;
float xi, yi;
-
+
x = x1;
y = y1;
@@ -568,7 +568,7 @@ void BlitString(char *name, int x, int y)
for (i=0; name[i]; i++)
{
- c = toupper(name[i]);
+ c = toupper(name[i]);
if (c >= 'A' && c <= 'Z')
{ // its a letter
c -= 'A';
@@ -594,7 +594,7 @@ void BlitNum(int num, int x, int y)
BlitString(buf, newx, y);
}
-
+
// ReadConfigSetting
int ReadConfigString(FILE *fp, char *setting, char *value)
@@ -614,15 +614,15 @@ int ReadConfigString(FILE *fp, char *setting, char *value)
sprintf(str, "%s=", setting);
slen = strlen(str);
-
+
fseek(fp, 0, SEEK_SET);
while ( !feof(fp) )
{
-
+
if (!fgets(buf, 512, fp))
break;
-
+
len = strlen(buf);
// strip linefeed
@@ -638,7 +638,7 @@ int ReadConfigString(FILE *fp, char *setting, char *value)
if ( strncmp(buf, str, strlen(str)) == 0)
{
// found our setting
-
+
for(i=0; i!=slen; i++)
{
if ( buf[i] == '=' )
@@ -648,10 +648,10 @@ int ReadConfigString(FILE *fp, char *setting, char *value)
return 1;
}
}
-
+
}
}
-
+
return 0;
}
@@ -675,7 +675,7 @@ int Read_Config_File( char *filename )
fp = fopen(filename, "r");
if (fp)
{
-
+
fclose(fp);
return 1;
}
@@ -688,9 +688,9 @@ int Read_Config_File( char *filename )
}
-
-
-
+
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmitime.git
More information about the Pkg-wmaker-commits
mailing list