diff -ru bfm-0.6.2/ChangeLog bfm-0.6.3/ChangeLog --- bfm-0.6.2/ChangeLog 2003-11-04 03:00:43.000000000 +0000 +++ bfm-0.6.3/ChangeLog 2004-01-03 08:12:25.000000000 +0000 @@ -1,3 +1,14 @@ +2003-11-05 05:03 James Rowe + * : Pull the NET_DEVICE variable in to the config section of the + Makefile. (suggestion from too many people to mention.) + * : Fixes to all "-Wall" warnings. + * : Fixed typo in PLUGIN_URL. + * : Wow, so not only are there still C compilers out there that don't + accept C++ style '//' comments, but there are people who use + such compilers out there too. In all seriousness though, thanks + to Teijo for finding such a system just to send a bug + report :P + 2003-11-04 01:48 Bill Wilson * : Adds a spin button and code so there can be a bubblefishymon update interval independent of gkrellm builtin updates. I @@ -9,7 +20,7 @@ longer the "Apply" and "Close" buttons appearing when the bubblefishymon config page is up. -2003-11-02 16:37 James Rowe +2003-11-02 16:37 James Rowe * : Applied patch from Huw Giddens to fix the memory usage routines for 2.6 kernels that still works for 2.4 kernels. It is now possible to use the same binary with different kernels. @@ -19,7 +30,7 @@ and "all" target]. And the "install" target changes have been taken under some duress. -2003-10-08 11:36 James Rowe +2003-10-08 11:36 James Rowe * : Applied the gkrellm2 support patch from Debian's package, by Sjoerd Simons . diff -ru bfm-0.6.2/Makefile bfm-0.6.3/Makefile --- bfm-0.6.2/Makefile 2003-11-01 16:45:41.000000000 +0000 +++ bfm-0.6.3/Makefile 2004-01-03 08:12:25.000000000 +0000 @@ -4,6 +4,9 @@ # Type 'make gkrellm' to build gkrellm-bfm.so for gkrellm2 # Type 'make gkrellm1' to build gkrellm-bfm.so for gkrellm +# where to install this program +PREFIX ?= /usr/local + # bubblemon configuration EXTRA = -DENABLE_DUCK EXTRA += -DENABLE_CPU @@ -13,10 +16,13 @@ # EXTRA += -DUPSIDE_DOWN_DUCK # EXTRA += -DKDE_DOCKAPP -# where to install this program -PREFIX ?= /usr/local +# If building for Linux define the network device to monitor. +NET_DEVICE = ppp0 + -# no user serviceable parts below +############################################################################### +# no user serviceable parts below # +############################################################################### EXTRA += $(WMAN) # gtk cflags and gtk lib flags @@ -59,6 +65,11 @@ # special things for Linux ifeq ($(OS), Linux) +ifeq "$(NET_DEVICE)" "" + CFLAGS+=-DNET_DEVICE=\"eth0\" +else + CFLAGS+=-DNET_DEVICE=\"$(NET_DEVICE)\" +endif SRCS += sys_linux.c OBJS += sys_linux.o INSTALL = -m 755 @@ -81,7 +92,6 @@ #special things for SunOS ifeq ($(OS), SunOS) - # try to detect if gcc is available (also works if you call gmake CC=cc to # select the sun compilers on a system with both) COMPILER=$(shell \ diff -ru bfm-0.6.2/bubblemon.c bfm-0.6.3/bubblemon.c --- bfm-0.6.2/bubblemon.c 2003-11-04 03:00:43.000000000 +0000 +++ bfm-0.6.3/bubblemon.c 2004-01-03 08:12:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * bubblefishymon 0.6.2 + * bubblefishymon * * Well, Hacks from bubblemon by timecop and Johan * @@ -76,7 +76,7 @@ */ #define _GNU_SOURCE -#define VERSION "0.6.2" +#define VERSION "0.6.3" /* general includes */ #include @@ -124,7 +124,9 @@ static void make_new_bubblemon_dockapp(void); static void get_memory_load_percentage(void); static void bubblemon_session_defaults(void); +#ifndef GKRELLM_BFM static int get_screen_selection(void); +#endif #if defined(ENABLE_CPU) || defined(ENABLE_MEMSCREEN) /* draw functions for load average / memory screens */ static void draw_pixel(unsigned int x, unsigned int y, unsigned char *buf, @@ -309,6 +311,7 @@ #undef DOUBLE_VAL #undef COLOR_VAL +#ifndef GKRELLM_BFM /* *INDENT-OFF* */ static void print_usage(void) { @@ -346,6 +349,7 @@ ); } /* *INDENT-ON* */ +#endif #ifdef GKRELLM_BFM int bfm_main() @@ -354,8 +358,10 @@ #endif { char execute[256]; +#ifndef GKRELLM_BFM int proximity = 0; int ch; +#endif #ifdef FPS int f, o; time_t y; @@ -678,9 +684,11 @@ GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK GdkWindowAttr attr; +#ifndef GKRELLM_BFM GdkWindowAttr attri; Window win; Window iconwin; +#endif XSizeHints sizehints; #ifndef GKRELLM_BFM @@ -767,8 +775,8 @@ #undef MASK } /* make_new_bubblemon_dockapp */ -// Pigeon -// Dirty, I moved these here so that I can use it somewhere else +/* Pigeon + Dirty, I moved these here so that I can use it somewhere else */ unsigned int real_waterlevel_min, real_waterlevel_max; /* diff -ru bfm-0.6.2/debian/changelog bfm-0.6.3/debian/changelog --- bfm-0.6.2/debian/changelog 2003-11-01 16:43:34.000000000 +0000 +++ bfm-0.6.3/debian/changelog 2004-01-03 08:26:18.000000000 +0000 @@ -1,3 +1,21 @@ +bfm (0.6.3-1) unstable; urgency=low + + * New upstream version. + + -- James Rowe Sat, 08 Nov 2003 17:45:31 +0000 + +bfm (0.6.2-1) unstable; urgency=low + + * New upstream version. + + -- James Rowe Sat, 08 Nov 2003 17:40:12 +0000 + +bfm (0.6.1-1) unstable; urgency=low + + * New upstream version. + + -- Huw Giddens Wed, 05 Nov 2003 13:06:29 +1300 + bfm (0.6.0-5) unstable; urgency=low * Added missing copyright text to fishmon.c diff -ru bfm-0.6.2/debian/copyright bfm-0.6.3/debian/copyright --- bfm-0.6.2/debian/copyright 2003-11-01 16:43:34.000000000 +0000 +++ bfm-0.6.3/debian/copyright 2004-01-03 08:26:58.000000000 +0000 @@ -1,9 +1,9 @@ This package was debianized by Huw Giddens on Mon, 27 Oct 2003 21:39:29 +1300. -It was downloaded from http://www.jnrowe.uklinux.net/projects/bfm.php +It was downloaded from http://www.jnrowe.ukfsn.org/projects/bfm.html -Upstream Author: James Rowe +Upstream Author: James Rowe Copyright: diff -ru bfm-0.6.2/fishmon.c bfm-0.6.3/fishmon.c --- bfm-0.6.2/fishmon.c 2003-11-04 03:00:43.000000000 +0000 +++ bfm-0.6.3/fishmon.c 2004-01-03 08:12:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* BubbleFishyMon dockapp 0.6.2 +/* BubbleFishyMon dockapp * * 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 @@ -251,8 +251,8 @@ */ static int adjust_y(int y) { - // Pigeon - // Make sure the fish is in the water :) + /* Pigeon + Make sure the fish is in the water :) */ int min_y = (YMAX * (100 - bm.mem_percent))/100; if(y <= min_y) return min_y; @@ -644,7 +644,7 @@ for (i = 0; i < NRFISH; i++) { - // No traffic, do nothing + /* No traffic, do nothing */ if (bm.fishes[i].speed == 0 && rx_speed == 0 && tx_speed == 0) { continue; @@ -652,12 +652,12 @@ if(i < (NRFISH / 2)) { - // tx traffic + /* tx traffic */ if(bm.fishes[i].tx < XMAX) { if(bm.fishes[i].speed < tx_speed) { - // Slowly accelerate + /* Slowly accelerate */ bm.fishes[i].speed += 1; } @@ -665,12 +665,12 @@ } else { - // Done once, go back + /* Done once, go back */ bm.fishes[i].tx = -18 - rand() % XMAX; bm.fishes[i].y = (rand() % (YMAX - 14)); if(tx_speed == 0) { - // Stop the fish when it's at the end... + /* Stop the fish when it's at the end... */ bm.fishes[i].speed = 0; } else @@ -681,24 +681,24 @@ } else { - // rx traffic + /* rx traffic */ if(bm.fishes[i].tx > -18) { if(bm.fishes[i].speed < rx_speed) { - // Slowly accelerate + /* Slowly accelerate */ bm.fishes[i].speed += 1; } bm.fishes[i].tx -= bm.fishes[i].speed; } else { - // Done once, go back + /* Done once, go back */ bm.fishes[i].tx = XMAX + rand() % XMAX; bm.fishes[i].y = (rand() % (YMAX - 14)); if(rx_speed == 0) { - // Stop the fish when it's at the end... + /* Stop the fish when it's at the end... */ bm.fishes[i].speed = 0; } else @@ -801,7 +801,7 @@ mdy = floor(-cos(psi) * 22 * 0.7) + 24; /* reflash the backbuffer / date / weekday */ - // prepare_backbuffer(0); + /* prepare_backbuffer(0); */ } } diff -ru bfm-0.6.2/gkrellm-bfm.c bfm-0.6.3/gkrellm-bfm.c --- bfm-0.6.2/gkrellm-bfm.c 2003-11-04 03:00:43.000000000 +0000 +++ bfm-0.6.3/gkrellm-bfm.c 2004-01-03 08:12:42.000000000 +0000 @@ -33,11 +33,11 @@ #include #include -#define PLUGIN_VERSION "0.6.2" +#define PLUGIN_VERSION "0.6.3" #define PLUGIN_NAME "gkrellm-bfm" #define PLUGIN_DESC "bubblefishymon gkrellm port" -#define PLUGIN_URL "http://www.jnrowe.uklinux.net.net/projects/bfm/" +#define PLUGIN_URL "http://www.jnrowe.ukfsn.org/projects/bfm/" #define PLUGIN_STYLE PLUGIN_NAME #define PLUGIN_KEYWORD PLUGIN_NAME diff -ru bfm-0.6.2/sys_linux.c bfm-0.6.3/sys_linux.c --- bfm-0.6.2/sys_linux.c 2003-11-01 16:34:58.000000000 +0000 +++ bfm-0.6.3/sys_linux.c 2004-01-03 08:12:26.000000000 +0000 @@ -140,28 +140,26 @@ #ifdef ENABLE_FISH - -#define NET_DEVICE "eth0" #define FISH_MAX_SPEED 8 #define DIFF_MIN 10 -// The actual speed for the fish... +/* The actual speed for the fish... */ int tx_speed; int rx_speed; u_int64_t tx_amount; u_int64_t rx_amount; -// Store the last one to compare +/* Store the last one to compare */ u_int64_t last_tx_amount; u_int64_t last_rx_amount; -// Store the max for scaling, too. +/* Store the max for scaling, too. */ u_int64_t max_tx_diff = DIFF_MIN; u_int64_t max_rx_diff = DIFF_MIN; -// The cnt for scaling +/* The cnt for scaling */ int tx_cnt; int rx_cnt; int delay; @@ -189,7 +187,7 @@ char buffer[256]; u_int64_t diff; - // Have some delay in updating/sampling traffic... + /* Have some delay in updating/sampling traffic... */ if(delay++ < 5) { return; @@ -201,12 +199,12 @@ if((dev = fopen("/proc/net/dev", "r")) == NULL) { - // Sanity check + /* Sanity check */ fish_traffic = 0; } else { - // Don't care about the first 2 lines + /* Don't care about the first 2 lines */ fgets(buffer, 256, dev); fgets(buffer, 256, dev); @@ -214,12 +212,12 @@ { char name[256]; - // I love sscanf! :) + /* I love sscanf! :) */ sscanf(buffer, "%*[ ]%[^:]:%*d %Ld %*d %*d %*d %*d %*d %*d %*d %Ld %*d %*d %*d %*d %*d %*d", name, &rx_amount, &tx_amount); if(!strcmp(name, NET_DEVICE)) { - // Incoming traffic + /* Incoming traffic */ if(rx_amount != last_rx_amount) { if(last_rx_amount == 0) @@ -232,26 +230,26 @@ rx_speed = FISH_MAX_SPEED * diff / max_rx_diff; if(rx_speed == 0) { - // At least, make it move a bit, cos we know there's - // traffic + /* At least, make it move a bit, cos we know there's + traffic */ rx_speed = 1; } - // Do something to max rate, to do proper (hopefully) - // scaling + /* Do something to max rate, to do proper (hopefully) + scaling */ if(max_rx_diff < diff) { max_rx_diff = diff; } else { - // Slowly lower the scale + /* Slowly lower the scale */ if(++rx_cnt > 5) { max_rx_diff = diff; if(max_rx_diff < DIFF_MIN) { - // And don't scale it too low + /* And don't scale it too low */ max_rx_diff = DIFF_MIN; } rx_cnt = 0; @@ -264,7 +262,7 @@ } - // Outgoing traffic + /* Outgoing traffic */ if(tx_amount != last_tx_amount) { if(last_tx_amount == 0) @@ -276,26 +274,26 @@ tx_speed= FISH_MAX_SPEED * diff / max_tx_diff; if(tx_speed == 0) { - // At least, make it move a bit, cos we know there's - // traffic + /* At least, make it move a bit, cos we know there's + traffic */ tx_speed = 1; } - // Do something to max rate, to do proper (hopefully) - // scaling + /* Do something to max rate, to do proper (hopefully) + scaling */ if(max_tx_diff < diff) { max_tx_diff = diff; } else { - // Slowly lower the scale + /* Slowly lower the scale */ if(++tx_cnt > 5) { max_tx_diff = diff; if(max_tx_diff < DIFF_MIN) { - // And don't scale it too low + /* And don't scale it too low */ max_tx_diff = DIFF_MIN; } tx_cnt = 0;