[Pkg-wmaker-commits] [wmbubble] 100/207: More renaming effort. Tried to get rid of the bubblemon name in any outward-facing manner. Still need to revise man page.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 04:18:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbubble.
commit 34d10bbfcc201d310ca5e2852ec81de64a6dcf23
Author: Robert Jacobs <rnjacobs at mit.edu>
Date: Wed Aug 31 18:28:14 2011 -0700
More renaming effort. Tried to get rid of the bubblemon name in any outward-facing manner. Still need to revise man page.
---
ChangeLog | 3 ++
INSTALL | 20 ++++++------
README | 89 ++++++++++++++++-----------------------------------
bubblemon.c | 4 +--
debian/changelog | 6 ++++
debian/docs | 2 +-
debian/rules | 0
doc/Xdefaults.sample | 12 -------
doc/Xresources.sample | 35 ++++++++++++++++++++
include/bubblemon.h | 2 +-
include/sys_include.h | 2 +-
sys_freebsd.c | 2 +-
sys_linux.c | 2 +-
sys_netbsd.c | 2 +-
sys_openbsd.c | 2 +-
sys_sunos.c | 2 +-
16 files changed, 90 insertions(+), 95 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dc3bcaf..b174e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -152,3 +152,6 @@ Thu 13 May 2004 - 1.45
Sat 15 May 2004 - 1.46
Compile fix for FreeBSD-5.x, forgotten include.
+
+??? - 1.50
+ blah blah blah
diff --git a/INSTALL b/INSTALL
index b599e81..e29ed68 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,22 +1,20 @@
Install instructions:
1. read README
-1a. On Linux 2.6, edit Makefile and uncommend top line that adds -DKERNEL_26
-2. make (on FreeBSD, make -f Makefile.FreeBSD)
-3. make install (this will put bubblemon in /usr/local/bin)
-4. bubblemon &
+2. make
+3. make install (this will put wmbubble in /usr/local/bin)
+4. wmbubble &
-Using GNU make bubblemon should compile without changes on any system listed
+Using GNU make wmbubble should compile without changes on any system listed
in SUPPORTED_SYSTEMS file. If not, feel free to fix it and send me a diff -u.
Check README file for configuration options - you can either permanently
disable a feature by editing Makefile and commenting out any of the EXTRA
defines, or disable it at run-time by using command-line switches. Colors
-and bubble physics can also be configured through ~/.Xdefaults file.
+and bubble physics can also be configured through ~/.Xresources file.
-If your FreeBSD system doesn't have GNU Make, use Makefile.FreeBSD. If it
-does, regular Makefile should be able to detect things correctly. Also,
-on FreeBSD, you can do make install as root to install in /usr/local/bin
-and give bubblemon proper permissions, or you'll have to give bubblemon
+On BSDs, you can do make install as root to install in /usr/local/bin
+and give wmbubble proper permissions, or you'll have to give wmbubble
kmem access yourself:
-root:~# chown root:kmem bubblemon; chmod g+s bubblemon
+
+root:~# chown root:kmem wmbubble; chmod g+s wmbubble
diff --git a/README b/README
index 5306cc8..5740d1a 100644
--- a/README
+++ b/README
@@ -5,11 +5,11 @@ Abstract:
This program is a dockapp-style CPU, memory, swap and load average monitor.
Based on the GNOME BubbleMon applet, this program has been considerably
-improved. Many new features have been added. This is version 1.3.
+improved. Many new features have been added. This is version 1.5.
Features:
-On the surface, dockapp BubbleMon follows the same style as original GNOME
+On the surface, WMBubble follows the same style as original GNOME
applet. Main screen area is split into 2 parts - air and water. Water level
depends on how much physical and virtual memory is used by the system. CPU
activity makes water "boil" and creates bubbles. CPU meter near the bottom
@@ -19,17 +19,17 @@ water and air colors change depending on amount of swap used. There is a
cute yellow duck swimming from one corner of the dockapp to another. The
duck really doesn't do anything at the moment, but in a future version it's
speed might correspond to system load average or another variable. This is
-the "main" mode of BubbleMon.
+the "main" mode of WMBubble.
There are 2 additional screens available - memory and load average. Load
-average screen is accessed by simply hovering the mouse pointer over BubbleMon
+average screen is accessed by simply hovering the mouse pointer over WMBubble
window. Memory screen is accessed same way, except you must hold down either
-left or right "Shift" key before moving the mouse pointer over BubbleMon
+left or right "Shift" key before moving the mouse pointer over WMBubble
window. Both Memory and Load average screens fade in slowly for a reason -
during fade, you can click "Right" mouse button to lock currently fading
screen. This way you can see both CPU load screen and either memory or load
average screen. To exit "locked" mode, simply move the mouse pointer in and
-out of the BubbleMon window.
+out of the WMBubble window.
Memory screen displays current amount of free memory and swap, in kilobytes
and percent. Top number is amount of used memory, in kilobytes and percent,
@@ -45,33 +45,37 @@ below the load average numbers. Default "light blue" color of load average
and memory screens can be changed to a "pale" version by using "-p" command
line switch.
-You can start BubbleMon with up to 2 command-line argumens (not counting
+You can start WMBubble with up to 2 command-line argumens (not counting
switches), each being a path to a program or shell script to execute when
-you click Left or Middle mouse button inside BubbleMon window. These must
+you click Left or Middle mouse button inside WMBubble window. These must
be the last 2 parameters. There is a .wav file and a simple shell script
to play it, inside misc/ directory, which you can use to make some duck
-sounds with bubblemon.
+sounds with WMBubble.
Configuration:
-BubbleMon is very configurable. Previous section explains many features, but
+WMBubble is very configurable. Previous section explains many features, but
all of them can be disabled, either through compile-time settings or with
-command-line switches at startup. Either the general Makefile or FreeBSD-
-specific Makefile contain compilation defines near the top. You can comment out
+command-line switches at startup. The general Makefile contains
+ compilation defines near the top. You can comment out
a particular line, to disable that feature. Alternatively, you can run
-"bubblemon -h" for a list of command line options. This will show command-line
-switches which can be used to disable certain BubbleMon modes, and modify color
+"wmbubble -help" for a list of command line options. This will show command-line
+switches which can be used to disable certain WMBubble modes, and modify color
scheme used in memory and load average screens. You can also change colors of
the air, water, various physics constants which control bubble generation, and
maximum number of bubbles to make. All of these settings are read on start-up
-from the user's HOME directory, using .Xdefaults file. If you don't have a
-.Xdefaults file in your home directory, you can copy Xdefaults.sample which
-is distributed with BubbleMon. If you already have some settings in .Xdefaults
-you can simply append BubbleMon settings file to your current configuration:
-hostname:~$ cat /path/to/bubblemon-src/Xdefaults.sample >> ~/.Xdefaults
-However if you are happy with the current color scheme or bubble physics, you
-don't need to do anything at all, because BubbleMon has default settings
-compiled in.
+from the Xserver's loaded xresources, probably loaded from the .Xresources files.
+
+If you don't have a .Xresources file in your home directory, you can copy
+Xresources.sample which is distributed with WMBubble. If you already have
+some settings in .Xresources you can simply append WMBubble settings file
+to your current configuration:
+
+hostname:~$ cat /path/to/wmbubble-src/Xresources.sample >> ~/.Xresources
+
+However if you are happy with the current color scheme or bubble physics,
+you don't need to do anything at all, because WMBubble has default
+settings compiled in.
Information about original GNOME BubbleMon applet:
@@ -81,48 +85,9 @@ not have a cute duck, uses more CPU, and doesn't allow you to start programs
by clicking on it. But, I guess if you like GNOME, you might want to check
it out.
-Programming details:
-
-It's been a long tradition that dockapps use Xlib to draw, mainly because
-that's what the first dockapp used and because there are some abstraction
-layers to hide some of Xlib ugliness (libdockapp, wmgeneral, etc). Xlib is
-fine if all you do is change a couple pixels every other second, like most
-dockapps do. But if you deal with 3D, or any kind of large amount of pixel
-shuffling, Xlib really starts to suck. Common mistake when doing lots of
-pixel shuffling in Xlib is using XPutPixel or XCopyArea. Say, you got a
-56x56 dockapp, and 80% of it is changed every 10ms. That's almost 2.5
-thousand pixel ops. And a 1x1 XCopyArea takes as much server overhead as a
-64x64 XCopyArea. Since X11 sucks, each one of these puts a request in the
-server queue and will waste ungodly amounts of bandwidth (if you run a
-remote X session) and use CPU time on the server machine. X11 really doesn't
-provide any simple way to deal with drawing stuff on screen without messing
-with colormaps or other serious ugliness. If you are familiar with game
-programming and that kind of stuff, you know that screen is usually drawn on
-a back buffer and then switched, so the user sees smooth animation instead
-of watching the screen redraw. X11 doesn't really have this feature, because
-even drawing to a off-screen pixmap is still slow - and requires contacting
-the server, and still requires dealing with colormaps.
-
-Solution is simple. GDK. Gimp Drawing toolKit. And a large buffer to draw
-in. Render your screen on the "back buffer", which is completely in memory
-and thus doesn't need to contact the server, and then use gdk_draw_rgb_image
-to quicky slap that on-screen. That's about the only GDK function you will
-ever need to use. Results are impressive - very complex scenes could be
-rendered in local memory, fast, and the only network I/O generated is from
-copying backbuffer to the screen, which is minimal compared to updating the
-same screen pixel by pixel. Since bubblemon does a lot of pixel shuffling,
-it uses this technique to draw. Thanks to gdkrgb, BubbleMon achieves fluid
-animation at 33 frames per second. Some window managers, like BlackBox,
-don't require dockapps to draw on the main window, only on the icon window.
-You can run make with "make WMAN=-DBLACKBOX" to remove code dealing with
-drawing on main window, for a marginal performance improvement, though it's
-very unlikely you will notice the difference unless you are profiling.
-
-timecop at japan.co.jp
-
Notes from the FreeBSD port author:
For FreeBSD, the percentage of used memory is calculated as
number_of_active_pages / total_number_of_pages_in_the_system * 100%.
-If you have any concerns regarding this or FreeBSD port of BubbleMon
+If you have any concerns regarding this or FreeBSD port of WMBubble
in general, please email oleg dashevskii <od at iclub.nsu.ru>.
diff --git a/bubblemon.c b/bubblemon.c
index 41bb8c0..d385b7f 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -238,13 +238,13 @@ void bubblemon_session_defaults(XrmDatabase x_resource_database)
/* number of CPU load samples */
bm.samples = 16;
- /* default colors. changeable from Xdefaults */
+ /* default colors. changeable from Xresources */
bm.air_noswap = 0x2299ff;
bm.liquid_noswap = 0x0055ff;
bm.air_maxswap = 0xff0000;
bm.liquid_maxswap = 0xaa0000;
- /* default bubble engine parameters. Changeable from Xdefaults */
+ /* default bubble engine parameters. Changeable from Xresources */
bm.maxbubbles = 100;
bm.ripples = .2;
bm.gravity = 0.06;
diff --git a/debian/changelog b/debian/changelog
index 5bbe178..31c1b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmbubble (1.50) upstream; urgency=low
+
+ * New upstream, new upstream release
+
+ -- Robert Jacobs <rnjacobs at mit.edu> Wed, 31 Aug 2011 18:00:12 -0700
+
wmbubble (1.46-2.1) unstable; urgency=low
* debian/control
diff --git a/debian/docs b/debian/docs
index e43d3cb..03b3484 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
README
-doc/Xdefaults.sample
+doc/Xresources.sample
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
diff --git a/doc/Xdefaults.sample b/doc/Xdefaults.sample
deleted file mode 100644
index 9b8403d..0000000
--- a/doc/Xdefaults.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-! WMBubble settings
-! vim: syntax=xdefaults
-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
diff --git a/doc/Xresources.sample b/doc/Xresources.sample
new file mode 100644
index 0000000..e6caba0
--- /dev/null
+++ b/doc/Xresources.sample
@@ -0,0 +1,35 @@
+! WMBubble settings
+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
+wmbubble*duckbody: #F8FC00
+wmbubble*duckbill: #F8B040
+wmbubble*duckeye: black
+wmbubble*delay: 15000
+wmbubble*duck: yes
+wmbubble*upsidedown: yes
+wmbubble*cpumeter: yes
+wmbubble*graphdigit: #308cf0
+wmbubble*graphwarn: #ed1717
+wmbubble*graphlabel: #C1C400
+wmbubble*graphfield: #202020
+wmbubble*graphgrid: #062A00
+wmbubble*graphmax: #20B6AE
+wmbubble*graphbar: #007D71
+wmbubble*graphmarkers: #71E371
+wmbubble*graphs: yes
+wmbubble*units: kilobytes
+wmbubble*shifttime: 0
+wmbubble*digital: no
+wmbubble*showdate: no
+wmbubble*analog: no
+wmbubble*hourcolor: #EEEEEE
+wmbubble*mincolor: #BF0000
+wmbubble*seccolor: #C79F2B
\ No newline at end of file
diff --git a/include/bubblemon.h b/include/bubblemon.h
index ebfb601..63b99af 100644
--- a/include/bubblemon.h
+++ b/include/bubblemon.h
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2
+/* WMBubble dockapp 1.2
*
* 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
diff --git a/include/sys_include.h b/include/sys_include.h
index 8e96773..c4812cc 100644
--- a/include/sys_include.h
+++ b/include/sys_include.h
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2
+/* WMBubble dockapp 1.2
*
* 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
diff --git a/sys_freebsd.c b/sys_freebsd.c
index fbfc4fd..a5098a8 100644
--- a/sys_freebsd.c
+++ b/sys_freebsd.c
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2 - FreeBSD specific code
+/* WMBubble dockapp 1.2 - FreeBSD specific code
* Copyright (C) 2001, oleg dashevskii <od at iclub.nsu.ru>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/sys_linux.c b/sys_linux.c
index c898ab6..be23f82 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2 - Linux specific code
+/* WMBubble dockapp 1.2 - Linux specific code
* Copyright 2000, 2001 timecop at japan.co.jp
*
* This program is free software; you can redistribute it and/or modify
diff --git a/sys_netbsd.c b/sys_netbsd.c
index a9222b6..b9bf3c8 100644
--- a/sys_netbsd.c
+++ b/sys_netbsd.c
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2 - NetBSD specific code
+/* WMBubble dockapp 1.2 - NetBSD specific code
* Copyright (C) 2001, Peter Stromberg <wilfried at openbsd.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/sys_openbsd.c b/sys_openbsd.c
index 1cd9427..78eb515 100644
--- a/sys_openbsd.c
+++ b/sys_openbsd.c
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2 - OpenBSD specific code
+/* WMBubble dockapp 1.2 - OpenBSD specific code
* Copyright (C) 2001, Peter Stromberg <wilfried at openbsd.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/sys_sunos.c b/sys_sunos.c
index 37c1934..b2c0e3c 100644
--- a/sys_sunos.c
+++ b/sys_sunos.c
@@ -1,4 +1,4 @@
-/* BubbleMon dockapp 1.2 - SunOS specific code
+/* WMBubble dockapp 1.2 - SunOS specific code
* Copyright 2001 Phil Lu <wplu13 at netscape.net>
* Copyright 2001 Dan Price <dp at rampant.org>
* vim: ts=4 sw=4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git
More information about the Pkg-wmaker-commits
mailing list