[PATCH 11/18] wmcdplay: Fix -Wwrite-string compiler warnings.

[Doug Torrance]

Previously, compiling wmcdplay caused a large number of warnings of the form
"deprecated conversion from string constant to ‘char*’".  This was fixed by
changing "char *" declarations to "const char *", especially in the .xpm files,
and using "const_cast" as needed when an external library expected a non-const.
---
 wmcdplay/ARTWORK   | 10 +-
 wmcdplay/XPM/bluered/cdplayer.xpm  |  2 +-
 wmcdplay/XPM/bluered/led.xpm   |  2 +-
 wmcdplay/XPM/bluered/ledsym.xpm|  2 +-
 wmcdplay/XPM/bluered/ledtsel.xpm   |  2 +-
 wmcdplay/XPM/bluered/symbols.xpm   |  2 +-
 wmcdplay/XPM/grey/cdplayer.xpm |  2 +-
 wmcdplay/XPM/grey/led.xpm  |  2 +-
 wmcdplay/XPM/grey/ledsym.xpm   |  2 +-
 wmcdplay/XPM/grey/ledtsel.xpm  |  2 +-
 wmcdplay/XPM/grey/symbols.xpm  |  2 +-
 wmcdplay/XPM/newstyle/cdplayer.xpm |  2 +-
 wmcdplay/XPM/newstyle/led.xpm  |  2 +-
 wmcdplay/XPM/newstyle/ledsym.xpm   |  2 +-
 wmcdplay/XPM/newstyle/ledtsel.xpm  |  2 +-
 wmcdplay/XPM/newstyle/symbols.xpm  |  2 +-
 wmcdplay/XPM/tile.xpm  |  2 +-
 wmcdplay/XPM/wmcd/cdplayer.xpm |  2 +-
 wmcdplay/XPM/wmcd/led.xpm  |  2 +-
 wmcdplay/XPM/wmcd/ledsym.xpm   |  2 +-
 wmcdplay/XPM/wmcd/ledtsel.xpm  |  2 +-
 wmcdplay/XPM/wmcd/symbols.xpm  |  2 +-
 wmcdplay/wmcdplay.cc   | 32 +---
 23 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/wmcdplay/ARTWORK b/wmcdplay/ARTWORK
index ece3395..120a78f 100644
--- a/wmcdplay/ARTWORK
+++ b/wmcdplay/ARTWORK
@@ -73,7 +73,7 @@ led.xpm
This file must begin with these 2 lines (character perfect):
 
 /* XPM */
