annotate lisp/battery.el @ 90072:cb67264d6096

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents 95879cc1ed20 9120644ff426
children 02f1dbc4a199
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38292
diff changeset
1 ;;; battery.el --- display battery status information
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
59363
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
3 ;; Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004, 2005
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
4 ;; Free Software Foundation, Inc.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
30110
23cb074f9d88 Change author's mail address.
Gerd Moellmann <gerd@gnu.org>
parents: 26828
diff changeset
6 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
20972
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
7 ;; Keywords: hardware
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8
18685
4f3350c88e6c Fix copyright and copying permissions.
Richard M. Stallman <rms@gnu.org>
parents: 18388
diff changeset
9 ;; This file is part of GNU Emacs.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
18685
4f3350c88e6c Fix copyright and copying permissions.
Richard M. Stallman <rms@gnu.org>
parents: 18388
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; any later version.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15
18685
4f3350c88e6c Fix copyright and copying permissions.
Richard M. Stallman <rms@gnu.org>
parents: 18388
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
18685
4f3350c88e6c Fix copyright and copying permissions.
Richard M. Stallman <rms@gnu.org>
parents: 18388
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
4f3350c88e6c Fix copyright and copying permissions.
Richard M. Stallman <rms@gnu.org>
parents: 18388
diff changeset
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 ;;; Commentary:
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
52470
b4d15685afef 2003-09-10 Mario Lang <mlang@delysid.org>
Alex Schroeder <alex@gnu.org>
parents: 52450
diff changeset
28 ;; There is at present support for interpreting the new `/proc/apm'
b4d15685afef 2003-09-10 Mario Lang <mlang@delysid.org>
Alex Schroeder <alex@gnu.org>
parents: 52450
diff changeset
29 ;; file format of Linux version 1.3.58 or newer and for the `/proc/acpi/'
b4d15685afef 2003-09-10 Mario Lang <mlang@delysid.org>
Alex Schroeder <alex@gnu.org>
parents: 52450
diff changeset
30 ;; directory structure of Linux 2.4.20 and 2.6.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 ;;; Code:
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 (require 'timer)
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
35 (eval-when-compile (require 'cl))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
38 (defgroup battery nil
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
39 "Display battery status information."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
40 :prefix "battery-"
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
41 :group 'hardware)
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
42
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
43 (defcustom battery-status-function
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 (cond ((and (eq system-type 'gnu/linux)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 (file-readable-p "/proc/apm"))
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
46 'battery-linux-proc-apm)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
47 ((and (eq system-type 'gnu/linux)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
48 (file-directory-p "/proc/acpi/battery"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
49 'battery-linux-proc-acpi))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50 "*Function for getting battery status information.
36090
9ed7c3f74e35 (battery-status-function): Fix doc, :type.
Dave Love <fx@gnu.org>
parents: 32356
diff changeset
51 The function has to return an alist of conversion definitions.
9ed7c3f74e35 (battery-status-function): Fix doc, :type.
Dave Love <fx@gnu.org>
parents: 32356
diff changeset
52 Its cons cells are of the form
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
54 (CONVERSION . REPLACEMENT-TEXT)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
55
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
56 CONVERSION is the character code of a \"conversion specification\"
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
57 introduced by a `%' character in a control string."
36090
9ed7c3f74e35 (battery-status-function): Fix doc, :type.
Dave Love <fx@gnu.org>
parents: 32356
diff changeset
58 :type '(choice (const nil) function)
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
59 :group 'battery)
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
61 (defcustom battery-echo-area-format
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
62 (cond ((eq battery-status-function 'battery-linux-proc-apm)
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
63 "Power %L, battery %B (%p%% load, remaining time %t)")
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
64 ((eq battery-status-function 'battery-linux-proc-acpi)
55904
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
65 "Power %L, battery %B at %r (%p%% load, remaining time %t)"))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66 "*Control string formatting the string to display in the echo area.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67 Ordinary characters in the control string are printed as-is, while
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68 conversion specifications introduced by a `%' character in the control
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 string are substituted as defined by the current value of the variable
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
70 `battery-status-function'."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
71 :type '(choice string (const nil))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
72 :group 'battery)
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
74 (defvar battery-mode-line-string nil
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
75 "String to display in the mode line.")
59132
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
76 ;;;###autoload (put 'battery-mode-line-string 'risky-local-variable t)
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
77
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
78 (defcustom battery-mode-line-format
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
79 (cond ((eq battery-status-function 'battery-linux-proc-apm)
59132
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
80 "[%b%p%%]")
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
81 ((eq battery-status-function 'battery-linux-proc-acpi)
59132
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
82 "[%b%p%%,%d°C]"))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
83 "*Control string formatting the string to display in the mode line.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
84 Ordinary characters in the control string are printed as-is, while
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
85 conversion specifications introduced by a `%' character in the control
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 string are substituted as defined by the current value of the variable
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
87 `battery-status-function'."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
88 :type '(choice string (const nil))
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
89 :group 'battery)
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90
21088
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
91 (defcustom battery-update-interval 60
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
92 "*Seconds after which the battery status will be updated."
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
93 :type 'integer
ac1673121774 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 21076
diff changeset
94 :group 'battery)
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 (defvar battery-update-timer nil
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 "Interval timer object.")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98
21076
dc82196eac58 Fixed spelling of `autoload' magic cookies.
Richard M. Stallman <rms@gnu.org>
parents: 20972
diff changeset
99 ;;;###autoload
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 (defun battery ()
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 "Display battery status information in the echo area.
26828
983f253505d0 (battery): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 21317
diff changeset
102 The text being displayed in the echo area is controlled by the variables
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103 `battery-echo-area-format' and `battery-status-function'."
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 (interactive)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 (message "%s" (if (and battery-echo-area-format battery-status-function)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106 (battery-format battery-echo-area-format
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 (funcall battery-status-function))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108 "Battery status not available")))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109
21076
dc82196eac58 Fixed spelling of `autoload' magic cookies.
Richard M. Stallman <rms@gnu.org>
parents: 20972
diff changeset
110 ;;;###autoload
59363
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
111 (define-minor-mode display-battery-mode
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
112 "Display battery status information in the mode line.
32346
fa3f5e8f6201 (display-battery): Doc spelling fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 30110
diff changeset
113 The text being displayed in the mode line is controlled by the variables
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
114 `battery-mode-line-format' and `battery-status-function'.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
115 The mode line will be updated automatically every `battery-update-interval'
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
116 seconds."
59363
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
117 :global t
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
118 (setq battery-mode-line-string "")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
119 (or global-mode-string (setq global-mode-string '("")))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
120 (and battery-update-timer (cancel-timer battery-update-timer))
59363
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
121 (if (not display-battery-mode)
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
122 (setq global-mode-string
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
123 (delq 'battery-mode-line-string global-mode-string))
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
124 (add-to-list 'global-mode-string 'battery-mode-line-string t)
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
125 (setq battery-update-timer (run-at-time nil battery-update-interval
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
126 'battery-update-handler))
9120644ff426 (display-battery-mode): Rename from display-battery.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59132
diff changeset
127 (battery-update)))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
128
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
129 (defun battery-update-handler ()
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
130 (battery-update)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
131 (sit-for 0))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
132
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
133 (defun battery-update ()
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
134 "Update battery status information in the mode line."
59132
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
135 (setq battery-mode-line-string
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
136 (propertize (if (and battery-mode-line-format
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
137 battery-status-function)
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
138 (battery-format
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
139 battery-mode-line-format
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
140 (funcall battery-status-function))
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
141 "")
38f1d5865861 (battery-mode-line-format): Remove initial spaces.
Richard M. Stallman <rms@gnu.org>
parents: 57143
diff changeset
142 'help-echo "Battery status information"))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
143 (force-mode-line-update))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
144
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
145
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
146 ;;; `/proc/apm' interface for Linux.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
147
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148 (defconst battery-linux-proc-apm-regexp
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
149 (concat "^\\([^ ]+\\)" ; Driver version.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
150 " \\([^ ]+\\)" ; APM BIOS version.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
151 " 0x\\([0-9a-f]+\\)" ; APM BIOS flags.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
152 " 0x\\([0-9a-f]+\\)" ; AC line status.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
153 " 0x\\([0-9a-f]+\\)" ; Battery status.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
154 " 0x\\([0-9a-f]+\\)" ; Battery flags.
20972
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
155 " \\(-?[0-9]+\\)%" ; Load percentage.
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
156 " \\(-?[0-9]+\\)" ; Remaining time.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
157 " \\(.*\\)" ; Time unit.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
158 "$")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
159 "Regular expression matching contents of `/proc/apm'.")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
160
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
161 (defun battery-linux-proc-apm ()
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
162 "Get APM status information from Linux kernel.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
163 This function works only with the new `/proc/apm' format introduced
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
164 in Linux version 1.3.58.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
165
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
166 The following %-sequences are provided:
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
167 %v Linux driver version
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168 %V APM BIOS version
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
169 %I APM BIOS status (verbose)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
170 %L AC line status (verbose)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
171 %B Battery status (verbose)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
172 %b Battery status, empty means high, `-' means low,
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
173 `!' means critical, and `+' means charging
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
174 %p battery load percentage
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
175 %s Remaining time in seconds
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
176 %m Remaining time in minutes
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
177 %h Remaining time in hours
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
178 %t Remaining time in the form `h:min'"
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
179 (let (driver-version bios-version bios-interface line-status
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
180 battery-status battery-status-symbol load-percentage
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
181 seconds minutes hours remaining-time buffer tem)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
182 (unwind-protect
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
183 (save-excursion
21317
566100bc6eef (battery-linux-proc-apm): Re-use the temporary buffer.
Richard M. Stallman <rms@gnu.org>
parents: 21088
diff changeset
184 (setq buffer (get-buffer-create " *battery*"))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
185 (set-buffer buffer)
21317
566100bc6eef (battery-linux-proc-apm): Re-use the temporary buffer.
Richard M. Stallman <rms@gnu.org>
parents: 21088
diff changeset
186 (erase-buffer)
41919
842512c9651c (battery-insert-file-contents): Obsolete function removed.
Noah Friedman <friedman@splode.com>
parents: 38737
diff changeset
187 (insert-file-contents "/proc/apm")
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
188 (re-search-forward battery-linux-proc-apm-regexp)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
189 (setq driver-version (match-string 1))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
190 (setq bios-version (match-string 2))
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
191 (setq tem (string-to-number (match-string 3) 16))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
192 (if (not (logand tem 2))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
193 (setq bios-interface "not supported")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
194 (setq bios-interface "enabled")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
195 (cond ((logand tem 16) (setq bios-interface "disabled"))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
196 ((logand tem 32) (setq bios-interface "disengaged")))
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
197 (setq tem (string-to-number (match-string 4) 16))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
198 (cond ((= tem 0) (setq line-status "off-line"))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
199 ((= tem 1) (setq line-status "on-line"))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
200 ((= tem 2) (setq line-status "on backup")))
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
201 (setq tem (string-to-number (match-string 6) 16))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
202 (if (= tem 255)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
203 (setq battery-status "N/A")
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
204 (setq tem (string-to-number (match-string 5) 16))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
205 (cond ((= tem 0) (setq battery-status "high"
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
206 battery-status-symbol ""))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
207 ((= tem 1) (setq battery-status "low"
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
208 battery-status-symbol "-"))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
209 ((= tem 2) (setq battery-status "critical"
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
210 battery-status-symbol "!"))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
211 ((= tem 3) (setq battery-status "charging"
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
212 battery-status-symbol "+")))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
213 (setq load-percentage (match-string 7))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
214 (setq seconds (string-to-number (match-string 8)))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
215 (and (string-equal (match-string 9) "min")
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
216 (setq seconds (* 60 seconds)))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
217 (setq minutes (/ seconds 60)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
218 hours (/ seconds 3600))
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
219 (setq remaining-time
21317
566100bc6eef (battery-linux-proc-apm): Re-use the temporary buffer.
Richard M. Stallman <rms@gnu.org>
parents: 21088
diff changeset
220 (format "%d:%02d" hours (- minutes (* 60 hours))))))))
20972
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
221 (list (cons ?v (or driver-version "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
222 (cons ?V (or bios-version "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
223 (cons ?I (or bios-interface "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
224 (cons ?L (or line-status "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
225 (cons ?B (or battery-status "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
226 (cons ?b (or battery-status-symbol ""))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
227 (cons ?p (or load-percentage "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
228 (cons ?s (or (and seconds (number-to-string seconds)) "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
229 (cons ?m (or (and minutes (number-to-string minutes)) "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
230 (cons ?h (or (and hours (number-to-string hours)) "N/A"))
9dff083ee7a9 (battery-linux-proc-apm-regexp): Load percentage
Karl Heuer <kwzh@gnu.org>
parents: 18685
diff changeset
231 (cons ?t (or remaining-time "N/A")))))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
232
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
233
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
234 ;;; `/proc/acpi/' interface for Linux.
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
235
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
236 (defun battery-linux-proc-acpi ()
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
237 "Get ACPI status information from Linux kernel.
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
238 This function works only with the new `/proc/acpi/' format introduced
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
239 in Linux version 2.4.20 and 2.6.0.
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
240
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
241 The following %-sequences are provided:
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
242 %c Current capacity (mAh)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
243 %B Battery status (verbose)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
244 %b Battery status, empty means high, `-' means low,
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
245 `!' means critical, and `+' means charging
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
246 %d Temperature (in degrees Celsius)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
247 %L AC line status (verbose)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
248 %p battery load percentage
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
249 %m Remaining time in minutes
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
250 %h Remaining time in hours
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
251 %t Remaining time in the form `h:min'"
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
252 (let ((design-capacity 0)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
253 (warn 0)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
254 (low 0)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
255 capacity rate rate-type charging-state minutes hours)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
256 ;; ACPI provides information about each battery present in the system in
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
257 ;; a separate subdirectory. We are going to merge the available
57133
fd1a6df8927e Delete superfluous empty lines.
Eli Zaretskii <eliz@gnu.org>
parents: 56663
diff changeset
258 ;; information together since displaying for a variable amount of
fd1a6df8927e Delete superfluous empty lines.
Eli Zaretskii <eliz@gnu.org>
parents: 56663
diff changeset
259 ;; batteries seems overkill for format-strings.
fd1a6df8927e Delete superfluous empty lines.
Eli Zaretskii <eliz@gnu.org>
parents: 56663
diff changeset
260 (with-temp-buffer
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
261 (dolist (dir (ignore-errors (directory-files "/proc/acpi/battery/"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
262 t "\\`[^.]")))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
263 (erase-buffer)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
264 (ignore-errors (insert-file-contents (expand-file-name "state" dir)))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
265 (when (re-search-forward "present: +yes$" nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
266 (and (re-search-forward "charging state: +\\(.*\\)$" nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
267 (member charging-state '("unknown" nil))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
268 ;; On most multi-battery systems, most of the time only one
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
269 ;; battery is "charging"/"discharging", the others are
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
270 ;; "unknown".
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
271 (setq charging-state (match-string 1)))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
272 (when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
273 nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
274 (setq rate (+ (or rate 0) (string-to-number (match-string 1)))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
275 rate-type (or (and rate-type
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
276 (if (string= rate-type (match-string 2))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
277 rate-type
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
278 (error
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
279 "Inconsistent rate types (%s vs. %s)"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
280 rate-type (match-string 2))))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
281 (match-string 2))))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
282 (when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
283 nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
284 (setq capacity
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
285 (+ (or capacity 0) (string-to-number (match-string 1))))))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
286 (goto-char (point-max))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
287 (ignore-errors (insert-file-contents (expand-file-name "info" dir)))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
288 (when (re-search-forward "present: +yes$" nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
289 (when (re-search-forward "design capacity: +\\([0-9]+\\) m[AW]h$"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
290 nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
291 (incf design-capacity (string-to-number (match-string 1))))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
292 (when (re-search-forward
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
293 "design capacity warning: +\\([0-9]+\\) m[AW]h$" nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
294 (incf warn (string-to-number (match-string 1))))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
295 (when (re-search-forward "design capacity low: +\\([0-9]+\\) m[AW]h$"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
296 nil t)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
297 (incf low (string-to-number (match-string 1)))))))
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
298 (and capacity rate
55904
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
299 (setq minutes (if (zerop rate) 0
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
300 (floor (* (/ (float (if (string= charging-state
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
301 "charging")
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
302 (- design-capacity capacity)
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
303 capacity)) rate) 60)))
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
304 hours (/ minutes 60)))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
305 (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
306 (cons ?L (or (when (file-exists-p "/proc/acpi/ac_adapter/AC/state")
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
307 (with-temp-buffer
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
308 (insert-file-contents
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
309 "/proc/acpi/ac_adapter/AC/state")
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
310 (when (re-search-forward "state: +\\(.*\\)$" nil t)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
311 (match-string 1))))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
312 "N/A"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
313 (cons ?d (or (when (file-exists-p
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
314 "/proc/acpi/thermal_zone/THRM/temperature")
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
315 (with-temp-buffer
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
316 (insert-file-contents
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
317 "/proc/acpi/thermal_zone/THRM/temperature")
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
318 (when (re-search-forward
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
319 "temperature: +\\([0-9]+\\) C$" nil t)
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
320 (match-string 1))))
55904
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
321 (when (file-exists-p
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
322 "/proc/acpi/thermal_zone/THM/temperature")
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
323 (with-temp-buffer
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
324 (insert-file-contents
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
325 "/proc/acpi/thermal_zone/THM/temperature")
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
326 (when (re-search-forward
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
327 "temperature: +\\([0-9]+\\) C$" nil t)
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
328 (match-string 1))))
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
329 "N/A"))
55904
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
330 (cons ?r (or (and rate (concat (number-to-string rate) " "
f3be7c4dc1e6 (battery-linux-proc-acpi): mA was hardcored, but some
Eli Zaretskii <eliz@gnu.org>
parents: 52470
diff changeset
331 rate-type)) "N/A"))
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
332 (cons ?B (or charging-state "N/A"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
333 (cons ?b (or (and (string= charging-state "charging") "+")
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
334 (and (< capacity low) "!")
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
335 (and (< capacity warn) "-")
52450
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
336 ""))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
337 (cons ?h (or (and hours (number-to-string hours)) "N/A"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
338 (cons ?m (or (and minutes (number-to-string minutes)) "N/A"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
339 (cons ?t (or (and minutes
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
340 (format "%d:%02d" hours (- minutes (* 60 hours))))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
341 "N/A"))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
342 (cons ?p (or (and design-capacity capacity
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
343 (number-to-string
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
344 (floor (/ capacity
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
345 (/ (float design-capacity) 100)))))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
346 "N/A")))))
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
347
d096f00804db (battery-linux-proc-acpi): New function.
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
348
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
349 ;;; Private functions.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
350
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
351 (defun battery-format (format alist)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
352 "Substitute %-sequences in FORMAT."
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
353 (replace-regexp-in-string
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
354 "%."
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
355 (lambda (str)
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
356 (let ((char (aref str 1)))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
357 (if (eq char ?%) "%"
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
358 (or (cdr (assoc char alist)) ""))))
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
359 format t t))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
360
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
361
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
362 (provide 'battery)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
363
57143
b628e08b0230 (battery-linux-proc-apm): Use string-to-number.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57133
diff changeset
364 ;; arch-tag: 65916f50-4754-4b6b-ac21-0b510f545a37
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
365 ;;; battery.el ends here