[Pkg-wmaker-commits] [wmbubble] 06/207: Binary can now be renamed and use different Xresources to not conflict with gnome bubblemon (debian)

[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 d999474ccb3a5b52dd026cb2fdcd13c67a214b57
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Mon Aug 29 19:17:17 2011 -0700

    Binary can now be renamed and use different Xresources to not conflict with gnome bubblemon (debian)
---
 Makefile             | 13 +++++++------
 bubblemon.c          | 38 +++++++++++++++++++++-----------------
 doc/Xdefaults.sample | 22 +++++++++++-----------
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index c7a8fce..7c35349 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ CFLAGS = -O3 -ansi -Wall `gtk-config --cflags` ${EXTRA}
 # test coverage cflags
 # CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO
 
-
+BINARY=bubblemon
 SHELL=sh
 OS = $(shell uname -s)
 OBJS = bubblemon.o
@@ -67,14 +67,15 @@ ifeq ($(OS), SunOS)
     INSTALL = -m 755
 endif
 
+CFLAGS += -DNAME=\"$(BINARY)\"
 
-all: bubblemon
+all: $(BINARY)
 
-bubblemon: $(OBJS)
-	$(CC) $(CFLAGS) -o bubblemon $(OBJS) $(LIBS)
+$(BINARY): $(OBJS)
+	$(CC) $(CFLAGS) -o $(BINARY) $(OBJS) $(LIBS)
 
 clean:
-	rm -f bubblemon *.o *.bb* *.gcov gmon.* *.da *~
+	rm -f $(BINARY) *.o *.bb* *.gcov gmon.* *.da *~
 
 install:
-	install $(INSTALL) bubblemon $(PREFIX)/bin
+	install $(INSTALL) $(BINARY) $(PREFIX)/bin
diff --git a/bubblemon.c b/bubblemon.c
index ed48e86..c12abed 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -76,6 +76,10 @@
 
 /* #define DEBUG_DUCK 1 */
 
+#ifndef NAME
+#define NAME "bubblemon"
+#endif
+
 /* local prototypes *INDENT-OFF* */
 static void bubblemon_setup_samples(void);
 static void bubblemon_setup_colors(void);
@@ -152,16 +156,16 @@ static void bubblemon_session_defaults(void)
     int i;
 
     xrm_vars tab[] = {
-	{"bubblemon.maxbubbles", INT_VAL, &bm.maxbubbles},
-	{"bubblemon.air_noswap", COLOR_VAL, &bm.air_noswap},
-	{"bubblemon.air_maxswap", COLOR_VAL, &bm.air_maxswap},
-	{"bubblemon.liquid_noswap", COLOR_VAL, &bm.liquid_noswap},
-	{"bubblemon.liquid_maxswap", COLOR_VAL, &bm.liquid_maxswap},
-	{"bubblemon.ripples", DOUBLE_VAL, &bm.ripples},
-	{"bubblemon.gravity", DOUBLE_VAL, &bm.gravity},
-	{"bubblemon.volatility", DOUBLE_VAL, &bm.volatility},
-	{"bubblemon.viscosity", DOUBLE_VAL, &bm.viscosity},
-	{"bubblemon.speed_limit", DOUBLE_VAL, &bm.speed_limit}
+	{NAME".maxbubbles", INT_VAL, &bm.maxbubbles},
+	{NAME".air_noswap", COLOR_VAL, &bm.air_noswap},
+	{NAME".air_maxswap", COLOR_VAL, &bm.air_maxswap},
+	{NAME".liquid_noswap", COLOR_VAL, &bm.liquid_noswap},
+	{NAME".liquid_maxswap", COLOR_VAL, &bm.liquid_maxswap},
+	{NAME".ripples", DOUBLE_VAL, &bm.ripples},
+	{NAME".gravity", DOUBLE_VAL, &bm.gravity},
+	{NAME".volatility", DOUBLE_VAL, &bm.volatility},
+	{NAME".viscosity", DOUBLE_VAL, &bm.viscosity},
+	{NAME".speed_limit", DOUBLE_VAL, &bm.speed_limit}
     };
 
     /* number of CPU load samples */
@@ -249,7 +253,7 @@ static void print_usage(void)
 {
     char *usage;
     usage = "BubbleMon version "VERSION", features: %s\n"
-	    "Usage: bubblemon [switches] [program_1] [program_2]\n\n"
+	    "Usage: "NAME" [switches] [program_1] [program_2]\n\n"
 	    "Disable compiled-in features\n"
 #ifdef ENABLE_DUCK
 	    " -d\tdisable swimming duck\n"
@@ -549,13 +553,13 @@ static void make_new_bubblemon_dockapp(void)
 
     attr.width = 64;
     attr.height = 64;
-    attr.title = "bubblemon";
+    attr.title = NAME;
     attr.event_mask = MASK;
     attr.wclass = GDK_INPUT_OUTPUT;
     attr.visual = gdk_visual_get_system();
     attr.colormap = gdk_colormap_get_system();
-    attr.wmclass_name = "bubblemon";
-    attr.wmclass_class = "bubblemon";
+    attr.wmclass_name = NAME;
+    attr.wmclass_class = NAME;
     attr.window_type = GDK_WINDOW_TOPLEVEL;
 
     sizehints.flags = USSize;
@@ -570,13 +574,13 @@ static void make_new_bubblemon_dockapp(void)
 
     attri.width = 64;
     attri.height = 64;
-    attri.title = "bubblemon";
+    attri.title = NAME;
     attri.event_mask = MASK;
     attri.wclass = GDK_INPUT_OUTPUT;
     attri.visual = gdk_visual_get_system();
     attri.colormap = gdk_colormap_get_system();
-    attri.wmclass_name = "bubblemon";
-    attri.wmclass_class = "bubblemon";
+    attri.wmclass_name = NAME;
+    attri.wmclass_class = NAME;
     attri.window_type = GDK_WINDOW_TOPLEVEL;
 
     bm.iconwin = gdk_window_new(bm.win, &attri,
diff --git a/doc/Xdefaults.sample b/doc/Xdefaults.sample
index f1d5544..9b8403d 100644
--- a/doc/Xdefaults.sample
+++ b/doc/Xdefaults.sample
@@ -1,12 +1,12 @@
-! BubbleMon settings 
+! WMBubble settings 
 ! vim: syntax=xdefaults
-bubblemon.maxbubbles: 100
-bubblemon.air_noswap: #2299FF
-bubblemon.air_maxswap: #FF0000
-bubblemon.liquid_noswap: #0055FF
-bubblemon.liquid_maxswap: #AA0000
-bubblemon.ripples: 0.2
-bubblemon.gravity: 0.01
-bubblemon.volatility: 1.0
-bubblemon.viscosity: 0.98
-bubblemon.speed_limit: 1.0
+wmbubble.maxbubbles: 100
+wmbubble.air_noswap: #2299FF
+wmbubble.air_maxswap: #FF0000
+wmbubble.liquid_noswap: #0055FF
+wmbubble.liquid_maxswap: #AA0000
+wmbubble.ripples: 0.2
+wmbubble.gravity: 0.01
+wmbubble.volatility: 1.0
+wmbubble.viscosity: 0.98
+wmbubble.speed_limit: 1.0

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