-static char * led_xpm[] = {
+static const char * led_xpm[] = {
 
 ledsym.xpm
 --
@@ -86,7 +86,7 @@ ledsym.xpm
This file must begin with these 2 lines (character perfect):
 
 /* XPM */
-static char * ledsym_xpm[] = {
+static const char * ledsym_xpm[] = {
 
 ledtsel.xpm
 ---
@@ -100,7 +100,7 @@ ledtsel.xpm
This file must begin with these 2 lines (character perfect):
 
 /* XPM */
-static char * ledtsel_xpm[] = {
+static const char * ledtsel_xpm[] = {
 
 symbols.xpm
 ---
@@ -113,7 +113,7 @@ symbols.xpm
This file must begin with these 2 lines (character perfect):
 
 /* XPM */
-static char * symbols_xpm[] = {
+static const char * symbols_xpm[] = {

 cdplayer.xpm
 
@@ -129,7 +129,7 @@ cdplayer.xpm
This file must begin with these 2 lines (character perfect):
 
 /* XPM */
-static char * cdplayer_xpm[] = {
+static const char * cdplayer_xpm[] = {
 
 
 THE DATA FILE - artwork.dat
diff --git a/wmcdplay/XPM/bluered/cdplayer.xpm 
b/wmcdplay/XPM/bluered/cdplayer.xpm
index 54ce780..3d439cf 100644
--- a/wmcdplay/XPM/bluered/cdplayer.xpm
+++ b/wmcdplay/XPM/bluered/cdplayer.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cdplayer_xpm[] = {
+static const char * cdplayer_xpm[] = {
 "64 64 64 1",
 "  c None",
 ". c #",
diff --git a/wmcdplay/XPM/bluered/led.xpm b/wmcdplay/XPM/bluered/led.xpm
index f4b5d53..e80580c 100644
--- a/wmcdplay/XPM/bluered/led.xpm
+++ b/wmcdplay/XPM/bluered/led.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * led_xpm[] = {
+static const char * led_xpm[] = {
 "171 11 4 1",
 "  c #00",
 "0 c #00ff00 s led_color_high",
diff --git a/wmcdplay/XPM/bluered/ledsym.xpm b/wmcdplay/XPM/bluered/ledsym.xpm
index 01be3df..8814b31 100644
--- a/wmcdplay/XPM/bluered/ledsym.xpm
+++ b/wmcdplay/XPM/bluered/ledsym.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ledsym_xpm[] = {
+static const char * ledsym_xpm[] = {
 "35 5 2 1",
 "   c #00",
 "0  c #00ff00 s led_color_high",
diff --git a/wmcdplay/XPM/bluered/ledtsel.xpm b/wmcdplay/XPM/bluered/ledtsel.xpm
index 51a7cce..bf1914b 100644
--- a/wmcdplay/XPM/bluered/ledtsel.xpm
+++ b/wmcdplay/XPM/bluered/ledtsel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ledtsel_xpm[]={
+static const char * ledtsel_xpm[]={
 "29 11 2 1",
 "  c #00",
 "0 c #00ff00 s led_color_high",
diff --git a/wmcdplay/XPM/bluered/symbols.xpm b/wmcdplay/XPM/bluered/symbols.xpm
index 62a2609..6560f02 100644
--- a/wmcdplay/XPM/bluered/symbols.xpm
+++ b/wmcdplay/XPM/bluered/symbols.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * symbols_xpm[] = {
+static const char * symbols_xpm[] = {
 "131 11 18 1",
 "  c None",
 ". c #DF7DDF7DDF7D",
diff --git a/wmcdplay/XPM/grey/cdplayer.xpm b/wmcdplay/XPM/grey/cdplayer.xpm
index 5f6e73e..0f0a686 100644
--- a/wmcdplay/XPM/grey/cdplayer.xpm
+++ b/wmcdplay/XPM/grey/cdplayer.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cdplayer_xpm[] = {
+static const char * cdplayer_xpm[] = {
 "64 64 5 1",
 "  c None",
 "0 c #414141",
diff --git a/wmcdplay/XPM/grey/led.xpm b/wmcdplay/XPM/grey/led.xpm
index f4b5d53..e80580c 100644
--- a/wmcdplay/XPM/grey/led.xpm
+++ b/wmcdplay/XPM/grey/led.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * led_xpm[] = {
+static const char * led_xpm[] = {
 "171 11 4 1",
 "  c #00",
 "0 c #00ff00 s led_color_high",
diff --gi

[PATCH 12/18] wmcdplay: Fix -Wunused-result compiler warnings.

[Doug Torrance]

In particular, fix warnings of the form "warning: ignoring return value of
‘char* fgets(char*, int, FILE*)’, declared with attribute warn_unused_result" by
checking return value of fgets.
---
 wmcdplay/wmcdplay.cc | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wmcdplay/wmcdplay.cc b/wmcdplay/wmcdplay.cc
index 0108b89..ab18f4a 100644
--- a/wmcdplay/wmcdplay.cc
+++ b/wmcdplay/wmcdplay.cc
@@ -644,7 +644,10 @@ bool readArtwork(char *artfilen){
char buf[256];
bool done=false;
while(!done){
-  fgets(buf, 250, artfile);
+  if (fgets(buf, 250, artfile) == NULL) {
+ fprintf(stderr,"%s : Error reading artwork file.\n", NAME);
+ return false;
+  }
   done=(feof(artfile)!=0);
   if(!done){
 
@@ -734,7 +737,10 @@ char *readBlock(FILE *dfile){
long bytes=0;
char *block=NULL;
do{
-  fgets(buf, 250, dfile);
+  if (fgets(buf, 250, dfile) == NULL) {
+ fprintf(stderr,"%s : Error reading artwork file.\n", NAME);
+ return NULL;
+  }
   int buflen=strlen(buf);
   block=(char *)realloc(block, sizeof(char)*(bytes+buflen+1));
   strcpy(block+bytes, buf);
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 13/18] wmcdplay: Fix -Wsign-compare compiler warnings.

[Doug Torrance]

---
 wmcdplay/wmcdplay.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wmcdplay/wmcdplay.cc b/wmcdplay/wmcdplay.cc
index ab18f4a..f1dd570 100644
--- a/wmcdplay/wmcdplay.cc
+++ b/wmcdplay/wmcdplay.cc
@@ -224,7 +224,7 @@ int main(int argc, char **argv)
 pressEvent(&xev.xbutton);
  break;
  case ClientMessage:
-if(xev.xclient.data.l[0]==deleteWin)
+if((Atom) xev.xclient.data.l[0]==deleteWin)
done=true;
  break;
 }
@@ -607,7 +607,7 @@ void update(){
 
 void drawText(int x, int y, char *text){
int drawx=x;
-   for(int i=0;i

[PATCH 14/18] wmcdplay: Centralize version number.

[Doug Torrance]

Previously, the wmcdplay version number was found in numerous places.  To ease
future releases, it now appears only in configure.ac.
---
 wmcdplay/ARTWORK | 1 -
 wmcdplay/README  | 1 -
 wmcdplay/cdctl.h | 1 -
 wmcdplay/cdctl_freebsd.h | 1 -
 wmcdplay/wmcdplay.cc | 3 +--
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/wmcdplay/ARTWORK b/wmcdplay/ARTWORK
index 120a78f..84bdfc6 100644
--- a/wmcdplay/ARTWORK
+++ b/wmcdplay/ARTWORK
@@ -1,5 +1,4 @@
 wmcdplay - A cd player designed for WindowMaker
-05/09/98  Release 1.0 Beta1
 Copyright (C) 1998  Sam Hawker 
 This software comes with ABSOLUTELY NO WARRANTY
 This software is free software, and you are welcome to redistribute it
diff --git a/wmcdplay/README b/wmcdplay/README
index e9e3fce..c6439f5 100644
--- a/wmcdplay/README
+++ b/wmcdplay/README
@@ -1,5 +1,4 @@
 wmcdplay - A cd player designed for WindowMaker
-05/09/98  Release 1.0 Beta1
 Copyright (C) 1998  Sam Hawker 
 This software comes with ABSOLUTELY NO WARRANTY
 This software is free software, and you are welcome to redistribute it
diff --git a/wmcdplay/cdctl.h b/wmcdplay/cdctl.h
index a93619f..3bdf75a 100644
--- a/wmcdplay/cdctl.h
+++ b/wmcdplay/cdctl.h
@@ -1,5 +1,4 @@
 // cdctl.h - CDCtl class provides easy control of cd audio functions
-// 05/09/98  Release 1.0 Beta1
 // Copyright (C) 1998  Sam Hawker 
 // This software comes with ABSOLUTELY NO WARRANTY
 // This software is free software, and you are welcome to redistribute it
diff --git a/wmcdplay/cdctl_freebsd.h b/wmcdplay/cdctl_freebsd.h
index b237609..0be07bc 100644
--- a/wmcdplay/cdctl_freebsd.h
+++ b/wmcdplay/cdctl_freebsd.h
@@ -1,5 +1,4 @@
 // cdctl.h - CDCtl class provides easy control of cd audio functions
-// 05/09/98  Release 1.0 Beta1
 // Copyright (C) 1998  Sam Hawker 
 // This software comes with ABSOLUTELY NO WARRANTY
 // This software is free software, and you are welcome to redistribute it
diff --git a/wmcdplay/wmcdplay.cc b/wmcdplay/wmcdplay.cc
index f1dd570..8057142 100644
--- a/wmcdplay/wmcdplay.cc
+++ b/wmcdplay/wmcdplay.cc
@@ -1,5 +1,4 @@
 // wmcdplay - A cd player designed for WindowMaker
-// 05/09/98  Release 1.0 Beta1
 // Copyright (C) 1998  Sam Hawker 
 // This software comes with ABSOLUTELY NO WARRANTY
 // This software is free software, and you are welcome to redistribute it
@@ -354,7 +353,7 @@ unsigned long mixColor(char *colorname1, int prop1, char 
*colorname2, int prop2)
 void scanArgs(int argc, char **argv){
for(int i=1;i\n");
  fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n");
  fprintf(stderr, "This software is free software, and you are welcome 
to redistribute it\n");
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 16/18] wmcdplay: Add manpage.

[Doug Torrance]

Obtained, with slight modification, from Debian [1].

[1] http://sources.debian.net/src/wmcdplay/1.0beta1-13/debian/wmcdplay.1x/
---
 wmcdplay/Makefile.am |  2 ++
 wmcdplay/wmcdplay.1  | 55 
 2 files changed, 57 insertions(+)
 create mode 100644 wmcdplay/wmcdplay.1

diff --git a/wmcdplay/Makefile.am b/wmcdplay/Makefile.am
index 0c13fab..afb1731 100644
--- a/wmcdplay/Makefile.am
+++ b/wmcdplay/Makefile.am
@@ -15,3 +15,5 @@ XPM/%.art:
 
 XPM/standard.art: XPM/@defaultart@.art
cd XPM && ln -s @defaultart@.art standard.art
+
+man_MANS = wmcdplay.1
diff --git a/wmcdplay/wmcdplay.1 b/wmcdplay/wmcdplay.1
new file mode 100644
index 000..00d3ca0
--- /dev/null
+++ b/wmcdplay/wmcdplay.1
@@ -0,0 +1,55 @@
+.TH WMCDplay 1 "December 18, 2014"
+.SH NAME
+wmcdplay \- A cd player designed for WindowMaker
+.SH SYNOPSIS
+.B wmcdplay
+.RI [ options ]
+.br
+.SH DESCRIPTION
+A skinable CD player for the Window Maker dock.
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-help\fR | \fB\-\-help\fR
+display this help screen
+.TP
+\fB\-w\fR
+use WithdrawnState (for WindowMaker)
+.TP
+\fB\-s\fR
+shaped window
+.TP
+\fB\-a\fR
+use smaller window (for AfterStep Wharf)
+.TP
+\fB\-f\fR artwork_file
+load the specified artwork file
+.TP
+\fB\-t\fR track_selection
+set track selection (between 0 and 4)
+.TP
+\fB\-v\fR volume
+set the cdrom volume (between 0 and 255)
+.TP
+\fB\-i\fR interval
+interval in 1/20 seconds between cd polls when empty
+.TP
+\fB\-l\fR led_color
+use the specified color for led displays
+.TP
+\fB\-b\fR back_color
+use the specified color for backgrounds
+.TP
+\fB\-d\fR cd_device
+use specified device
+.TP
+\fB\-position\fR position
+set window position
+.TP
+\fB\-display\fR display
+select target display
+.SH AUTHOR
+wmcdplay was written by Sam Hawker 
+
+This manual page was written by John H. Robinson, IV ,
+for the Debian GNU/Linux system (but may be used by others).
+.
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 15/18] wmcdplay: Update installation documentation.

[Doug Torrance]

---
 wmcdplay/README | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/wmcdplay/README b/wmcdplay/README
index c6439f5..38e84b0 100644
--- a/wmcdplay/README
+++ b/wmcdplay/README
@@ -31,15 +31,11 @@ http://www.geocities.com/SiliconValley/Vista/2471/
 INSTALLING:
 ===
 
-xmkmf
+autoreconf -i
+./configure
 make
-strip wmcdplay
 make install
 
-mkdir /usr/X11R6/lib/X11/wmcdplay
-cp XPM/*.art /usr/X11R6/lib/X11/wmcdplay
-
-
 TRACK SELECTION:
 
 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 18/18] wmcdplay: Bump to version 1.1.

[Doug Torrance]

---
 wmcdplay/ChangeLog| 10 ++
 wmcdplay/configure.ac |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/wmcdplay/ChangeLog b/wmcdplay/ChangeLog
index 4744933..2dec3dd 100644
--- a/wmcdplay/ChangeLog
+++ b/wmcdplay/ChangeLog
@@ -91,3 +91,13 @@ Beta1  "-a artwork_file" is now "-f 
artwork_file", sorry ;-)
Improved artwork loading (it was very brain-dead).
Formatting changes in artwork files (ARTWORK 
documentation
   is now up-to-date).
+
+Release 1.118/12/14Add -i option so users can specify cd polling
+  interval.
+   Fix compiler warnings.
+   Add FreeBSD and Hurd support.
+   Switch build system to autotools.
+   Install art script.
+   Add manpage from Debian.
+   Now maintained by Window Maker Developers Team
+  .
diff --git a/wmcdplay/configure.ac b/wmcdplay/configure.ac
index 82ed4c0..18210e2 100644
--- a/wmcdplay/configure.ac
+++ b/wmcdplay/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wmcdplay], [1.0beta1])
+AC_INIT([wmcdplay], [1.1], [wmaker-dev@lists.windowmaker.org])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_PROG_CXX
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 17/18] wmcdplay: Create ChangeLog.

[Doug Torrance]

Previously, release history was kept in README.  This has been separated out
into a new file to avoid a "no-upstream-changelog" Lintian warning in the
Debian package.
---
 wmcdplay/ChangeLog | 93 
 wmcdplay/README| 95 --
 2 files changed, 93 insertions(+), 95 deletions(-)
 create mode 100644 wmcdplay/ChangeLog

diff --git a/wmcdplay/ChangeLog b/wmcdplay/ChangeLog
new file mode 100644
index 000..4744933
--- /dev/null
+++ b/wmcdplay/ChangeLog
@@ -0,0 +1,93 @@
+RELEASE HISTORY:
+
+
+Release 0.122/01/98Poor window repaint technique.
+   Incorrect display if paused on startup.
+   Does not show Tray Open if opened by button on 
drive,
+  (I think this can only be done if the drive is 
empty).
+
+Release 0.223/01/98Improved window repaints.
+   Correct display even if paused on startup.
+   Improved interface on 'other' window managers.
+
+Release 0.307/02/98Handles multisession CD properly.
+   Now free's ALL pixmaps on exit (i hope).
+   And GCs :-).
+   Major re-write and interface alterations.
+   Option for led display color.
+   Smaller and better written.
+
+Release 0.412/02/98Highly customizable user interface. You chose:
+  Basic pixmap,
+  How many buttons,
+  Size, shape, position of buttons (polygons),
+  Actions for each button in each state:
+ (Stop, Stop Data, Play, Pause, Ejected),
+  Led and symbol pixmaps,
+  Position of displays.
+
+Release 0.524/02/98Fixed bug relating to manual window positioning.
+   Fixed error in grey.art.
+
+Release 0.604/03/98Rewritten cdctl engine.
+   Some more changes to artwork:
+  Different states,
+  Different actions.
+   Random/Repeat track selection.
+
+   Reduced CPU load (thanks to aselt...@cd.umass.edu),
+   It wasn't high on my K6 233MHz box :-).
+
+Release 0.712/03/98Better track selection.
+   Command line option to set track selection mode.
+   Yet more changes to artwork:
+  Hiding of do-NOTHING buttons now optional,
+  Symbols can be drawn onto non-solid background.
+   New name (wmcdplay).
+   Now works on 8bpp displays with full colormaps.
+  (thanks to dever...@istar.fr on the mailing-list)
+
+Release 0.807/05/98Now GPL.
+   Added "-v volume" command line argument.
+   Added "-b back_color" command line argument,
+  ("-b darkslategrey -l cyan" gives a nice backlit 
look).
+   Reduced cpu load.
+   Relative or absolute time display,
+  (click time display to switch).
+   More changes to artwork:
+  Led pixmaps now part of artwork,
+  Symbolic color names can now be used in all 
pixmaps:
+ led_color_high,
+ led_color_med,
+ led_color_low,
+ color_back.
+  All pixmaps now use standard names:
+ cdplayer.xpm = cdplayer_xpm,
+ symbols.xpm  = symbols_xpm,
+ led.xpm  = led_xpm,
+ ledsym.xpm   = ledsym_xpm,
+ ledtsel.xpm  = ledtsel_xpm.
+  Entries specifying symbol dimensions no longer 
needed,
+  "symbols.xpm" now includes a symbol for NOTHING,
+  New piece of artwork, "newstyle.art",
+  New directory structure and scripts.
+   Track selection should be more reliable now.
+
+Release 1.005/09/98Added some error checking.
+Beta1  "-a artwork_file" is now "-f artwork_file", sorry 
;-).
+   Added "-a" command line argument for AfterStep 
users.
+   Added "-position position" command line argument.
+   Command line a

[PATCH (whome)] Add wmcdplay to dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db   |   9 +
 dockapps/img/wmcdplay1.gif | Bin 0 -> 2221 bytes
 dockapps/img/wmcdplay2.gif | Bin 0 -> 2458 bytes
 dockapps/img/wmcdplay3.gif | Bin 0 -> 3021 bytes
 dockapps/img/wmcdplay4.gif | Bin 0 -> 2447 bytes
 5 files changed, 9 insertions(+)
 create mode 100644 dockapps/img/wmcdplay1.gif
 create mode 100644 dockapps/img/wmcdplay2.gif
 create mode 100644 dockapps/img/wmcdplay3.gif
 create mode 100644 dockapps/img/wmcdplay4.gif

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index f63d23d..f1e6361 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -172,6 +172,15 @@ url = "http://wmcalendar.sourceforge.net/";
 dockapps = 171
 category = Date/Time
 
+[wmcdplay]
+version-1.1 = c39c8d60a5a7613267bd2f275c1eeaff9251e12f
+version-1.0beta1 = 69deb773a5083ee760daf8bb68afc75f6c89dc4e
+image = "wmcdplay1.gif,wmcdplay2.gif,wmcdplay3.gif,wmcdplay4.gif"
+description = "A dock applet for playing CDs.  Artwork files allow you to 
customize the look-and-feel of wmcdplay."
+url = 
"http://web.archive.org/web/2604201402/http://www.geocities.com/SiliconValley/Vista/2471/wmcdplay.html";
+dockapps =
+category = Audio
+
 [wmckgmail]
 version-1.1+20141005 = 4cd077591088c3b6dfae982ef1875246d10cafdc
 version-1.1 = 0daf87ea4f81433819245f95ed022d7837fb42c8
diff --git a/dockapps/img/wmcdplay1.gif b/dockapps/img/wmcdplay1.gif
new file mode 100644
index 
..0b5ff324780f21b64819c4108da9ccacc658ba40
GIT binary patch
literal 2221
zcmbW2`!|#e7svNp@X*N6#E7JvP*e}cWi-+=lBNzdEM;=Ua7K+2B~epU<5r`1n^VeE
zs&PqED7i$}nWCH2Q7_AMA|qC&#F;djDVKTYJ?s4o-n~ET`@>#quf5mWd+ohuZ7|I@
z4g(Cd@Q)G6zyX*9SA(H66va?445eW-8k6SFq+v|VpM_y8EQp0MSQc)|dXqHN)a=H9zyW(kwqN82e(V^_2%c0j1oq&o1Dgs~{1!nMdMFRtjw
z1_|v9?MD7dXKFFJxvb*1CqFr!v|k%vQSod+@KK6wUAWK!BCoMa1J#^|i^40tG7-yl
zK`vHH;*-k4%B`H|of6n5=KgfzgzLsS`#|nf3)on#Q9memv#^id+ar$~I9yoo!|PNeRdT8@{ZI-HUbNb^~_ste;tY($I4~nC>gha^K2uK
zczV(;(xEli)J%Q_iCus1cKYCpU*xCn6Cf3*%%9G&;Y7;?Uk6{5uL)4@7g_yTo--bE
z0oy;Jdv@$e-~FknVZ|91KFxG>aO^JaLSgK|NlRs4_T%v(W$NFjP#hrrl9sFqbM3rb
z@;cRgf#MW~&k7elD&_aT+4~MYUecBo49|7xFMMLe2sE|g&>pef0(GSaTN-^A{1JSD
z-IL*jT_(@;BVLhYo3HmPEu7_?-;4PFV4p4`g>UAH%@^O|nmTEoiZ(O;>MlDMw4YXf
z%sW{14oSp!bZkyO`_Uzjf7RCL;vwtbw~(_w`AN+W%=zSs6aI^wRhDbL+@TPib5x3~
z2&mXp-qovh+!uA$HWxYZ>3eIGB-~|j&h(}DXFbRQf53t+T5HSB_gQL{VxRlXZhIC8
z&?_6x)`$o9ZN?Ax^V7DrRn;r9SZ;tdUaGEdcR0co);UDE6BWxnR++zz`N*lRy=j-!
z)SgAou6ffY8m)_T{{E>d&)5==%q*JNRCO(|>O#XIW86a%TrAP%!SS;{a4o>5*tA-n
zq_(!2`|jHH*m2eJU4+>g?yJbIm#fFx+?zg+Jx6zbX2_{87PibNeX}|$(Y>MLXU^3d
zTg9e}X+!pz3&ld`v;6n@zu$N?P5;vBkcoMQrS)fazs&ev62+;Sy(#Tguv3j!aVR~s
zs&QvxDq8S^V{oRm)#w;^XdzWdDRkN
zH~z5u@V$|t>pQ2u_YU1>=%g;V71~d~9$%R}dhXAaKmMM$IH@WoE-b3d#23U&Yi#`C
zhsB=0bFp8sRBSZSV$a0(c?5!#L5e{SK06m{xRh4+?XMqtK%Z|`Xp?Ks<7BT<9W(P)
z$ZcPX_>2y@F&PAZ=!{@`5igpYr)r)*TA61{oxhe#TmHiPOMc0$UR5|bm&6ks3B?td
zCoAM5=^p#$Fc-kOx@_wtkBluL1J+g2EJA^$X;hFCk>R>#aP9S+$Mu}a>f%)-&MPG6
zRxf@VB3tpnDbAdkaAZU^B01o4ms>szBK(-FezGI=(dPN&PV*-
zQNw&0&0uW!LZ?f>$m4mXPt!9`5?fyE#wak&9B8T-L6Q^gqC0zn8(Y@y*lRDo=%3D8
z?Y8uFQDt#arO{F>^lI}5-XZ!nWv6lD&CrpQ(V(8OLBEyz4~G%7t(OCqsY3yYLk5Ua
zzv9zAQ8mfuP4eE-ZQ58z{`#4q^Q!b+)VAT+v;>b{!i-$8EK?SS_dO+8zmSZ(5a5Wn
z5XcGkScHj}Tsng%$5U&;h}Lz*lm&Pzw2R=V1ojF6ZYB!|X^nv6RkEM_Xcibg+J6A2
Cw4NdW

literal 0
HcmV?d1

diff --git a/dockapps/img/wmcdplay2.gif b/dockapps/img/wmcdplay2.gif
new file mode 100644
index 
..d99f7b160c0785f33e1c62aeb8ef93ffb03a
GIT binary patch
literal 2458
zcmbu9`B#!@8^i@{_unH**$
zhsolwSUeV+#bWbV93BUNGXu`ow06p2MS5|KzE$`^_9B_gp=QZaxyUn0(z
zijD6QvAD!&Ys3<%L@bq*7*!*Y7$uWb)JQ92QmM4Y$gLWgOr|i>tWc_yN>zta-Jw=#
z)M}0Tg+|?>>3E^-m_pmprR~sYHC;N5MyKi3XnJ)Ttxnsk*J}0JA-&EhonAMp*8}K{
z_KO~oBWx2g9;g5$0EEjuL8k+es6bIXo6H=e1{+8uIf4X`zfn#hk;b7+Y{vi$0CIq@XQSQ-q7Tn;biKqMdV=Ef|RVavvY
zVhyC3yhL2g}@xw7$K
zy@6zqBXS-jw!*j_7!YGw@@}9W1(K<;v(L;FEEvp5z$<}P8rYEl$CUwH4@3i?awwL;
z4n5!vu&E1&`={##kc0zp1z7U;G60wW!C)YP9050_3^%F=g8}67)crM39tH$^KvA&6
zRa0}8j0OGeXNfQo2^$w+G_o)G$CRGh${i8juJ!C^+bb)cct%x4p0C}s
z#ugG@RQRpbahm+OtpTaX#&uy-Tkq|oWgGt}^l@px9Cu~77v@pEsVxcJnPm&{&s|q1
zSG={E8++Qs=7XCuw{As>o_V2s__Slt>-HMIqRcIG7U`a1et(2_&&Iag<@cn8_t<$w
zF%=1!*S>X&NF&*=ZT5QQvirMRWA6i#*o}chnNR8EDcy2EGb@i&+P>_TfP2n<{$bT3
z*8*RI^5)U~@jnM7bva!>wAYf1ZJrjlN070*1&F~noWc^{wcXv%>$99K)2W-+Pd=nw
ziup9yqddc3Xlq$F)xqqz%fG+g>$D>|>g{aBFtjmycFv2YHj
zf7TV}QwzNGTSL!=@LUes-PfMyJK$Me*wr3^<_vLM97?nWOk^G273dzLw;%W|XHC|}
z(sSvHi#SI&UBQ}ixx$PK>G227pTMWI@9MuO=!@)2zP0wwjnc18WJhV+qop-BOlNvgujUsY^}RnoUouQiaQZy2<-Jb~zs{jfb+f)d
zjooB1J=f+@jEzg@<>?f2FW(C4|8o9R%?kiDEb;J@?o5io%d_6uH^=9hTforfV_gF!
z++Ust|5~fq5H>woIX9PS^!((pFE4=UxLfh#s%$?8M->(id?B0N2~^~B7lypGTf7xjpHjsoo_CmhZ-$x|
zS-d`crTxy`H`hK+ei@ktzRU9-`Y!1kR$lfDeEl2UupGItqj$+zpF{5Q%T5b(4vpMj
zVU>pTxV4&@F%?UFJ5VGqAWr@p~gzT~pozv*>$UY&&H!$7K
zs-)6yy6SAw);c$*1C@{SmkjR7*^YPkRhr=~?#tR+N3OQ*tfogb^S_Yi=zm*xam%{?KpZn~cEzd_`bpLI!Sj{JQ*5zIEbCI#eB!}@m~EGl
z^^{;kblx8Wl*1wCiU(DF_dcG&(nCfSuAS1KjwKtX!
z;Y%yESk$6`gc#F@nhl5jR_@yT&BO}nnu2mCMm(vi*mOR77Qs&6zs9*L`0LHR)!j!E
z)-IlServqW0;N76_*mmzSwO%8tYu;1#-zPv)or_@K

[PATCH (dockapps)] Add wmcdplay information for dockapps webpage.

[Doug Torrance]

---
 dockapps.db.in | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dockapps.db.in b/dockapps.db.in
index 0f6bcb2..ff7260c 100644
--- a/dockapps.db.in
+++ b/dockapps.db.in
@@ -121,6 +121,13 @@ url = "http://wmcalendar.sourceforge.net/";
 dockapps = 171
 category = Date/Time
 
+[wmcdplay]
+image = "wmcdplay1.gif,wmcdplay2.gif,wmcdplay3.gif,wmcdplay4.gif"
+description = "A dock applet for playing CDs.  Artwork files allow you to 
customize the look-and-feel of wmcdplay."
+url = 
"http://web.archive.org/web/2604201402/http://www.geocities.com/SiliconValley/Vista/2471/wmcdplay.html";
+dockapps =
+category = Audio
+
 [wmckgmail]
 image = "wmckgmail-screenshot.jpg,wmckgmail-screenshot2.jpg"
 description = "wmckgmail is a very simple program used to monitor the number 
of unread mails in a gmail inbox. It uses the wget command to get the gmail 
atom feed and reads the number of new mails from this feed.
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 00/11] wmitime updates

[Doug Torrance]

Here are several patches for wmitime.  Carlos, could you tag the last one
wmitime-0.4?

Thanks!

Doug Torrance (11):
  wmitime: Allow -display option with no argument
  wmitime: Update Makefile.
  wmitime: Improve locale support.
  wmitime: Remove C++ style comments.
  wmitime: Remove references to config file in source; nonexistent
feature.
  wmitime: Update contact information.
  wmitime: Add manpage.
  wmitime: Add desktop file.
  wmitime: Remove wmitime-master-led.xpm; unused duplicate file.
  wmitime: Do not include or compile unused wmgeneral files.
  wmitime: Bump to version 0.4.

 wmitime/CHANGES|  36 ++
 wmitime/Makefile   |  35 ++
 wmitime/README |   9 +-
 wmitime/wmgeneral/wmgeneral.c  |   6 +-
 wmitime/wmitime-master.xpm | 135 ++
 wmitime/wmitime.1  |  34 ++
 wmitime/wmitime.c  | 599 +++
 wmitime/wmitime.desktop.in |  10 +
 wmitime/wmitime/Makefile   |  47 ---
 wmitime/wmitime/french.h   |  30 --
 wmitime/wmitime/language.h |  35 --
 wmitime/wmitime/wmitime-master-led.xpm | 135 --
 wmitime/wmitime/wmitime-master.xpm | 135 --
 wmitime/wmitime/wmitime.c  | 721 -
 14 files changed, 858 insertions(+), 1109 deletions(-)
 create mode 100644 wmitime/Makefile
 create mode 100644 wmitime/wmitime-master.xpm
 create mode 100644 wmitime/wmitime.1
 create mode 100644 wmitime/wmitime.c
 create mode 100644 wmitime/wmitime.desktop.in
 delete mode 100644 wmitime/wmitime/Makefile
 delete mode 100644 wmitime/wmitime/french.h
 delete mode 100644 wmitime/wmitime/language.h
 delete mode 100644 wmitime/wmitime/wmitime-master-led.xpm
 delete mode 100644 wmitime/wmitime/wmitime-master.xpm
 delete mode 100644 wmitime/wmitime/wmitime.c

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 01/11] wmitime: Allow -display option with no argument

[Doug Torrance]

Previously, if a user ran wmitime with the -display option and no argument,
a segmentation fault would occur. Print a warning instead.

Patch from Debian [1] to fix bug #716466 [2].

[1] 
http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/patches/allow_display_with_no_args.patch/
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=716466
---
 wmitime/wmgeneral/wmgeneral.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wmitime/wmgeneral/wmgeneral.c b/wmitime/wmgeneral/wmgeneral.c
index c064b39..fb8a8f4 100644
--- a/wmitime/wmgeneral/wmgeneral.c
+++ b/wmitime/wmgeneral/wmgeneral.c
@@ -385,7 +385,11 @@ void openXwindow(int argc, char *argv[], char 
*pixmap_bytes[], char *pixmask_bit
for (i=1; argv[i]; i++) {
if (!strcmp(argv[i], "-display")) {
display_name = argv[i+1];
-   i++;
+   if (!display_name)
+   printf("Please provide an argument for "
+  "-display.\n");
+   else
+   i++;
}
if (!strcmp(argv[i], "-geometry")) {
geometry = argv[i+1];
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 05/11] wmitime: Remove references to config file in source; nonexistent feature.

[Doug Torrance]

---
 wmitime/wmitime.c | 139 --
 1 file changed, 139 deletions(-)

diff --git a/wmitime/wmitime.c b/wmitime/wmitime.c
index 0c58d32..60d1144 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -53,7 +53,6 @@ externchar **environ;
 
 char   *ProgName;
 
-char uconfig_file[256];
 char locale[256];
 
 time_t curtime;
@@ -74,9 +73,6 @@ void BlitString(char *name, int x, int y);
 void BlitNum(int num, int x, int y);
 void wmitime_routine(int, char **);
 int PortWatch( short port );
-int ReadConfigInt(FILE *fp, char *setting, int *value);
-int ReadConfigString(FILE *fp, char *setting, char *value);
-int Read_Config_File( char *filename );
 void DrawInetTime(void);
 void DrawStdTime(void);
 void DrawDate(void);
@@ -88,7 +84,6 @@ int main(int argc, char *argv[]) {
 
int i;
 
-uconfig_file[0] = 0;
 locale[0] = 0;
 
/* Parse Command Line */
@@ -118,13 +113,6 @@ int main(int argc, char *argv[]) {
printversion();
exit(0);
break;
-case 'c' :
-if (argc > (i+1))
-{
-strcpy(uconfig_file, argv[i+1]);
-i++;
-}
-break;
 case '1' :
 if (arg[2] == '2')
 {
@@ -168,39 +156,12 @@ void wmitime_routine(int argc, char **argv)
int but_stat = -1;
 
 
-/* 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 */
-
-if (uconfig_file[0] != 0)
-{
-/* user-specified config file */
-fprintf(stderr, "Using user-specified config file '%s'.\n", 
uconfig_file);
-Read_Config_File(uconfig_file);
-}
-else
-{
-sprintf(config_file, "%s/.wmitimerc", getenv("HOME"));
-
-if (!Read_Config_File(config_file))
-{
-/* Fall back to /etc/wminetrc */
-sprintf(config_file, "/etc/wmitimerc");
-
-Read_Config_File(config_file);
-}
-}
-#endif
-
 RedrawWindow();
 
 prevtime = time(0) - 1;
@@ -611,105 +572,6 @@ void BlitNum(int num, int x, int y)
 BlitString(buf, newx, y);
 }
 
-
-/* ReadConfigSetting */
-int ReadConfigString(FILE *fp, char *setting, char *value)
-{
-char str[1024];
-char buf[1024];
-int i;
-int len;
-int slen;
-char *p=NULL;
-
-
-if (!fp)
-{
-return 0;
-}
-
-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 */
-for (i=0; i!=len; i++)
-{
-if (buf[i] == '\n')
-{
-buf[i] = 0;
-}
-}
-
-/* printf("Scanning '%s'...\n", buf); */
-if ( strncmp(buf, str, strlen(str)) == 0)
-{
-/* found our setting */
-
-for(i=0; i!=slen; i++)
-{
-if ( buf[i] == '=' )
-{
-p=buf+i+1;
-strcpy(value, p);
-return 1;
-}
-}
-
-}
-}
-
-return 0;
-}
-
-int ReadConfigInt(FILE *fp, char *setting, int *value)
-{
-char buf[1024];
-
-if (ReadConfigString(fp, setting, (char *) &buf))
-{
-*value = atoi(buf);
-return 1;
-}
-
-return 0;
-}
-
-int Read_Config_File( char *filename )
-{
-FILE *fp;
-
-fp = fopen(filename, "r");
-if (fp)
-{
-
-fclose(fp);
-return 1;
-}
-else
-{
-perror("Read_Config_File");
-fprintf(stderr, "Unable to open %s, no settings read.\n", filename);
-return 0;
-}
-
-}
-
-
-
-
-
-
-
 
/***\
 |* usage   
   *|
 
\***/
@@ -721,7 +583,6 @@ void usage(void)
 fprintf(stderr, "-12   12-hour mode\n");
fprintf(stderr, "-display \n");
fprintf(stderr, "-geometry +XPOS+YPOS  initial window 
position\n");
-/* fprintf(stderr, "-c  use specified config 
file\n"); */
fprintf(stderr, "-lspecify locale\n");
 fprintf(stderr, "-hthis help scree

[PATCH 08/11] wmitime: Add desktop file.

[Doug Torrance]

Adapted from Debian [1].

[1] 
http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/wmitime.desktop/
---
 wmitime/Makefile   | 10 --
 wmitime/wmitime.desktop.in | 10 ++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 wmitime/wmitime.desktop.in

diff --git a/wmitime/Makefile b/wmitime/Makefile
index 2cb6164..31a2a99 100644
--- a/wmitime/Makefile
+++ b/wmitime/Makefile
@@ -8,6 +8,7 @@ INSTALL = install
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/share/man/man1
+DESKTOPDIR = $(PREFIX)/share/applications
 
 .c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
@@ -21,12 +22,17 @@ clean::
for i in $(OBJS) ; do \
rm -f $$i ; \
done
-   rm -f wmitime
+   rm -f wmitime wmitime.desktop
rm -f *~
 
-install:: wmitime
+wmitime.desktop:
+   sed "s|@BINDIR@|$(BINDIR)|" wmitime.desktop.in > $@
+
+install:: wmitime wmitime.desktop
$(INSTALL) -d $(DESTDIR)$(BINDIR)
$(INSTALL) wmitime $(DESTDIR)$(BINDIR)
$(INSTALL) -d $(DESTDIR)$(MANDIR)
$(INSTALL) -m 644 wmitime.1 $(DESTDIR)$(MANDIR)
+   $(INSTALL) -d $(DESTDIR)$(DESKTOPDIR)
+   $(INSTALL) -m 644 wmitime.desktop $(DESTDIR)$(DESKTOPDIR)
@echo "wmitime Installation finished..."
diff --git a/wmitime/wmitime.desktop.in b/wmitime/wmitime.desktop.in
new file mode 100644
index 000..da694cf
--- /dev/null
+++ b/wmitime/wmitime.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Wmitime
+GenericName="Clock dockapp"
+Comment="Display time and internet time"
+Icon=
+Exec=@BINDIR@/wmitime
+Terminal=false
+Categories=Utility;Clock;
+Keywords=clock;dockapp;window maker;
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 03/11] wmitime: Improve locale support.

[Doug Torrance]

Previously, wmitime only had support for English, French, and (in Debian
only) Hungarian.  In addition, the choice was made at compile time.

This patch adds run-time support for any language using the Latin alphabet.
The locale is determined by the user's environment or may be specified on
the command line with the "-l" option.  Note that users whose environment
specifies a non-Latin locale may wish to use, e.g., "-l C", as otherwise
no date will appear.

Note that, for simplicity, the month and day are now displayed as "01 JAN"
as opposed to "JAN 01".  (Previously, the former format was used for English
and the latter for French.)
---
 wmitime/Makefile   |  3 +--
 wmitime/french.h   | 30 -
 wmitime/language.h | 35 -
 wmitime/wmitime.c  | 65 ++
 4 files changed, 42 insertions(+), 91 deletions(-)
 delete mode 100644 wmitime/french.h
 delete mode 100644 wmitime/language.h

diff --git a/wmitime/Makefile b/wmitime/Makefile
index c928067..e9029c0 100644
--- a/wmitime/Makefile
+++ b/wmitime/Makefile
@@ -1,4 +1,3 @@
-#LANG = fr
 LIBS   = -lXpm -lXext -lX11 -lm
 CFLAGS = -O2 -Wall
 OBJS = wmitime.o \
@@ -10,7 +9,7 @@ PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 
 .c.o:
-   $(CC) $(CPPFLAGS) $(CFLAGS) -D$(LANG) -c $< -o $*.o
+   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
 
 wmitime: $(OBJS)
$(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
diff --git a/wmitime/french.h b/wmitime/french.h
deleted file mode 100644
index 17d86f0..000
--- a/wmitime/french.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// french.h
-// Created by pierre-marie.allem...@capway.com
-// 08-jan-1999
-
-static char daynames[7][3] =
-{
-{"Di"},
-{"Lu"},
-{"Ma"},
-{"Me"},
-{"Je"},
-{"Ve"},
-{"Sa"}
-};
-
-static char monthnames[12][4] =
-{
-{"Jan"},
-{"Fev"},
-{"Mar"},
-{"Avr"},
-{"Mai"},
-{"Jun"},
-{"Jui"},
-{"Aou"},
-{"Sep"},
-{"Oct"},
-{"Nov"},
-{"Dec"}
-};
diff --git a/wmitime/language.h b/wmitime/language.h
deleted file mode 100644
index 88b67a1..000
--- a/wmitime/language.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// language.h
-
-static char daynames[7][3] =
-{
-{"Su"},
-{"Mo"},
-{"Tu"},
-{"We"},
-{"Th"},
-{"Fr"},
-{"Sa"}
-};
-
-static char monthnames[12][4] =
-{
-{"Jan"},
-{"Feb"},
-{"Mar"},
-{"Apr"},
-{"May"},
-{"Jun"},
-{"Jul"},
-{"Aug"},
-{"Sep"},
-{"Oct"},
-{"Nov"},
-{"Dec"}
-};
-
-
-
-
-
-
-
diff --git a/wmitime/wmitime.c b/wmitime/wmitime.c
index e72d16a..c29deaa 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -16,6 +16,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -31,16 +34,6 @@
 #include "wmgeneral/wmgeneral.h"
 #include "wmgeneral/misc.h"
 
-#ifdef fr_FR
-#define fr
-#endif
-
-#ifdef fr
-#include "french.h"
-#else
-#include "language.h"
-#endif
-
 #include "wmitime-master.xpm"
 char wmitime_mask_bits[64*64];
 int  wmitime_mask_width = 64;
@@ -61,6 +54,7 @@ externchar **environ;
 char   *ProgName;
 
 char uconfig_file[256];
+char locale[256];
 
 time_t curtime;
 time_t prevtime;
@@ -95,6 +89,7 @@ int main(int argc, char *argv[]) {
int i;
 
 uconfig_file[0] = 0;
+locale[0] = 0;
 
/* Parse Command Line */
 
@@ -137,6 +132,13 @@ int main(int argc, char *argv[]) {
 TwelveHour = 1;
 }
 break;
+case 'l' :
+if (argc > (i+1))
+{
+strcpy(locale, argv[i+1]);
+i++;
+}
+break;
 default:
usage();
exit(0);
@@ -145,6 +147,11 @@ int main(int argc, char *argv[]) {
}
}
 
+   if (setlocale(LC_ALL, locale) == NULL)
+   fprintf(stderr,
+   "warning: locale '%s' not recognized; defaulting to '%s'.",
+   locale, setlocale(LC_ALL, NULL));
+
wmitime_routine(argc, argv);
 
return 0;
@@ -365,28 +372,37 @@ void DrawStdTime(void)
 
 void DrawDate(void)
 {
-char BlitStr[20];
+char OrigBlitStr[20], BlitStr[20];
+char *inbuf, *outbuf;
+size_t inbytesleft, outbytesleft;
+iconv_t cd;
 
-sprintf(BlitStr, "%s", daynames[clk->tm_wday]);
+cd = iconv_open("ASCII//TRANSLIT", nl_langinfo(CODESET));
+
+inbuf = OrigBlitStr;
+outbuf = BlitStr;
+inbytesleft = sizeof OrigBlitStr;
+outbytesleft = sizeof BlitStr;
+
+sprintf(OrigBlitStr, "%s", nl_langinfo(ABDAY_1 + clk->tm_wday));
+iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+BlitStr[2] = 0;
 BlitString( BlitStr, 6, 50);
 
-#ifdef fr
+inbuf = OrigBlitStr;
+outbuf = BlitStr;
+inbytesleft = sizeof OrigBlitStr;
+outbytesleft = sizeof BlitStr;
 
-// French 

[PATCH 06/11] wmitime: Update contact information.

[Doug Torrance]

---
 wmitime/README| 6 +++---
 wmitime/wmitime.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wmitime/README b/wmitime/README
index c26ffa8..3c1f0a0 100644
--- a/wmitime/README
+++ b/wmitime/README
@@ -1,8 +1,8 @@
 wmitime 0.2 beta Public Release
 --
 Author...: Dave Clark (cla...@skynet.ca)
-
-Homepage :  http://www.neotokyo.org
+Maintainers :   Window Maker Developers Team 
+Homepage :  http://windowmaker.org/dockapps/?name=wmitime
 
 Description
 --
@@ -41,7 +41,7 @@ COPYING   GNU General Public License Version 2.
 Bugs
 --
 If you discover any bugs in this software, please send a
-bugreport to cla...@skynet.ca and describe the
+bugreport to wmaker-dev@lists.windowmaker.org and describe the
 problem as detailed! as you can.
 
 
diff --git a/wmitime/wmitime.c b/wmitime/wmitime.c
index 60d1144..d574ef7 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -578,7 +578,8 @@ void BlitNum(int num, int x, int y)
 
 void usage(void)
 {
-fprintf(stderr, "\nWMiTIME - illusion   
http://www.neotokyo.org/illusion\n\n";);
+fprintf(stderr, "\nWMiTIME - Window Maker Developers Team 
\n");
+fprintf(stderr, "  original author: Dave Clark 
\n\n");
fprintf(stderr, "usage:\n");
 fprintf(stderr, "-12   12-hour mode\n");
fprintf(stderr, "-display \n");
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 02/11] wmitime: Update Makefile.

[Doug Torrance]

In particular,
- Remove reference to deprecated X11R6 directory.
- Replace FLAGS variable with CFLAGS, CPPFLAGS, and LDFLAGS.
- Honor CC, PREFIX, and DESTDIR variables.
- Use INSTALL instead of cp for installation.
- Remove redundant -lXext flag.
- Move contents of wmitime directory to top directory to ease the building
  process.

Inspired in part by the Debian patches [1,2].

[1] 
http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/patches/20-makefile-CC.patch/
[2] 
http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/patches/make-install.patch/
---
 wmitime/Makefile   |  30 ++
 wmitime/README |   1 -
 wmitime/french.h   |  30 ++
 wmitime/language.h |  35 ++
 wmitime/wmitime-master-led.xpm | 135 ++
 wmitime/wmitime-master.xpm | 135 ++
 wmitime/wmitime.c  | 721 +
 wmitime/wmitime/Makefile   |  47 ---
 wmitime/wmitime/french.h   |  30 --
 wmitime/wmitime/language.h |  35 --
 wmitime/wmitime/wmitime-master-led.xpm | 135 --
 wmitime/wmitime/wmitime-master.xpm | 135 --
 wmitime/wmitime/wmitime.c  | 721 -
 13 files changed, 1086 insertions(+), 1104 deletions(-)
 create mode 100644 wmitime/Makefile
 create mode 100644 wmitime/french.h
 create mode 100644 wmitime/language.h
 create mode 100644 wmitime/wmitime-master-led.xpm
 create mode 100644 wmitime/wmitime-master.xpm
 create mode 100644 wmitime/wmitime.c
 delete mode 100644 wmitime/wmitime/Makefile
 delete mode 100644 wmitime/wmitime/french.h
 delete mode 100644 wmitime/wmitime/language.h
 delete mode 100644 wmitime/wmitime/wmitime-master-led.xpm
 delete mode 100644 wmitime/wmitime/wmitime-master.xpm
 delete mode 100644 wmitime/wmitime/wmitime.c

diff --git a/wmitime/Makefile b/wmitime/Makefile
new file mode 100644
index 000..c928067
--- /dev/null
+++ b/wmitime/Makefile
@@ -0,0 +1,30 @@
+#LANG = fr
+LIBS   = -lXpm -lXext -lX11 -lm
+CFLAGS = -O2 -Wall
+OBJS = wmitime.o \
+   wmgeneral/wmgeneral.o \
+   wmgeneral/misc.o \
+   wmgeneral/list.o
+INSTALL = install
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+
+.c.o:
+   $(CC) $(CPPFLAGS) $(CFLAGS) -D$(LANG) -c $< -o $*.o
+
+wmitime: $(OBJS)
+   $(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
+
+all:: wmtime
+
+clean::
+   for i in $(OBJS) ; do \
+   rm -f $$i ; \
+   done
+   rm -f wmitime
+   rm -f *~
+
+install:: wmitime
+   $(INSTALL) -d $(DESTDIR)$(BINDIR)
+   $(INSTALL) wmitime $(DESTDIR)$(BINDIR)
+   @echo "wmitime Installation finished..."
diff --git a/wmitime/README b/wmitime/README
index 1b8caf2..c26ffa8 100644
--- a/wmitime/README
+++ b/wmitime/README
@@ -20,7 +20,6 @@ Let me know what you think of it. ;)
 
 Installing
 --
-cd wmitime
 make
 make install
 
diff --git a/wmitime/french.h b/wmitime/french.h
new file mode 100644
index 000..17d86f0
--- /dev/null
+++ b/wmitime/french.h
@@ -0,0 +1,30 @@
+// french.h
+// Created by pierre-marie.allem...@capway.com
+// 08-jan-1999
+
+static char daynames[7][3] =
+{
+{"Di"},
+{"Lu"},
+{"Ma"},
+{"Me"},
+{"Je"},
+{"Ve"},
+{"Sa"}
+};
+
+static char monthnames[12][4] =
+{
+{"Jan"},
+{"Fev"},
+{"Mar"},
+{"Avr"},
+{"Mai"},
+{"Jun"},
+{"Jui"},
+{"Aou"},
+{"Sep"},
+{"Oct"},
+{"Nov"},
+{"Dec"}
+};
diff --git a/wmitime/language.h b/wmitime/language.h
new file mode 100644
index 000..88b67a1
--- /dev/null
+++ b/wmitime/language.h
@@ -0,0 +1,35 @@
+// language.h
+
+static char daynames[7][3] =
+{
+{"Su"},
+{"Mo"},
+{"Tu"},
+{"We"},
+{"Th"},
+{"Fr"},
+{"Sa"}
+};
+
+static char monthnames[12][4] =
+{
+{"Jan"},
+{"Feb"},
+{"Mar"},
+{"Apr"},
+{"May"},
+{"Jun"},
+{"Jul"},
+{"Aug"},
+{"Sep"},
+{"Oct"},
+{"Nov"},
+{"Dec"}
+};
+
+
+
+
+
+
+
diff --git a/wmitime/wmitime-master-led.xpm b/wmitime/wmitime-master-led.xpm
new file mode 100644
index 000..ede97a7
--- /dev/null
+++ b/wmitime/wmitime-master-led.xpm
@@ -0,0 +1,135 @@
+/* XPM */
+static char * wmitime_master_xpm[] = {
+"240 100 32 1",
+". c #FF",
+"  c None",
+"+ c #202020",
+"@ c #00",
+"# c #C7C3C7",
+"$ c #004941",
+"% c #020205",
+"& c #010101",
+"* c #040405",
+"= c #01",
+"- c #04040C",
+"; c #02",
+"> c #060609",
+", c #20B2AE",
+"' c #107D79",
+") c #188A86",
+"! c #070707",
+"~ c #020202",
+"{ c #020203",
+"] c #FF",
+"^ c #20B1AD",
+"/ c #20B0AC",
+"( c #20AEAA",
+"_ c #007D71",
+": c #B60418",
+"< c #00EB00",
+"[ c #283C38",
+"} c #F7F3FF",
+"| c #71E371",
+"1 c #494949",
+"2 c #7A7A7A",
+"3 c #BCBCBC",
+"

[PATCH 04/11] wmitime: Remove C++ style comments.

[Doug Torrance]

---
 wmitime/wmitime.c | 58 +++
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/wmitime/wmitime.c b/wmitime/wmitime.c
index c29deaa..0c58d32 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
 case '1' :
 if (arg[2] == '2')
 {
-// Twelve-hour mode
+/* Twelve-hour mode */
 TwelveHour = 1;
 }
 break;
@@ -168,7 +168,7 @@ void wmitime_routine(int argc, char **argv)
int but_stat = -1;
 
 
-//char config_file[512];
+/* char config_file[512]; */
 
 createXBMfromXPM(wmitime_mask_bits, wmitime_master_xpm, 
wmitime_mask_width, wmitime_mask_height);
 
@@ -176,14 +176,14 @@ void wmitime_routine(int argc, char **argv)
 
AddMouseRegion(0, 5, 6, 58, 16);
 
-// We don't need a config file (yet)...
+/* We don't need a config file (yet)... */
 
 #if 0
-// Read config file
+/* Read config file */
 
 if (uconfig_file[0] != 0)
 {
-// user-specified config file
+/* user-specified config file */
 fprintf(stderr, "Using user-specified config file '%s'.\n", 
uconfig_file);
 Read_Config_File(uconfig_file);
 }
@@ -193,7 +193,7 @@ void wmitime_routine(int argc, char **argv)
 
 if (!Read_Config_File(config_file))
 {
-// Fall back to /etc/wminetrc
+/* Fall back to /etc/wminetrc */
 sprintf(config_file, "/etc/wmitimerc");
 
 Read_Config_File(config_file);
@@ -215,7 +215,7 @@ void wmitime_routine(int argc, char **argv)
 
 clk = localtime(&curtime);
 
-// Update display
+/* Update display */
 
 DrawInetTime();
 
@@ -231,7 +231,7 @@ void wmitime_routine(int argc, char **argv)
 
 }
 
-// X Events
+/* X Events */
 while (XPending(display))
 {
XNextEvent(display, &Event);
@@ -272,7 +272,7 @@ void wmitime_routine(int argc, char **argv)
}
}
but_stat = -1;
-// RedrawWindow();
+   /* RedrawWindow(); */
break;
}
}
@@ -286,7 +286,7 @@ void DrawInetTime(void)
 {
 int iTime;
 
-// Compute Inet Time
+/* Compute Inet Time */
 iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec);
 iTime=iTime+((timezone-1)+3600);
 if (clk->tm_isdst)
@@ -299,7 +299,7 @@ void DrawInetTime(void)
 if (iTime < 0)
 iTime+=1000;
 
-// Blit it
+/* Blit it */
 
 BlitNum(iTime, 38, 18);
 
@@ -334,11 +334,11 @@ void DrawStdTime(void)
 
 len = strlen(blitstr);
 
-// Set starting co-ordinates...
+/* Set starting co-ordinates... */
 xoff = 6;
 yoff = 6;
 
-// Blit it.
+/* Blit it. */
 for( i=0;  itm_hour*3600+clk->tm_min*60+clk->tm_sec);
 iTime=iTime+((timezone-1)+3600);
 if (clk->tm_isdst)
@@ -429,7 +429,7 @@ void DrawInetWheel(void)
 
 WheelPos = floor( (iTime *8) / 10);
 
-// Draw the Wheel...
+/* Draw the Wheel... */
 i=WheelPos;
 yoff=35;
 xoff=67;
@@ -449,8 +449,8 @@ void DrawInetWheel(void)
 
 void DrawStdWheel(void)
 {
-//19x33 = center
-//radius of 14
+/* 19x33 = center
+ * radius of 14 */
 
 int sx, sy;
 int cx, cy;
@@ -464,9 +464,9 @@ void DrawStdWheel(void)
 sx = 2;
 sy = 97;
 
-// Hour Hand...
+/* Hour Hand... */
 
-DrawLine(cx, cy, prevhourx, prevhoury, 66, 9); // erase old line
+DrawLine(cx, cy, prevhourx, prevhoury, 66, 9); /* erase old line */
 
 hr = (clk->tm_hour % 12);
 
@@ -484,9 +484,9 @@ void DrawStdWheel(void)
 
 DrawLine(cx, cy, dx, dy, sx, sy);
 
-// Minute Hand...
+/* Minute Hand... */
 
-DrawLine(cx, cy, prevminx, prevminy, 66, 9); // erase old line
+DrawLine(cx, cy, prevminx, prevminy, 66, 9); /* erase old line */
 
 cx=19;
 cy=33;
@@ -573,7 +573,7 @@ void DrawLine(int x1, int y1, int x2, int y2, int sourcex, 
int sourcey)
 
 
 
-// Blits a string at given co-ordinates
+/* Blits a string at given co-ordinates */
 void BlitString(char *name, int x, int y)
 {
 inti;
@@ -586,13 +586,13 @@ void BlitString(char *name, int x, int y)
 
 c = toupper(name[i]);
 if (c >= 'A' && c <= 'Z')
-{   // its a letter
+{  /* its a letter */
c -= 'A';
copyXPMArea(c * 6, 74, 6, 8, k, y);
k += 6;
 }
 else
-{   // its a number or symbol
+{   /* its a number or symbol */
c -= '0';
copyXPMArea(c * 6, 64, 6, 8, k, y);
  

[PATCH 07/11] wmitime: Add manpage.

[Doug Torrance]

Adapted from Debian [1].

[1] http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/wmitime.1/
---
 wmitime/Makefile  |  3 +++
 wmitime/wmitime.1 | 34 ++
 2 files changed, 37 insertions(+)
 create mode 100644 wmitime/wmitime.1

diff --git a/wmitime/Makefile b/wmitime/Makefile
index e9029c0..2cb6164 100644
--- a/wmitime/Makefile
+++ b/wmitime/Makefile
@@ -7,6 +7,7 @@ OBJS =  wmitime.o \
 INSTALL = install
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/share/man/man1
 
 .c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
@@ -26,4 +27,6 @@ clean::
 install:: wmitime
$(INSTALL) -d $(DESTDIR)$(BINDIR)
$(INSTALL) wmitime $(DESTDIR)$(BINDIR)
+   $(INSTALL) -d $(DESTDIR)$(MANDIR)
+   $(INSTALL) -m 644 wmitime.1 $(DESTDIR)$(MANDIR)
@echo "wmitime Installation finished..."
diff --git a/wmitime/wmitime.1 b/wmitime/wmitime.1
new file mode 100644
index 000..50e71d3
--- /dev/null
+++ b/wmitime/wmitime.1
@@ -0,0 +1,34 @@
+.TH wmitime 1 "2014-12-19" "wmitime" "User Commands"
+.SH "NAME"
+wmitime \- Window Maker dock app displaying date, clock and internet time
+.SH "SYNOPSIS"
+.B wmitime
+[\fI\,options\/\fR]
+.SH "DESCRIPTION"
+WMitime is yet another clock dock app, which shows standard time,
+date, as well as the new internet time .
+.SH "OPTIONS"
+.TP
+\fB\-12\fR
+12\-hour mode
+.TP
+\fB\-display\fR 
+Specify X display
+.TP
+\fB\-geometry\fR +XPOS+YPOS
+Initial window position.
+.TP
+\fB\-l\fR 
+Specify locale.
+.TP
+\fB\-h\fR
+Print available options.
+.TP
+\fB\-v\fR
+Print the version number.
+.SH "SEE ALSO"
+.BR wmtime (1)
+.SH "AUTHORS"
+This manual page was written by Lenart Janos , for
+the Debian GNU system (but may be used by others). Updated by Jari
+Aalto .
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 09/11] wmitime: Remove wmitime-master-led.xpm; unused duplicate file.

[Doug Torrance]

---
 wmitime/wmitime-master-led.xpm | 135 -
 1 file changed, 135 deletions(-)
 delete mode 100644 wmitime/wmitime-master-led.xpm

diff --git a/wmitime/wmitime-master-led.xpm b/wmitime/wmitime-master-led.xpm
deleted file mode 100644
index ede97a7..000
--- a/wmitime/wmitime-master-led.xpm
+++ /dev/null
@@ -1,135 +0,0 @@
-/* XPM */
-static char * wmitime_master_xpm[] = {
-"240 100 32 1",
-". c #FF",
-"  c None",
-"+ c #202020",
-"@ c #00",
-"# c #C7C3C7",
-"$ c #004941",
-"% c #020205",
-"& c #010101",
-"* c #040405",
-"= c #01",
-"- c #04040C",
-"; c #02",
-"> c #060609",
-", c #20B2AE",
-"' c #107D79",
-") c #188A86",
-"! c #070707",
-"~ c #020202",
-"{ c #020203",
-"] c #FF",
-"^ c #20B1AD",
-"/ c #20B0AC",
-"( c #20AEAA",
-"_ c #007D71",
-": c #B60418",
-"< c #00EB00",
-"[ c #283C38",
-"} c #F7F3FF",
-"| c #71E371",
-"1 c #494949",
-"2 c #7A7A7A",
-"3 c #BCBCBC",
-"+...",
-"+...",
-"+...",
-"+...",
-"+...",
-"@++#+...",
-"@++++++++++++++++++#+...",
-"@++$$+$$++$++$$+$$++$++$$+$$+++#+...",
-"@++$$+$$++$++$$+$$++$++$$+$$+++#+...",
-"@++$$+$$+$$+$$+$$+$$+++#+.+++...",
-"@++++++++++++++++++#+.+++++++++++++++++++...",
-"@++$$+$$+$$+$$+$$+$$+++#+.+$$+$$++$++$$+$$++$++$$+$$+...",
-"@++$$+$$++$++$$+$$++$++$$+$$+++#+.+$$+$$++$++$$+$$++$++$$+$$+...",
-"@++$$+$$++$++$$+$$++$++$$+$$+++#+.+$$+$$+$$+$$+$$+$$+...",
-"@++++++++++++++++++#+.+++++++++++++++++++...",
-"@++#+.+$$+$$+$$+$$+$$+$$+...",
-"@###

[PATCH 10/11] wmitime: Do not include or compile unused wmgeneral files.

[Doug Torrance]

---
 wmitime/Makefile  | 5 +
 wmitime/wmitime.c | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/wmitime/Makefile b/wmitime/Makefile
index 31a2a99..d10139e 100644
--- a/wmitime/Makefile
+++ b/wmitime/Makefile
@@ -1,9 +1,6 @@
 LIBS   = -lXpm -lXext -lX11 -lm
 CFLAGS = -O2 -Wall
-OBJS = wmitime.o \
-   wmgeneral/wmgeneral.o \
-   wmgeneral/misc.o \
-   wmgeneral/list.o
+OBJS = wmitime.o wmgeneral/wmgeneral.o
 INSTALL = install
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
diff --git a/wmitime/wmitime.c b/wmitime/wmitime.c
index d574ef7..77844d3 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -32,7 +32,6 @@
 #include 
 
 #include "wmgeneral/wmgeneral.h"
-#include "wmgeneral/misc.h"
 
 #include "wmitime-master.xpm"
 char wmitime_mask_bits[64*64];
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 11/11] wmitime: Bump to version 0.4.

[Doug Torrance]

---
 wmitime/CHANGES   | 36 
 wmitime/README|  2 +-
 wmitime/wmitime.c |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/wmitime/CHANGES b/wmitime/CHANGES
index dd7749a..71fc433 100644
--- a/wmitime/CHANGES
+++ b/wmitime/CHANGES
@@ -1,5 +1,41 @@
 VersionDescription
 --
+0.4* Update GPL text and Free Software Foundation address.
+   * Remove trailing whitespace.
+   * Allow -display option with no argument.  Previously, if a user
+ ran wmitime with the -display option and no argument, a
+ segmentation fault would occur. Print a warning instead.
+ (Patch from Debian to fix bug #716466.)
+   * Update Makefile.  In particular,
+ - Remove reference to deprecated X11R6 directory.
+ - Replace FLAGS variable with CFLAGS, CPPFLAGS, and LDFLAGS.
+ - Honor CC, PREFIX, and DESTDIR variables.
+ - Use INSTALL instead of cp for installation.
+ - Remove redundant -lXext flag.
+ - Move contents of wmitime directory to top directory to ease
+   the building process.
+   * Improve locale support.  Previously, wmitime only had support
+ for English, French, and (in Debian only) Hungarian.  In
+ addition, the choice was made at compile time.
+ Add run-time support for any language using the Latin
+ alphabet.  The locale is determined by the user's environment
+ or may be specified on the command line with the "-l" option.
+ Note that users whose environment specifies a non-Latin locale
+ may wish to use, e.g., "-l C", as otherwise no date will
+ appear.
+ Note that, for simplicity, the month and day are now displayed
+ as "01 JAN" as opposed to "JAN 01".  (Previously, the former
+ format was used for English and the latter for French.)
+   * Remove C++ style comments.
+   * Remove references to config file in source; nonexistent
+ feature.
+   * Update contact information.  wmitime is now maintained by the
+ Window Maker Developers Team
+ .
+   * Add manpage and desktop file, both adapted from Debian.
+   * Remove wmitime-master-led.xpm; unused duplicate file.
+   * Do not include or compile unused wmgeneral files.
+
 0.3* fixed inet time calculation error (oops :) )
  (thanks to Martijn van de Streek 
* Added french support
diff --git a/wmitime/README b/wmitime/README
index 3c1f0a0..285be7c 100644
--- a/wmitime/README
+++ b/wmitime/README
@@ -1,4 +1,4 @@
-wmitime 0.2 beta Public Release
+wmitime
 --
 Author...: Dave Clark (cla...@skynet.ca)
 Maintainers :   Window Maker Developers Team 
diff --git a/wmitime/wmitime.c b/wmitime/wmitime.c
index 77844d3..d2a90a4 100644
--- a/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -38,7 +38,7 @@ char wmitime_mask_bits[64*64];
 int  wmitime_mask_width = 64;
 int  wmitime_mask_height = 64;
 
-#define WMITIME_VERSION "0.1"
+#define WMITIME_VERSION "0.4"
 
 #define CHAR_WIDTH 5
 #define CHAR_HEIGHT 7
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Update wmitime on dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index f1e6361..41a233d 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -278,7 +278,7 @@ dockapps =
 category = Network
 
 [wmitime]
-version-0.3+20141005 = 84f5d9248a6b2b1ab48b1849ce72ff7415094a8d
+version-0.4 = 49fa1f6a55e22ad45f2121273e1631c62e642c6d
 version-0.3 = bf32df76ae6ae945f02428fff7a9b269c82f32f6
 image = wmitime1.jpg
 description = "WMitime is yet another clock dock app (and quite overglorified 
at that! :)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH] WPrefs: add possibility to configure the size of the aperçu

[Doug Torrance]

From: Christophe CURIS 

The Icon preference panel have been rearranged to include a slider which
controls the size of the Aperçu. This slider is also used to turn off the
feature, so the related checkbox have been removed from the Misc preference
panel, because it is more convenient to have the related settings at the
same place.

Signed-off-by: Christophe CURIS 
---
 WPrefs.app/Icons.c   | 217 ++-
 WPrefs.app/Preferences.c |   5 +-
 WPrefs.app/po/nl.po  |   4 +-
 3 files changed, 179 insertions(+), 47 deletions(-)

diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index 0faaa5f..f50c36e 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -66,6 +66,10 @@ typedef struct _Panel {
WMFrame *posVF;
WMFrame *posV;
 
+   struct {
+   int width, height;
+   } icon_position;
+
WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
 
WMFrame *animF;
@@ -76,12 +80,28 @@ typedef struct _Panel {
WMButton *omnB;
WMButton *sclB;
 
+   struct {
+   WMFrame *frame;
+   WMSlider *slider;
+   WMLabel *label;
+   } apercu;
+
WMFrame *sizeF;
WMPopUpButton *sizeP;
 
int iconPos;
 } _Panel;
 
+/*
+ * Minimum size for an Apercu:
+ * This value is actually twice the size of the minimum icon size choosable.
+ * We set the slider min to taht number minus one, because when set to this
+ * value WPrefs will consider that the user wants the feature turned off.
+ */
+static const int apercu_minimum_size = 2 * 24 - 1;
+
+static const int apercu_maximum_size = 512;/* Arbitrary limit for the 
slider */
+
 #define ICON_FILE  "iconprefs"
 
 static void showIconLayout(WMWidget * widget, void *data)
@@ -111,21 +131,44 @@ static void showIconLayout(WMWidget * widget, void *data)
WMMoveWidget(panel->posV, 2, 2);
break;
case 2:
-   WMMoveWidget(panel->posV, 95 - 2 - w, 2);
+   WMMoveWidget(panel->posV, panel->icon_position.width - 2 - w, 
2);
break;
case 4:
-   WMMoveWidget(panel->posV, 2, 70 - 2 - h);
+   WMMoveWidget(panel->posV, 2, panel->icon_position.height - 2 - 
h);
break;
default:
-   WMMoveWidget(panel->posV, 95 - 2 - w, 70 - 2 - h);
+   WMMoveWidget(panel->posV, panel->icon_position.width - 2 - w, 
panel->icon_position.height - 2 - h);
break;
}
 }
 
+static void apercu_slider_changed(WMWidget *w, void *data)
+{
+   _Panel *panel = (_Panel *) data;
+   char buffer[64];
+   int value;
+
+   /* Parameter is not used, but tell the compiler that it is ok */
+   (void) w;
+
+   value = WMGetSliderValue(panel->apercu.slider);
+
+   /* Round the value to a multiple of 8 because it makes the displayed 
value look better */
+   value &= ~7;
+
+   if (value <= apercu_minimum_size)
+   sprintf(buffer, _("OFF"));
+   else
+   sprintf(buffer, "%i", value);
+
+   WMSetLabelText(panel->apercu.label, buffer);
+}
+
 static void showData(_Panel * panel)
 {
int i;
char *str;
+   Bool b;
 
WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons"));
WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons"));
@@ -154,6 +197,19 @@ static void showData(_Panel * panel)
i = 9;
WMSetPopUpButtonSelectedItem(panel->sizeP, i);
 
+   /* Apercu */
+   b = GetBoolForKey("MiniwindowApercuBalloons");
+   if (b) {
+   i = GetIntegerForKey("ApercuSize");
+   if (i <= apercu_minimum_size)
+   i = apercu_minimum_size;
+   } else {
+   i = apercu_minimum_size;
+   }
+   WMSetSliderValue(panel->apercu.slider, i);
+   apercu_slider_changed(panel->apercu.slider, panel);
+
+   /* Animation */
str = GetStringForKey("IconificationStyle");
if (str != NULL) {
for (i = 0; i < wlengthof(icon_animation); i++) {
@@ -174,50 +230,87 @@ static void showData(_Panel * panel)
 static void createPanel(Panel * p)
 {
_Panel *panel = (_Panel *) p;
+   WMScreen *scr;
WMColor *color;
int i;
char buf[16];
+   int swidth, sheight;
+   int width, height;
+   int startx, starty;
 
panel->box = WMCreateBox(panel->parent);
WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
 /* Positioning of Icons */
panel->posF = WMCreateFrame(panel->box);
-   WMResizeWidget(panel->posF, 210, 140);
-   WMMoveWidget(panel->posF, 20, 10);
+   WMResizeWidget(panel->posF, 268, 155);
+   WMMoveWidget(panel->posF, 12, 6);
WMSetFrameTitle(panel->posF, _("Icon Positioning"));
 
+   /*
+* There is an available area of 240 x 122, st

[PATCH] WPrefs: Clarify purpose of "window snapping" feature in expert panel.

[Doug Torrance]

---
 WPrefs.app/Expert.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index dc455dd..582a0ef 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -84,7 +84,7 @@ static const struct {
  /* default: */ False, OPTION_WMAKER, "KbdModeLock" },
 #endif /* XKB_MODELOCK */
 
-   { N_("Enable window snapping."),
+   { N_("Maximize a window to side or corner by dragging."),
  /* default: */ False, OPTION_WMAKER, "WindowSnapping" },
 
{ N_("Open dialogs in the same workspace as their owners."),
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

Re: few suggestions on UI of Appearance.app and Wmaker

[Doug Torrance]

On Sun, Dec 21, 2014 at 3:19 AM, Yury Tarasievich <
yury.tarasiev...@gmail.com> wrote:

> 4) What does "Enable window snapping" do (last tab)? Is it related with
> things set in the windows handling tab (2nd from the left)? I've tried
> enabling and disabling this, and have seen no discernible difference.
>


It allows you to maximize a window to a side or corner of the screen by
dragging in (a feature common in Windows, Gnome, Cinnamon, Unity, etc.).  I
just submitted a patch clarifying its meaning.

Note that if  "Switch workspaces while dragging windows" is selected under
"Workspace Preferences", then window snapping is automatically disabled.

Doug

[PATCH (whome)] Fix broken links to dockapps.org and dockapps.windowmaker.org.

[Doug Torrance]

---
 FAQ.php  | 2 +-
 docs.php | 6 +++---
 home.php | 2 +-
 installation.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FAQ.php b/FAQ.php
index 4df3dc7..deef103 100644
--- a/FAQ.php
+++ b/FAQ.php
@@ -1471,7 +1471,7 @@ If you get an error such as sh: /dev/console: Permission 
denied, login as root,
 
 5.5  Where can I get more dockapps?
 The Window Maker team got tired of people E-mailing constantly asking where 
the websites for obscure dockapps disappeared to.  So we've created the 
ultimate dockapps community website.
-Visit http://dockapps.org/";>dockapps.org for the latest, 
up-to-date links, information, and download for Window Maker and related 
dockapps.
+Visit http://windowmaker.org/dockapps";>windowmaker.org/dockapps 
for the latest, up-to-date links, information, and download for Window Maker 
and related dockapps.
 
 Another large index of dockapp links is available at http://www.bensinclair.com/dockapp";>http://www.bensinclair.com/dockapp
 .  The downside to this is that they're only links, so if someone stops 
maintaining a dockapp, or their web hosting provider cuts them off, you won't 
be able to get to it.  Still, Ben Sinclair's site was the first big "dockapp 
warehouse" site, so we give credit where credit is due. :)
 
diff --git a/docs.php b/docs.php
index 5f9fd3b..9cc6255 100644
--- a/docs.php
+++ b/docs.php
@@ -50,12 +50,12 @@
 Can I easily mount my external drives or connect to the internet 
with Window Maker?
 Yes, you can. Mounting external media is not the problem of a 
window manager to solve, but
a tipical Window Maker user can mount external media just as easily as 
any other desktop user.
-   If you use a dockapp like http://dockapps.windowmaker.org/file.php/id/275";>wmvolman or 
-   http://dockapps.windowmaker.org/file.php/id/357";>wmudmount 
you are just a click away from
+   If you use a dockapp like https://github.com/raorn/wmvolman";>wmvolman or
+   http://sourceforge.net/projects/wmudmount";>wmudmount you 
are just a click away from
having your external media mounted on /media/VOLUME_LABEL.
 
 And you can just as easily manage your network connections 
using the standard nm-applet running
-   in a system tray like http://dockapps.windowmaker.org/file.php/id/355";>wmsystemtray on your 
dock.
+   in a system tray like http://sourceforge.net/projects/wmsystemtray";>wmsystemtray on your 
dock.
 
wmvolman and wmsystemtray with 
nm-applet
 
diff --git a/home.php b/home.php
index 5984acf..84fda27 100644
--- a/home.php
+++ b/home.php
@@ -28,7 +28,7 @@
 
   Window Maker has a stable user interface since many years and 
comes with a powerful GUI configuration editor called
   WPrefs, which removes the need to edit text-based config files by 
hand. It supports running http://dockapps.windowmaker.org";>dockapps which make everyday 
tasks such as monitoring system performance and
+  "http://windowmaker.org/dockapps";>dockapps which make everyday 
tasks such as monitoring system performance and
   battery usage, mounting devices or connecting to the internet very 
easy. Please see the features section for more specifics on what 
Window Maker can do, and how it compares with other
   popular window managers.
diff --git a/installation.php b/installation.php
index 991f001..dda98be 100644
--- a/installation.php
+++ b/installation.php
@@ -109,7 +109,7 @@

 
 Another recommended step is to install a few dockapps like 
wmvolman, wmmixer and wmsystemtray which allow one to
-   easily mount external media on /media among other things. Visit http://dockapps.windowmaker.org";> dockapps
+   easily mount external media on /media among other things. Visit http://windowmaker.org/dockapps";>dockapps
for many more choices.
 

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 0/6] wmtime updates

[Doug Torrance]

Hi everyone,

Here are a few patches for wmtime, culminating in a new version.

Carlos, if these are accepted, could you tag the final commit wmtime-1.2?

Thanks!
Doug

Doug Torrance (6):
  wmtime: Remove unnecessary Imakefile.
  wmtime: Move source files to top directory.
  wmtime: Update Makefile.
  wmtime: Add -l option to specify locale.
  wmtime: Remove unnecessary references to current version number.
  wmtime: Bump to version 1.2.

 wmtime/CHANGES  |  15 +
 wmtime/INSTALL  |  20 +-
 wmtime/Imakefile|  17 -
 wmtime/Makefile |  31 ++
 wmtime/README   |   2 +-
 wmtime/wmtime-mask.xbm  |  72 
 wmtime/wmtime-master.xpm| 187 +++
 wmtime/wmtime.1 | 183 +++
 wmtime/wmtime.c | 704 
 wmtime/wmtime/Makefile  |  25 --
 wmtime/wmtime/wmtime-mask.xbm   |  72 
 wmtime/wmtime/wmtime-master.xpm | 187 ---
 wmtime/wmtime/wmtime.1  | 179 --
 wmtime/wmtime/wmtime.c  | 691 ---
 14 files changed, 1199 insertions(+), 1186 deletions(-)
 delete mode 100644 wmtime/Imakefile
 create mode 100755 wmtime/Makefile
 create mode 100644 wmtime/wmtime-mask.xbm
 create mode 100644 wmtime/wmtime-master.xpm
 create mode 100644 wmtime/wmtime.1
 create mode 100644 wmtime/wmtime.c
 delete mode 100755 wmtime/wmtime/Makefile
 delete mode 100644 wmtime/wmtime/wmtime-mask.xbm
 delete mode 100644 wmtime/wmtime/wmtime-master.xpm
 delete mode 100644 wmtime/wmtime/wmtime.1
 delete mode 100644 wmtime/wmtime/wmtime.c

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 4/6] wmtime: Add -l option to specify locale.

[Doug Torrance]

Based on a similar patch for wmitime [1].

[1] 
http://repo.or.cz/w/dockapps.git/commitdiff/cc801880a5be8902af715ff1722981a4bc35bf6d
---
 wmtime/INSTALL  |  6 +++---
 wmtime/wmtime.1 |  6 +-
 wmtime/wmtime.c | 17 +++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/wmtime/INSTALL b/wmtime/INSTALL
index 813a6e0..cff76a8 100644
--- a/wmtime/INSTALL
+++ b/wmtime/INSTALL
@@ -16,10 +16,10 @@ Installation
 use Latin alphabet characters, then WMTime defaults to
 US/English.
 
-You may change this behavior by setting the LANG
-environment variable, e.g.,
+You may change this behavior by using the '-l' command line
+option, e.g.,
 
-% LANG=es_MX.UTF-8 wmtime
+% wmtime -l es_MX.utf8
 
 Be sure to read the HINTS and TODO files too!
 
diff --git a/wmtime/wmtime.1 b/wmtime/wmtime.1
index 8b51e57..9fb1a89 100644
--- a/wmtime/wmtime.1
+++ b/wmtime/wmtime.1
@@ -17,7 +17,7 @@
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 .\" USA.
 .\"
-.TH WMTIME 1 "October 2013" "WMTIME 1.1"
+.TH WMTIME 1 "January 2015" "WMTIME 1.1"
 
 .SH NAME
 wmtime \- Window Maker dockapp that displays the time and date
@@ -70,6 +70,10 @@ This option specifies the preferred position of clock; see
 Disables the second hand.
 
 .TP
+.BI \-l \ locale
+Specify locale.
+
+.TP
 .B \-h
 Show help information.
 
diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c
index 2bb9c5c..b23d065 100644
--- a/wmtime/wmtime.c
+++ b/wmtime/wmtime.c
@@ -114,6 +114,9 @@ int main(int argc, char *argv[]) {
 
int i;
char*name = argv[0];
+   char locale[256];
+
+   locale[0] = 0;
 
for (i=1; i i+1) {
+   strcpy(locale, argv[i+1]);
+   i++;
+   }
+   break;
default:
usage(name);
return 1;
@@ -153,8 +162,11 @@ int main(int argc, char *argv[]) {
}
}
 
-   if (setlocale(LC_ALL, "") != NULL)
-   get_lang();
+   if (setlocale(LC_ALL, locale) == NULL)
+   fprintf(stderr,
+   "warning: locale '%s' not recognized; defaulting to 
'%s'.",
+   locale, setlocale(LC_ALL, NULL));
+   get_lang();
 
wmtime_routine(argc, argv);
return 0;
@@ -675,6 +687,7 @@ void usage(char *name) {
printf("  -display DISPLAY contact the DISPLAY X server\n");
printf("  -geometry GEOMETRY   position the clock at GEOMETRY\n");
printf("  -n, -noseconds   disables the second hand\n");
+   printf("  -l LOCALEset locale to LOCALE\n");
printf("  -h   display this help and exit\n");
printf("  -v   output version information and exit\n");
 }
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 5/6] wmtime: Remove unnecessary references to current version number.

[Doug Torrance]

To simplify maintenace, all references to the current version number outside
of the appropriate macro in in wmtime.c have been removed.  Note that this
macro had been WMMON_VERSION, likely a copy/paste error, and has been
renamed to WMTIME_VERSION.
---
 wmtime/INSTALL  | 7 +++
 wmtime/README   | 2 +-
 wmtime/wmtime.1 | 2 +-
 wmtime/wmtime.c | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/wmtime/INSTALL b/wmtime/INSTALL
index cff76a8..0573be5 100644
--- a/wmtime/INSTALL
+++ b/wmtime/INSTALL
@@ -7,11 +7,10 @@ Nothing particular, but a computer might come in handy doh ;-)
 
 Installation
 --
-1)  % tar -zxvf wmtime-1.1.tar.gz
-2)  % make
-3)  % make install (as root)
+1)  % make
+2)  % make install (as root)
 
-4)* WMTime uses month and weekday abbreviations from the
+3)* 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.
diff --git a/wmtime/README b/wmtime/README
index ed22a67..d1dfcf1 100644
--- a/wmtime/README
+++ b/wmtime/README
@@ -1,4 +1,4 @@
-WMTime-1.1
+WMTime
 --
 Authors...: Martijn Pieterse (piete...@xs4all.nl)
Antoine Nulle(w...@xs4all.nl)
diff --git a/wmtime/wmtime.1 b/wmtime/wmtime.1
index 9fb1a89..686c151 100644
--- a/wmtime/wmtime.1
+++ b/wmtime/wmtime.1
@@ -17,7 +17,7 @@
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 .\" USA.
 .\"
-.TH WMTIME 1 "January 2015" "WMTIME 1.1"
+.TH WMTIME 1 "January 2015" "WMTIME"
 
 .SH NAME
 wmtime \- Window Maker dockapp that displays the time and date
diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c
index b23d065..0981de3 100644
--- a/wmtime/wmtime.c
+++ b/wmtime/wmtime.c
@@ -92,7 +92,7 @@ const char* default_left_action = NULL;
 const char* default_middle_action = NULL;
 const char* default_right_action = NULL;
 
-#define WMMON_VERSION "1.1"
+#define WMTIME_VERSION "1.1"
 
   //
  /* Global Variables */
@@ -697,7 +697,7 @@ void usage(char *name) {
 
\***/
 
 void printversion(void) {
-   printf("WMTime version %s\n", WMMON_VERSION);
+   printf("WMTime version %s\n", WMTIME_VERSION);
 }
 
 /* vim: sw=4 ts=4 columns=82
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 1/6] wmtime: Remove unnecessary Imakefile.

[Doug Torrance]

Also update INSTALL to remove reference to it.
---
 wmtime/INSTALL   | 12 +++-
 wmtime/Imakefile | 17 -
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 wmtime/Imakefile

diff --git a/wmtime/INSTALL b/wmtime/INSTALL
index a5616cb..94943c4 100644
--- a/wmtime/INSTALL
+++ b/wmtime/INSTALL
@@ -9,11 +9,10 @@ Installation
 --
 1)  % tar -zxvf wmtime-1.1.tar.gz
 2)  % cd wmtime/wmtime
-3)* xmkmf -a (for *BSD systems needed only!).
-4)  % make
-5)  % make install (as root)
+3)  % make
+4)  % make install (as root)
 
-6)* WMTime uses month and weekday abbreviations from the
+5)* 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.
@@ -23,11 +22,6 @@ Installation
 
 % 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
-Imakefiles though ;-)
-
 Be sure to read the HINTS and TODO files too!
 
 
diff --git a/wmtime/Imakefile b/wmtime/Imakefile
deleted file mode 100644
index 93c8775..000
--- a/wmtime/Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
-XPMLIB = -lXpm -lm
-DEPLIBS = $(DEPXLIB)
-
-LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
-
-SRCS = wmtime.c \
-../wmgeneral/wmgeneral.c \
-../wmgeneral/misc.c \
-../wmgeneral/list.c
-
-OBJS = wmtime.o \
-wmgeneral.o \
-misc.o \
-list.o
-
-ComplexProgramTarget(wmtime)
-
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 6/6] wmtime: Bump to version 1.2.

[Doug Torrance]

---
 wmtime/CHANGES  | 15 +++
 wmtime/wmtime.c |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/wmtime/CHANGES b/wmtime/CHANGES
index fe5dd3e..47ceb52 100644
--- a/wmtime/CHANGES
+++ b/wmtime/CHANGES
@@ -3,6 +3,21 @@ WMTime changes.
 Version Description
 --
 
+1.2- Released 150103
+   - Remove unused variables.
+   - Use rm -f in make clean.
+   - Update FSF address.
+   - Update GPLv2 from
+ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+   - Update README contact information; remove trailing
+ whitespaces.
+   - Remove trailing whitespace.
+   - Remove unnecessary Imakefile.
+   - Move source files to top directory.
+   - Update Makefile.
+   - Add -l option to specify locale.
+   - Remove unnecessary references to current version number.
+
 1.1- Released 131013
- Incorporated many patches from Debian, including
  + Added manual page
diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c
index 0981de3..ef12a4d 100644
--- a/wmtime/wmtime.c
+++ b/wmtime/wmtime.c
@@ -92,7 +92,7 @@ const char* default_left_action = NULL;
 const char* default_middle_action = NULL;
 const char* default_right_action = NULL;
 
-#define WMTIME_VERSION "1.1"
+#define WMTIME_VERSION "1.2"
 
   //
  /* Global Variables */
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 2/6] wmtime: Move source files to top directory.

[Doug Torrance]

Ease the build process by skipping the initial "cd wmtime" step.  Document
this in INSTALL.
---
 wmtime/INSTALL  |   7 +-
 wmtime/Makefile |  25 ++
 wmtime/wmtime-mask.xbm  |  72 +
 wmtime/wmtime-master.xpm| 187 +++
 wmtime/wmtime.1 | 179 +++
 wmtime/wmtime.c | 691 
 wmtime/wmtime/Makefile  |  25 --
 wmtime/wmtime/wmtime-mask.xbm   |  72 -
 wmtime/wmtime/wmtime-master.xpm | 187 ---
 wmtime/wmtime/wmtime.1  | 179 ---
 wmtime/wmtime/wmtime.c  | 691 
 11 files changed, 1157 insertions(+), 1158 deletions(-)
 create mode 100755 wmtime/Makefile
 create mode 100644 wmtime/wmtime-mask.xbm
 create mode 100644 wmtime/wmtime-master.xpm
 create mode 100644 wmtime/wmtime.1
 create mode 100644 wmtime/wmtime.c
 delete mode 100755 wmtime/wmtime/Makefile
 delete mode 100644 wmtime/wmtime/wmtime-mask.xbm
 delete mode 100644 wmtime/wmtime/wmtime-master.xpm
 delete mode 100644 wmtime/wmtime/wmtime.1
 delete mode 100644 wmtime/wmtime/wmtime.c

diff --git a/wmtime/INSTALL b/wmtime/INSTALL
index 94943c4..813a6e0 100644
--- a/wmtime/INSTALL
+++ b/wmtime/INSTALL
@@ -8,11 +8,10 @@ Nothing particular, but a computer might come in handy doh ;-)
 Installation
 --
 1)  % tar -zxvf wmtime-1.1.tar.gz
-2)  % cd wmtime/wmtime
-3)  % make
-4)  % make install (as root)
+2)  % make
+3)  % make install (as root)
 
-5)* WMTime uses month and weekday abbreviations from the
+4)* 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.
diff --git a/wmtime/Makefile b/wmtime/Makefile
new file mode 100755
index 000..0b3ce5c
--- /dev/null
+++ b/wmtime/Makefile
@@ -0,0 +1,25 @@
+LIBDIR = -L/usr/X11R6/lib
+LIBS   = -lXpm -lXext -lX11 -lm
+OBJS = wmtime.o \
+   wmgeneral/wmgeneral.o \
+   wmgeneral/misc.o \
+   wmgeneral/list.o
+XPMS = wmtime-master.xpm wmtime-mask.xbm
+
+CC = gcc
+CFLAGS += -O2
+
+.c.o:
+   $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -Wall $< -o $*.o
+
+wmtime: $(OBJS) $(XPMS)
+   $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wmtime $(OBJS) $(LIBDIR) 
$(LIBS)
+
+clean::
+   for i in $(OBJS) ; do \
+   rm -f $$i; \
+   done
+   rm -f wmtime
+
+install:: wmtime
+   install -m 755 wmtime $(DESTDIR)/usr/bin
diff --git a/wmtime/wmtime-mask.xbm b/wmtime/wmtime-mask.xbm
new file mode 100644
index 000..dd73c69
--- /dev/null
+++ b/wmtime/wmtime-mask.xbm
@@ -0,0 +1,72 @@
+#define wmtime_mask_width 128
+#define wmtime_mask_height 64
+static char wmtime_mask_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 0x00, 0x00,
+
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,   0xf0, 0xff, 0xff, 0xff, 
0xff, 0xff, 0xff, 0x0f,
+ 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0

[PATCH 3/6] wmtime: Update Makefile.

[Doug Torrance]

In particular,
- Remove reference to deprecated X11R6 directory.
- Honor PREFIX and INSTALL variables.
- Change definition of CFLAGS from += to =; perhaps users don't want to
  append -O2. Also move -Wall to CFLAGS.
- Use C*FLAGS only when compiling and LDFLAGS only when linking.
- Create directories if needed during install.
- Install manpage.
---
 wmtime/Makefile | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/wmtime/Makefile b/wmtime/Makefile
index 0b3ce5c..561c0f4 100755
--- a/wmtime/Makefile
+++ b/wmtime/Makefile
@@ -1,19 +1,22 @@
-LIBDIR = -L/usr/X11R6/lib
 LIBS   = -lXpm -lXext -lX11 -lm
 OBJS = wmtime.o \
wmgeneral/wmgeneral.o \
wmgeneral/misc.o \
wmgeneral/list.o
 XPMS = wmtime-master.xpm wmtime-mask.xbm
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/share/man/man1
+INSTALL = install
 
 CC = gcc
-CFLAGS += -O2
+CFLAGS = -O2 -Wall
 
 .c.o:
-   $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -Wall $< -o $*.o
+   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
 
 wmtime: $(OBJS) $(XPMS)
-   $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wmtime $(OBJS) $(LIBDIR) 
$(LIBS)
+   $(CC) $(LDFLAGS) -o wmtime $(OBJS) $(LIBS)
 
 clean::
for i in $(OBJS) ; do \
@@ -22,4 +25,7 @@ clean::
rm -f wmtime
 
 install:: wmtime
-   install -m 755 wmtime $(DESTDIR)/usr/bin
+   $(INSTALL) -d $(DESTDIR)$(BINDIR)
+   $(INSTALL) wmtime $(DESTDIR)$(BINDIR)
+   $(INSTALL) -d $(DESTDIR)$(MANDIR)
+   $(INSTALL) -m 644 wmtime.1 $(DESTDIR)$(MANDIR)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Update wmtime on dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index 41a233d..21abb51 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -480,7 +480,7 @@ dockapps = 320
 category = System Monitoring
 
 [wmtime]
-version-1.1+20141005 = fbd8c9d4751c5317e2fd02a956b19bcffd9f56a4
+version-1.2 = 62029f244a9e03250dd846a0d75d692cbd9da683
 version-1.1 = 41744c0d145f064c961989e2650a279b59e27518
 version-1.0b2 = 0ead761a83788078585342c0728f3d9430baac29
 image = wmtime.png
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH] Add generate-mapfile-from-header.sh to distribution tarball.

[Doug Torrance]

---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index ddbb0c9..d3d4221 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL \
The-perfect-Window-Maker-patch.txt \
README COPYING.WTFPL autogen.sh \
email-clients.txt checkpatch.pl update-changelog.pl \
-   script/nested-func-to-macro.sh
+   script/nested-func-to-macro.sh \
+   script/generate-mapfile-from-header.sh
 
 if USE_LCOV
 coverage-reset:
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 05/15] wmcalc: Fix -Wunused-but-set-variable compiler warnings.

[Doug Torrance]

---
 wmcalc/wmcalc.c   | 3 +--
 wmcalc/wmcalcswitch.c | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/wmcalc/wmcalc.c b/wmcalc/wmcalc.c
index f68714b..36bca61 100644
--- a/wmcalc/wmcalc.c
+++ b/wmcalc/wmcalc.c
@@ -106,7 +106,6 @@ int main( int argc, char **argv ) {
   XComposeStatus compose;
   char buffer[20];
   int bufsize = 20;
-  int chcnt = 0;
   
 
   strcpy(configfile, getenv("HOME"));  // Added to wmbutton by Casey Harkin, 
3/6/99
@@ -303,7 +302,7 @@ int main( int argc, char **argv ) {
   //  ksym = XLookupKeysym(&(report.xkey), report.xkey.state);
   /* KeywithMask - this allows Left, middle, and right button functions 
 to be implemented via keyboard */
-  chcnt = XLookupString(&(report.xkey), buffer, bufsize, &ksym, &compose);
+  XLookupString(&(report.xkey), buffer, bufsize, &ksym, &compose);
   if (Verbose) printf("Keysym is: 0x%x\n", (int) ksym);
   KeywithMask = whichKey(ksym);
   ExecFunc( KeywithMask );
diff --git a/wmcalc/wmcalcswitch.c b/wmcalc/wmcalcswitch.c
index f8b9846..ae3f374 100644
--- a/wmcalc/wmcalcswitch.c
+++ b/wmcalc/wmcalcswitch.c
@@ -479,13 +479,10 @@ int read_config(void) {
   int i = 0;
   int err_code = OKAY;
   char *line   = NULL;
-  char *sepstr = NULL;
   char  sep_ch = '\t';
   char *cfg_var_ptr = NULL;
 
 
-  sepstr = &sep_ch;
-
   if ((fp = fopen(configfile, "r")) == NULL) {// Can't find config file
 strcpy(configfile, CONFIGGLOBAL); // ...so try to open global 
config
 if ((fp = fopen(configfile, "r")) == NULL) {  // Can't find global config 
file
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 02/15] wmcalc: Add manpage from Debian.

[Doug Torrance]

Obtained from:
http://snapshot.debian.org/package/wmcalc/0.3-7/

Additionally, add rule to Makefile to install new manpage.
---
 wmcalc/Makefile |   3 +-
 wmcalc/wmcalc.1 | 118 
 2 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 wmcalc/wmcalc.1

diff --git a/wmcalc/Makefile b/wmcalc/Makefile
index ccc305a..37b30f4 100644
--- a/wmcalc/Makefile
+++ b/wmcalc/Makefile
@@ -7,7 +7,7 @@ OBJECTS = wmcalc.o readln.o wmcalcswitch.o wmcalcfunc.o
 DESTDIR =
 PREFIX = /usr/local
 BINDIR = ${PREFIX}/bin
-MANDIR = ${PREFIX}/share/man
+MANDIR = ${PREFIX}/share/man/man1
 CONF   = /etc
 INSTALL = /usr/bin/install
 INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
@@ -26,3 +26,4 @@ clean::
 install::
${INSTALL_PROGRAM} wmcalc ${DESTDIR}${BINDIR}
${INSTALL_FILE} wmcalc.conf ${DESTDIR}${CONF}
+   ${INSTALL_FILE} wmcalc.1 ${DESTDIR}${MANDIR}
diff --git a/wmcalc/wmcalc.1 b/wmcalc/wmcalc.1
new file mode 100644
index 000..da0b581
--- /dev/null
+++ b/wmcalc/wmcalc.1
@@ -0,0 +1,118 @@
+.\"  Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH WMCALC 1 "September 20, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nhdisable hyphenation
+.\" .hyenable hyphenation
+.\" .ad l  left justify
+.\" .ad b  justify to both left and right margins
+.\" .nfdisable filling
+.\" .fienable filling
+.\" .brinsert line break
+.\" .sp insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+wmcalc \- dockable calculator application
+.SH SYNOPSIS
+.B wmcalc
+[\-g \fIgeometry\fP] [\-d \fIdisplay\fP] [\-v] [\-f \fIconfigfile\fP] [\-h]
+
+.SH DESCRIPTION
+This manual page documents briefly the
+.B wmcalc
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB\fP and
+.\" \fI\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBwmcalc\fP is a program designed to act as a simple calculator offering 
basic operations like addition, subtraction, multiplication, division, square 
and squareroot.  It is different from other calculator programs, however in 
that it is designed to take up very little desktop space.  As such, it can be 
left running on the desktop at all times.  It is intended to placed in the 
WindowMaker dock, or in Wharf under Afterstep, though it should run as well 
under any window manager. 
+
+\fB*IMPORTANT*\fP: this calculator, due to its simple target, does not respect 
the proper mathematical operations order, and they are executed in the order 
they are inserted.
+
+Buttons are defined as:
+.nf
+   
+|   x00  |  x = 1 for Left Mouse Button
+| 0 1 2 3 4 5 6 7 8 9|  x = 2 for Middle Mouse Button
+||  x = 3 for Right Mouse Button 
+|x01 x02 x03 x04 x05 |
+|x06 x07 x08 x09 x10 |  Note: the numbers 0..9 are the
+|x11 x12 x13 x14 x15 | indicators for memory cells  
+|x16 x17 x18 x19 x20 | 0..9 respectively
+  
+.fi
+.TP
+Button Functions:
+.TP
+.B 100
+Reinitialize the calculator. (100 = Left Mouse Button on Display)
+.TP
+.B 200
+Clear all the memory registers (0..10)
+.TP
+.B 300
+Clear the current number being entered only
+.TP
+.B x11
+Start a program defined by CalcStart variable in config file
+.TP
+.B 1yy
+Perform function shown on button
+.TP
+.B 2yy
+Recall number from memory location [0-9] to display for calculation if yy = 
2,3,4, 7,8,9, 12, 13, 14, 17 otherwise, can run a user-defined function (not 
implemented)
+.TP
+.B 3yy
+Store Displayed number in memory location [0-9] if yy = 2,3,4, 7,8,9, 
12,13,14, 17 otherwise, can run a user-defined function (not implemented)
+.TP
+.B 1xx
+Hopefully the other functions are obvious from their button graphics.
+
+
+.SH OPTIONS
+.TP
+.B \-g 
+Window Geometry - ie: 64x64+10+10
+.TP
+.B \-d  
+Display -  ie: 127.0.0.1:0.0
+.TP
+.B \-f  
+Full path to configuration file.
+.TP
+.B \-v
+Verbose Mode. 
+.TP
+.B \-h
+Help.
+.SH FILES
+.TP
+.I /etc/wmbutton.conf
+system wide wmbutton configuration file which will be used for all users who 
start wmcalc the first time.
+.TP
+.I ~/.wmcalc
+The configuration file (.wmcalc) is written by wmcalc whenever the user 
requests to store a number to memory. This file is automatically created the 
first time a user launches wmcalc with /etc/wmcalc.conf as template. As a part 
of this process, a file is written to /tmp. If /tmp is not accessible, it tries 
in the user's home directory, as defined by the environment variable HOME. This 
file is erased as soon as it is written over th

[PATCH 04/15] wmcalc: Switch #include to #include .

[Doug Torrance]

Otherwise, wmcalc fails to build.
---
 wmcalc/wmcalc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmcalc/wmcalc.c b/wmcalc/wmcalc.c
index 19990a6..f68714b 100644
--- a/wmcalc/wmcalc.c
+++ b/wmcalc/wmcalc.c
@@ -38,7 +38,7 @@
  /
 
 #include "wmcalc_x.h"
-#include 
+#include 
 #include 
 #include 
 #include 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 03/15] wmcalc: Update Makefile.

[Doug Torrance]

In particular,
- Drop INCLUDES and LIBINC variables; referenced deprecated X11R6 directories
  and INCLUDES unnecessarily included the default path.
- Switch hard-coded gcc for CC variable.
- Move hard-coded -02 and -Wall flags to new CFLAGS variable.
- Switch ${} to $() for consistency.
- Add new INSTALL_DIR variable for creating installation directories.
- Respect CPPFLAGS and LDFLAGS.
---
 wmcalc/Makefile | 29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/wmcalc/Makefile b/wmcalc/Makefile
index 37b30f4..0559573 100644
--- a/wmcalc/Makefile
+++ b/wmcalc/Makefile
@@ -1,29 +1,32 @@
-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include
-LIBINC =-L/usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXext -lm
-
+CC = gcc
 TARGET = wmcalc
 OBJECTS = wmcalc.o readln.o wmcalcswitch.o wmcalcfunc.o
+CFLAGS = -O2 -Wall
 DESTDIR =
 PREFIX = /usr/local
-BINDIR = ${PREFIX}/bin
-MANDIR = ${PREFIX}/share/man/man1
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/share/man/man1
 CONF   = /etc
 INSTALL = /usr/bin/install
+INSTALL_DIR= $(INSTALL) -d
 INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
 INSTALL_FILE= $(INSTALL) -p -o root -g root -m 644
 
 .c.o:
-   gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
+   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
 
-${TARGET}: ${OBJECTS}
-   gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
+$(TARGET): $(OBJECTS)
+   $(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
 
 clean::
-   for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
-   if [ -e ${TARGET} ] ; then rm ${TARGET}; fi
+   for i in $(OBJECTS); do if [ -e $$i ] ; then rm $$i; fi; done
+   if [ -e $(TARGET) ] ; then rm $(TARGET); fi
 
 install::
-   ${INSTALL_PROGRAM} wmcalc ${DESTDIR}${BINDIR}
-   ${INSTALL_FILE} wmcalc.conf ${DESTDIR}${CONF}
-   ${INSTALL_FILE} wmcalc.1 ${DESTDIR}${MANDIR}
+   $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+   $(INSTALL_PROGRAM) wmcalc $(DESTDIR)$(BINDIR)
+   $(INSTALL_DIR) $(DESTDIR)$(CONF)
+   $(INSTALL_FILE) wmcalc.conf $(DESTDIR)$(CONF)
+   $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+   $(INSTALL_FILE) wmcalc.1 $(DESTDIR)$(MANDIR)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 06/15] wmcalc: Fix -Warray-bounds compiler warning.

[Doug Torrance]

---
 wmcalc/wmcalc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wmcalc/wmcalc.c b/wmcalc/wmcalc.c
index 36bca61..3af1d66 100644
--- a/wmcalc/wmcalc.c
+++ b/wmcalc/wmcalc.c
@@ -114,8 +114,8 @@ int main( int argc, char **argv ) {
   strcat(tempfile, CONFTEMPFILE);  // Setup name for temp file
 
   /* Clear the Calculator Display */
-  for(i=0; i<11; i++) DispString[i] = ' ';
-  DispString[11] = '\0';
+  for(i=0; i

[PATCH 00/15] Add wmcalc to dockapps repository

[Doug Torrance]

I would like to add wmcalc to the dockapps git repo.  It's a nice little
dockapps I use relatively frequently and it currently doesn't have a maintainer.

Carlos, if these patches are accepted, could you tag the first one wmcalc-0.4
and the last wmcalc-0.5?

Thanks!
Doug

Doug Torrance (15):
  wmcalc: Add version 0.4 to repository.
  wmcalc: Add manpage from Debian.
  wmcalc: Update Makefile.
  wmcalc: Switch #include  to #include .
  wmcalc: Fix -Wunused-but-set-variable compiler warnings.
  wmcalc: Fix -Warray-bounds compiler warning.
  wmcalc: Fix -Wunused-result compiler warning.
  wmcalc: Remove trailing whitespace.
  wmcalc: Remove redundant .wmcalc*; essentially the same as
wmcalc.conf.
  wmcalc: Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.
  wmcalc: Update README.
  wmcalc: Allow installation without root access.
  wmcalc: Fix -Woverflow compiler warnings.
  wmcalc: Remove C++ style comments.
  wmcalc: Bump to version 0.5.

 wmcalc/COPYING| 339 +
 wmcalc/Makefile   |  32 ++
 wmcalc/README | 225 
 wmcalc/backdrop.xpm   | 126 +++
 wmcalc/calcbuttons.xpm|  47 +++
 wmcalc/charmap-colors.xpm |  79 
 wmcalc/charmap.xpm|  71 
 wmcalc/charmap_old.xpm|  70 
 wmcalc/main.xpm   |  73 
 wmcalc/mask.xbm   |  67 
 wmcalc/readln.c   |  59 +++
 wmcalc/wmcalc.1   | 118 ++
 wmcalc/wmcalc.c   | 908 ++
 wmcalc/wmcalc.conf|  35 ++
 wmcalc/wmcalc1.xpm| 137 +++
 wmcalc/wmcalc2.xpm| 131 +++
 wmcalc/wmcalc3.xpm| 131 +++
 wmcalc/wmcalc_c.h |  38 ++
 wmcalc/wmcalc_err.h   |  31 ++
 wmcalc/wmcalc_f.h |  80 
 wmcalc/wmcalc_g.h |  73 
 wmcalc/wmcalc_t.h |  54 +++
 wmcalc/wmcalc_x.h |  30 ++
 wmcalc/wmcalcfunc.c   | 526 +++
 wmcalc/wmcalcscr.xpm  | 128 +++
 wmcalc/wmcalcscr2.gif | Bin 0 -> 2307 bytes
 wmcalc/wmcalcscr2.xpm | 128 +++
 wmcalc/wmcalcsrc.jpg  | Bin 0 -> 2520 bytes
 wmcalc/wmcalcswitch.c | 602 ++
 29 files changed, 4338 insertions(+)
 create mode 100644 wmcalc/COPYING
 create mode 100644 wmcalc/Makefile
 create mode 100644 wmcalc/README
 create mode 100644 wmcalc/backdrop.xpm
 create mode 100644 wmcalc/calcbuttons.xpm
 create mode 100644 wmcalc/charmap-colors.xpm
 create mode 100644 wmcalc/charmap.xpm
 create mode 100644 wmcalc/charmap_old.xpm
 create mode 100644 wmcalc/main.xpm
 create mode 100644 wmcalc/mask.xbm
 create mode 100644 wmcalc/readln.c
 create mode 100644 wmcalc/wmcalc.1
 create mode 100644 wmcalc/wmcalc.c
 create mode 100644 wmcalc/wmcalc.conf
 create mode 100644 wmcalc/wmcalc1.xpm
 create mode 100644 wmcalc/wmcalc2.xpm
 create mode 100644 wmcalc/wmcalc3.xpm
 create mode 100644 wmcalc/wmcalc_c.h
 create mode 100644 wmcalc/wmcalc_err.h
 create mode 100644 wmcalc/wmcalc_f.h
 create mode 100644 wmcalc/wmcalc_g.h
 create mode 100644 wmcalc/wmcalc_t.h
 create mode 100644 wmcalc/wmcalc_x.h
 create mode 100644 wmcalc/wmcalcfunc.c
 create mode 100644 wmcalc/wmcalcscr.xpm
 create mode 100644 wmcalc/wmcalcscr2.gif
 create mode 100644 wmcalc/wmcalcscr2.xpm
 create mode 100644 wmcalc/wmcalcsrc.jpg
 create mode 100644 wmcalc/wmcalcswitch.c

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 09/15] wmcalc: Remove redundant .wmcalc*; essentially the same as wmcalc.conf.

[Doug Torrance]

---
 wmcalc/.wmcalc | 35 ---
 wmcalc/.wmcalc.bk  | 35 ---
 wmcalc/.wmcalc.bkp | 35 ---
 3 files changed, 105 deletions(-)
 delete mode 100644 wmcalc/.wmcalc
 delete mode 100644 wmcalc/.wmcalc.bk
 delete mode 100644 wmcalc/.wmcalc.bkp

diff --git a/wmcalc/.wmcalc b/wmcalc/.wmcalc
deleted file mode 100644
index 234fa12..000
--- a/wmcalc/.wmcalc
+++ /dev/null
@@ -1,35 +0,0 @@
-# wmcalc Configuration File
-# Last Manual Update: 10/29/00
-
-# General Notes:
-# * There must be a tab character '\t' between the variable name and
-#   the value, not a series of spaces.
-# * wmcalc is case sensitive when reading these variables.  Examine the
-#   wmcalc_g.h file for currently defined variables.
-
-#Calculator Memory Locations
-#Note: These must all exist, though they may be in any order
-Mem0   0.00
-Mem1   0.00
-MEM2   2.718282
-MEM3   3.141593
-Mem4   0.00
-Mem5   0.00
-Mem6   0.00
-Mem7   0.00
-Mem8   0.00
-Mem9   0.00
-
-# The CalcStart variable is intended to allow the user to start a larger
-# calculator for more complicated needs.  Everything after the tab '\t'
-# character is sent unmodified in a system() call, so anything you can type
-# at the command prompt may be put here.
-#CalcStart xterm -T "Basic Calculator" -e bc &
-#CalcStart xterm -T "gnuplot" -sb -sl 500 -e gnuplot &
-CalcStart  xcalc &
-
-# The ImagChar variable allows the user to choose between 'i' and 'j' to
-# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j'
-# rather than 'i.')
-#ImagChar  i
-ImagChar   j
diff --git a/wmcalc/.wmcalc.bk b/wmcalc/.wmcalc.bk
deleted file mode 100644
index f7a3759..000
--- a/wmcalc/.wmcalc.bk
+++ /dev/null
@@ -1,35 +0,0 @@
-# wmcalc Configuration File
-# Last Manual Update: 10/29/00
-
-# General Notes:
-# * There must be a tab character '\t' between the variable name and
-#   the value, not a series of spaces.
-# * wmcalc is case sensitive when reading these variables.  Examine the
-#   wmcalc_g.h file for currently defined variables.
-
-#Calculator Memory Locations
-#Note: These must all exist, though they may be in any order
-Mem0   0.00
-Mem1   0.00
-MEM2   2.718282
-MEM3   3.1415926535
-Mem4   0.00
-Mem5   0.00
-Mem6   0.00
-Mem7   0.00
-Mem8   0.00
-Mem9   0.00
-
-# The CalcStart variable is intended to allow the user to start a larger
-# calculator for more complicated needs.  Everything after the tab '\t'
-# character is sent unmodified in a system() call, so anything you can type
-# at the command prompt may be put here.
-#CalcStart xterm -T "Basic Calculator" -e bc &
-#CalcStart xterm -T "gnuplot" -sb -sl 500 -e gnuplot &
-CalcStart  xcalc &
-
-# The ImagChar variable allows the user to choose between 'i' and 'j' to
-# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j'
-# rather than 'i.')
-#ImagChar  i
-ImagChar   j
diff --git a/wmcalc/.wmcalc.bkp b/wmcalc/.wmcalc.bkp
deleted file mode 100644
index f7a3759..000
--- a/wmcalc/.wmcalc.bkp
+++ /dev/null
@@ -1,35 +0,0 @@
-# wmcalc Configuration File
-# Last Manual Update: 10/29/00
-
-# General Notes:
-# * There must be a tab character '\t' between the variable name and
-#   the value, not a series of spaces.
-# * wmcalc is case sensitive when reading these variables.  Examine the
-#   wmcalc_g.h file for currently defined variables.
-
-#Calculator Memory Locations
-#Note: These must all exist, though they may be in any order
-Mem0   0.00
-Mem1   0.00
-MEM2   2.718282
-MEM3   3.1415926535
-Mem4   0.00
-Mem5   0.00
-Mem6   0.00
-Mem7   0.00
-Mem8   0.00
-Mem9   0.00
-
-# The CalcStart variable is intended to allow the user to start a larger
-# calculator for more complicated needs.  Everything after the tab '\t'
-# character is sent unmodified in a system() call, so anything you can type
-# at the command prompt may be put here.
-#CalcStart xterm -T "Basic Calculator" -e bc &
-#CalcStart xterm -T "gnuplot" -sb -sl 500 -e gnuplot &
-CalcStart  xcalc &
-
-# The ImagChar variable allows the user to choose between 'i' and 'j' to
-# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j'
-# rather than 'i.')
-#ImagChar  i
-ImagChar   j
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 08/15] wmcalc: Remove trailing whitespace.

[Doug Torrance]

---
 wmcalc/.wmcalc|  12 +--
 wmcalc/.wmcalc.bk |  12 +--
 wmcalc/.wmcalc.bkp|  12 +--
 wmcalc/README |  68 
 wmcalc/mask.xbm   |   8 +-
 wmcalc/wmcalc.1   |  16 ++--
 wmcalc/wmcalc.c   | 222 +-
 wmcalc/wmcalc.conf|  12 +--
 wmcalc/wmcalc_c.h |   2 +-
 wmcalc/wmcalc_f.h |   4 +-
 wmcalc/wmcalc_g.h |   2 +-
 wmcalc/wmcalc_t.h |   2 +-
 wmcalc/wmcalc_x.h |  12 +--
 wmcalc/wmcalcfunc.c   |  42 +-
 wmcalc/wmcalcswitch.c |  42 +-
 15 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/wmcalc/.wmcalc b/wmcalc/.wmcalc
index d6f110d..234fa12 100644
--- a/wmcalc/.wmcalc
+++ b/wmcalc/.wmcalc
@@ -1,13 +1,13 @@
 # wmcalc Configuration File
 # Last Manual Update: 10/29/00
 
-# General Notes: 
+# General Notes:
 # * There must be a tab character '\t' between the variable name and
 #   the value, not a series of spaces.
-# * wmcalc is case sensitive when reading these variables.  Examine the 
+# * wmcalc is case sensitive when reading these variables.  Examine the
 #   wmcalc_g.h file for currently defined variables.
 
-#Calculator Memory Locations 
+#Calculator Memory Locations
 #Note: These must all exist, though they may be in any order
 Mem0   0.00
 Mem1   0.00
@@ -21,15 +21,15 @@ Mem80.00
 Mem9   0.00
 
 # The CalcStart variable is intended to allow the user to start a larger
-# calculator for more complicated needs.  Everything after the tab '\t' 
+# calculator for more complicated needs.  Everything after the tab '\t'
 # character is sent unmodified in a system() call, so anything you can type
 # at the command prompt may be put here.
 #CalcStart xterm -T "Basic Calculator" -e bc &
 #CalcStart xterm -T "gnuplot" -sb -sl 500 -e gnuplot &
 CalcStart  xcalc &
 
-# The ImagChar variable allows the user to choose between 'i' and 'j' to 
-# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j' 
+# The ImagChar variable allows the user to choose between 'i' and 'j' to
+# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j'
 # rather than 'i.')
 #ImagChar  i
 ImagChar   j
diff --git a/wmcalc/.wmcalc.bk b/wmcalc/.wmcalc.bk
index 235f5c7..f7a3759 100644
--- a/wmcalc/.wmcalc.bk
+++ b/wmcalc/.wmcalc.bk
@@ -1,13 +1,13 @@
 # wmcalc Configuration File
 # Last Manual Update: 10/29/00
 
-# General Notes: 
+# General Notes:
 # * There must be a tab character '\t' between the variable name and
 #   the value, not a series of spaces.
-# * wmcalc is case sensitive when reading these variables.  Examine the 
+# * wmcalc is case sensitive when reading these variables.  Examine the
 #   wmcalc_g.h file for currently defined variables.
 
-#Calculator Memory Locations 
+#Calculator Memory Locations
 #Note: These must all exist, though they may be in any order
 Mem0   0.00
 Mem1   0.00
@@ -21,15 +21,15 @@ Mem80.00
 Mem9   0.00
 
 # The CalcStart variable is intended to allow the user to start a larger
-# calculator for more complicated needs.  Everything after the tab '\t' 
+# calculator for more complicated needs.  Everything after the tab '\t'
 # character is sent unmodified in a system() call, so anything you can type
 # at the command prompt may be put here.
 #CalcStart xterm -T "Basic Calculator" -e bc &
 #CalcStart xterm -T "gnuplot" -sb -sl 500 -e gnuplot &
 CalcStart  xcalc &
 
-# The ImagChar variable allows the user to choose between 'i' and 'j' to 
-# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j' 
+# The ImagChar variable allows the user to choose between 'i' and 'j' to
+# represent the sqrt(-1).  (Electrical Engineers (such as myself) use 'j'
 # rather than 'i.')
 #ImagChar  i
 ImagChar   j
diff --git a/wmcalc/.wmcalc.bkp b/wmcalc/.wmcalc.bkp
index 235f5c7..f7a3759 100644
--- a/wmcalc/.wmcalc.bkp
+++ b/wmcalc/.wmcalc.bkp
@@ -1,13 +1,13 @@
 # wmcalc Configuration File
 # Last Manual Update: 10/29/00
 
-# General Notes: 
+# General Notes:
 # * There must be a tab character '\t' between the variable name and
 #   the value, not a series of spaces.
-# * wmcalc is case sensitive when reading these variables.  Examine the 
+# * wmcalc is case sensitive when reading these variables.  Examine the
 #   wmcalc_g.h file for currently defined variables.
 
-#Calculator Memory Locations 
+#Calculator Memory Locations
 #Note: These must all exist, though they may be in any order
 Mem0   0.00
 Mem1   0.00
@@ -21,15 +21,15 @@ Mem80.00
 Mem9   0.00
 
 # The CalcStart variable is intended to allow the user to start a larger
-# calculator for more complicated needs.  Everything after the tab '\t' 
+# calculator for more complicated needs.  Everything after the tab '\t'
 # character is sent unmodified in a system() call, so anything you can type
 # at the command prompt may be put here.
 #CalcStart xterm -T "Basic Calculato

[PATCH 07/15] wmcalc: Fix -Wunused-result compiler warning.

[Doug Torrance]

---
 wmcalc/wmcalcfunc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wmcalc/wmcalcfunc.c b/wmcalc/wmcalcfunc.c
index 17f9518..4215e52 100644
--- a/wmcalc/wmcalcfunc.c
+++ b/wmcalc/wmcalcfunc.c
@@ -521,5 +521,6 @@ void startcalc(void) {
   if (Verbose) 
 fprintf(stderr, "Starting external calculator %s\n", SysCalcCmd);
 
-  system(SysCalcCmd);
+  if (system(SysCalcCmd) == -1)
+fprintf(stderr, "%s returned an error.\n", SysCalcCmd);
 } /*  End of function startcalc */
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 14/15] wmcalc: Remove C++ style comments.

[Doug Torrance]

---
 wmcalc/wmcalc.c   | 58 +--
 wmcalc/wmcalc_c.h |  4 ++--
 wmcalc/wmcalc_f.h | 46 
 wmcalc/wmcalcswitch.c | 58 +--
 4 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/wmcalc/wmcalc.c b/wmcalc/wmcalc.c
index 38d0dbe..9e50c30 100644
--- a/wmcalc/wmcalc.c
+++ b/wmcalc/wmcalc.c
@@ -50,9 +50,9 @@
 #include "wmcalc_g.h"
 #include "wmcalc_f.h"
 
-#include "backdrop.xpm"   // background graphic
-#include "calcbuttons.xpm"// graphic of buttons
-#include "charmap.xpm"// pixmap of characters
+#include "backdrop.xpm"   /* background graphic */
+#include "calcbuttons.xpm"/* graphic of buttons */
+#include "charmap.xpm"/* pixmap of characters */
 #include "mask.xbm"
 
 /* Global Variables */
@@ -108,10 +108,10 @@ int main( int argc, char **argv ) {
   int bufsize = 20;
 
 
-  strcpy(configfile, getenv("HOME"));  // Added to wmbutton by Casey Harkin, 
3/6/99
-  strcat(configfile, CONFFILENAME);// Fixed Bug - didn't look in home 
directory
-   // but startup directory
-  strcat(tempfile, CONFTEMPFILE);  // Setup name for temp file
+  strcpy(configfile, getenv("HOME"));  /* Added to wmbutton by Casey Harkin, 
3/6/99 */
+  strcat(configfile, CONFFILENAME);/* Fixed Bug - didn't look in home 
directory */
+   /* but startup directory */
+  strcat(tempfile, CONFTEMPFILE);  /* Setup name for temp file */
 
   /* Clear the Calculator Display */
   for(i=0; i= argc ) show_usage();
sscanf(argv[i], "%s", Geometry_str);
if ( Verbose ) printf("Geometry is: %s\n", Geometry_str);
break;
-  case 'd':// Set display
+  case 'd':/* Set display */
if ( ++i >= argc ) show_usage();
sscanf(argv[i], "%s", Display_str);
if ( Verbose ) printf("Display is: %s\n", Display_str);
break;
-  case 'h':// Show Help Message
+  case 'h':/* Show Help Message */
show_usage();
break;
-  case 'f':// use config file 
+  case 'f':/* use config file  */
if ( ++i >= argc ) show_usage();
sscanf(argv[i], "%s", configfile);
if ( Verbose ) printf("Using Config File: %s\n", configfile);
break;
-  default: // other, unknown, parameters
+  default: /* other, unknown, parameters */
show_usage();
break;
   }
@@ -292,14 +292,14 @@ int main( int argc, char **argv ) {
   break;
 case ConfigureNotify:
   if ( Verbose ) printf("Event: ConfigureNotify\n");
-  //  redraw();
+  /*  redraw(); */
   break;
 
 case KeyPress:
   if (Verbose) printf("Event: Key state: 0x%x  Key: 0x%x\n",
  report.xkey.state, report.xkey.keycode);
 
-  //  ksym = XLookupKeysym(&(report.xkey), report.xkey.state);
+  /*  ksym = XLookupKeysym(&(report.xkey), report.xkey.state); */
   /* KeywithMask - this allows Left, middle, and right button functions
 to be implemented via keyboard */
   XLookupString(&(report.xkey), buffer, bufsize, &ksym, &compose);
@@ -315,7 +315,7 @@ int main( int argc, char **argv ) {
N = whichButton(report.xbutton.x, report.xbutton.y );
if ( (N >= 0) && (N <= NUM_BUTTONS) ) {
  button_pressed = N + LMASK;
- //  redraw();
+ /*  redraw(); */
}
if ( Verbose )
  printf("Button 1:x=%d y=%d N=%d\n",
@@ -326,7 +326,7 @@ int main( int argc, char **argv ) {
  N = whichButton(report.xbutton.x, report.xbutton.y );
  if ( (N >= 0) && (N <= NUM_BUTTONS) ) {
button_pressed = N + MMASK;
-   //  redraw();
+   /*  redraw(); */
  }
  if ( Verbose )
printf("Button 2:x=%d y=%d N=%d\n",
@@ -337,7 +337,7 @@ int main( int argc, char **argv ) {
N = whichButton(report.xbutton.x, report.xbutton.y );
if ( (N >= 0) && (N <= NUM_BUTTONS) ) {
  button_pressed = N + RMASK;
- //  redraw();
+ /*  redraw(); */
}
if ( Verbose )
  printf("Button 3:x=%d y=%d N=%d\n",
@@ -429,7 +429,7 @@ void redraw() {
   flush_expose( iconwin );
   XCopyArea(display, visible.pixmap, iconwin, gc, 0, 0,
visible.attributes.width, visible.attributes.height, 0, 0 );
-  //  if ( Verbose ) printf("In Redraw()\n");
+  /*  if ( Verbose ) printf("In Redraw()\n"); */
   displaystr();
 }  /* End of function redraw() /
 
@@ -697,44 +697,44 @@ int flush_expose(Window w) {
 void defineButtonRegions(void) {
   int ndx = 0;   /* button index */

[PATCH 12/15] wmcalc: Allow installation without root access.

[Doug Torrance]

Drop "-p -o root -g root" from the INSTALL_* Makefile variables and honor
the CONF Makefile variable for accessing the global config file instead of
hardcoding it as /etc.

These changes allow users without root access to install wmcalc in their home
directory.
---
 wmcalc/Makefile   | 6 +++---
 wmcalc/wmcalc_c.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wmcalc/Makefile b/wmcalc/Makefile
index 0559573..4dc8440 100644
--- a/wmcalc/Makefile
+++ b/wmcalc/Makefile
@@ -10,11 +10,11 @@ MANDIR = $(PREFIX)/share/man/man1
 CONF   = /etc
 INSTALL = /usr/bin/install
 INSTALL_DIR= $(INSTALL) -d
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-INSTALL_FILE= $(INSTALL) -p -o root -g root -m 644
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_FILE= $(INSTALL) -m 644
 
 .c.o:
-   $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
+   $(CC) -DCONF=\"$(CONF)\" $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
 
 $(TARGET): $(OBJECTS)
$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
diff --git a/wmcalc/wmcalc_c.h b/wmcalc/wmcalc_c.h
index 9212e6d..af41e24 100644
--- a/wmcalc/wmcalc_c.h
+++ b/wmcalc/wmcalc_c.h
@@ -17,7 +17,7 @@
 #define CALC_CMD_SIZE 128
 #define CONFFILENAME  "/.wmcalc"
 #define CONFTEMPFILE  "/tmp/wmcalc.tmp"
-#define CONFIGGLOBAL  "/etc/wmcalc.conf"
+#define CONFIGGLOBAL  CONF"/wmcalc.conf"
 #define VER   0
 #define REL   3
 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 13/15] wmcalc: Fix -Woverflow compiler warnings.

[Doug Torrance]

---
 wmcalc/mask.xbm | 2 +-
 wmcalc/wmcalc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wmcalc/mask.xbm b/wmcalc/mask.xbm
index 85290d7..828bbf2 100644
--- a/wmcalc/mask.xbm
+++ b/wmcalc/mask.xbm
@@ -1,7 +1,7 @@
 #define mask_width 64
 #define mask_height 64
 
-static char mask_bits[] = {
+static unsigned char mask_bits[] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f,
  0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f,
diff --git a/wmcalc/wmcalc.c b/wmcalc/wmcalc.c
index 2e6a8ba..38d0dbe 100644
--- a/wmcalc/wmcalc.c
+++ b/wmcalc/wmcalc.c
@@ -204,7 +204,7 @@ int main( int argc, char **argv ) {
 
   if ( ( pixmask = XCreateBitmapFromData(display,
 win,
-mask_bits,
+(char *)mask_bits,
 mask_width,
 mask_height) )  == 0 ) {
 error_handler(ERR_X_CREATE_BITMAP, NULL);
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 10/15] wmcalc: Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.

[Doug Torrance]

---
 wmcalc/COPYING | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/wmcalc/COPYING b/wmcalc/COPYING
index a43ea21..d159169 100644
--- a/wmcalc/COPYING
+++ b/wmcalc/COPYING
@@ -1,12 +1,12 @@
-   GNU GENERAL PUBLIC LICENSE
-  Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-  675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-   Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its 
users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not 
licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-   GNU GENERAL PUBLIC LICENSE
+
+GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
 License.  (Exception: if the Program itself is interactive but
 does not normally print such an announcement, your work based on
 the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering 
equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by 
the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE 
WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
-
-   Appendix: How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have 
at least
 the "copyright" line and a pointer to where the full notice is found.
 
 
-Copyright (C) 19yy  
+Copyright (C)   
 
 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
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full 
notice is found.
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-alon

[PATCH 11/15] wmcalc: Update README.

[Doug Torrance]

In particular,
- Update maintainer.
- Remove version-specific information.
- Update installation instructions.
- Add previously released version 0.4 to changelog.
---
 wmcalc/README | 23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/wmcalc/README b/wmcalc/README
index b4d58b1..5bc8970 100644
--- a/wmcalc/README
+++ b/wmcalc/README
@@ -1,9 +1,9 @@
-wmcalc Ver. 0 Rel 4
+wmcalc
 -
Code is loosely based on wmppp, wmload, wmtime, wmcp, and asbutton
Original Author: Edward H. Flora 
-   Current Maintainer: Gordon Fraser 
-   Ver 0 Rel 4May 25, 2002
+   Current Maintainer: Window Maker Developers Team
+   
 
 DESCRIPTION:
 
@@ -36,20 +36,14 @@ bugs in the code, etc.
 
 INSTALLATION:
 -
-   Untar the file:
-   tar xvzf wmcalc-0.3.tar.gz
-
-   CD to source directory:
-   cd wmcalc-0.3
-
Compile it:
make clean; make
 
-   Copy the config file:
-   cp .wmcalc ~
+   As root, install it:
+   make install
 
-   Put the executable somewhere in your path:
-   mv wmcalc /usr/local/bin (or anyhere in your path)
+   Optionally, copy the config file:
+   cp wmcalc.conf ~/.wmcalc
 
Run it:
wmcalc &
@@ -141,6 +135,9 @@ The background border is defined in backdrop.xpm.
 
 CHANGE LOG:
 ---
+0.4 Added global config file
+   Maintained by Gordon Fraser 
+
 0.3 Added "Locked" memory capabilities via config file
 General Code clean-up
Keyboard Support - may not be platform independent
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 15/15] wmcalc: Bump to version 0.5.

[Doug Torrance]

---
 wmcalc/README | 16 
 wmcalc/wmcalc_c.h |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/wmcalc/README b/wmcalc/README
index 5bc8970..4cbd69a 100644
--- a/wmcalc/README
+++ b/wmcalc/README
@@ -135,6 +135,22 @@ The background border is defined in backdrop.xpm.
 
 CHANGE LOG:
 ---
+0.5Add manpage from Debian.
+   Update Makefile.
+   Switch #include  to #include .
+   Fix -Wunused-but-set-variable compiler warnings.
+   Fix -Warray-bounds compiler warning.
+   Fix -Wunused-result compiler warning.
+   Remove trailing whitespace.
+   Remove redundant .wmcalc*; essentially the same as wmcalc.conf.
+   Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.
+   Update README.
+   Allow installation without root access.
+   Fix -Woverflow compiler warnings.
+   Remove C++ style comments.
+   Maintained by Window Maker Developers Team
+   
+
 0.4 Added global config file
Maintained by Gordon Fraser 
 
diff --git a/wmcalc/wmcalc_c.h b/wmcalc/wmcalc_c.h
index 9c482fd..c8d7df8 100644
--- a/wmcalc/wmcalc_c.h
+++ b/wmcalc/wmcalc_c.h
@@ -19,7 +19,7 @@
 #define CONFTEMPFILE  "/tmp/wmcalc.tmp"
 #define CONFIGGLOBAL  CONF"/wmcalc.conf"
 #define VER   0
-#define REL   3
+#define REL   5
 
 #define LMASK 100
 #define MMASK 200
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Add wmcalc to dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db|  13 +
 dockapps/img/wmcalcscr3.jpg | Bin 0 -> 7628 bytes
 2 files changed, 13 insertions(+)
 create mode 100644 dockapps/img/wmcalcscr3.jpg

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index 21abb51..3918435 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -154,6 +154,19 @@ url = 
"https://web.archive.org/web/20040417092638/http://members.cox.net/ehf_doc
 dockapps = 241
 category = General/Others
 
+[wmcalc]
+version-0.5 = c2f0ad2882b89c5c33dfb8331c1f05ca284e7c36
+version-0.4 = 8c0d48a6e55bb901cd1217e8a78601e1ab36a6a4
+image = wmcalcscr3.jpg
+description = "Wmcalc is simple little application that I am writing. It is 
specifically designed to be docked in Windowmaker, or 'Swallowed' by wharf in 
Afterstep. If
+you're not familiar with these windowmanagers, check them out in the links 
section. Of course, it should work in just about any window manager.
+
+Wmcalc is a 64x64 pixel application that performs all the functions (and 
eventually more) of a simple four function calculator. It includes a 10 digit
+alpha-numeric display, and twenty buttons for user input. Clicking on the 
display will clear the calculator. "
+url = 
"https://web.archive.org/web/20040417092638/http://members.cox.net/ehf_dockapps/";
+dockapps = 130
+category = General/Others
+
 [wmCalClock]
 version-1.25+20141005 = 50d11cae21a3af47ae11cc4563dbf2705881464b
 version-1.25 = fb4abc9848d55c0cf53c110ec4a5dff3f7585add
diff --git a/dockapps/img/wmcalcscr3.jpg b/dockapps/img/wmcalcscr3.jpg
new file mode 100644
index 
..b8f425b4ab3ebc3d19a274537c65467af4988821
GIT binary patch
literal 7628
zcmbuC)mIeW*N2C0>F!ceLApU2Dd|q>1{oMS1Qh8MB&A~*x>JN92N)O{k!~f181nUd
z@%szjeRI}2&*waQ?VGdCd0Kq>4It4_QC9(=p`igB0ImSQ(<6Xd(bvKDgTs540GAKW
zEC$XFEUM~Sx=$+r#s6aeuli5&{}TLn_^BU2iVKhj$YY?90?PNdaUyV})9KRh3cHSmxqh5V)1(9ReDKJ?p7TFI@Lr{PXwq;1MfcTWg_N=ok$*$Rfs;
z>!bflWl~d?J!4kOY;^7!C~IQoSV^yx*KtcZ8%#$ekg*zPfk^WAQ6#h&r=;7#ga*x}fVZ%+km&lG*HTTZl!;2=tf{^}
zT4ST|UTVWKh_Q&vP?X_Fd6z_)U1unG0Q&qEivCi}FucpLKSkh-j&u>x!*fiBGQ5C{HgE>M
zZvIJU6$k5Mu)knW#0~oQ=}%q7Y}=dk`2+al({cmortR7tr_M!6GM)Hnjvak
zZ}rLY8S#L>K0y}(-DuWF0$kL;S_63BQsD^*Q783wbNNxy>E<-~v2TwO>hA0ML-=yY
z%P+{~NJ};kVCtrgKKOE0a6jb(*pkmb6jck4f!`5M7NQFX
zUc6k1~(Lsa?gwpPG#HMYp=N>T^$|g)3}bE
z&D(%-<#Y%+-DD2982G)~F-$9vpVq-Xbac(n==hM~c|131YcX>gm|NaYyM1zsWRC6m
z5NxYM{Pt{>SpcdIuov``&O9dc9{5N&kx!_~=(LG|gq%U0Pn~-;r}xY<0yWza5)@Lc
zmmoqCS)-VcqYN`iAe*J42%-%Wv=r5_(Biur7NTo9qlg8zx`wTj?A`~P?}W-ay~##v
z%OPfsOS2eV2U8{-312|qA4)_h5md*6Erm?}7;o>uD{Wl63pGwklSUJ&ZN0%hX>EdD
zNO&fp|5xnVQOp&guM042r28OVL~Y7D@lo(iS$aM|Z-ZN@li-U`DWNpcq*S+OEufR6
zUXITZ!d3HwbEmCz$Jl#!dwQe1chFp1q|V7vHb28CO)}E~4u@cgw(tjZy|&PJ``*E&
z#cds>zvZx-)5j#nUIc1wB@FqV%p6-#)xJo!GFpNSj^drfqHBe?!@=qhliK-Ji=;+v
z6dl|U(uy-n)UceZ@C2}4ZTV4OJ#2wgUOi!0FsDjqn&3A3T22e(Dy`~w?R>*n-Zy9`
z6CkM}zbkvl+gfztZM!3u1DIjELD`3ty-l}RofukNoyn$Hgv~Tb`ic#ufpQ;1Z$T?`
z!dqK+S$^)yZbF{DB5Qc3B2{@04zSsHH9Ak`b7Rci+pfTFWBEgitvc4Z7G{QRWTRCe
zzq|aGev*2eK@?T(+#I
zT(r4u@G
zhP;&Lj(I?8EB4Ia;hvJ0nNaBm=Ow}L+|*Lnh3VYMPb^XRu!||NbwU9s=4U(80#h3$
zK~)Mep^=zOc|tY)lO1Emo30F(MZ}M>$V;F|NkvRf&bQ1_kM&tZLst&JhABnKfN1OS
zT9A%Wrn}k)_tiETao$1J7E%|Qi|uWbi3s~raVI%Scbs1zp$yFHgM--bxN|twP|5yZ
zu2A01pZ18wOLxXsT0QUI4<#q%`Tc5i>kzb`o6YuPl3qG7N$QPWGpvxVEtaix;@&^!
z)oY|xI1bf$9IK~~3fBr3{?%|tl?@Hq-4hvXC~0aKJh%@&=kK-7%qh`N;&fZi(`Y04
zmhJ%ecGY<0yp1S5bKM%H{7kJ~vBa(0TNNoRQa~6>PZK$RM#bfli5$ti&+tn)CSUQJ
zZ#4iCCfix16U;y4vrPOBT}Zp!T-i8UKdBX-LX31Q)8GoX=OjWF)0}m
z?E8}2KI2qY4h+6A@i4=828WNx-RTCa0v&0yIhHI8hx_G;glY%y8{Gy33Y19?wYkVc
zOB;w9h-#Emta02)#*^Y=jod}&E*_P?=ohwBwmWol6lcgv)nFy57J?m-A96j~B{EUI
z%`Wp*qCW+cGyRfw4<@ZewsR5mz>m74OVHoeeDi(h%N7rDUU)vQc|*L+Fkp?BU>9SN
zX0hU3I;y~)TMvy;i=jBWzr+)31q>*qR=+={X}D!C5Z7a1?NtJ^Ns2Grja`i%8oQ(H
z{E$;OAONk#NRjBP=4<2-@3yP0SChcJtcBqfcDcVwIfucn5oe@6b^Rdi=JGn4Z=K?4
zHpxbI2i@=UKdfg{Y#S862iut1h!H&{KM&9FJ0<(t1F^vIg;kSNS>2t1Ii?J81iWeI
zAr|1^Ok{aez+hW=*~@^DCqRWK){j@`U&WsQ0vjR3Io_TAr*fShK8$W%A+MM}!r=?x
z5n1l8QK2WmyZmU+?pqX%c<_z*eMRb~{U2*c1OK-YAY)|Zt{c&L_5@Ygwb-4b(D%;i
zcLZdqKXIcUYMuc+cWL=iRH_!1tgDT^nycLH4snP#e4vVi9dXUZ>#FfVi3DpdZz4qY
z3*%%T7(v%CP}EN
zvIu*Jca}<2$~)1Gx(mtA=i|O=XZ$dN_L
z1z?-wZ#h>~(V4u^{)U&&i&+C)GPaN$uIz2BU-X@8JzB2)0{tpB0Y8tbSX91#VMyUJ
zxNP0jRX%Y$un`-nQ}8vlW@;Ihw}1h_4Ai#gD~eTd#}mD*5iRiuf~*^p#=M@zI{C>f
zp|Euycwt~ZVV)rn{m$eM-SdVPDln0-woQcxgyO!kA4=7?MwE+FyH9ohyi?))9=!Ll
z9~uwKrd7?RsXMPgD8;?T(m-F%+IHCbL0j{azSa6Nad@f%7*kc7QjmyYNtj29!)X55`A}G9V)*5X`9l&
zzGqb39a?1O1HXWL7&qct!0^xI^fNHxlp~F5t%2@o9KxA~8zs}W)pJzq<3Hr$D=Mf>
zt85RhLkM5%_wZHs&U}JPn3fqPZmajG-rVZJB{`fq-eY~m^75@jVWFYr3TTYH88Jp-
z;p5`N2bZq=4Q2ZDq-_S}?C=

[PATCH (dockapps)] Add wmcalc information for dockapps webpage.

[Doug Torrance]

---
 dockapps.db.in | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/dockapps.db.in b/dockapps.db.in
index ff7260c..67831dd 100644
--- a/dockapps.db.in
+++ b/dockapps.db.in
@@ -107,6 +107,17 @@ url = 
"https://web.archive.org/web/20040417092638/http://members.cox.net/ehf_doc
 dockapps = 241
 category = General/Others
 
+[wmcalc]
+image = wmcalcscr3.jpg
+description = "Wmcalc is simple little application that I am writing. It is 
specifically designed to be docked in Windowmaker, or 'Swallowed' by wharf in 
Afterstep. If
+you're not familiar with these windowmanagers, check them out in the links 
section. Of course, it should work in just about any window manager.
+
+Wmcalc is a 64x64 pixel application that performs all the functions (and 
eventually more) of a simple four function calculator. It includes a 10 digit
+alpha-numeric display, and twenty buttons for user input. Clicking on the 
display will clear the calculator. "
+url = 
"https://web.archive.org/web/20040417092638/http://members.cox.net/ehf_dockapps/";
+dockapps = 130
+category = General/Others
+
 [wmCalClock]
 image = wmCalClock4.gif
 description = "A Calendar clock with antialiased text."
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Update wmnet on dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index 3918435..e0a10f5 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -390,7 +390,7 @@ dockapps = 14
 category = General/Others
 
 [wmnet]
-version-1.06+20141005 = 4a6a1ccee2c02a982e0c1258b3304dcf02b26d28
+version-1.06+20150111 = c70d3fcb8cff5d407fd3a732e1342c779aee8678
 version-1.06 = c71cfb9e9bbd4dbd1c7ca2d79705ab3598734175
 image = wmnet.gif
 description = "WMnet is a little X dock.app network monitor I wrote for Linux. 
It was originally inspired by that funky program 'tleds' that blinks your 
keyboard LED's in response to net traffic, but its a lot more entertaining than 
that nowadays. I wrote this thing with low cpusage, low memory, and efficient 
use of screen real-estate in mind."
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Further update wmnet on dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index e0a10f5..ed9e9ea 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -390,7 +390,7 @@ dockapps = 14
 category = General/Others
 
 [wmnet]
-version-1.06+20150111 = c70d3fcb8cff5d407fd3a732e1342c779aee8678
+version-1.06+20150111 = 6b26d9e66a9d973c4a117a8647e112ee1f56d457
 version-1.06 = c71cfb9e9bbd4dbd1c7ca2d79705ab3598734175
 image = wmnet.gif
 description = "WMnet is a little X dock.app network monitor I wrote for Linux. 
It was originally inspired by that funky program 'tleds' that blinks your 
keyboard LED's in response to net traffic, but its a lot more entertaining than 
that nowadays. I wrote this thing with low cpusage, low memory, and efficient 
use of screen real-estate in mind."
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 0/3] wmbattery updates

[Doug Torrance]

Here are a couple patches I received as pull requests on github for
wmbattery [1].  Carlos, could you tag the last commit wmbattery-2.46?

Thanks!

[1] https://github.com/d-torrance/wmbattery/pull/1

Doug Torrance (1):
  wmbattery: Bump to version 2.46.

Ludwig Nussel (2):
  wmbattery: make it work without libapm
  wmbattery: update upower support

 wmbattery/ChangeLog|  9 +
 wmbattery/apm.h|  2 +-
 wmbattery/configure.ac |  2 +-
 wmbattery/upower.c |  7 +--
 wmbattery/wmbattery.c  | 14 +-
 5 files changed, 25 insertions(+), 9 deletions(-)

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 2/3] wmbattery: update upower support

[Doug Torrance]

From: Ludwig Nussel 

* reuse dbus connection
* set delay to actually refresh values
---
 wmbattery/upower.c| 7 +--
 wmbattery/wmbattery.c | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wmbattery/upower.c b/wmbattery/upower.c
index 857c7f4..75ba874 100644
--- a/wmbattery/upower.c
+++ b/wmbattery/upower.c
@@ -9,7 +9,7 @@
 #include 
 #include "apm.h"
 
-int num_batteries = 0;
+static UpClient * up;
 
 struct context {
int current;
@@ -54,7 +54,6 @@ static void get_devinfo(gpointer device, gpointer result)
 
 int upower_supported(void)
 {
-   UpClient *up;
up = up_client_new();
 
if (!up) {
@@ -63,11 +62,9 @@ int upower_supported(void)
GPtrArray *devices = up_client_get_devices(up);
 
if (!devices) {
-   g_object_unref(up);
return 0;
} else {
g_ptr_array_unref(devices);
-   g_object_unref(up);
return 1;
}
}
@@ -76,7 +73,6 @@ int upower_supported(void)
 /* Fill the passed apm_info struct. */
 int upower_read(int battery, apm_info *info)
 {
-   UpClient *up;
GPtrArray *devices = NULL;
 
up = up_client_new();
@@ -139,6 +135,5 @@ int upower_read(int battery, apm_info *info)
}
 
g_ptr_array_free(devices, TRUE);
-   g_object_unref(up);
return 0;
 }
diff --git a/wmbattery/wmbattery.c b/wmbattery/wmbattery.c
index 1d45d65..74d39fd 100644
--- a/wmbattery/wmbattery.c
+++ b/wmbattery/wmbattery.c
@@ -798,8 +798,10 @@ int main(int argc, char *argv[])
}
 #endif
 #ifdef UPOWER
-   else if (upower_supported())
+   else if (upower_supported()) {
use_upower = 1;
+   delay = 2;
+   }
 #endif
/* Check for ACPI support. */
else if (acpi_supported() && acpi_batt_count > 0) {
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 1/3] wmbattery: make it work without libapm

[Doug Torrance]

From: Ludwig Nussel 

libapm and apm.h are not necessarily available on Linux either so make it work
without.
---
 wmbattery/apm.h   |  2 +-
 wmbattery/wmbattery.c | 10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/wmbattery/apm.h b/wmbattery/apm.h
index 381b7f7..fc2428e 100644
--- a/wmbattery/apm.h
+++ b/wmbattery/apm.h
@@ -37,7 +37,7 @@
 #define BATTERY_TIME_UNKNOWN(-1)
 #endif /* AC_LINE_STATUS_ON */
 
-#if defined (HAVE_MACHINE_APM_BIOS_H) || defined (HAVE_I386_APMVAR_H) /* BSD */
+#if !defined(HAVE_APM_H)
 typedef struct {
const char driver_version[10];
int apm_version_major;
diff --git a/wmbattery/wmbattery.c b/wmbattery/wmbattery.c
index 8f9cbb5..1d45d65 100644
--- a/wmbattery/wmbattery.c
+++ b/wmbattery/wmbattery.c
@@ -148,6 +148,16 @@ int apm_exists(void)
return apm_read(&i);
 }
 #endif
+#if !defined(HAVE_APM_H)
+int apm_read(apm_info *i)
+{
+   return -1;
+}
+int apm_exists(void)
+{
+   return -1;
+}
+#endif
 
 int apm_change(apm_info *cur)
 {
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 3/3] wmbattery: Bump to version 2.46.

[Doug Torrance]

---
 wmbattery/ChangeLog| 9 +
 wmbattery/configure.ac | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/wmbattery/ChangeLog b/wmbattery/ChangeLog
index 7bd96dc..bdbae3e 100644
--- a/wmbattery/ChangeLog
+++ b/wmbattery/ChangeLog
@@ -1,3 +1,12 @@
+wmbattery (2.46)
+  * Make it possible to work without libapm as libapm and apm.h are not
+necessarily available on Linux.
+  * Update upower support.  Reuse dbus connection and set delay to actually
+refresh values.
+  * Thanks to Ludwig Nussel  for patches.
+
+ -- Doug Torrance   Sat, 17 Jan 2015 08:37:05 
-0600
+
 wmbattery (2.45)
   * Switch from a Debian native package to a non-native package.
 - Remove debian directory.
diff --git a/wmbattery/configure.ac b/wmbattery/configure.ac
index 6d97732..5c5a8fc 100644
--- a/wmbattery/configure.ac
+++ b/wmbattery/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(wmbattery.c, 2.45)
+AC_INIT(wmbattery.c, 2.46)
 AC_CONFIG_HEADER(config.h)
 
 AC_CONFIG_AUX_DIR(autoconf)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Update wmbattery on dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index ed9e9ea..0e0f28b 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -116,6 +116,7 @@ dockapps = 216
 category = System Monitoring
 
 [wmbattery]
+version-2.46 = 6eaba7b5eb1ecf697f4e76b1cd33283b70a30194
 version-2.45 = a1ef96938f522770c6b41e85e6d15c91b13aa189
 version-2.44 = f5f804289e0255a167ca5bc90076007d495a578b
 image = wmbattery.gif
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 00/21] wmfsm

[Doug Torrance]

The following patches add wmfsm to the dockapps repository.  I incorporate
a number of Gentoo and Debian patches and several of my own.

Carlos, could you tag the first commit wmfsm-0.34 and the last wmfsm-0.35?

Thanks!

Doug Torrance (21):
  wmfsm: Add version 0.34 to repository.
  wmfsm: Remove autotools-generated files.
  wmfsm: Rename configure.in to configure.ac.
  wmfsm: Autotools updates.
  wmfsm: Hide "system" file systems.
  wmfsm: Read newly mounted filesystems.
  wmfsm: Apply further Debian patches.
  wmfsm: Improve manpage.
  wmfsm: Update sample configuration file.
  wmfsm: Remove trailing whitespace.
  wmfsm: Update Free Software Foundation address in copyright header.
  wmfsm: Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.
  wmfsm: Fix -Wunused-result compiler warnings.
  wmfsm: Remove TODO; all the items have been done.
  wmfsm: Add --with-xpm option to configure to select appearance at
compile time.
  wmfsm: Add -a command line option to select appearance at runtime.
  wmfsm: Update with new contact information.
  wmfsm: Impove version number handling.
  wmfsm: Combine ChangeLog and ChangeLog.old.
  wmfsm: Update README with new installation instructions.
  wmfsm: Bump to version 0.35.

 wmfsm/AUTHORS  |   4 +
 wmfsm/COPYING  | 339 +
 wmfsm/ChangeLog| 295 +++
 wmfsm/Makefile.am  |   4 +
 wmfsm/NEWS |   0
 wmfsm/README   |   7 +
 wmfsm/configure.ac |  80 +
 wmfsm/wmfsm/Makefile.am|  13 +
 wmfsm/wmfsm/wmfsm.1|  68 
 wmfsm/wmfsm/wmfsm.c| 639 +
 wmfsm/wmfsm/wmfsm_mask.xbm |  38 ++
 wmfsm/wmfsm/wmfsm_master_cyan.xpm  | 187 ++
 wmfsm/wmfsm/wmfsm_master_highcolor.xpm | 186 ++
 wmfsm/wmfsm/wmfsm_master_lowcolor.xpm  | 143 
 wmfsm/wmfsm/wmfsmrc.sample |   9 +
 wmfsm/wmgeneral/Makefile.am|   2 +
 wmfsm/wmgeneral/wmgeneral.c| 366 +++
 wmfsm/wmgeneral/wmgeneral.h|  50 +++
 18 files changed, 2430 insertions(+)
 create mode 100644 wmfsm/AUTHORS
 create mode 100644 wmfsm/COPYING
 create mode 100644 wmfsm/ChangeLog
 create mode 100644 wmfsm/Makefile.am
 create mode 100644 wmfsm/NEWS
 create mode 100644 wmfsm/README
 create mode 100644 wmfsm/configure.ac
 create mode 100644 wmfsm/wmfsm/Makefile.am
 create mode 100644 wmfsm/wmfsm/wmfsm.1
 create mode 100644 wmfsm/wmfsm/wmfsm.c
 create mode 100644 wmfsm/wmfsm/wmfsm_mask.xbm
 create mode 100644 wmfsm/wmfsm/wmfsm_master_cyan.xpm
 create mode 100644 wmfsm/wmfsm/wmfsm_master_highcolor.xpm
 create mode 100644 wmfsm/wmfsm/wmfsm_master_lowcolor.xpm
 create mode 100644 wmfsm/wmfsm/wmfsmrc.sample
 create mode 100644 wmfsm/wmgeneral/Makefile.am
 create mode 100644 wmfsm/wmgeneral/wmgeneral.c
 create mode 100644 wmfsm/wmgeneral/wmgeneral.h

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 04/21] wmfsm: Autotools updates.

[Doug Torrance]

In particular,
- Update AM_INIT_AUTOMAKE to silence "two- and three-arguments forms are
  deprecated" warnings.
- Update AC_DEFINEs to silence "missing template" warnings.
---
 wmfsm/configure.ac | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/wmfsm/configure.ac b/wmfsm/configure.ac
index ee5426c..7ed0c7a 100644
--- a/wmfsm/configure.ac
+++ b/wmfsm/configure.ac
@@ -1,10 +1,11 @@
 dnl Hey emacs -*- mode: m4 -*- thanks
 dnl Process this file with autoconf to create a configure script
-AC_INIT(wmfsm/wmfsm.c)
+AC_INIT([wmfsm], [0.34])
+AC_CONFIG_SRCDIR([wmfsm/wmfsm.c])
+AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(wmfsm, 0.34)
 AM_SANITY_CHECK
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -26,7 +27,9 @@ AC_TRY_COMPILE([#include 
 ],
 [struct statfs a; statfs("/", &a);], 
 [AC_MSG_RESULT([2 arguments]) 
-AC_DEFINE(STATFS_2_ARGUMENTS)
+AC_DEFINE(
+   STATFS_2_ARGUMENTS, 1,
+   [Define if statfs takes two arguments (like linux)])
 ac_statfs_args=2], 
 
 AC_TRY_COMPILE([
@@ -35,7 +38,9 @@ AC_TRY_COMPILE([
 ],
 [struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);],
 [AC_MSG_RESULT([4 arguments]) 
-AC_DEFINE(STATFS_4_ARGUMENTS)
+AC_DEFINE(
+   STATFS_4_ARGUMENTS, 1,
+   [Define if statfs takes four arguments (like SunOS)])
 ],
 AC_MSG_RESULT([Can not determine])))
 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 06/21] wmfsm: Read newly mounted filesystems.

[Doug Torrance]

Patch by Timo Benk  to fix Debian bug #186826 [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=186826
---
 wmfsm/wmfsm/wmfsm.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index f8d9458..a82e57f 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -170,7 +170,6 @@ main(int argc, char *argv[])
 */
myName = strdup(argv[0]);
ParseCMDLine(argc, argv);
-   readFileSystems();
 
 
openXwindow(argc, argv, wmfsm_master_xpm, wmfsm_mask_bits, 
wmfsm_mask_width, wmfsm_mask_height);
@@ -188,6 +187,10 @@ main(int argc, char *argv[])
}
 #endif
while (1) {
+
+   readFileSystems ();
+   usleep (100);
+
/* 
 *   Process any pending X events.
 */
@@ -518,6 +521,8 @@ readFileSystems()
}
}
 #endif /* __OpenBSD__ || __FreeBSD__ */
+
+   fclose (fp);
excludeFileSystems();
 }
 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 05/21] wmfsm: Hide "system" file systems.

[Doug Torrance]

Patch [1] by roma1390 and Michele Noberasco to fix Gentoo bug #50148 [2].

[1] 
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
[2] https://bugs.gentoo.org/show_bug.cgi?id=50148
---
 wmfsm/wmfsm/wmfsm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index 36fa906..f8d9458 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -509,7 +509,7 @@ readFileSystems()
 #if defined IRIX64 || defined(SunOS)
   strcmp(fstype, "hwgfs") && strcmp(fstype, "autofs") 
&& strcmp(fstype, "proc") && strcmp(fstype, "fd") && !strstr(options, "ignore")
 #elif defined linux
-  strcmp(fstype, "proc") && strcmp(fstype, "shm")
+  strcmp(fstype, "proc") && strcmp(fstype, "tmpfs") && 
strcmp(fstype, "devfs") && strcmp(fstype, "ramfs") && strcmp(fstype, "sysfs") 
&& strcmp(fstype, "devpts") && strcmp(fstype, "usbfs")
 #else
   1
 #endif
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 03/21] wmfsm: Rename configure.in to configure.ac.

[Doug Torrance]

---
 wmfsm/configure.ac | 56 ++
 wmfsm/configure.in | 56 --
 2 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 wmfsm/configure.ac
 delete mode 100644 wmfsm/configure.in

diff --git a/wmfsm/configure.ac b/wmfsm/configure.ac
new file mode 100644
index 000..ee5426c
--- /dev/null
+++ b/wmfsm/configure.ac
@@ -0,0 +1,56 @@
+dnl Hey emacs -*- mode: m4 -*- thanks
+dnl Process this file with autoconf to create a configure script
+AC_INIT(wmfsm/wmfsm.c)
+AC_CANONICAL_HOST
+AM_CONFIG_HEADER(config.h)
+
+AM_INIT_AUTOMAKE(wmfsm, 0.34)
+AM_SANITY_CHECK
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+
+dnl Checks for libraries
+AC_PATH_XTRA
+X11LIBS="-L$x_libraries -I$x_includes -lX11 -lXpm -lXext"
+AC_SUBST(X11LIBS)
+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_TRY_COMPILE([#include 
+#include 
+#include 
+],
+[struct statfs a; statfs("/", &a);], 
+[AC_MSG_RESULT([2 arguments]) 
+AC_DEFINE(STATFS_2_ARGUMENTS)
+ac_statfs_args=2], 
+
+AC_TRY_COMPILE([
+#include 
+#include 
+],
+[struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);],
+[AC_MSG_RESULT([4 arguments]) 
+AC_DEFINE(STATFS_4_ARGUMENTS)
+],
+AC_MSG_RESULT([Can not determine])))
+
+
+dnl Checks for header files
+AC_HEADER_STDC
+AC_CHECK_HEADERS(unistd.h sys/statfs.h sys/vfs.h sys/param.h sys/mount.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+dnl Checks for library functions.
+AC_CHECK_FUNCS(gethostname strcspn strdup strspn strstr statfs)
+AC_CHECK_FUNCS(getopt_long, have_getopt=true)
+AM_CONDITIONAL(GETOPT, test x$have_getopt = xtrue)
+
+AC_OUTPUT(Makefile wmfsm/Makefile wmgeneral/Makefile)
+
diff --git a/wmfsm/configure.in b/wmfsm/configure.in
deleted file mode 100644
index ee5426c..000
--- a/wmfsm/configure.in
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl Hey emacs -*- mode: m4 -*- thanks
-dnl Process this file with autoconf to create a configure script
-AC_INIT(wmfsm/wmfsm.c)
-AC_CANONICAL_HOST
-AM_CONFIG_HEADER(config.h)
-
-AM_INIT_AUTOMAKE(wmfsm, 0.34)
-AM_SANITY_CHECK
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-dnl Checks for libraries
-AC_PATH_XTRA
-X11LIBS="-L$x_libraries -I$x_includes -lX11 -lXpm -lXext"
-AC_SUBST(X11LIBS)
-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_TRY_COMPILE([#include 
-#include 
-#include 
-],
-[struct statfs a; statfs("/", &a);], 
-[AC_MSG_RESULT([2 arguments]) 
-AC_DEFINE(STATFS_2_ARGUMENTS)
-ac_statfs_args=2], 
-
-AC_TRY_COMPILE([
-#include 
-#include 
-],
-[struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);],
-[AC_MSG_RESULT([4 arguments]) 
-AC_DEFINE(STATFS_4_ARGUMENTS)
-],
-AC_MSG_RESULT([Can not determine])))
-
-
-dnl Checks for header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h sys/statfs.h sys/vfs.h sys/param.h sys/mount.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(gethostname strcspn strdup strspn strstr statfs)
-AC_CHECK_FUNCS(getopt_long, have_getopt=true)
-AM_CONDITIONAL(GETOPT, test x$have_getopt = xtrue)
-
-AC_OUTPUT(Makefile wmfsm/Makefile wmgeneral/Makefile)
-
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 08/21] wmfsm: Improve manpage.

[Doug Torrance]

In particular,
- Apply, with some modification, a patch by Jari Aalto
   to clarify the format of the configuration file.
  See [1].
- Escape minus signs to avoid hyphen-used-as-minus-sign Lintian warning in
  the Debian package.
- Remove docbook-to-man comments to avoid manpage-has-errors-from-man
  Lintian warning in the Debian package.
- Add commas between short and long options for readability.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=226274
---
 wmfsm/wmfsm/wmfsm.1 | 91 +++--
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/wmfsm/wmfsm/wmfsm.1 b/wmfsm/wmfsm/wmfsm.1
index 8e4b45e..52adf18 100644
--- a/wmfsm/wmfsm/wmfsm.1
+++ b/wmfsm/wmfsm/wmfsm.1
@@ -1,64 +1,9 @@
-.\" This -*- nroff -*- file has been generated from
-.\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
-...\"
-...\"  transcript compatibility for postscript use.
-...\"
-...\"  synopsis:  .P! 
-...\"
-.de P!
-\\&.
-.fl\" force out current output buffer
-\\!%PB
-\\!/showpage{}def
-...\" the following is from Ken Flowers -- it prevents dictionary overflows
-\\!/tempdict 200 dict def tempdict begin
-.fl\" prolog
-.sy cat \\$1\" bring in postscript file
-...\" the following line matches the tempdict above
-\\!end % tempdict %
-\\!PE
-\\!.
-.sp \\$2u  \" move below the image
-..
-.de pF
-.ie \\*(f1 .ds f1 \\n(.f
-.el .ie \\*(f2 .ds f2 \\n(.f
-.el .ie \\*(f3 .ds f3 \\n(.f
-.el .ie \\*(f4 .ds f4 \\n(.f
-.el .tm ? font overflow
-.ft \\$1
-..
-.de fP
-.ie !\\*(f4 \{\
-.  ft \\*(f4
-.  ds f4\"
-'  br \}
-.el .ie !\\*(f3 \{\
-.  ft \\*(f3
-.  ds f3\"
-'  br \}
-.el .ie !\\*(f2 \{\
-.  ft \\*(f2
-.  ds f2\"
-'  br \}
-.el .ie !\\*(f1 \{\
-.  ft \\*(f1
-.  ds f1\"
-'  br \}
-.el .tm ? font underflow
-..
-.ds f1\"
-.ds f2\"
-.ds f3\"
-.ds f4\"
-'\" t 
-.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
 .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]  
+\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 
@@ -67,26 +12,26 @@ 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 
+with long options starting with two dashes (`\-').  A summary of 
 options is included below.  
  
-.IP "\fB-h\fP \fB--help\fP " 10 
+.IP "\fB\-h\fP, \fB\-\-help\fP " 10 
 Show summary of options. 
-.IP "\fB-v\fP \fB--version\fP " 10 
+.IP "\fB\-v\fP, \fB\-\-version\fP " 10 
 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. 
-.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 
 the normal and fire modes by mouse clicks anywhere on 
 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. 
-.IP "\fB--noblink\fP   " 10 
+.IP "\fB\-\-noblink\fP " 10 
 Do not blink if the filesystem is 95% full. 
-.IP "\fB-display\fP" 10 
+.IP "\fB\-display\fP   " 10 
 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 
 the window. 
 .SH "FILES" 
@@ -96,6 +41,21 @@ 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.
+No comments (#) are allowed. Here is an example:
+
+[exclude]
+.br
+/proc
+.br
+/dev/pts
+.br
+/floppy
+.br
+/cdrom
+
 .SH "SEE ALSO" 
 .PP 
 X (1x), wmaker (1), df (1). 
@@ -103,4 +63,3 @@ X (1x), wmaker (1), df (1).
 .PP 
 This manual page was written by Chris Gray 
 . 
-...\" created by instant / docbook-to-man, Fri 12 Jul 2002, 22:38 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 07/21] wmfsm: Apply further Debian patches.

[Doug Torrance]

The individual patches no longer seem to exist, so I submit them together.
According to debian/changelog entries by Arthur Korn ,
these patches include:
* fixed memleak introduced in 0.34-2 with the patch by Timo Benk.
  global char *mp[] was assigned the result of stdup() repeatedly
  without free. My ugly fix is to free it all up at the beginning of
  readFileSystems(). Now I'm a proud Perl coder ... closes: #196057
* memleak news: avoid it if there are more than 9 filesystems too.
* Fixed filesystem name corruption, thanks to Ralf Horstmann and Cristian
  Ionescu-Idbohrn for the patch.
---
 wmfsm/wmfsm/wmfsm.c | 45 -
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index a82e57f..8c1805a 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -78,7 +79,6 @@
 # define STATFS(a,b) statfs(a,b)   /* Maybe configure got messed up */
 #endif
 
-
 /*
   #if defined IRIX64
   # include 
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
 
if (numberfs > 4) {
for (i = 0, dy = 0; i < numberfs; i++) {
-   for (j = 0, dx = 0; j < LENMP && j < 
strlen(mp[i]); j++) {
+   for (j = 0, dx = 0; j < LENMP && (unsigned 
int)j < strlen(mp[i]); j++) {
k = j + (strlen(mp[i]) > LENMP ? 
strlen(mp[i]) - LENMP : 0);
c = (int) mp[i][k];
switch (c) {
@@ -284,7 +284,7 @@ main(int argc, char *argv[])
}
else {  /*one fs in two lines */
for (i = 0, dy = 0; i < numberfs; i++) {
-   for (j = 0, dx = 0; j < 10 && j < 
strlen(mp[i]); j++) {
+   for (j = 0, dx = 0; j < 10 && (unsigned int)j < 
strlen(mp[i]); j++) {
c = (int) mp[i][j + (strlen(mp[i]) > 10 
? strlen(mp[i]) - 10 : 0)];
switch (c) {
case '/':
@@ -337,7 +337,7 @@ main(int argc, char *argv[])
}
}
if (numberfs < 9) {
-   for (j = 0, dx = 0, dy = 47; j < 10 && j < 
strlen(hostname); j++) {
+   for (j = 0, dx = 0, dy = 47; j < 10 && (unsigned int)j 
< strlen(hostname); j++) {
c = (int) hostname[j];
switch (c) {
case '/':
@@ -394,7 +394,7 @@ void
 ParseCMDLine(int argc, char *argv[])
 {
 
-   int c, option_index, arg;
+   int c, option_index;
static struct option long_options[] = {
{"fire", no_argument, 0, 'f'},
{"normal", no_argument, 0, 'n'},
@@ -453,6 +453,7 @@ print_usage()
 void
 pressEvent(XButtonEvent * xev)
 {
+   (void)xev;
ForceUpdate = 1;
return;
 }
@@ -460,6 +461,14 @@ pressEvent(XButtonEvent * xev)
 void
 readFileSystems()
 {
+   /* Wipe mp[] */
+   int i;
+   for (i = 0; i < 100; i++)
+   if (mp[i]) {
+   free(mp[i]);
+   mp[i]=0;
+   }
+
/* Look for the goods between #if defined(__OpenBSD__) -- tschroed */
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 #define MAXMOUNT   32
@@ -517,6 +526,7 @@ readFileSystems()
   1
 #endif
) {
+   if (mp[numberfs]) free(mp[numberfs]);
mp[numberfs++] = strdup(mountPoint);
}
}
@@ -532,7 +542,7 @@ excludeFileSystems()
char confFileName[255];
char workString[255];
int i, j, exnumberfs = 0;
-   int start = 0, excluded, finalnumberfs = 0;
+   int excluded, finalnumberfs = 0;
char *mount_points[100];
FILE *confFile;
int include = -1;
@@ -569,11 +579,11 @@ excludeFileSystems()
}
else {
numberfs = numberfs > 9 ? 9 : numberfs;
-   return;
+   goto CLEANUP;
}
if (!exnumberfs) {
numberfs = numberfs > 9 ? 9 : numberfs;
-   return;
+   goto CLEANUP;
}
excluded = 0;
for (i = 0; i < numberfs; i++) {
@@ -584,13 +594,22 @@ excludeFileSystems()
included = 1;
}
}
-   if ((!excluded && !include) || (included && include))
-   mp[finalnumberfs++] = strdup(mp[i]);
+   if ((!excluded && !include) || (included && include)) {
+   if (finalnumberfs == i) {
+   finalnumberfs++;
+   } else {
+  

[PATCH 14/21] wmfsm: Remove TODO; all the items have been done.

[Doug Torrance]

---
 wmfsm/TODO | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 wmfsm/TODO

diff --git a/wmfsm/TODO b/wmfsm/TODO
deleted file mode 100644
index 5ec80bd..000
--- a/wmfsm/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add automake/autoconf support.
-- Make sure man page is correct.
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 12/21] wmfsm: Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.

[Doug Torrance]

---
 wmfsm/COPYING | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/wmfsm/COPYING b/wmfsm/COPYING
index a43ea21..d159169 100644
--- a/wmfsm/COPYING
+++ b/wmfsm/COPYING
@@ -1,12 +1,12 @@
-   GNU GENERAL PUBLIC LICENSE
-  Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-  675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-   Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its 
users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not 
licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-   GNU GENERAL PUBLIC LICENSE
+
+GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
 License.  (Exception: if the Program itself is interactive but
 does not normally print such an announcement, your work based on
 the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering 
equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by 
the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE 
WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
-
-   Appendix: How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have 
at least
 the "copyright" line and a pointer to where the full notice is found.
 
 
-Copyright (C) 19yy  
+Copyright (C)   
 
 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
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full 
notice is found.
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along wit

[PATCH 10/21] wmfsm: Remove trailing whitespace.

[Doug Torrance]

---
 wmfsm/ChangeLog |   8 ++--
 wmfsm/Makefile.am   |   2 +-
 wmfsm/configure.ac  |  10 ++---
 wmfsm/wmfsm/Makefile.am |   4 +-
 wmfsm/wmfsm/wmfsm.1 | 100 ++--
 wmfsm/wmfsm/wmfsm.c |  34 +++
 wmfsm/wmgeneral/wmgeneral.c |  20 -
 7 files changed, 89 insertions(+), 89 deletions(-)

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

[PATCH 11/21] wmfsm: Update Free Software Foundation address in copyright header.

[Doug Torrance]

---
 wmfsm/wmfsm/wmfsm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index 11277ba..add5290 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -19,8 +19,8 @@
  *
  * 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,
- *  Boston, MA  02111-1307, USA
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301, USA
  *
  *
  *
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 13/21] wmfsm: Fix -Wunused-result compiler warnings.

[Doug Torrance]

In particular, if fscanf does not read the expected number of items from
/etc/mtab, print a warning message.
---
 wmfsm/wmfsm/wmfsm.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index add5290..01bf326 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -512,9 +512,11 @@ readFileSystems()
while (!feof(fp) && numberfs < 100) {
 #if defined(SunOS)
/* only five entries per row in /etc/mnttab */
-   fscanf(fp, "%s %s %s %s %s\n", dummy, mountPoint, fstype, 
options, dummy);
+   if (fscanf(fp, "%s %s %s %s %s\n", dummy, mountPoint, fstype, 
options, dummy) < 5)
+   fprintf(stderr, "%s:/etc/mnttab not in expected 
format\n", myName);
 #else
-   fscanf(fp, "%s %s %s %s %s %s\n", dummy, mountPoint, fstype, 
options, dummy, dummy);
+   if (fscanf(fp, "%s %s %s %s %s %s\n", dummy, mountPoint, 
fstype, options, dummy, dummy) < 6)
+   fprintf(stderr, "%s:/etc/mtab not in expected 
format\n", myName);
 #endif
 
if (
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 09/21] wmfsm: Update sample configuration file.

[Doug Torrance]

Patch by Arthur Korn  to fix Debian bug #226298 [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=226298
---
 wmfsm/wmfsm/wmfsmrc.sample | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/wmfsm/wmfsm/wmfsmrc.sample b/wmfsm/wmfsm/wmfsmrc.sample
index c468f2e..02a98c5 100644
--- a/wmfsm/wmfsm/wmfsmrc.sample
+++ b/wmfsm/wmfsm/wmfsmrc.sample
@@ -1,4 +1,9 @@
 [exclude]
-/home/cdserver
-/Backup_User
-/Backup_System
+/dev/pts
+/dev/shm
+/sys
+/proc/bus/usb
+/proc/sys/fs/binfmt_misc
+/cdrom
+/var/autofs/net
+/var/autofs/misc
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 18/21] wmfsm: Impove version number handling.

[Doug Torrance]

In particular,
- Add new --version command line option.  (This was already documented in
  the manpage.)  Remove this information from the --help text.  Also took
  the opportunity to properly align the --fire line in the --help text.
- Remove WMFSM_VERSION macro in favor of PACKAGE_VERSION from autconf.
- Remove hard-coded version number at top of source file for
  maintainability.
---
 wmfsm/wmfsm/wmfsm.c | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index 9f57aae..1eb5185 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -1,6 +1,6 @@
 /*
  *
- * wmfsm-0.33 (C) 1999 Stefan Eilemann (stefan.eilem...@dlr.de)
+ * wmfsm (C) 1999 Stefan Eilemann (stefan.eilem...@dlr.de)
  *
  * - Shows file system usage ala mfsm
  *
@@ -100,7 +100,6 @@
  *   coz irix has max of 10L :(.
  */
 #define DELAY_10 9L
-#define WMFSM_VERSION "0.33"
 #define LENMP 5/*max 10, number char for mountpoint */
 
 /*modes for drawing*/
@@ -418,10 +417,11 @@ ParseCMDLine(int argc, char *argv[])
{"delay", required_argument, 0, 'd'},
{"appearance", required_argument, 0, 'a'},
{"help", no_argument, 0, 'h'},
+   {"version", no_argument, 0, 'v'},
{0, 0, 0, 0}
};
while (1) {
-   c = getopt_long(argc, argv, "a:bd:fhn", long_options, 
&option_index);
+   c = getopt_long(argc, argv, "a:bd:fhnv", long_options, 
&option_index);
if (c == -1)
break;
switch (c) {
@@ -445,6 +445,9 @@ ParseCMDLine(int argc, char *argv[])
case 'n':
mode = NORMAL;
break;
+   case 'v':
+   printf("wmfsm version: %s\n", PACKAGE_VERSION);
+   exit(0);
case '?':
break;
default:
@@ -459,10 +462,9 @@ void
 print_usage()
 {
 
-   printf("\nwmfsm version: %s\n", WMFSM_VERSION);
-   printf("\nusage: wmfsm \n");
+   printf("usage: wmfsm \n");
printf("\t--normal, -n\t\tDraw bars in normal mode.\n");
-   printf("\t--fire, -f\t\t\tDraw bars in fire mode.\n");
+   printf("\t--fire, -f\t\tDraw bars in fire mode.\n");
printf("\t--[no]blink\t\tBlinks if a filesystem is 95 percent full.\n");
printf("\t-display \tUse alternate X display.\n");
printf("\t--delay , -d\tUse a delay that is not the 
default.\n");
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 17/21] wmfsm: Update with new contact information.

[Doug Torrance]

---
 wmfsm/AUTHORS  | 5 +++--
 wmfsm/configure.ac | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wmfsm/AUTHORS b/wmfsm/AUTHORS
index ba45726..5ae605d 100644
--- a/wmfsm/AUTHORS
+++ b/wmfsm/AUTHORS
@@ -1,3 +1,4 @@
-The current maintainer is Chris Gray , but wmfsm was
+wmfsm is currently maintained by the Window Maker Developers Team
+.
+It was previously maintained by Chris Gray , but was
 originally written by Stefan Eilemann .
-
diff --git a/wmfsm/configure.ac b/wmfsm/configure.ac
index 6f793dd..cb397b7 100644
--- a/wmfsm/configure.ac
+++ b/wmfsm/configure.ac
@@ -1,6 +1,6 @@
 dnl Hey emacs -*- mode: m4 -*- thanks
 dnl Process this file with autoconf to create a configure script
-AC_INIT([wmfsm], [0.34])
+AC_INIT([wmfsm], [0.34], [wmaker-dev@lists.windowmaker.org])
 AC_CONFIG_SRCDIR([wmfsm/wmfsm.c])
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 20/21] wmfsm: Update README with new installation instructions.

[Doug Torrance]

---
 wmfsm/README | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wmfsm/README b/wmfsm/README
index d0d2c27..38791da 100644
--- a/wmfsm/README
+++ b/wmfsm/README
@@ -1,4 +1,7 @@
 Installation:
-copy your preferred .xpm to wmfsm_master.xpm
-Hack the Makefile, compile the stuff.
+autoreconf -i
+./configure
+(or ./configure --with-xpm=foo, where foo is your preferred .xpm)
+make
+make install (as root)
 Edit sample.wmfsmrc and copy it to ~/.wmfsmrc
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 21/21] wmfsm: Bump to version 0.35.

[Doug Torrance]

---
 wmfsm/ChangeLog| 163 +
 wmfsm/configure.ac |   2 +-
 2 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/wmfsm/ChangeLog b/wmfsm/ChangeLog
index afd47a6..ce25e98 100644
--- a/wmfsm/ChangeLog
+++ b/wmfsm/ChangeLog
@@ -1,3 +1,166 @@
+2015-01-22  Doug Torrance 
+
+   * ChangeLog, configure.ac: Bump to version 0.35.
+
+2015-01-21  Doug Torrance 
+
+   * README: Update README with new installation instructions.
+
+2015-01-21  Doug Torrance 
+
+   * ChangeLog, ChangeLog.old: Combine ChangeLog and
+   ChangeLog.old.
+
+   As ChangeLog is no longer automatically generated by arch, there is
+   no need to keep these files separate.
+
+2015-01-21  Doug Torrance 
+
+   * wmfsm/wmfsm.c: Impove version number handling.
+
+   In particular,
+   - Add new --version command line option.  (This was already
+ documented in the manpage.)  Remove this information from the --help
+ text.  Also took the opportunity to properly align the --fire line
+ in the --help text.
+   - Remove WMFSM_VERSION macro in favor of PACKAGE_VERSION from
+ autconf.
+   - Remove hard-coded version number at top of source file for
+ maintainability.
+
+2015-01-21  Doug Torrance 
+
+   * AUTHORS, configure.ac: Update with new contact information.
+
+2015-01-21  Doug Torrance 
+
+   * wmfsm/Makefile.am, wmfsm/wmfsm.1, wmfsm/wmfsm.c: Add -a
+   command line option to select appearance at runtime.
+
+   Also update Makefile to install appearance XPMs during "make
+   install".
+
+2015-01-21  Doug Torrance 
+
+   * configure.ac, wmfsm/Makefile.am, wmfsm/wmfsm_master.xpm: wmfsm:
+   Add --with-xpm option to configure to select appearance at compile
+   time.
+
+   Note that wmfsm/wmfsm_master.xpm has been removed, as it is now
+   created as a symlink during configure.  It is also removed by "make
+   clean".
+
+2015-01-21  Doug Torrance 
+
+   * TODO: Remove TODO; all the items have been done.
+
+2015-01-21  Doug Torrance 
+
+   * wmfsm/wmfsm.c: Fix -Wunused-result compiler warnings.
+
+   In particular, if fscanf does not read the expected number of items
+   from /etc/mtab, print a warning message.
+
+2015-01-20  Doug Torrance 
+
+   * COPYING: Update COPYING from
+   http://www.gnu.org/licenses/gpl-2.0.txt.
+
+2015-01-20  Doug Torrance 
+
+   * wmfsm/wmfsm.c: Update Free Software Foundation address in
+   copyright header.
+
+2015-01-20  Doug Torrance 
+
+   * ChangeLog, Makefile.am, configure.ac, wmfsm/Makefile.am,
+   wmfsm/wmfsm.1, wmfsm/wmfsm.c, wmgeneral/wmgeneral.c: Remove
+   trailing whitespace.
+
+2015-01-20  Doug Torrance 
+
+   * wmfsm/wmfsmrc.sample: Update sample configuration file.
+
+   Patch by Arthur Korn  to fix Debian bug #226298 [1].
+
+   [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=226298
+
+2015-01-20  Doug Torrance 
+
+   * wmfsm/wmfsm.1: Improve manpage.
+
+   In particular,
+   - Apply, with some modification, a patch by Jari Aalto
+  to clarify the format of the
+ configuration file.  See [1].
+   - Escape minus signs to avoid hyphen-used-as-minus-sign Lintian
+ warning in the Debian package.
+   - Remove docbook-to-man comments to avoid
+ manpage-has-errors-from-man Lintian warning in the Debian package.
+   - Add commas between short and long options for readability.
+
+   [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=226274
+
+2015-01-19  Doug Torrance 
+
+   * wmfsm/wmfsm.c: Apply further Debian patches.
+
+   The individual patches no longer seem to exist, so I submit them
+   together.  According to debian/changelog entries by Arthur Korn
+   , these patches include:
+   * fixed memleak introduced in 0.34-2 with the patch by Timo Benk.
+ global char *mp[] was assigned the result of stdup() repeatedly
+ without free. My ugly fix is to free it all up at the beginning of
+ readFileSystems(). Now I'm a proud Perl coder ... closes: #196057
+   * memleak news: avoid it if there are more than 9 filesystems too.
+   * Fixed filesystem name corruption, thanks to Ralf Horstmann and
+ Cristian Ionescu-Idbohrn for the patch.
+
+2015-01-19  Doug Torrance 
+
+   * wmfsm/wmfsm.c: Read newly mounted filesystems.
+
+   Patch by Timo Benk  to fix Debian bug #186826 [1].
+
+   [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=186826
+
+2015-01-19  Doug Torrance 
+
+   * wmfsm/wmfsm.c: Hide "system" file systems.
+
+   Patch [1] by roma1390 and Michele Noberasco to fix Gentoo bug #50148
+   [2].
+
+   [1] 
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
+   [2] https://bugs

[PATCH 16/21] wmfsm: Add -a command line option to select appearance at runtime.

[Doug Torrance]

Also update Makefile to install appearance XPMs during "make install".
---
 wmfsm/wmfsm/Makefile.am |  4 +++-
 wmfsm/wmfsm/wmfsm.1 |  3 +++
 wmfsm/wmfsm/wmfsm.c | 24 ++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/wmfsm/wmfsm/Makefile.am b/wmfsm/wmfsm/Makefile.am
index cf8d271..f315429 100644
--- a/wmfsm/wmfsm/Makefile.am
+++ b/wmfsm/wmfsm/Makefile.am
@@ -6,6 +6,8 @@ wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h
 endif
 wmfsm_LDADD = ../wmgeneral/libwmgeneral.a @LIBS@ @X11LIBS@ @X_LIBS@ 
@X_EXTRA_LIBS@
 man_MANS = wmfsm.1
-EXTRA_DIST = $(man_MANS) wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm 
wmfsm_master_lowcolor.xpm wmfsm_mask.xbm wmfsmrc.sample
+dist_pkgdata_DATA = wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm \
+   wmfsm_master_lowcolor.xpm
+EXTRA_DIST = $(man_MANS) wmfsm_mask.xbm wmfsmrc.sample
 CLEANFILES = wmfsm_master.xpm
 
diff --git a/wmfsm/wmfsm/wmfsm.1 b/wmfsm/wmfsm/wmfsm.1
index 93b0910..de691ff 100644
--- a/wmfsm/wmfsm/wmfsm.1
+++ b/wmfsm/wmfsm/wmfsm.1
@@ -34,6 +34,9 @@ Draw on the specified display.
 .IP "\fB\-d\fP, \fB\-\-delay\fP" 10
 Wait the specified number of milliseconds to redraw
 the window.
+.IP "\fB\-a\fP, \fB\-\-appearance\fP" 10
+Select an appearance file.  Note that these files may be found in the wmfsm
+data directory, likely /usr/local/share/wmfsm or /usr/share/wmfsm.
 .SH "FILES"
 .PP
 You may exclude filesystems from being show by wmfsm
diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index 01bf326..9f57aae 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -125,6 +125,7 @@ int blinkper = 95;
 char dummy[4096];
 char *myName;
 int delay = DELAY_10;
+char appearance[256] = "";
 
 int xpos[] = { 66, 71, 76, 81, 86, 91, /* A B C D E F */
66, 71, 76, 81, 86, 91, /* G H I J K L */
@@ -162,8 +163,10 @@ main(int argc, char *argv[])
int dx, dy;
char hostname[100];
int i, j, k;
+   int xpm_free = 0;
int c, on[9] = { 1, 1, 1, 1, 1, 1, 1, 1, 1 };
struct statfs buffer;
+   char **pixmap;
 
/*
 *  Parse any command line arguments.
@@ -171,9 +174,21 @@ main(int argc, char *argv[])
myName = strdup(argv[0]);
ParseCMDLine(argc, argv);
 
+   if (appearance[0] == 0) {
+   pixmap = wmfsm_master_xpm;
+   } else {
+   if (XpmReadFileToData(appearance, &pixmap) != XpmSuccess) {
+   fprintf(stderr, "warning: could not read appearance 
file; using default.\n");
+   pixmap = wmfsm_master_xpm;
+   } else {
+   xpm_free = 1;
+   }
+   }
 
-   openXwindow(argc, argv, wmfsm_master_xpm, wmfsm_mask_bits, 
wmfsm_mask_width, wmfsm_mask_height);
+   openXwindow(argc, argv, pixmap, wmfsm_mask_bits, wmfsm_mask_width, 
wmfsm_mask_height);
 
+   if (xpm_free)
+   XpmFree(pixmap);
 
 #ifndef SVR4
if (gethostname(hostname, 100) != 0) {
@@ -401,16 +416,20 @@ ParseCMDLine(int argc, char *argv[])
{"blink", no_argument, &blink, 1},
{"noblink", no_argument, &blink, 0},
{"delay", required_argument, 0, 'd'},
+   {"appearance", required_argument, 0, 'a'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
while (1) {
-   c = getopt_long(argc, argv, "bd:fhn", long_options, 
&option_index);
+   c = getopt_long(argc, argv, "a:bd:fhn", long_options, 
&option_index);
if (c == -1)
break;
switch (c) {
case 0: /* If blink or noblink was toggled */
break;
+   case 'a':
+   strcpy(appearance, optarg);
+   break;
case 'b':
blink = 1;
break;
@@ -447,6 +466,7 @@ print_usage()
printf("\t--[no]blink\t\tBlinks if a filesystem is 95 percent full.\n");
printf("\t-display \tUse alternate X display.\n");
printf("\t--delay , -d\tUse a delay that is not the 
default.\n");
+   printf("\t--appearance , -a\tSelect an appearance file.\n");
printf("\t-h\t\t\tDisplay help screen.\n");
 }
 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 15/21] wmfsm: Add --with-xpm option to configure to select appearance at compile time.

[Doug Torrance]

Note that wmfsm/wmfsm_master.xpm has been removed, as it is now created as a
symlink during configure.  It is also removed by "make clean".
---
 wmfsm/configure.ac   |  19 +
 wmfsm/wmfsm/Makefile.am  |   3 +-
 wmfsm/wmfsm/wmfsm_master.xpm | 186 ---
 3 files changed, 21 insertions(+), 187 deletions(-)
 delete mode 100644 wmfsm/wmfsm/wmfsm_master.xpm

diff --git a/wmfsm/configure.ac b/wmfsm/configure.ac
index c03da17..6f793dd 100644
--- a/wmfsm/configure.ac
+++ b/wmfsm/configure.ac
@@ -57,5 +57,24 @@ AC_CHECK_FUNCS(gethostname strcspn strdup strspn strstr 
statfs)
 AC_CHECK_FUNCS(getopt_long, have_getopt=true)
 AM_CONDITIONAL(GETOPT, test x$have_getopt = xtrue)
 
+dnl Set default XPM
+define([xpmlist], esyscmd([find wmfsm/ -name 'wmfsm_master_*.xpm' -exec 
basename {} .xpm \;| sed 's/wmfsm_master_//']))
+AC_ARG_WITH([xpm],
+   AS_HELP_STRING([--with-xpm],
+   [Configure wmfsm to use specified xpm file for appearance. Defaults to
+   'highcolor'. Choices are: ]
+   xpmlist),
+   [],
+[with_xpm=highcolor])
+
+xpm="wmfsm/wmfsm_master_${with_xpm}.xpm"
+if test ! -e "${xpm}"; then
+   AC_MSG_ERROR([Cannot find xpm file '${xpm}'.])
+fi
+
+echo "configuring for ${with_xpm} appearance..."
+rm -f wmfsm/wmfsm_master.xpm
+ln -sr ${xpm} wmfsm/wmfsm_master.xpm
+
 AC_OUTPUT(Makefile wmfsm/Makefile wmgeneral/Makefile)
 
diff --git a/wmfsm/wmfsm/Makefile.am b/wmfsm/wmfsm/Makefile.am
index 8ab21a0..cf8d271 100644
--- a/wmfsm/wmfsm/Makefile.am
+++ b/wmfsm/wmfsm/Makefile.am
@@ -6,5 +6,6 @@ wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h
 endif
 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_highcolor.xpm wmfsm_master_cyan.xpm 
wmfsm_master_lowcolor.xpm wmfsm_mask.xbm wmfsmrc.sample
+CLEANFILES = wmfsm_master.xpm
 
diff --git a/wmfsm/wmfsm/wmfsm_master.xpm b/wmfsm/wmfsm/wmfsm_master.xpm
deleted file mode 100644
index 7140851..000
--- a/wmfsm/wmfsm/wmfsm_master.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * wmfsm_master_xpm[] = {
-"134 128 55 1",
-"  c None",
-". c #00",
-"+ c #20B2AE",
-"@ c #00FF00",
-"# c #09FF00",
-"$ c #13FF00",
-"% c #1DFF00",
-"& c #27FF00",
-"* c #31FF00",
-"= c #3AFF00",
-"- c #44FF00",
-"; c #4EFF00",
-"> c #58FF00",
-", c #62FF00",
-"' c #6BFF00",
-") c #75FF00",
-"! c #7FFF00",
-"~ c #89FF00",
-"{ c #93FF00",
-"] c #9CFF00",
-"^ c #A6FF00",
-"/ c #B0FF00",
-"( c #BAFF00",
-"_ c #C4FF00",
-": c #CDFF00",
-"< c #D7FF00",
-"[ c #E1FF00",
-"} c #EBFF00",
-"| c #F5FF00",
-"1 c #00",
-"2 c #FFF500",
-"3 c #FFEB00",
-"4 c #FFE100",
-"5 c #FFD700",
-"6 c #FFCD00",
-"7 c #FFC400",
-"8 c #FFBA00",
-"9 c #FFB000",
-"0 c #FFA600",
-"a c #FF9C00",
-"b c #FF9300",
-"c c #FF8900",
-"d c #FF7F00",
-"e c #FF7500",
-"f c #FF6B00",
-"g c #FF6200",
-"h c #FF5800",
-"i c #FF4E00",
-"j c #FF4400",
-"k c #FF3A00",
-"l c #FF3100",
-"m c #FF2700",
-"n c #FF1D00",
-"o c #FF1300",
-"p c #FF0900",
-"..",
-"..",
-"..",
-"..",
-"...++..+++...+++.+++.....+++..",
-"..+..+.+..+.++..+.+++..+..++..",
-"...+++..++..+.+++..+++..+..+...+..",
-"..+..+.+..+.++..+.+++..+...+..",
-"..+..+.+++...+++.+++...+.++...+++.",
-"...+++.+..+..+++..+..+.+.++..+++..",
-"..++..+...+.+.+.+..++..++.",
-".

[PATCH 19/21] wmfsm: Combine ChangeLog and ChangeLog.old.

[Doug Torrance]

As ChangeLog is no longer automatically generated by arch, there is no need
to keep these files separate.
---
 wmfsm/ChangeLog | 38 ++
 wmfsm/ChangeLog.old | 34 --
 2 files changed, 34 insertions(+), 38 deletions(-)
 delete mode 100644 wmfsm/ChangeLog.old

diff --git a/wmfsm/ChangeLog b/wmfsm/ChangeLog
index de04f61..afd47a6 100644
--- a/wmfsm/ChangeLog
+++ b/wmfsm/ChangeLog
@@ -1,7 +1,3 @@
-# do not edit -- automatically generated by arch changelog
-# tag: automatic-changelog--cgr...@po-box.mcgill.ca--archive/wmfsm--dev--0.3
-#
-
 2002-07-13 03:17:14 GMTChris Gray patch-4
 
 Summary:
@@ -100,3 +96,37 @@
  ./wmgeneral/wmgeneral.c ./wmgeneral/wmgeneral.h
 
 
+2001-01-19  Chris Gray  
+
+   * configure.in: Did a lot of work so that maintenance should be
+   easier in the future.  Things are totally done with
+   automake/autoconf now.  The goal is to remove all of the OS
+   dependent ifdefs and change them to depend on the actual feature
+   of the OS that we are testing for.
+
+2001-01-13  Chris Gray  
+
+   * debian/wmfsm.1: Changed the man page to reflect the new
+   options.  I should probably distribute this man page in such a way
+   that non-Debian users can install it easily.
+
+   * wmfsm/wmfsm.c: Added getopt support, and a new option, --delay.
+   The delay should be 10 * number in microseconds which seems a bit
+   unintuitive to me.  I'll probably change that.
+
+2001-01-09  Chris Gray  
+
+   * wmfsm/wmfsm.c: Added FreeBSD patches from Steven Enderle
+   .  Also, it looks like I am taking this project
+   over.  Hopefully I can do some good!
+
+0.3024/08/1999  OpenBSD support, it hopefully works...
+Blinking on a filesystem that is 95 percent full
+0.3004/06/1999  use fstat() instead of system("df")
+Exclusion of directories via ~/.wmfsmrc
+uses less colors (54), other colorschemes are included
+0.2726/03/1999  mouse toggable fire/normal mode
+bug fixes
+Solaris 2.6/7 support
+0.2606/03/1999  added fire mode for bars
+0.25   05/03/1999  first release
diff --git a/wmfsm/ChangeLog.old b/wmfsm/ChangeLog.old
deleted file mode 100644
index e53ff61..000
--- a/wmfsm/ChangeLog.old
+++ /dev/null
@@ -1,34 +0,0 @@
-2001-01-19  Chris Gray  
-
-   * configure.in: Did a lot of work so that maintenance should be
-   easier in the future.  Things are totally done with
-   automake/autoconf now.  The goal is to remove all of the OS
-   dependent ifdefs and change them to depend on the actual feature
-   of the OS that we are testing for.
-
-2001-01-13  Chris Gray  
-
-   * debian/wmfsm.1: Changed the man page to reflect the new
-   options.  I should probably distribute this man page in such a way
-   that non-Debian users can install it easily.
-
-   * wmfsm/wmfsm.c: Added getopt support, and a new option, --delay.
-   The delay should be 10 * number in microseconds which seems a bit
-   unintuitive to me.  I'll probably change that.
-
-2001-01-09  Chris Gray  
-
-   * wmfsm/wmfsm.c: Added FreeBSD patches from Steven Enderle
-   .  Also, it looks like I am taking this project
-   over.  Hopefully I can do some good!
-
-0.3024/08/1999  OpenBSD support, it hopefully works...
-Blinking on a filesystem that is 95 percent full
-0.3004/06/1999  use fstat() instead of system("df")
-Exclusion of directories via ~/.wmfsmrc
-uses less colors (54), other colorschemes are included
-0.2726/03/1999  mouse toggable fire/normal mode
-bug fixes
-Solaris 2.6/7 support
-0.2606/03/1999  added fire mode for bars
-0.25   05/03/1999  first release
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (dockapps)] Add wmfsm information for dockapps webpage.

[Doug Torrance]

---
 dockapps.db.in | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dockapps.db.in b/dockapps.db.in
index 67831dd..e216b33 100644
--- a/dockapps.db.in
+++ b/dockapps.db.in
@@ -189,6 +189,13 @@ url =
 dockapps = 338
 category = System Monitoring
 
+[wmfsm]
+image = wmfsm.png
+description = "Nice graphical 'df', showing you to what degree the mounted 
filesystems are used."
+url = "https://web.archive.org/web/20050202220830/http://www.cs.ubc.ca/~cmg/";
+dockapps = 100
+category = System Monitoring
+
 [wmfu]
 image = wmfu-1.0.png
 description = "wmfu displays all sorts of information about your Linux 
(laptop) system. It is designed for WindowMaker, but can also be run in other 
window managers. It does not need external custom libraries, but does need a 
recent kernel, since it uses ACPI and proc/sys pseudo-filesystems to read 
system data."
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome)] Add wmfsm to dockapps webpage.

[Doug Torrance]

---
 dockapps/dockapps.db   |   9 +
 dockapps/img/wmfsm.png | Bin 0 -> 1275 bytes
 2 files changed, 9 insertions(+)
 create mode 100644 dockapps/img/wmfsm.png

diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db
index 0e0f28b..c4e8612 100644
--- a/dockapps/dockapps.db
+++ b/dockapps/dockapps.db
@@ -257,6 +257,15 @@ url =
 dockapps = 338
 category = System Monitoring
 
+[wmfsm]
+version-0.35 = 9bd29e4b921c53d9d1c70eb164dbd858f4580ecb
+version-0.34 = fa3a329d866128a901ae468944ab6b5a46b3bee7
+image = wmfsm.png
+description = "Nice graphical 'df', showing you to what degree the mounted 
filesystems are used."
+url = "https://web.archive.org/web/20050202220830/http://www.cs.ubc.ca/~cmg/";
+dockapps = 100
+category = System Monitoring
+
 [wmfu]
 version-1.0+20141005 = 4e034402892005f0074aa95e3ca2afde5a4ca71b
 version-1.0 = 8c09e77da4a28b1b191a5f2385537898603845d9
diff --git a/dockapps/img/wmfsm.png b/dockapps/img/wmfsm.png
new file mode 100644
index 
..8c048e973384aeb7c3f72e5421e62f2b40727ae4
GIT binary patch
literal 1275
zcmY+@dsNbA7zgn8hXfAO#Bs{ZIks7vYs;OPYvm?zaG@D9XPsJg@={4FHW>(8C@KA-1&-}5~Gyyv{dar8Z&
zI6oW!z%!agjYm4^b-BAC-sj{`APt>L-bV(2UE;BlvzB7vAfi{A%8
z_7(t`R{&T-u9)KhoDT)SmI%PEG5|KD-{b9%K=!_ki%p1vVOXQlAY;AV%BA_)UbSLz
zezphEHPh48vEZ5^*4F?Sya|IK80>-p9R|rTI1htj7<3~8bJN`_`TX3JTGc-9oKklp
zPO3ZGT(2g(l!%TlW$WCmL#05RP$^oRGxp97nRD9KDVM&QvMJjUt;+W1*-5LS4RKu2
zCYfu6gu-(ekTZRR<~M_MI_
z!>y9035&5s%$+bBTSQ#Dc}OPW*iAz+A;)GKlnNVdV}nvbqjk*CEO=%eec8-^IzFP8
z@ER<`1LCH7%dk$|#5NmsA}*p<#H}+AX+@km)1XG!SUYCu7d)#OGrSNyV~xIi!GDVQ
zod5L6i2gaR0kMzQP(3ox$E&X%9_VeVe>|+~X=49l)b(%?wcXshDo$P1nf(_YB5w^P
z@7+TMSJ%8nL&6*Bw8I$yc=)_7sMnCU0szVoO(iEBl2!Jv^6_K>Ha#o*rcf9ZeIxMy
z$GJ45nIAOhHrCup%gUSHR5c~8o2lvn%rfNoh@OqN(9Ac^Vg$m46dM}r`)!EU(*ah3_7By~0C
zBje0HjB&1`e@{Hb
z{VG2RdV=|k&k9(vxO|2a$2@d44edi*&&Lr1j(0#0wo`}!;=dvDkGMdevtG_v`ERAP
zqZa7=ZuX^K_tMyN_&CzL|$U@2A7E`u75d%T@E08tDB4KV@)^L*tp92OsoZ^sLaEc+hg-
zVG3s%L#pLuu6M%0H#R%7zk{61FAv8NWF#^C3o6Ic8RG|G++5ojoci*$?}Yjau%Z6t
zENS`zBwoIDYbc2Y{{eyLm0SP-

literal 0
HcmV?d1

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 0/1] wmmenu

[Doug Torrance]

Carlos, could you tag this commit wmmenu-1.2?

Note that I haven't tested to see if this still compiles.

Thanks!

Doug Torrance (1):
  wmmenu: Add version 1.2 to repository.

 wmmenu/COPYING   | 340 +++
 wmmenu/Makefile  |  70 
 wmmenu/README| 331 +
 wmmenu/TODO  |  10 ++
 wmmenu/buttonbar.c   | 241 +++
 wmmenu/buttonbar.h   |  12 ++
 wmmenu/defaultIcon.xpm   | 302 ++
 wmmenu/defaultTile.xpm   | 197 +++
 wmmenu/error.c   |  32 
 wmmenu/error.h   |   8 +
 wmmenu/events.c  | 251 +
 wmmenu/events.h  |   7 +
 wmmenu/example/apps  |  11 ++
 wmmenu/example/defaults  |  26 +++
 wmmenu/example/extract_icon_back |  61 +++
 wmmenu/menu.c| 196 ++
 wmmenu/menu.h|  19 +++
 wmmenu/options.c | 305 +++
 wmmenu/options.h |  41 +
 wmmenu/pixmaps.c | 238 +++
 wmmenu/pixmaps.h |  10 ++
 wmmenu/target-white.xpm  |  69 
 wmmenu/types.h   |  16 ++
 wmmenu/utils.c   | 183 +
 wmmenu/utils.h   |  17 ++
 wmmenu/version.h |  12 ++
 wmmenu/wmmenu.1  | 196 ++
 wmmenu/wmmenu.c  |  36 +
 wmmenu/xobjects.c|  11 ++
 wmmenu/xobjects.h|  13 ++
 30 files changed, 3261 insertions(+)
 create mode 100644 wmmenu/COPYING
 create mode 100644 wmmenu/Makefile
 create mode 100644 wmmenu/README
 create mode 100644 wmmenu/TODO
 create mode 100644 wmmenu/buttonbar.c
 create mode 100644 wmmenu/buttonbar.h
 create mode 100644 wmmenu/defaultIcon.xpm
 create mode 100644 wmmenu/defaultTile.xpm
 create mode 100644 wmmenu/error.c
 create mode 100644 wmmenu/error.h
 create mode 100644 wmmenu/events.c
 create mode 100644 wmmenu/events.h
 create mode 100644 wmmenu/example/apps
 create mode 100644 wmmenu/example/defaults
 create mode 100755 wmmenu/example/extract_icon_back
 create mode 100644 wmmenu/menu.c
 create mode 100644 wmmenu/menu.h
 create mode 100644 wmmenu/options.c
 create mode 100644 wmmenu/options.h
 create mode 100644 wmmenu/pixmaps.c
 create mode 100644 wmmenu/pixmaps.h
 create mode 100644 wmmenu/target-white.xpm
 create mode 100644 wmmenu/types.h
 create mode 100644 wmmenu/utils.c
 create mode 100644 wmmenu/utils.h
 create mode 100644 wmmenu/version.h
 create mode 100644 wmmenu/wmmenu.1
 create mode 100644 wmmenu/wmmenu.c
 create mode 100644 wmmenu/xobjects.c
 create mode 100644 wmmenu/xobjects.h

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

Re: [PATCH 07/23] doc: create the skeleton to have a documentation for Internationalisation

[Doug Torrance]

Hi Christophe,

On 01/20/2015 03:03 PM, Christophe CURIS wrote:
> There is a new script to generate the documentation, because from the way
> we generate it we cannot assume that 'texi2any' is available  and working
> on the user's computer; it is also the opportunity to generate a better
> looking document (see the description at the beginning of the script);

Thanks for these patches!

However, I get the following errors from the new script if I only have
mawk available.
> awk: line 42: syntax error at or near ,
> awk: line 52: syntax error at or near {
> awk: line 58: syntax error at or near :
> awk: line 62: syntax error at or near :
> awk: line 65: syntax error at or near }
> Makefile:488: recipe for target '../../README.i18n' failed

With gawk, everything is fine.

I believe these are the lines in question:
>   local_idx = match(line, /^([^ \t]+)([ \t]*)(.*)$/, local_split);
>   if (local_idx > 0) {
> variable[ local_split[1] ] = local_split[3];
>   }
> }
>
> # Write a single line to the output
> function write_line(line) {
>   if (!cond_state) { return; }
>
>   switch (redirect_out) {
>   case "no":
> print line;
> line_number++;
> break;
>
>   case "copyright":
> copyright_lines[copyright_count++] = line;
> break;
>
>   default:
> report_error("redirect output mode \"" redirect_out "\" is not
> supported (line " NR ")");
>   }
> }





--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 01/11] wmmenu: Update Makefile.

[Doug Torrance]

In particular,
- Remove option to compile with deprecated GDK-PixBuf 1.0.
- Remove *ROOT variables; libdockapp should be in the default include search
  path and X11R6 directories are deprecated.
- Remove /opt/gtk2/bin from PIXBUF_CFG; pkg-config is likely elsewhere.
- Remove CPPFLAGS from CFLAGS and INCDIRS and DEFINES from CFLAGS; we  don't
  want these to disappear if user defines different flags.

Inspired in part by similar patches in Gentoo [1] and by Nerijus Baliunas [2].

[1] 
http://mirrors.telepoint.bg/gentoo-portage/x11-plugins/wmmenu/files/wmmenu-1.2-Makefile.patch
[2] http://lists.windowmaker.org/dev/msg07994.html
---
 wmmenu/Makefile | 27 ---
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/wmmenu/Makefile b/wmmenu/Makefile
index 0a0c193..de9cde7 100644
--- a/wmmenu/Makefile
+++ b/wmmenu/Makefile
@@ -3,35 +3,24 @@ BINDIR = $(prefix)/bin
 MANDIR = $(prefix)/man
 ETCDIR = $(prefix)/etc
 
-# comment out both lines to get the old, Xpm-only, version
-GDKPIXBUF = 1
-#GDKPIXBUF2 = 1
-
-XROOT = /usr/X11R6
-DAROOT = /usr/local
-
-# If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
-ifdef GDKPIXBUF
-PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)
-PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib 
-lgdk_pixbuf_xlib
-endif
+# comment to get the old, Xpm-only, version
+GDKPIXBUF2 = 1
 
 # If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
 ifdef GDKPIXBUF2
-PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0
+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
 PIXBUF_DEF = -DWITH_GDKPIXBUF
 PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
 PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib 
-lgdk_pixbuf_xlib-2.0
 endif
 
 CC = gcc #-g
-CFLAGS = -pipe $(CPPFLAGS) -O2
-CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
-INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
+CFLAGS = -pipe -O2
+CPPFLAGS = -MMD -ansi -pedantic -Wall
+INCDIRS = $(PIXBUF_INC)
 DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
 LDFLAGS = -s
-LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
+LIBDIRS = $(PIXBUF_LIB)
 LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
 
 MKDIRHIER = mkdir -p
@@ -52,7 +41,7 @@ INSTMAN = install -c
 all : $(PRGS)
 
 .c.o :
-   $(CC) $(CFLAGS) -c $<
+   $(CC) $(INCDIRS) $(DEFINES) $(CPPFLAGS) $(CFLAGS) -c $<
 
 wmmenu : $(OBJS1)
$(CC) $(LDFLAGS) -o $@ $(OBJS1) $(LIBDIRS) $(LDLIBS)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 02/11] wmmenu: Update to compile with modern GDK-PixBuf.

[Doug Torrance]

In particular,
- We need to link against gdk_pixbuf-2.0 in addition to
  gdk_pixbuf_xlib-2.0.
- The header gdk-pixbuf-xlib.h has been moved to the gdk-pixbuf-xlib
  directory.
- The function gdk_pixbuf_new_from_file now requires two arguments.
- We need to define GdkColor ourselves since we don't include gdk.h.

Inspired by a patch by Nerijus Baliunas [1].

[1] http://lists.windowmaker.org/dev/msg07994.html
---
 wmmenu/Makefile  |  2 +-
 wmmenu/pixmaps.c | 12 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/wmmenu/Makefile b/wmmenu/Makefile
index de9cde7..730ad10 100644
--- a/wmmenu/Makefile
+++ b/wmmenu/Makefile
@@ -11,7 +11,7 @@ ifdef GDKPIXBUF2
 PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
 PIXBUF_DEF = -DWITH_GDKPIXBUF
 PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib 
-lgdk_pixbuf_xlib-2.0
+PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib 
-lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0
 endif
 
 CC = gcc #-g
diff --git a/wmmenu/pixmaps.c b/wmmenu/pixmaps.c
index 8799dbb..92b7d4e 100644
--- a/wmmenu/pixmaps.c
+++ b/wmmenu/pixmaps.c
@@ -2,7 +2,7 @@
 #include 
 
 #ifdef WITH_GDKPIXBUF
-#include 
+#include 
 #endif
 #include 
 
@@ -28,6 +28,7 @@ extern void Pixmaps_FindLoad (const char * name,
 GdkPixbuf * pix ;
 int width, height ;
 void (* problem) (const char *, ...) ;
+GError *gerror = NULL;
 
 if (mustInitGdkPixbuf)
 {
@@ -59,7 +60,7 @@ extern void Pixmaps_FindLoad (const char * name,
 UseDefault () ;
 }
 else
-if ((pix = gdk_pixbuf_new_from_file (path)) == NULL)
+if ((pix = gdk_pixbuf_new_from_file (path, &gerror)) == NULL)
 {
 problem ("can't load image \"%s\"", path) ;
 UseDefault () ;
@@ -112,6 +113,13 @@ We have to reimplement a few trivial gdk functions here to 
avoid linking with
 it !
 */
 
+typedef struct {
+guint32 pixel;
+guint16 red;
+guint16 green;
+guint16 blue;
+} GdkColor;
+
 extern gint gdk_screen_width (void)
 {
 return DisplayWidth (DADisplay, DefaultScreen (DADisplay)) ;
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 00/11] wmmenu updates

[Doug Torrance]

Here are some patches for wmmenu.  Among other things, they incorporate some
of the fixes from Nerijus's patch and from Gentoo.

Carlos, could you tag the last commit wmmenu-1.3?

Thanks!
Doug

Doug Torrance (11):
  wmmenu: Update Makefile.
  wmmenu: Update to compile with modern GDK-PixBuf.
  wmmenu: Replace deprecated DAInitialize() from libdockapp.
  wmmenu: Fix -Wunused-result compiler warning.
  wmmenu: Fix -Wdeprecated-declarations compiler warnings.
  wmmenu: Fix -Woverlength-strings compiler warning.
  wmmenu: Fix -Wunused-value compiler warnings.
  wmmenu: Fix -Wsign-compare compiler warning.
  wmmenu: Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.
  wmmenu: Remove trailing whitespace.
  wmmenu: Bump to version 1.3.

 wmmenu/COPYING |  43 +-
 wmmenu/Makefile|  29 
 wmmenu/README  |  56 ++-
 wmmenu/buttonbar.c |   4 +-
 wmmenu/events.c|  11 -
 wmmenu/options.c   |  33 +++---
 wmmenu/pixmaps.c   |  16 +--
 wmmenu/utils.c |   2 +-
 wmmenu/version.h   |   2 +-
 wmmenu/wmmenu.1| 130 ++---
 wmmenu/wmmenu.c|   3 +-
 11 files changed, 193 insertions(+), 136 deletions(-)

-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 05/11] wmmenu: Fix -Wdeprecated-declarations compiler warnings.

[Doug Torrance]

The function gdk_pixbuf_unref is deprecated.  We replace it with
g_object_unref.  This requires linking against gobject-2.0.
---
 wmmenu/Makefile  | 2 +-
 wmmenu/pixmaps.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wmmenu/Makefile b/wmmenu/Makefile
index 730ad10..8ffe394 100644
--- a/wmmenu/Makefile
+++ b/wmmenu/Makefile
@@ -11,7 +11,7 @@ ifdef GDKPIXBUF2
 PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
 PIXBUF_DEF = -DWITH_GDKPIXBUF
 PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib 
-lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0
+PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib 
-lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
 endif
 
 CC = gcc #-g
diff --git a/wmmenu/pixmaps.c b/wmmenu/pixmaps.c
index 92b7d4e..e56f637 100644
--- a/wmmenu/pixmaps.c
+++ b/wmmenu/pixmaps.c
@@ -97,7 +97,7 @@ extern void Pixmaps_FindLoad (const char * name,
 
scaled = gdk_pixbuf_scale_simple (pix,
width, height, GDK_INTERP_HYPER) ;
-   gdk_pixbuf_unref (pix) ;
+   g_object_unref (pix) ;
pix = scaled ;
 }
 
@@ -105,7 +105,7 @@ extern void Pixmaps_FindLoad (const char * name,
 if (hP != NULL) *hP = height ;
 gdk_pixbuf_xlib_render_pixmap_and_mask (pix, imageP, maskP, 128) ;
 /* don't forget to free now we've done pixmaps */
-gdk_pixbuf_unref (pix) ;
+g_object_unref (pix) ;
 }
 
 /*
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 03/11] wmmenu: Replace deprecated DAInitialize() from libdockapp.

[Doug Torrance]

Patch from Gentoo [1].

[1] 
http://mirrors.telepoint.bg/gentoo-portage/x11-plugins/wmmenu/files/wmmenu-1.2-support-libdockapp-0.5.0.patch
---
 wmmenu/wmmenu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wmmenu/wmmenu.c b/wmmenu/wmmenu.c
index 1afb417..b2ae56b 100644
--- a/wmmenu/wmmenu.c
+++ b/wmmenu/wmmenu.c
@@ -18,7 +18,8 @@ extern int main (int argc, char ** argv)
 
 DAParseArguments (Options_Argc, Options_Argv, NULL, 0,
 "wmmenu", VERSION) ;
-DAInitialize (NULL, (char*)Menu_GetTitle (), 48, 48, argc, argv) ;
+DAOpenDisplay (NULL, argc, argv) ;
+DACreateIcon((char*)Menu_GetTitle (), 48, 48, argc, argv);
 
 Pixmaps_LoadMenu () ;
 Pixmaps_LoadTile () ;
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 04/11] wmmenu: Fix -Wunused-result compiler warning.

[Doug Torrance]

Print a warning message if system() fails.
---
 wmmenu/events.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wmmenu/events.c b/wmmenu/events.c
index 8c44f55..0498635 100644
--- a/wmmenu/events.c
+++ b/wmmenu/events.c
@@ -31,6 +31,7 @@ Reparent and Destroy events are catched with 
StructureNotifyMask.
 #include "menu.h"
 #include "xobjects.h"
 #include "pixmaps.h"
+#include "error.h"
 
 static bool BarShown = false ;
 static bool HideBarDelayed = false ;
@@ -134,7 +135,11 @@ static void InvokeBar (int x, int y)
 
 if (entry < Menu_GetNbEntries ())
 {
-system (Menu_GetEntryCommand (entry)) ;
+const char *command;
+
+command = Menu_GetEntryCommand (entry);
+if (system (command) == -1)
+warn("'%s' returned an error\n", command);
 }
 }
 
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 07/11] wmmenu: Fix -Wunused-value compiler warnings.

[Doug Torrance]

---
 wmmenu/buttonbar.c | 2 ++
 wmmenu/events.c| 4 
 2 files changed, 6 insertions(+)

diff --git a/wmmenu/buttonbar.c b/wmmenu/buttonbar.c
index 210318a..619cde6 100644
--- a/wmmenu/buttonbar.c
+++ b/wmmenu/buttonbar.c
@@ -130,6 +130,8 @@ extern void ButtonBar_SetPositionFromDockApp (int dockx, 
int docky,
 int xMid, scrWidth, h, scrHeight ;
 int x, y ;
 
+(void) dockh;
+
 /* compute y */
 scrHeight = DisplayHeight (DADisplay, DefaultScreen (DADisplay)) ;
 y = docky ;
diff --git a/wmmenu/events.c b/wmmenu/events.c
index 0498635..11403d0 100644
--- a/wmmenu/events.c
+++ b/wmmenu/events.c
@@ -148,6 +148,10 @@ static void InvokeBar (int x, int y)
 
 static void PressApp (int button, int state, int x, int y)
 {
+(void) button;
+(void) state;
+(void) x;
+(void) y;
 if (BarShown) LeaveBar () ;
 else EnterApp () ;
 }
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 08/11] wmmenu: Fix -Wsign-compare compiler warning.

[Doug Torrance]

Use size_t instead of int since comparing with sizeof.
---
 wmmenu/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmmenu/utils.c b/wmmenu/utils.c
index cdb92e2..f9e5921 100644
--- a/wmmenu/utils.c
+++ b/wmmenu/utils.c
@@ -16,7 +16,7 @@
 static char * ReadAll (FILE * f, int offset)
 {
 char buf [10*1024] ;
-int iRead, nRead ;
+size_t iRead, nRead ;
 char * ret ;
 
 clearerr (f) ;
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 10/11] wmmenu: Remove trailing whitespace.

[Doug Torrance]

---
 wmmenu/README  |   4 +-
 wmmenu/buttonbar.c |   2 +-
 wmmenu/wmmenu.1| 130 ++---
 3 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/wmmenu/README b/wmmenu/README
index 0872350..cea901f 100644
--- a/wmmenu/README
+++ b/wmmenu/README
@@ -49,7 +49,7 @@ diff -ru libdockapp-0.4.0.orig/src/damain.c 
libdockapp-0.4.0/src/damain.c
 -classHint->res_class = "DockApp";
 +classHint->res_class = name;
  classHint->res_name = name;
- 
+
  XSetClassHint(DADisplay, DALeader, classHint);
 
 
@@ -244,7 +244,7 @@ STATUS
 
When using the gdk-pixbuf enabled version, pixmaps larger than tile
(either the tile pixmap itself, or the size specified on command
-   line) are automatically scaled to fit within the requested size. 
+   line) are automatically scaled to fit within the requested size.
This affects the dock icon, tile, highlight and application icons.
If you like pixmaps overriding each other (gasp!), this can be
disabled with "-O noautoscale".
diff --git a/wmmenu/buttonbar.c b/wmmenu/buttonbar.c
index 619cde6..a80cde1 100644
--- a/wmmenu/buttonbar.c
+++ b/wmmenu/buttonbar.c
@@ -215,7 +215,7 @@ extern void ButtonBar_Unhighlight (void)
 int x, y, h ;
 
 if (HighlightImage == 0 || OldPos < 0) return ;
-
+
 h = Menu_GetNbRows () ;
 x = (OldPos / h) * TileXSize ;
 y = (OldPos % h) * TileYSize ;
diff --git a/wmmenu/wmmenu.1 b/wmmenu/wmmenu.1
index 25a9671..ba701a6 100644
--- a/wmmenu/wmmenu.1
+++ b/wmmenu/wmmenu.1
@@ -1,64 +1,64 @@
 .TH "wmmenu" "1" "1.1" "Fabien COUTANT" "WMaker dockapp"
 .SH "NAME"
-.LP 
+.LP
 wmmenu \- A WindowMaker dockapp to launch programs with a popup pixmap menu
 .SH "SYNTAX"
-.LP 
+.LP
 wmmenu [\fI\fR] \fB\-m\fP \fI\fR
-.br 
+.br
 wmmenu \fB\-v\fP
-.br 
+.br
 wmmenu \fB\-h\fP
 .SH "DESCRIPTION"
-.LP 
+.LP
 This is a "dock application" for Windowmaker, that provides a button bar to
 launch applications from.
-.LP 
+.LP
 The bar opens automatically when either the mouse enters the button or you
 click on it (this is configurable).
-.LP 
+.LP
 Multiple instances of the program can run at the same time:  each one provides
 a menu that it reads from a separate file, so you can have as many different
 menus as you want (you can also display the same menu more than once if you
 want; dunno what it's useful for...).
-.LP 
+.LP
 NOTE: options can take place before or after "\-m", as long as each option is
 correctly paired with its corresponding argument (when it has one).
 .SH "OPTIONS"
-.LP 
-.TP 
+.LP
+.TP
 \fB\-h\fR
 print a help message listing known options.
-.TP 
+.TP
 \fB\-v\fR
 print version information
-.TP 
+.TP
 \fB\-g\fR \fIW\fP\fBx\fR\fIH\fP
 force width and height of tile
-.TP 
+.TP
 \fB\-l\fR \fIXPMFILE\fP
 set filename of the pixmap used to highlight icon under cursor
-.TP 
+.TP
 \fB\-t\fR \fIXPMFILE\fP
 set filename of the pixmap used as button bar background.
 XPMFILE may also be '!COMMAND' to execute COMMAND and get the pixmap name to 
use
 from its output.
-.TP 
+.TP
 \fB\-O click\fR
 bar is only triggered by clicks on the tile, not moves
-.TP 
+.TP
 \fB\-O noautoscale\fR
 disable automatic pixmap scaling to tile size
-.TP 
+.TP
 \fB\-O behind\fR
 draw highlight pixmap behind icon, not above
-.TP 
+.TP
 \fB\-O hide=\fIN\fR
 set bar hiding timeout in ms.  See hide_timeout description in Defaults.
-.TP 
+.TP
 \fB\-r\fR \fIROWS\fP
 set number of menu rows (default one)
-.LP 
+.LP
 Please note, that \fB\-l\fR, \fB\-t\fR and \fB\-O behind\fR options
 can also be specified with another syntax in the \fBdefaults\fR file
 (described hereafter).
@@ -67,62 +67,62 @@ This is a configuration file that defines things common to 
all instances
 of wmmenu.
 It is located in "~/.wmmenu/defaults".
 
-.LP 
+.LP
 The syntax is as follows:
-.LP 
+.LP
 # comment or empty lines are ignored
-.LP 
+.LP
 xpmpath PATH1:PATH2:...
-.br 
+.br
 xpmpath PATH3
-.br 
+.br
 xpmpath PATH4
-.br 
+.br
 ...
-.br 
+.br
 # defines in which path to search for pixmaps
-.LP 
+.LP
 tile FILE.XPM
-.br 
+.br
  or
-.br 
+.br
 tile /SOME/PATH/TO/FILE.XPM
-.br 
+.br
 # defines pixmap used as background tile in menu bar
-.br 
+.br
  or
-.br 
+.br
 tile !some_command with arguments
-.br 
+.br
 # defines the command to call to get the pixmap name to be
 # used: the name is read from its standard output.
 # If the name read is empty, the internal default is used
 # instead.
-.LP 
+.LP
 highlight FILE.XPM
-.br 
+.br
  or
-.br 
+.br
 highlight /SOME/PATH/TO/FILE.XPM
-.br 
+.br
 # defines pixmap used to highlight item under cursor
-.LP 
+.LP
 highlight_behind[ ANYTHING_NOT_EMPTY]
-.br 
+.br
 # (don't forget the separating space)
-.br 
+.br
 # request to draw highlight pixmap BEHIND icon,
-.br 
+.br
 # no more in front.
-.br 
+.br
 # To be used if your pixmap is designed to cover most
-.br 
+.br
 # of tile's su

[PATCH 06/11] wmmenu: Fix -Woverlength-strings compiler warning.

[Doug Torrance]

Instead of printing one giant string for the help text, we print each line
individually.
---
 wmmenu/options.c | 33 +++--
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/wmmenu/options.c b/wmmenu/options.c
index 228cbc7..0a059a2 100644
--- a/wmmenu/options.c
+++ b/wmmenu/options.c
@@ -48,24 +48,21 @@ char * Options_Argv [MAXOPTIONS] ;
 
 static void Usage (void)
 {
-printf (
-"Usage: wmmenu [...][-- ...]\n"
-"Normal options:\n"
-"-m MENUNAMEset the name of the menu file to load from ~/.wmmenu\n"
-"-g WxH force width and height of tile\n"
-"-l XPMFILE set the pixmap used to highlight icon under cursor\n"
-"-t XPMFILE set the pixmap used as button bar background\n"
-"-O click   bar is only triggered by clicks on the tile, not moves\n"
-"-O noautoscale disable automatic pixmap scaling to tile size\n"
-"-O behind  draw highlight pixmap behind icon, not above\n"
-"-O hide=N  set bar hiding timeout to N ms (default one)\n"
-"-r ROWSset number of menu rows (default one)\n"
-"-v print version information\n"
-"-h print this help message\n"
-"Note:\n"
-"  -t, -l and '-O behind' can also be specified with the defaults file.\n"
-""
-) ;
+printf("Usage: wmmenu [...][-- ...]\n");
+printf("Normal options:\n");
+printf("-m MENUNAMEset the name of the menu file to load from 
~/.wmmenu\n");
+printf("-g WxH force width and height of tile\n");
+printf("-l XPMFILE set the pixmap used to highlight icon under 
cursor\n");
+printf("-t XPMFILE set the pixmap used as button bar background\n");
+printf("-O click   bar is only triggered by clicks on the tile, not 
moves\n");
+printf("-O noautoscale disable automatic pixmap scaling to tile size\n");
+printf("-O behind  draw highlight pixmap behind icon, not above\n");
+printf("-O hide=N  set bar hiding timeout to N ms (default one)\n");
+printf("-r ROWSset number of menu rows (default one)\n");
+printf("-v print version information\n");
+printf("-h print this help message\n");
+printf("Note:\n");
+printf("  -t, -l and '-O behind' can also be specified with the defaults 
file.\n");
 }
 
 static void SetGeometry (const char * val)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 09/11] wmmenu: Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.

[Doug Torrance]

---
 wmmenu/COPYING | 43 +--
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/wmmenu/COPYING b/wmmenu/COPYING
index eeb586b..d159169 100644
--- a/wmmenu/COPYING
+++ b/wmmenu/COPYING
@@ -1,12 +1,12 @@
-   GNU GENERAL PUBLIC LICENSE
-  Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-   Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its 
users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not 
licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-   GNU GENERAL PUBLIC LICENSE
+
+GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
 License.  (Exception: if the Program itself is interactive but
 does not normally print such an announcement, your work based on
 the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering 
equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by 
the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE 
WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
-
-   How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have 
at least
 the "copyright" line and a pointer to where the full notice is found.
 
 
-Copyright (C) 19yy  
+Copyright (C)   
 
 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
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full 
notice is found.
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with th

[PATCH 11/11] wmmenu: Bump to version 1.3.

[Doug Torrance]

---
 wmmenu/README| 52 
 wmmenu/version.h |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/wmmenu/README b/wmmenu/README
index cea901f..8325d88 100644
--- a/wmmenu/README
+++ b/wmmenu/README
@@ -183,6 +183,58 @@ balloon.
 STATUS
 --
 
+1.32015/01/24
+
+   Now maintained by the Window Maker Developers Team
+   .
+
+   Remove trailing whitespace.
+
+   Update COPYING from http://www.gnu.org/licenses/gpl-2.0.txt.
+
+   Fix -Wsign-compare compiler warning.  Use size_t instead of int since
+   comparing with sizeof.
+
+   Fix -Wunused-value compiler warnings
+
+   Fix -Woverlength-strings compiler warning.  Instead of printing one
+   giant string for the help text, we print each line individually.
+
+   Fix -Wdeprecated-declarations compiler warnings.  The function
+   gdk_pixbuf_unref is deprecated.  We replace it with g_object_unref.
+   This requires linking against gobject-2.0.
+
+   Fix -Wunused-result compiler warning.  Print a warning message if
+   system() fails.
+
+   Replace deprecated DAInitialize() from libdockapp.  Patch from
+   Gentoo [1].
+
+   Update to compile with modern GDK-PixBuf.  In particular,
+   - We need to link against gdk_pixbuf-2.0 in addition to
+ gdk_pixbuf_xlib-2.0.
+   - The header gdk-pixbuf-xlib.h has been moved to the gdk-pixbuf-xlib
+ directory.
+   - The function gdk_pixbuf_new_from_file now requires two arguments.
+   - We need to define GdkColor ourselves since we don't include gdk.h.
+   Inspired by a patch by Nerijus Baliunas [2].
+
+   Update Makefile.  In particular,
+   - Remove option to compile with deprecated GDK-PixBuf 1.0.
+   - Remove *ROOT variables; libdockapp should be in the default include
+ search path and X11R6 directories are deprecated.
+   - Remove /opt/gtk2/bin from PIXBUF_CFG; pkg-config is likely elsewhere.
+   - Remove CPPFLAGS from CFLAGS and INCDIRS and DEFINES from CFLAGS; we
+ don't want these to disappear if user defines different flags.
+   Inspired in part by similar patches in Gentoo [3] and by Nerijus
+   Baliunas [2].
+
+   [1] http://mirrors.telepoint.bg/gentoo-portage/x11-plugins/wmmenu/files/
+   wmmenu-1.2-support-libdockapp-0.5.0.patch
+   [2] http://lists.windowmaker.org/dev/msg07994.html
+   [3] http://mirrors.telepoint.bg/gentoo-portage/x11-plugins/wmmenu/files/
+wmmenu-1.2-Makefile.patch
+
 1.22002/05/04
 
(Thanks to Daniel D�chelotte for many bug fixes, patches and
diff --git a/wmmenu/version.h b/wmmenu/version.h
index 93bebea..ee34fef 100644
--- a/wmmenu/version.h
+++ b/wmmenu/version.h
@@ -7,6 +7,6 @@
 #define ADDVER " (XPM only)"
 #endif
 
-#define VERSION ("1.2" ADDVER)
+#define VERSION ("1.3" ADDVER)
 
 #endif /* version_h_ */
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH (whome) 2/2] Rename "Website" field on dockapps webpages to "Original Website".

[Doug Torrance]

This may help clarify that these dockapps are no longer maintained by their
original authors and that their windowmaker.org pages are the current ones.
---
 dockapps/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockapps/index.php b/dockapps/index.php
index 5d9cadd..e157fde 100644
--- a/dockapps/index.php
+++ b/dockapps/index.php
@@ -44,7 +44,7 @@ if ($name) {
$dockapps[$name]["category"] .
"\n";
if ($dockapps[$name]["url"])
-   echo "Website: Original Website: " . $dockapps[$name]["url"] . "\n";
echo "Description: " . nl2br($dockapps[$name]["description"]) .
"\n";
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH] wmaker: Add autocomplete/history feature to keyboard shortcut Run dialog.

[Doug Torrance]

As reported by Juan Giordana, the autocomplete/history feature which is
available to Run dialogs brought up by the root menu is not available to Run
dialogs brought up by a keyboard shortcut.  This patch enables this
behavior.
---
 src/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/event.c b/src/event.c
index 6b2e0db..3e2ecb6 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1791,7 +1791,7 @@ static void handleKeyPress(XEvent * event)
{
char *cmdline;
 
-   cmdline = ExpandOptions(scr, _("exec %a(Run,Type command to 
run:)"));
+   cmdline = ExpandOptions(scr, _("exec %A(Run,Type command to 
run:)"));
 
if (cmdline) {
XGrabPointer(dpy, scr->root_win, True, 0,
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 3/3] wmbattery: Bump to version 2.47.

[Doug Torrance]

---
 wmbattery/ChangeLog| 13 +
 wmbattery/configure.ac |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/wmbattery/ChangeLog b/wmbattery/ChangeLog
index bdbae3e..1876f4f 100644
--- a/wmbattery/ChangeLog
+++ b/wmbattery/ChangeLog
@@ -1,3 +1,16 @@
+wmbattery (2.47)
+  * Avoid redefinition of apm_read/apm_exists in *BSD.
+The two functions are defined if the BSD-specific apm headers are found and
+if libapm is not found.  Both of these conditions will be true on BSD
+systems, so we use #elif instead of the separate #if statements.
+  * Use AC_CHECK_LIB instead of AC_CHECK_HEADERS to check for libapm.
+If autoconf finds an apm.h other than the one belonging to libapm, we get
+builds errors like the ones reported by Haroldo Gambini Santos in [1].
+
+[1] http://lists.windowmaker.org/dev/msg07937.html
+
+ -- Doug Torrance   Thu, 19 Feb 2015 23:26:34 
-0600
+
 wmbattery (2.46)
   * Make it possible to work without libapm as libapm and apm.h are not
 necessarily available on Linux.
diff --git a/wmbattery/configure.ac b/wmbattery/configure.ac
index 0d9b57b..5bfa487 100644
--- a/wmbattery/configure.ac
+++ b/wmbattery/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(wmbattery.c, 2.46)
+AC_INIT(wmbattery.c, 2.47)
 AC_CONFIG_HEADER(config.h)
 
 AC_CONFIG_AUX_DIR(autoconf)
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH 1/3] wmbattery: Use AC_CHECK_LIB instead of AC_CHECK_HEADERS to check for libapm.

[Doug Torrance]

If autoconf finds an apm.h other than the one belonging to libapm, we get
builds errors like the ones reported by Haroldo Gambini Santos in [1].

[1] http://lists.windowmaker.org/dev/msg07937.html
---
 wmbattery/apm.h| 4 ++--
 wmbattery/configure.ac | 1 -
 wmbattery/wmbattery.c  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/wmbattery/apm.h b/wmbattery/apm.h
index fc2428e..04b6e7f 100644
--- a/wmbattery/apm.h
+++ b/wmbattery/apm.h
@@ -8,7 +8,7 @@
 #include 
 #endif
 
-#ifdef HAVE_APM_H
+#ifdef HAVE_LIBAPM
 #include 
 #endif
 
@@ -37,7 +37,7 @@
 #define BATTERY_TIME_UNKNOWN(-1)
 #endif /* AC_LINE_STATUS_ON */
 
-#if !defined(HAVE_APM_H)
+#if !defined(HAVE_LIBAPM)
 typedef struct {
const char driver_version[10];
int apm_version_major;
diff --git a/wmbattery/configure.ac b/wmbattery/configure.ac
index 5c5a8fc..0d9b57b 100644
--- a/wmbattery/configure.ac
+++ b/wmbattery/configure.ac
@@ -34,7 +34,6 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(X11/xpm.h)
 AC_CHECK_HEADERS(X11/extensions/shape.h)
 AC_CHECK_HEADERS(getopt.h)
-AC_CHECK_HEADERS(apm.h)
 dnl FreeBSD needs apm_bios.h
 AC_CHECK_HEADERS(machine/apm_bios.h)
 dnl NetBSD and OpenBSD need apmvar.h
diff --git a/wmbattery/wmbattery.c b/wmbattery/wmbattery.c
index 74d39fd..1c74409 100644
--- a/wmbattery/wmbattery.c
+++ b/wmbattery/wmbattery.c
@@ -148,7 +148,7 @@ int apm_exists(void)
return apm_read(&i);
 }
 #endif
-#if !defined(HAVE_APM_H)
+#if !defined(HAVE_LIBAPM)
 int apm_read(apm_info *i)
 {
return -1;
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.