[Pkg-wmaker-commits] [wmbattery] 24/241: * Still show percent sign when blinking low. Closes: #123183

[Doug Torrance]

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

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

commit 8f1a76b34aa3ef7a94951cbd933d0303593626ad
Author: joey <joey at a4a2c43b-8ac3-0310-8836-e0e880c912e2>
Date:   Mon Dec 10 04:18:06 2001 +0000

       * Still show percent sign when blinking low. Closes: #123183
---
 battery_blink.xpm | 19 +++++++++++++++++++
 debian/changelog  |  6 ++++++
 debian/control    |  2 +-
 wmbattery.c       |  2 +-
 wmbattery.h       | 19 ++++++++++---------
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/battery_blink.xpm b/battery_blink.xpm
new file mode 100644
index 0000000..28c5ef6
--- /dev/null
+++ b/battery_blink.xpm
@@ -0,0 +1,19 @@
+/* XPM */
+static char * battery_blink_xpm[] = {
+"25 13 3 1",
+" 	c #208120812081",
+".	c #000049244103",
+"X	c #2081B2CAAEBA",
+" .....................   ",
+"..                   ..  ",
+".                     .  ",
+".    ...   ...   X    .  ",
+". . .   . .   . X X X ...",
+". . .   . .   .  X X  ...",
+".    ...   ...    X   ...",
+". . .   . .   .  X X  ...",
+". . .   . .   . X X X ...",
+".    ...   ...     .  .  ",
+".                     .  ",
+"..                   ..  ",
+" .....................   "};
diff --git a/debian/changelog b/debian/changelog
index d972d10..5720c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmbattery (1.20) unstable; urgency=low
+
+  * Still show percent sign when blinking low. Closes: #123183
+
+ -- Joey Hess <joeyh at debian.org>  Sun,  9 Dec 2001 22:44:17 -0500
+
 wmbattery (1.19) unstable; urgency=low
 
   * Used two more grey's in the transition between shadow and highlight
diff --git a/debian/control b/debian/control
index fc83a6f..b200fd5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: wmbattery
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: wmaker
-Description: Display laptop battery info, dockable in Windowmaker
+Description: Display laptop battery info, dockable in WindowMaker
  Wmbattery displays the status of your laptop's battery in a small icon.
  This includes if it is plugged in, if the battery is charging, how many
  minutes of battery life remain, battery life remaining (with both a 
diff --git a/wmbattery.c b/wmbattery.c
index 8cca32f..623f19d 100644
--- a/wmbattery.c
+++ b/wmbattery.c
@@ -422,7 +422,7 @@ void recalc_window(apm_info cur_info) {
 		if (blinked)
 			draw_image(BATTERY_LOW);
 		else
-			draw_image(BATTERY_NONE);
+			draw_image(BATTERY_BLINK);
 		blinked=!blinked;
 		break;
 	  default:
diff --git a/wmbattery.h b/wmbattery.h
index 0a71563..0937c6f 100644
--- a/wmbattery.h
+++ b/wmbattery.h
@@ -39,15 +39,16 @@ typedef struct image_info_type {
 #define BATTERY_MEDIUM 3
 #define BATTERY_LOW 4
 #define BATTERY_NONE 5
-#define UNPLUGGED 6
-#define PLUGGED 7
-#define NOCHARGING 8
-#define CHARGING 9
-#define DIAL_BRIGHT 10
-#define DIAL_DIM 11
-#define FACE 12
+#define BATTERY_BLINK 6
+#define UNPLUGGED 7
+#define PLUGGED 8
+#define NOCHARGING 9
+#define CHARGING 10
+#define DIAL_BRIGHT 11
+#define DIAL_DIM 12
+#define FACE 13
 
-#define NUM_IMAGES 13
+#define NUM_IMAGES 14
 
 /*
  * An array of the filenames of all images to load (minus .xpm extention),
@@ -60,6 +61,7 @@ static struct image_info_type image_info[] = {
   {"battery_medium",25,13,33,42,0},
   {"battery_low",25,13,33,42,0},
   {"battery_none",25,13,33,42,0},
+  {"battery_blink",25,13,33,42,0},
   {"unplugged",10,8,6,45,0},
   {"plugged",10,8,6,45,0},
   {"nocharging",15,9,17,43,0},
@@ -69,7 +71,6 @@ static struct image_info_type image_info[] = {
   {"face",64,64,0,0,0},
 };
 
-/* TODO: get rid of this. */
 #define DIAL_MULTIPLIER 0.56
 
 /* Locations of letters in the percent remaining display. */

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