From owner-FreeBSD-users-jp@jp.freebsd.org  Fri Nov 22 02:57:43 1996
Received: by jaz.jp.freebsd.org (8.7.3+2.6Wbeta5/8.7.3) id CAA24172
	Fri, 22 Nov 1996 02:57:43 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.7.3+2.6Wbeta5/8.7.3) with ESMTP id CAA24167
	for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 22 Nov 1996 02:57:42 +0900 (JST)
Received: from chaos.calm.imasy.or.jp (ume@ppp2.imasy.or.jp [202.227.24.12]) by tasogare.imasy.or.jp (8.8.2+2.6Wbeta9/3.4W4-96030215) with ESMTP id CAA28020 for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 22 Nov 1996 02:57:36 +0900 (JST)
Received: from localhost (ume@localhost [127.0.0.1]) by chaos.calm.imasy.or.jp (8.8.3+2.6Wbeta9/3.5Wpl1-CHAOS1.5) with ESMTP id CAA22596 for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 22 Nov 1996 02:33:20 +0900 (JST)
To: FreeBSD-users-jp@jp.freebsd.org
In-Reply-To: Your message of "Thu, 21 Nov 1996 00:08:27 +0000"
References: <199611210008.AAA00835@cylon.on.rim.or.jp>
X-Mailer: Mew version 1.06 on Emacs 19.34.1, Mule 2.3
X-PGP-Fingerprint: 6B 0C 53 FC 5D D0 37 91  05 D0 B3 EF 36 9B 6A BC
X-URL: http://www.imasy.or.jp/~ume/
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Fri_Nov_22_02:33:13_1996)--"
Message-Id: <19961122023317G/ume@chaos.calm.imasy.or.jp>
Date: Fri, 22 Nov 1996 02:33:17 +0900
From: Hajimu UMEMOTO <ume@calm.imasy.or.jp>
X-Dispatcher: impost version 0.91 (Jun 5,1996)
Lines: 85
Reply-To: FreeBSD-users-jp@jp.freebsd.org
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 6664
Subject: [FreeBSD-users-jp 6664] Re: fvwm95 APM patch for FreeBSD
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

----Next_Part(Fri_Nov_22_02:33:13_1996)--
Content-Type: Text/Plain; charset=iso-2022-jp

  $BG_K\!wF|N)$G$9!#(B

>>>>> On Thu, 21 Nov 1996 00:08:27 +0000,
	Yoshishige Arai <ryo2@on.rim.or.jp> said:

ryo2> $B$($C$H!"(Bfvwm95-2.0.42a$B$KBP$9$k(B APM$B3HD%%Q%C%A$H$$$&E[$r:n$j$^$7$?!#(B

  TP530Cs $B$G;H$&$H!"(BBattery Life $B$,>o$K(B 100% $B$K$J$C$A$c$C$F2y$7$$$N$G!"(B
$B$A$g$C$H$4$^$+$7$^$7$?!#$^$?!"(BBattery Status $B$,=&$($J$$%1!<%9$,$"$k$N(B
$B$G!"$3$N>l9g!"(Bunknown $B$HI=<($9$k$h$&$K$7$F$"$j$^$9!#(B
  I18N $B%Q%C%AHG$+$i$N:9J,$K$J$C$F$$$^$9!#(B

ryo2> $BF0:n%F%9%H$O(B 2.1.5R$B$7$+$7$F$$$J$$$N$G!"B>$N%P!<%8%g%s$GIT6q9g$,$"$C(B
ryo2> $B$?$i$*CN$i$;$$$?$@$1$k$H4r$7$$$G$9!#(B

  2.2-ALPHA + PAO-961115 $B$G855$$KF0$$$F$$$^$9!#(B:-)


----Next_Part(Fri_Nov_22_02:33:13_1996)--
Content-Type: Text/Plain; charset=us-ascii

diff -ur org/modules/FvwmTaskBar/Goodies.c modules/FvwmTaskBar/Goodies.c
--- org/modules/FvwmTaskBar/Goodies.c	Fri Nov 22 01:07:40 1996
+++ modules/FvwmTaskBar/Goodies.c	Thu Nov 21 02:52:09 1996
@@ -43,7 +43,7 @@
 static int fontheight, clock_width, battery_width = 0;
 char ac_str[] = " !*";
 char *acline_str[] = {"AC off-line","AC on-line","On backup power"};
-char *battstat_str[] = {"high", "low", "critical", "charging"};
+char *battstat_str[] = {"high", "low", "critical", "charging", "unknown"};
 Pixmap battpix, batt2pix;
 #else
 int fontheight, clock_width;
diff -ur org/modules/FvwmTaskBar/apm.h modules/FvwmTaskBar/apm.h
--- org/modules/FvwmTaskBar/apm.h	Fri Nov 22 01:07:40 1996
+++ modules/FvwmTaskBar/apm.h	Fri Nov 22 01:12:40 1996
@@ -11,5 +11,14 @@
 #define APM_DEVICE "/dev/apm"
 #define BATT_ICON (True+1)
 
+#define	APM_STAT_UNKNOWN	255
+#define	APM_STAT_LINE_OFF	0
+#define	APM_STAT_LINE_ON	1
+#define	APM_STAT_BATT_HIGH	0
+#define	APM_STAT_BATT_LOW	1
+#define	APM_STAT_BATT_CRITICAL	2
+#define	APM_STAT_BATT_CHARGING	3
+#define	APM_STAT_BATT_UNKNOWN	4
+
 extern int   apm_exists(void);
 extern int   apm_read(apm_info_t i);
diff -ur org/modules/FvwmTaskBar/apmlib.c modules/FvwmTaskBar/apmlib.c
--- org/modules/FvwmTaskBar/apmlib.c	Fri Nov 22 01:07:40 1996
+++ modules/FvwmTaskBar/apmlib.c	Thu Nov 21 03:04:40 1996
@@ -20,6 +20,18 @@
   int  fd;
   if (!(fd = open(APM_DEVICE, O_RDWR))) return 0;
   if (ioctl(fd, APMIO_GETINFO, i) == -1) return 0;
+  if (i->ai_batt_stat > APM_STAT_BATT_UNKNOWN)
+    i->ai_batt_stat = APM_STAT_BATT_UNKNOWN;
+  if (i->ai_batt_life == APM_STAT_UNKNOWN) {
+    if (i->ai_batt_stat == APM_STAT_BATT_HIGH) {
+      i->ai_batt_life = 100;
+    } else if (i->ai_batt_stat == APM_STAT_BATT_LOW) {
+      i->ai_batt_life = 40;
+    } else if (i->ai_batt_stat == APM_STAT_BATT_CRITICAL ||
+	       i->ai_batt_stat == APM_STAT_BATT_CHARGING) {
+      i->ai_batt_life = 20;
+    }
+  }
   if (i->ai_batt_life > 100) i->ai_batt_life = 100;
   close(fd);
   return 1;

----Next_Part(Fri_Nov_22_02:33:13_1996)--
Content-Type: Text/Plain; charset=iso-2022-jp

$BG_K\(B $BH%(B $B!w(B $B%$%s%?!<%M%C%H8_=u2q2#IM(B
ume@imasy.or.jp  ume@iabs.hitachi.co.jp  http://www.imasy.or.jp/~ume/
$B%W%m%0%i%`$O=q$$$??M$N0U?^$G$O$J$/=q$+$l$?DL$jF0$/(B

----Next_Part(Fri_Nov_22_02:33:13_1996)----
