wmfsm: Remove trailing whitespace.
This commit is contained in:
parent
bec2a56a92
commit
70c80a41a5
7 changed files with 89 additions and 89 deletions
|
@ -64,10 +64,10 @@
|
||||||
|
|
||||||
As per user request, I added an [include] section to the ~/.wmfsmrc file
|
As per user request, I added an [include] section to the ~/.wmfsmrc file
|
||||||
so that you can explicitly include filesystems rather than just
|
so that you can explicitly include filesystems rather than just
|
||||||
excluding them.
|
excluding them.
|
||||||
|
|
||||||
Also made a new SGML manpage because *roff sucks.
|
Also made a new SGML manpage because *roff sucks.
|
||||||
|
|
||||||
|
|
||||||
new files:
|
new files:
|
||||||
ChangeLog.old wmfsm/wmfsm.sgml
|
ChangeLog.old wmfsm/wmfsm.sgml
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
wmfsm--dev--0.3--base-0
|
wmfsm--dev--0.3--base-0
|
||||||
|
|
||||||
wmfsm is a fairly complete program, but it's still nice to have some
|
wmfsm is a fairly complete program, but it's still nice to have some
|
||||||
version control.
|
version control.
|
||||||
|
|
||||||
new files:
|
new files:
|
||||||
./AUTHORS ./COPYING ./ChangeLog ./INSTALL ./Makefile.am
|
./AUTHORS ./COPYING ./ChangeLog ./INSTALL ./Makefile.am
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
|
|
||||||
SUBDIRS = wmgeneral wmfsm
|
SUBDIRS = wmgeneral wmfsm
|
||||||
EXTRA_DIST = ChangeLog.old
|
EXTRA_DIST = ChangeLog.old
|
||||||
|
|
||||||
|
|
|
@ -20,24 +20,24 @@ AC_MSG_CHECKING([to see if we can use X])
|
||||||
AC_TRY_LINK([#include <X11/Xlib.h>],,AC_MSG_RESULT([yes]),AC_MSG_RESULT([no]); exit 1)
|
AC_TRY_LINK([#include <X11/Xlib.h>],,AC_MSG_RESULT([yes]),AC_MSG_RESULT([no]); exit 1)
|
||||||
|
|
||||||
dnl Checks how to call statfs
|
dnl Checks how to call statfs
|
||||||
AC_MSG_CHECKING([how to call statfs])
|
AC_MSG_CHECKING([how to call statfs])
|
||||||
AC_TRY_COMPILE([#include <sys/vfs.h>
|
AC_TRY_COMPILE([#include <sys/vfs.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
],
|
],
|
||||||
[struct statfs a; statfs("/", &a);],
|
[struct statfs a; statfs("/", &a);],
|
||||||
[AC_MSG_RESULT([2 arguments])
|
[AC_MSG_RESULT([2 arguments])
|
||||||
AC_DEFINE(
|
AC_DEFINE(
|
||||||
STATFS_2_ARGUMENTS, 1,
|
STATFS_2_ARGUMENTS, 1,
|
||||||
[Define if statfs takes two arguments (like linux)])
|
[Define if statfs takes two arguments (like linux)])
|
||||||
ac_statfs_args=2],
|
ac_statfs_args=2],
|
||||||
|
|
||||||
AC_TRY_COMPILE([
|
AC_TRY_COMPILE([
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/statfs.h>
|
#include <sys/statfs.h>
|
||||||
],
|
],
|
||||||
[struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);],
|
[struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);],
|
||||||
[AC_MSG_RESULT([4 arguments])
|
[AC_MSG_RESULT([4 arguments])
|
||||||
AC_DEFINE(
|
AC_DEFINE(
|
||||||
STATFS_4_ARGUMENTS, 1,
|
STATFS_4_ARGUMENTS, 1,
|
||||||
[Define if statfs takes four arguments (like SunOS)])
|
[Define if statfs takes four arguments (like SunOS)])
|
||||||
|
|
|
@ -4,7 +4,7 @@ wmfsm_SOURCES = wmfsm.c
|
||||||
else
|
else
|
||||||
wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h
|
wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h
|
||||||
endif
|
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
|
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
|
||||||
|
|
||||||
|
|
|
@ -1,46 +1,46 @@
|
||||||
.TH "WMFSM" "1"
|
.TH "WMFSM" "1"
|
||||||
.SH "NAME"
|
.SH "NAME"
|
||||||
wmfsm \(em shows the amount of disk space available
|
wmfsm \(em shows the amount of disk space available
|
||||||
.SH "SYNOPSIS"
|
.SH "SYNOPSIS"
|
||||||
.PP
|
.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]
|
\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"
|
.SH "DESCRIPTION"
|
||||||
.PP
|
.PP
|
||||||
\fBwmfsm\fP is a WindowMaker dock
|
\fBwmfsm\fP is a WindowMaker dock
|
||||||
application that shows the amount of disk space available on mounted
|
application that shows the amount of disk space available on mounted
|
||||||
file systems with colored bars.
|
file systems with colored bars.
|
||||||
.SH "OPTIONS"
|
.SH "OPTIONS"
|
||||||
.PP
|
.PP
|
||||||
This program follows the usual GNU command line syntax,
|
This program follows the usual GNU command line syntax,
|
||||||
with long options starting with two dashes (`\-'). A summary of
|
with long options starting with two dashes (`\-'). A summary of
|
||||||
options is included below.
|
options is included below.
|
||||||
|
|
||||||
.IP "\fB\-h\fP, \fB\-\-help\fP " 10
|
.IP "\fB\-h\fP, \fB\-\-help\fP " 10
|
||||||
Show summary of options.
|
Show summary of options.
|
||||||
.IP "\fB\-v\fP, \fB\-\-version\fP " 10
|
.IP "\fB\-v\fP, \fB\-\-version\fP " 10
|
||||||
Show version of program.
|
Show version of program.
|
||||||
.IP "\fB\-n\fP, \fB\-\-normal\fP " 10
|
.IP "\fB\-n\fP, \fB\-\-normal\fP " 10
|
||||||
Show the entire bars in the same color.
|
Show the entire bars in the same color.
|
||||||
.IP "\fB\-f\fP, \fB\-\-fire\fP " 10
|
.IP "\fB\-f\fP, \fB\-\-fire\fP " 10
|
||||||
Render the bars as gradients. You may switch between
|
Render the bars as gradients. You may switch between
|
||||||
the normal and fire modes by mouse clicks anywhere on
|
the normal and fire modes by mouse clicks anywhere on
|
||||||
wmfsm.
|
wmfsm.
|
||||||
.IP "\fB\-b\fP, \fB\-\-blink\fP " 10
|
.IP "\fB\-b\fP, \fB\-\-blink\fP " 10
|
||||||
Blink the bars if the filesystem is 95% full.
|
Blink the bars if the filesystem is 95% full.
|
||||||
.IP "\fB\-\-noblink\fP " 10
|
.IP "\fB\-\-noblink\fP " 10
|
||||||
Do not blink if the filesystem is 95% full.
|
Do not blink if the filesystem is 95% full.
|
||||||
.IP "\fB\-display\fP " 10
|
.IP "\fB\-display\fP " 10
|
||||||
Draw on the specified display.
|
Draw on the specified display.
|
||||||
.IP "\fB\-d\fP, \fB\-\-delay\fP " 10
|
.IP "\fB\-d\fP, \fB\-\-delay\fP " 10
|
||||||
Wait the specified number of milliseconds to redraw
|
Wait the specified number of milliseconds to redraw
|
||||||
the window.
|
the window.
|
||||||
.SH "FILES"
|
.SH "FILES"
|
||||||
.PP
|
.PP
|
||||||
You may exclude filesystems from being show by wmfsm
|
You may exclude filesystems from being show by wmfsm
|
||||||
by listing them in the ~/.wmfsmrc file. It should have as its
|
by listing them in the ~/.wmfsmrc file. It should have as its
|
||||||
first line either [include] or [exclude].
|
first line either [include] or [exclude].
|
||||||
The next lines are filesystems that are either explicitly included
|
The next lines are filesystems that are either explicitly included
|
||||||
or excluded respectively.
|
or excluded respectively.
|
||||||
|
|
||||||
Note: the format of the ~/.wmfsmrc file is very strict. Make sure
|
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.
|
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
|
.br
|
||||||
/cdrom
|
/cdrom
|
||||||
|
|
||||||
.SH "SEE ALSO"
|
.SH "SEE ALSO"
|
||||||
.PP
|
.PP
|
||||||
X (1x), wmaker (1), df (1).
|
X (1x), wmaker (1), df (1).
|
||||||
.SH "AUTHOR"
|
.SH "AUTHOR"
|
||||||
.PP
|
.PP
|
||||||
This manual page was written by Chris Gray
|
This manual page was written by Chris Gray
|
||||||
<cgray4@po-box.mcgill.ca>.
|
<cgray4@po-box.mcgill.ca>.
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* wmfsm-0.33 (C) 1999 Stefan Eilemann (Stefan.Eilemann@dlr.de)
|
* wmfsm-0.33 (C) 1999 Stefan Eilemann (Stefan.Eilemann@dlr.de)
|
||||||
*
|
*
|
||||||
* - Shows file system usage ala mfsm
|
* - Shows file system usage ala mfsm
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* 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
|
* 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
|
* 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
|
* Boston, MA 02111-1307, USA
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* Changes: #include "../ChangeLog"
|
* Changes: #include "../ChangeLog"
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -32,8 +32,8 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Includes
|
* Includes
|
||||||
*/
|
*/
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -83,21 +83,21 @@
|
||||||
#if defined IRIX64
|
#if defined IRIX64
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
# define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
|
# define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
|
||||||
#elif defined linux
|
#elif defined linux
|
||||||
# define STATFS(a,b) statfs(a,b)
|
# define STATFS(a,b) statfs(a,b)
|
||||||
#elif defined(SunOS)
|
#elif defined(SunOS)
|
||||||
# define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
|
# define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
|
||||||
#elif defined(__OpenBSD__) || defined(__FreeBSD__)
|
#elif defined(__OpenBSD__) || defined(__FreeBSD__)
|
||||||
# define STATFS(a,b) statfs(a,b)
|
# define STATFS(a,b) statfs(a,b)
|
||||||
# include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#endif
|
#endif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
/*
|
/*
|
||||||
* Delay between refreshes (in microseconds), uses the 10*DELAY_10
|
* 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 DELAY_10 99999L
|
||||||
#define WMFSM_VERSION "0.33"
|
#define WMFSM_VERSION "0.33"
|
||||||
|
@ -151,8 +151,8 @@ int ypos[] = { 4, 4, 4, 4, 4, 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* main
|
* main
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
|
@ -191,7 +191,7 @@ main(int argc, char *argv[])
|
||||||
readFileSystems ();
|
readFileSystems ();
|
||||||
usleep (100);
|
usleep (100);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Process any pending X events.
|
* Process any pending X events.
|
||||||
*/
|
*/
|
||||||
while (XPending(display)) {
|
while (XPending(display)) {
|
||||||
|
@ -374,8 +374,8 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
RedrawWindow();
|
RedrawWindow();
|
||||||
/*
|
/*
|
||||||
* Wait for next update
|
* Wait for next update
|
||||||
*/
|
*/
|
||||||
i = 0;
|
i = 0;
|
||||||
while (i < 10) {
|
while (i < 10) {
|
||||||
|
|
|
@ -124,7 +124,7 @@ static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) {
|
||||||
|
|
||||||
err = XpmCreatePixmapFromData(display, Root, pixmap_bytes, &(wmgen->pixmap),
|
err = XpmCreatePixmapFromData(display, Root, pixmap_bytes, &(wmgen->pixmap),
|
||||||
&(wmgen->mask), &(wmgen->attributes));
|
&(wmgen->mask), &(wmgen->attributes));
|
||||||
|
|
||||||
if (err != XpmSuccess) {
|
if (err != XpmSuccess) {
|
||||||
fprintf(stderr, "Not enough free colorcells.\n");
|
fprintf(stderr, "Not enough free colorcells.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -171,9 +171,9 @@ static int flush_expose(Window w) {
|
||||||
\*******************************************************************************/
|
\*******************************************************************************/
|
||||||
|
|
||||||
void RedrawWindow(void) {
|
void RedrawWindow(void) {
|
||||||
|
|
||||||
flush_expose(iconwin);
|
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);
|
0,0, wmgen.attributes.width, wmgen.attributes.height, 0,0);
|
||||||
flush_expose(win);
|
flush_expose(win);
|
||||||
XCopyArea(display, wmgen.pixmap, win, NormalGC,
|
XCopyArea(display, wmgen.pixmap, win, NormalGC,
|
||||||
|
@ -185,9 +185,9 @@ void RedrawWindow(void) {
|
||||||
\*******************************************************************************/
|
\*******************************************************************************/
|
||||||
|
|
||||||
void RedrawWindowXY(int x, int y) {
|
void RedrawWindowXY(int x, int y) {
|
||||||
|
|
||||||
flush_expose(iconwin);
|
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);
|
x,y, wmgen.attributes.width, wmgen.attributes.height, 0,0);
|
||||||
flush_expose(win);
|
flush_expose(win);
|
||||||
XCopyArea(display, wmgen.pixmap, win, NormalGC,
|
XCopyArea(display, wmgen.pixmap, win, NormalGC,
|
||||||
|
@ -281,12 +281,12 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i=1; argv[i]; i++) {
|
for (i=1; argv[i]; i++) {
|
||||||
if (!strcmp(argv[i], "-display"))
|
if (!strcmp(argv[i], "-display"))
|
||||||
display_name = argv[i+1];
|
display_name = argv[i+1];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(display = XOpenDisplay(display_name))) {
|
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));
|
wname, XDisplayName(display_name));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
@ -311,10 +311,10 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
|
||||||
|
|
||||||
mysizehints.width = 64;
|
mysizehints.width = 64;
|
||||||
mysizehints.height = 64;
|
mysizehints.height = 64;
|
||||||
|
|
||||||
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
|
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
|
||||||
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
|
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
|
||||||
|
|
||||||
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
|
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
|
||||||
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
|
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);
|
XSetWMName(display, win, &name);
|
||||||
|
|
||||||
/* Create GC for drawing */
|
/* Create GC for drawing */
|
||||||
|
|
||||||
gcm = GCForeground | GCBackground | GCGraphicsExposures;
|
gcm = GCForeground | GCBackground | GCGraphicsExposures;
|
||||||
gcv.foreground = fore_pix;
|
gcv.foreground = fore_pix;
|
||||||
gcv.background = back_pix;
|
gcv.background = back_pix;
|
||||||
|
|
Loading…
Reference in a new issue