diff --git a/wmfsm/ChangeLog b/wmfsm/ChangeLog index 06ca201..de04f61 100644 --- a/wmfsm/ChangeLog +++ b/wmfsm/ChangeLog @@ -64,10 +64,10 @@ As per user request, I added an [include] section to the ~/.wmfsmrc file so that you can explicitly include filesystems rather than just - excluding them. - + excluding them. + Also made a new SGML manpage because *roff sucks. - + new files: ChangeLog.old wmfsm/wmfsm.sgml @@ -84,7 +84,7 @@ wmfsm--dev--0.3--base-0 wmfsm is a fairly complete program, but it's still nice to have some - version control. + version control. new files: ./AUTHORS ./COPYING ./ChangeLog ./INSTALL ./Makefile.am diff --git a/wmfsm/Makefile.am b/wmfsm/Makefile.am index 764d2ed..840b1ea 100644 --- a/wmfsm/Makefile.am +++ b/wmfsm/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = wmgeneral wmfsm -EXTRA_DIST = ChangeLog.old +EXTRA_DIST = ChangeLog.old diff --git a/wmfsm/configure.ac b/wmfsm/configure.ac index 7ed0c7a..c03da17 100644 --- a/wmfsm/configure.ac +++ b/wmfsm/configure.ac @@ -20,24 +20,24 @@ AC_MSG_CHECKING([to see if we can use X]) AC_TRY_LINK([#include ],,AC_MSG_RESULT([yes]),AC_MSG_RESULT([no]); exit 1) dnl Checks how to call statfs -AC_MSG_CHECKING([how to call statfs]) +AC_MSG_CHECKING([how to call statfs]) AC_TRY_COMPILE([#include #include #include ], -[struct statfs a; statfs("/", &a);], -[AC_MSG_RESULT([2 arguments]) +[struct statfs a; statfs("/", &a);], +[AC_MSG_RESULT([2 arguments]) AC_DEFINE( STATFS_2_ARGUMENTS, 1, [Define if statfs takes two arguments (like linux)]) -ac_statfs_args=2], +ac_statfs_args=2], AC_TRY_COMPILE([ #include #include ], [struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);], -[AC_MSG_RESULT([4 arguments]) +[AC_MSG_RESULT([4 arguments]) AC_DEFINE( STATFS_4_ARGUMENTS, 1, [Define if statfs takes four arguments (like SunOS)]) diff --git a/wmfsm/wmfsm/Makefile.am b/wmfsm/wmfsm/Makefile.am index d9ed7ce..8ab21a0 100644 --- a/wmfsm/wmfsm/Makefile.am +++ b/wmfsm/wmfsm/Makefile.am @@ -4,7 +4,7 @@ wmfsm_SOURCES = wmfsm.c else wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h endif -wmfsm_LDADD = ../wmgeneral/libwmgeneral.a @LIBS@ @X11LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ +wmfsm_LDADD = ../wmgeneral/libwmgeneral.a @LIBS@ @X11LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ man_MANS = wmfsm.1 -EXTRA_DIST = $(man_MANS) wmfsm_master.xpm wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm wmfsm_master_lowcolor.xpm wmfsm_mask.xbm wmfsmrc.sample +EXTRA_DIST = $(man_MANS) wmfsm_master.xpm wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm wmfsm_master_lowcolor.xpm wmfsm_mask.xbm wmfsmrc.sample diff --git a/wmfsm/wmfsm/wmfsm.1 b/wmfsm/wmfsm/wmfsm.1 index 52adf18..93b0910 100644 --- a/wmfsm/wmfsm/wmfsm.1 +++ b/wmfsm/wmfsm/wmfsm.1 @@ -1,46 +1,46 @@ -.TH "WMFSM" "1" -.SH "NAME" -wmfsm \(em shows the amount of disk space available -.SH "SYNOPSIS" -.PP -\fBwmfsm\fP [\fB\-\-normal, \-n \fP] [\fB\-\-fire, \-f \fP] [\fB\-\-blink, \-b \fP] [\fB\-\-noblink \fP] [\fB\-display \fP] [\fB\-d, \-\-delay \fP] [\fB\-h, \-\-help \fP] -.SH "DESCRIPTION" -.PP -\fBwmfsm\fP is a WindowMaker dock -application that shows the amount of disk space available on mounted -file systems with colored bars. -.SH "OPTIONS" -.PP -This program follows the usual GNU command line syntax, -with long options starting with two dashes (`\-'). A summary of -options is included below. - -.IP "\fB\-h\fP, \fB\-\-help\fP " 10 -Show summary of options. -.IP "\fB\-v\fP, \fB\-\-version\fP " 10 -Show version of program. -.IP "\fB\-n\fP, \fB\-\-normal\fP " 10 -Show the entire bars in the same color. -.IP "\fB\-f\fP, \fB\-\-fire\fP " 10 -Render the bars as gradients. You may switch between -the normal and fire modes by mouse clicks anywhere on -wmfsm. -.IP "\fB\-b\fP, \fB\-\-blink\fP " 10 -Blink the bars if the filesystem is 95% full. -.IP "\fB\-\-noblink\fP " 10 -Do not blink if the filesystem is 95% full. -.IP "\fB\-display\fP " 10 -Draw on the specified display. -.IP "\fB\-d\fP, \fB\-\-delay\fP " 10 -Wait the specified number of milliseconds to redraw -the window. -.SH "FILES" -.PP -You may exclude filesystems from being show by wmfsm -by listing them in the ~/.wmfsmrc file. It should have as its -first line either [include] or [exclude]. -The next lines are filesystems that are either explicitly included -or excluded respectively. +.TH "WMFSM" "1" +.SH "NAME" +wmfsm \(em shows the amount of disk space available +.SH "SYNOPSIS" +.PP +\fBwmfsm\fP [\fB\-\-normal, \-n \fP] [\fB\-\-fire, \-f \fP] [\fB\-\-blink, \-b \fP] [\fB\-\-noblink \fP] [\fB\-display \fP] [\fB\-d, \-\-delay \fP] [\fB\-h, \-\-help \fP] +.SH "DESCRIPTION" +.PP +\fBwmfsm\fP is a WindowMaker dock +application that shows the amount of disk space available on mounted +file systems with colored bars. +.SH "OPTIONS" +.PP +This program follows the usual GNU command line syntax, +with long options starting with two dashes (`\-'). A summary of +options is included below. + +.IP "\fB\-h\fP, \fB\-\-help\fP " 10 +Show summary of options. +.IP "\fB\-v\fP, \fB\-\-version\fP " 10 +Show version of program. +.IP "\fB\-n\fP, \fB\-\-normal\fP " 10 +Show the entire bars in the same color. +.IP "\fB\-f\fP, \fB\-\-fire\fP " 10 +Render the bars as gradients. You may switch between +the normal and fire modes by mouse clicks anywhere on +wmfsm. +.IP "\fB\-b\fP, \fB\-\-blink\fP " 10 +Blink the bars if the filesystem is 95% full. +.IP "\fB\-\-noblink\fP " 10 +Do not blink if the filesystem is 95% full. +.IP "\fB\-display\fP " 10 +Draw on the specified display. +.IP "\fB\-d\fP, \fB\-\-delay\fP " 10 +Wait the specified number of milliseconds to redraw +the window. +.SH "FILES" +.PP +You may exclude filesystems from being show by wmfsm +by listing them in the ~/.wmfsmrc file. It should have as its +first line either [include] or [exclude]. +The next lines are filesystems that are either explicitly included +or excluded respectively. Note: the format of the ~/.wmfsmrc file is very strict. Make sure there are no whitespaces at the beginning or at the end of lines. @@ -56,10 +56,10 @@ No comments (#) are allowed. Here is an example: .br /cdrom -.SH "SEE ALSO" -.PP -X (1x), wmaker (1), df (1). -.SH "AUTHOR" -.PP -This manual page was written by Chris Gray -. +.SH "SEE ALSO" +.PP +X (1x), wmaker (1), df (1). +.SH "AUTHOR" +.PP +This manual page was written by Chris Gray +. diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c index 8c1805a..11277ba 100644 --- a/wmfsm/wmfsm/wmfsm.c +++ b/wmfsm/wmfsm/wmfsm.c @@ -1,11 +1,11 @@ /* * * wmfsm-0.33 (C) 1999 Stefan Eilemann (Stefan.Eilemann@dlr.de) - * + * * - Shows file system usage ala mfsm - * - * - * + * + * + * * * 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 @@ -19,12 +19,12 @@ * * You should have received a copy of the GNU General Public License * along with this program (see the file COPYING); if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA * * * - * Changes: #include "../ChangeLog" + * Changes: #include "../ChangeLog" * */ @@ -32,8 +32,8 @@ -/* - * Includes +/* + * Includes */ #include #include @@ -83,21 +83,21 @@ #if defined IRIX64 # include # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0) - #elif defined linux + #elif defined linux # define STATFS(a,b) statfs(a,b) #elif defined(SunOS) # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0) #elif defined(__OpenBSD__) || defined(__FreeBSD__) # define STATFS(a,b) statfs(a,b) # include - #endif + #endif */ #define _GNU_SOURCE #include -/* +/* * Delay between refreshes (in microseconds), uses the 10*DELAY_10 - * coz irix has max of 100000L :(. + * coz irix has max of 100000L :(. */ #define DELAY_10 99999L #define WMFSM_VERSION "0.33" @@ -151,8 +151,8 @@ int ypos[] = { 4, 4, 4, 4, 4, 4, }; -/* - * main +/* + * main */ int main(int argc, char *argv[]) @@ -191,7 +191,7 @@ main(int argc, char *argv[]) readFileSystems (); usleep (100); - /* + /* * Process any pending X events. */ while (XPending(display)) { @@ -374,8 +374,8 @@ main(int argc, char *argv[]) } RedrawWindow(); - /* - * Wait for next update + /* + * Wait for next update */ i = 0; while (i < 10) { diff --git a/wmfsm/wmgeneral/wmgeneral.c b/wmfsm/wmgeneral/wmgeneral.c index a4f13c1..645321c 100644 --- a/wmfsm/wmgeneral/wmgeneral.c +++ b/wmfsm/wmgeneral/wmgeneral.c @@ -124,7 +124,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); @@ -171,9 +171,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, @@ -185,9 +185,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, @@ -281,12 +281,12 @@ 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+1]; } 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); } @@ -311,10 +311,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); @@ -335,7 +335,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;