[Pkg-wmaker-commits] [wmbubble] 188/207: Update version to 1.52. Slightly tweak "blink on system() failure" code, as if a dockapp would matter if it did...

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit b610accca3aa32ae12012688dc340438f9fae898
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Mon Dec 1 20:05:10 2014 -0800

    Update version to 1.52. Slightly tweak "blink on system() failure" code, as if a dockapp would matter if it did...
---
 ChangeLog   | 11 +++++++++--
 bubblemon.c | 14 +++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a0f679..7b406a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -132,7 +132,7 @@ Sat 14 Apr 2001 - 1.31
     fairly weird looking color problem.  This has been fixed :)  Minor change
     to Makefile.FreeBSD to put bubblemon in /usr/X11R6 during install.
     Released version 1.31
-    
+
 Mon 16 Apr 2001 - 1.32
     Important security update for FreeBSD - previous versions did not drop
     kmem privileges, and programs started by clicking on the dockapp were
@@ -151,7 +151,7 @@ Thu 13 May 2004 - 1.45
     This support is untested, use Makefile.NetBSD to compile.
 
 Sat 15 May 2004 - 1.46
-    Compile fix for FreeBSD-5.x, forgotten include. 
+    Compile fix for FreeBSD-5.x, forgotten include.
 
 Sat 03 Sep 2011 - 1.50
     Add calendar, digital and analog clocks. Dropped gdk for Ximage. Make
@@ -162,3 +162,10 @@ Sat 03 Sep 2011 - 1.50
 Mon 28 Jul 2014 - 1.51
     Fixes from Doug Torrance for working on modern FreeBSD, and add Makefile
     rules to build on Debian GNU/kFreeBSD.
+
+Mon 1 Dec 2014 - 1.52
+    Accept patches to omit various compilation warnings; use C99 format
+    specifiers; explicitly handle system() failing (as unlikely as that
+    is); update man page.
+    Additionally, FreeBSD has long since had a way to get the memory status
+    without being setgid, so jettison that scariness.
diff --git a/bubblemon.c b/bubblemon.c
index 2044835..a8c8e5e 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -1,4 +1,4 @@
-/*  WMBubble dockapp 1.51
+/*  WMBubble dockapp 1.52
  *
  * Todo: merge in wmfishtime/bubblefishymon, reduce number of
  * compilation-time settings, make more things configurable via xresources.
@@ -44,7 +44,7 @@
  */
 #define _GNU_SOURCE
 
-#define VERSION "1.51"
+#define VERSION "1.52"
 
 /* general includes */
 #include <stdio.h>
@@ -175,6 +175,7 @@ char datefont_transparent;
 unsigned int datefont_offset;
 
 int duck_blink = 0;
+int blinkdelay = 1;
 
 const struct XrmUnified {
 	char * const option;
@@ -414,6 +415,9 @@ int main(int argc, char **argv) {
 	graphdelay = graphdivisor = 1000000 / delay_time;
 	if (graphdivisor == 0) graphdivisor = 1;
 
+	blinkdelay = 150000 / delay_time;
+	if (blinkdelay == 0) blinkdelay++;
+
 	loadPercentage = 0;
 
 #ifdef PRO
@@ -439,7 +443,7 @@ int main(int argc, char **argv) {
 					snprintf(execute, 250, "%s &",
 					         argv[event.xbutton.button - 1]);
 					if (system(execute) == -1)
-						duck_blink += 6 * (150000 / delay_time);
+						duck_blink += 6 * blinkdelay;
 				}
 				break;
 			case EnterNotify:
@@ -1347,8 +1351,8 @@ void draw_duck(int x, int y, int frame_no, int flipx, int flipy) {
 	if (x < 0)
 		duck_left = -(x);
 	if (duck_blink > 0) {
-		if (duck_blink % (150000 / delay_time) == 0)
-			duck_colors[1] = 0xFFFFFF - duck_colors[1];
+		if (duck_blink % blinkdelay == 0)
+			duck_colors[1] = 0x808080 ^ duck_colors[1];
 		duck_blink--;
 	}
 	for (yy = duck_top; yy < duck_bottom; yy++) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git