From owner-ports-jp@jp.freebsd.org  Mon Oct  4 14:21:36 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id OAA18608;
	Mon, 4 Oct 1999 14:21:36 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from sraigw.sra.co.jp (sraigw.sra.co.jp [202.32.10.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id OAA18603
	for <ports-jp@jp.freebsd.org>; Mon, 4 Oct 1999 14:21:36 +0900 (JST)
	(envelope-from m-kasahr@sra.co.jp)
Received: from srapc517.sra.co.jp (srapc517 [133.137.20.77])
	by sraigw.sra.co.jp (8.8.7/3.7W-sraigw) with ESMTP id OAA15546
	for <ports-jp@jp.freebsd.org>; Mon, 4 Oct 1999 14:21:36 +0900 (JST)
Received: from localhost (localhost [127.0.0.1])
	by srapc517.sra.co.jp (Postfix) with ESMTP id 5A7BE12F
	for <ports-jp@jp.freebsd.org>; Mon,  4 Oct 1999 14:21:35 +0900 (JST)
To: ports-jp@jp.freebsd.org
In-Reply-To: <199910011517.AAA09267@tasogare.imasy.or.jp>
References: <19991001113624M.m-kasahr@srapc517.sra.co.jp>
	<199910011517.AAA09267@tasogare.imasy.or.jp>
X-Mailer: Mew version 1.94 on Emacs 20.3 / Mule 4.0 (HANANOEN)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Mon_Oct__4_14:09:48_1999_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19991004142134V.m-kasahr@srapc517.sra.co.jp>
Date: Mon, 04 Oct 1999 14:21:34 +0900 (JST)
From: Motoyuki Kasahara <m-kasahr@sra.co.jp>
X-Dispatcher: imput version 990905(IM130)
Lines: 125
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 7766
Subject: [ports-jp 7766] Re: ports =?ISO-2022-JP?B?GyRCJEglOyUtJWUbKEI=?=
 =?ISO-2022-JP?B?GyRCJWolRiUjGyhC?= 
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: m-kasahr@sra.co.jp

----Next_Part(Mon_Oct__4_14:09:48_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B3^86$G$9!#(B

* From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
* Date: Sat, 02 Oct 1999 00:20:32 +0900

> $B%;%-%e%j%F%#$H$$$($P!"(B
> crw-rw----  1 root  operator   39,   0 Apr 27 03:36 apm
> $B$3$l$N$3$H$b$"$j$^$9!#(Bshutdown $B$H$+$G$-$k%0%k!<%W$K(B
> $BF~$C$F$$$J$$$H(B apm $B$N>pJs$,<hF@$G$-$J$$$s$G$9!#(B
> $B$3$NItJ,$@$1(B ioctl() $B$8$c$J$/$F(B read() $B$K$9$l$P$&$l$7$$$G$9$+(B?

read() $B$G$b(B apm $B$N>pJs$,<hF@$G$-$k$N$G$7$g$&$+(B?


> wmapm $B$b$=$&$i$7$$$G$9$M!#(B
> redraw $B$OKh2s!"(Bapm $B$X$N(B ioctl() $B$O?t2s$K(B1$B2s$C$FFq$7$$$G$9$+(B?

X $B$N%W%m%0%i%_%s%0$O$<$s$<$s>\$7$/$J$$$N$GJ,$+$j$^$;$s$,!"(Bdocklib
$B$r;29M$K$7$F!"0l1~4V3V$rD9$/$7$F$b(B redraw $B$5$l$k$h$&$K$7$F$_$^$7(B
$B$?!#(B($B$H8@$C$F$b(B XSetWindowBackgroundPixmap() $B$r8F$V$h$&$K$7$?$@$1(B
$B$G$9$,!#(B)

$B%*%W%7%g%s$G(B apm $B$N>pJs$rFI$_$K9T$/4V3V$rIC?t$G;XDj$G$-$k$h$&$K(B
$B$9$k%Q%C%A$r:n$C$F$_$^$7$?$N$G!"$3$N%a!<%k$N8e$m$KE:IU$7$^$9!#(B

$B%W%m%0%i%`$r=q$$$F$kK\?M$,$A$c$s$HJ,$+$C$F$J$$%3!<%I$J$N$GIT0B$G(B
$B$9$,!"!V$=$s$J=hM}$8$cBLL\BLL\!W$H$$$&@<$,$J$5$=$&$J$i!":n<T$KAw$C(B
$B$F%^!<%8$7$F$b$i$($k$+$I$&$+J9$$$F$_$^$9!#(B
________________________________________________________________
                                    $B3^86(B $B4pG7(B($B$+$5$O$i(B $B$b$H$f$-(B)

----Next_Part(Mon_Oct__4_14:09:48_1999_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="wmbattery_1.10.diff"

--- ./wmbattery.c.orig	Mon Oct  4 12:09:04 1999
+++ ./wmbattery.c	Mon Oct  4 13:56:41 1999
@@ -24,6 +24,7 @@
 Display *display;
 GC NormalGC;
 int pos[2] = {0, 0};
+unsigned int sleep_time = DELAY;
 
 #ifdef __FreeBSD__
 #define APM_STATUS_FILE "/dev/apm"
@@ -184,13 +185,15 @@
 	extern char *optarg;
 	
   	while (c != -1) {
-  		c=getopt(argc, argv, "hd:g:");
+  		c=getopt(argc, argv, "hd:g:u:");
 		switch (c) {
 		  case 'h':
 			printf("\nUsage: wmbattery [options]\n");
               		printf("\t-d <display>\tselects target display\n");
                		printf("\t-h\t\tdisplay this help\n");
-                        printf("\t-g +x+y\t\tposition of the window\n\n");
+                        printf("\t-g +x+y\t\tposition of the window\n");
+                        printf("\t-u <seconds>\tupdate interval ");
+                        printf("(default: %u)\n\n", sleep_time);
                		exit(0);
 		 	break;
 		  case 'd':
@@ -208,6 +211,9 @@
                           }
                         }
                         break;
+		  case 'u':
+			sleep_time = atoi(optarg);
+			break;
       		}
     	}
   
@@ -339,7 +345,6 @@
 int main(int argc, char *argv[]) {
 	apm_info cur_info;
 	int time_left, hour_left, min_left, digit, x;
-	unsigned long sleep_time = DELAY;
 
   	make_window(parse_commandline(argc, argv), argc ,argv);
 
@@ -349,6 +354,8 @@
 
 	load_images();
   
+	XSetWindowBackgroundPixmap(display, iconwin, images[FACE]);
+
 	while (1) {
       		if (! apm_read(&cur_info))
       			error("Cannot read APM information.");
@@ -444,6 +451,6 @@
 	
 	      	/* Redraw and wait for next update */
 	      	redraw_window();
-	      	usleep(sleep_time);
+	      	sleep(sleep_time);
 	}
 }
--- ./wmbattery.h.orig	Mon Oct  4 12:09:04 1999
+++ ./wmbattery.h	Mon Oct  4 13:43:07 1999
@@ -1,4 +1,4 @@
-#define DELAY 1250000 /* Delay between refreshes (in microseconds) */
+#define DELAY 2 /* Delay between refreshes (in seconds) */
 
 typedef struct {
 	Pixmap pixmap;
--- ./wmbattery.1x.orig	Mon Oct  4 12:09:04 1999
+++ ./wmbattery.1x	Mon Oct  4 12:09:08 1999
@@ -56,6 +56,9 @@
 .TP
 .B \-g +x+y
 Specify geometry to start up at. This specifies position, not size.
+.TP
+.B \-u [seconds]
+Specify update interval. The default value is 2.
 .SH AUTHOR
 Joey Hess <joey@kitenet.net>, based on wmapm by
 Chris D. Faulhaber <jedgar@speck.ml.org>

----Next_Part(Mon_Oct__4_14:09:48_1999_809)----
