* battery.el patch
@ 2007-01-07 10:01 Ralph Schleicher
0 siblings, 0 replies; 4+ messages in thread
From: Ralph Schleicher @ 2007-01-07 10:01 UTC (permalink / raw)
Cc: Luigi Panzeri
Hi,
below is a patch for battery.el (CVS revision 1.38) together with the
associated ChangeLog entry. Please commit it into Emacs CVS.
2007-01-07 Ralph Schleicher <rs@nunatak.allgaeu.org>
* battery.el (battery-linux-proc-acpi): Ignore errors when
evaluating optional subdirectories. Bug report and initial
patch by Luigi Panzeri <matley@member.fsf.org>.
(battery-search-for-one-match-in-files): Leave error handling
to the caller.
--- battery.el-1.38 2007-01-05 20:27:53.000000000 +0100
+++ battery.el 2007-01-07 08:54:36.000000000 +0100
@@ -355,19 +355,19 @@
60)))
hours (/ minutes 60)))
(list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
- (cons ?L (or (battery-search-for-one-match-in-files
- (mapcar (lambda (e) (concat e "/state"))
- (directory-files "/proc/acpi/ac_adapter/"
- t "\\`[^.]"))
- "state: +\\(.*\\)$" 1)
-
+ (cons ?L (or (ignore-errors
+ (battery-search-for-one-match-in-files
+ (mapcar (lambda (e) (concat e "/state"))
+ (directory-files "/proc/acpi/ac_adapter/"
+ t "\\`[^.]"))
+ "state: +\\(.*\\)$" 1))
"N/A"))
- (cons ?d (or (battery-search-for-one-match-in-files
- (mapcar (lambda (e) (concat e "/temperature"))
- (directory-files "/proc/acpi/thermal_zone/"
- t "\\`[^.]"))
- "temperature: +\\([0-9]+\\) C$" 1)
-
+ (cons ?d (or (ignore-errors
+ (battery-search-for-one-match-in-files
+ (mapcar (lambda (e) (concat e "/temperature"))
+ (directory-files "/proc/acpi/thermal_zone/"
+ t "\\`[^.]"))
+ "temperature: +\\([0-9]+\\) C$" 1))
"N/A"))
(cons ?r (or (and rate (concat (number-to-string rate) " "
rate-type)) "N/A"))
@@ -460,7 +460,7 @@
(with-temp-buffer
(catch 'found
(dolist (file files)
- (and (ignore-errors (insert-file-contents file nil nil nil 'replace))
+ (and (insert-file-contents file nil nil nil 'replace)
(re-search-forward regexp nil t)
(throw 'found (match-string match-num)))))))
--
Ralph
^ permalink raw reply [flat|nested] 4+ messages in thread* battery.el patch
@ 2004-09-14 20:33 Ralph Schleicher
[not found] ` <E1C7bwj-0001T6-HR@fencepost.gnu.org>
0 siblings, 1 reply; 4+ messages in thread
From: Ralph Schleicher @ 2004-09-14 20:33 UTC (permalink / raw)
Hi,
please find attached a patch against battery.el version 1.20 from Emacs
CVS together with a ChangeLog entry. The patch provides some source
code cleanups and a fail-save solution for "non-standard" battery
subdirectory names for the ACPI driver of the Linux kernel. The later
turned out to be a hardware issue because the battery subdirectory names
are not choosen by the ACPI driver. Instead, the ACPI driver uses the
battery name as provided by the hardware.
2004-09-13 Ralph Schleicher <rs@nunatak.allgaeu.org>
* battery.el: Delete superfluous empty lines.
Change single back-quotes into single quotes in all comments.
(battery-linux-proc-acpi): Attempt to gather information from
all battery subdirectories regardless of their file name.
(battery-linux-proc-apm): Replace all occurrences of
battery-hex-to-int-2 with string-to-int (base 16).
(battery-hex-to-int-2): Delete function.
(battery-hex-to-int): Delete function.
(battery-hex-map): Delete variable.
--- battery.el~ 2004-08-09 21:49:21.000000000 +0200
+++ battery.el 2004-09-13 21:55:45.000000000 +0200
@@ -24,8 +24,8 @@
;;; Commentary:
-;; There is at present support for interpreting the new `/proc/apm'
-;; file format of Linux version 1.3.58 or newer and for the `/proc/acpi/'
+;; There is at present support for interpreting the new '/proc/apm'
+;; file format of Linux version 1.3.58 or newer and for the '/proc/acpi/'
;; directory structure of Linux 2.4.20 and 2.6.
;;; Code:
@@ -33,7 +33,6 @@
(require 'timer)
\f
-
(defgroup battery nil
"Display battery status information."
:prefix "battery-"
@@ -137,7 +136,7 @@
(force-mode-line-update))
\f
-;;; `/proc/apm' interface for Linux.
+;;; '/proc/apm' interface for Linux.
(defconst battery-linux-proc-apm-regexp
(concat "^\\([^ ]+\\)" ; Driver version.
@@ -182,20 +181,20 @@
(re-search-forward battery-linux-proc-apm-regexp)
(setq driver-version (match-string 1))
(setq bios-version (match-string 2))
- (setq tem (battery-hex-to-int-2 (match-string 3)))
+ (setq tem (string-to-int (match-string 3) 16))
(if (not (logand tem 2))
(setq bios-interface "not supported")
(setq bios-interface "enabled")
(cond ((logand tem 16) (setq bios-interface "disabled"))
((logand tem 32) (setq bios-interface "disengaged")))
- (setq tem (battery-hex-to-int-2 (match-string 4)))
+ (setq tem (string-to-int (match-string 4) 16))
(cond ((= tem 0) (setq line-status "off-line"))
((= tem 1) (setq line-status "on-line"))
((= tem 2) (setq line-status "on backup")))
- (setq tem (battery-hex-to-int-2 (match-string 6)))
+ (setq tem (string-to-int (match-string 6) 16))
(if (= tem 255)
(setq battery-status "N/A")
- (setq tem (battery-hex-to-int-2 (match-string 5)))
+ (setq tem (string-to-int (match-string 5) 16))
(cond ((= tem 0) (setq battery-status "high"
battery-status-symbol ""))
((= tem 1) (setq battery-status "low"
@@ -225,7 +224,7 @@
(cons ?t (or remaining-time "N/A")))))
\f
-;;; `/proc/acpi/' interface for Linux.
+;;; '/proc/acpi/' interface for Linux.
(defun battery-linux-proc-acpi ()
"Get ACPI status information from Linux kernel.
@@ -245,52 +244,62 @@
%t Remaining time in the form `h:min'"
(let (capacity design-capacity rate rate-type charging-state warn low
minutes hours)
- (when (file-directory-p "/proc/acpi/battery/")
- ;; ACPI provides information about each battery present in the system in
- ;; a separate subdirectory. We are going to merge the available
- ;; information together since displaying for a variable amount of
- ;; batteries seems overkill for format-strings.
- (mapc
- (lambda (dir)
- (with-temp-buffer
- (insert-file-contents (expand-file-name "state" dir))
- (when (re-search-forward "present: +yes$" nil t)
- (and (re-search-forward "charging state: +\\(.*\\)$" nil t)
- (or (null charging-state) (string= charging-state
- "unknown"))
- ;; On most multi-battery systems, most of the time only one
- ;; battery is "charging"/"discharging", the others are
- ;; "unknown".
- (setq charging-state (match-string 1)))
- (when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$"
- nil t)
- (setq rate (+ (or rate 0) (string-to-int (match-string 1)))
- rate-type (or (and rate-type
- (if (string= rate-type (match-string 2))
- rate-type
- (error
- "Inconsistent rate types (%s vs. %s)"
- rate-type (match-string 2))))
- (match-string 2))))
- (when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$"
- nil t)
- (setq capacity
- (+ (or capacity 0) (string-to-int (match-string 1))))))
- (goto-char (point-max))
- (insert-file-contents (expand-file-name "info" dir))
- (when (re-search-forward "present: +yes$" nil t)
- (when (re-search-forward "design capacity: +\\([0-9]+\\) m[AW]h$"
- nil t)
- (setq design-capacity (+ (or design-capacity 0)
- (string-to-int (match-string 1)))))
- (when (re-search-forward "design capacity warning: +\\([0-9]+\\) m[AW]h$"
- nil t)
- (setq warn (+ (or warn 0) (string-to-int (match-string 1)))))
- (when (re-search-forward "design capacity low: +\\([0-9]+\\) m[AW]h$"
- nil t)
- (setq low (+ (or low 0)
- (string-to-int (match-string 1))))))))
- (directory-files "/proc/acpi/battery/" t "\\(BAT\\|CMB\\)")))
+ ;; ACPI provides information about each battery present in the system
+ ;; in a separate subdirectory. We are going to merge the available
+ ;; information together since displaying for a variable amount of
+ ;; batteries seems overkill for format-strings.
+ (with-temp-buffer
+ (mapc (lambda (dir)
+ (if (string-match "/\\.\\.?\\'" dir)
+ nil
+ (delete-region (point-min) (point-max))
+ (condition-case nil
+ (insert-file-contents (expand-file-name "state" dir))
+ (error nil))
+ (when (re-search-forward "present: +yes$" nil t)
+ (and (re-search-forward
+ "charging state: +\\(.*\\)$" nil t)
+ (or (null charging-state)
+ (string= charging-state "unknown"))
+ ;; On most multi-battery systems, most of the time
+ ;; only one battery is "charging/discharging", the
+ ;; others are "unknown".
+ (setq charging-state (match-string 1)))
+ (when (re-search-forward
+ "present rate: +\\([0-9]+\\) \\(m[AW]\\)$" nil t)
+ (setq rate (+ (or rate 0)
+ (string-to-int (match-string 1)))
+ rate-type (or (and rate-type
+ (if (string= rate-type (match-string 2))
+ rate-type
+ (error
+ "Inconsistent rate types (%s vs. %s)"
+ rate-type (match-string 2))))
+ (match-string 2))))
+ (when (re-search-forward
+ "remaining capacity: +\\([0-9]+\\) m[AW]h$" nil t)
+ (setq capacity (+ (or capacity 0)
+ (string-to-int (match-string 1))))))
+ (goto-char (point-max))
+ (condition-case nil
+ (insert-file-contents (expand-file-name "info" dir))
+ (error nil))
+ (when (re-search-forward "present: +yes$" nil t)
+ (when (re-search-forward
+ "design capacity: +\\([0-9]+\\) m[AW]h$" nil t)
+ (setq design-capacity (+ (or design-capacity 0)
+ (string-to-int (match-string 1)))))
+ (when (re-search-forward
+ "design capacity warning: +\\([0-9]+\\) m[AW]h$" nil t)
+ (setq warn (+ (or warn 0)
+ (string-to-int (match-string 1)))))
+ (when (re-search-forward
+ "design capacity low: +\\([0-9]+\\) m[AW]h$" nil t)
+ (setq low (+ (or low 0)
+ (string-to-int (match-string 1))))))))
+ (condition-case nil
+ (directory-files "/proc/acpi/battery/" t)
+ (error nil))))
(and capacity rate
(setq minutes (if (zerop rate) 0
(floor (* (/ (float (if (string= charging-state
@@ -366,32 +375,6 @@
(setq result (concat result "%")))
result))
-(defconst battery-hex-map '((?0 . 0) (?1 . 1) (?2 . 2) (?3 . 3)
- (?4 . 4) (?5 . 5) (?6 . 6) (?7 . 7)
- (?8 . 8) (?9 . 9) (?a . 10) (?b . 11)
- (?c . 12) (?d . 13) (?e . 14) (?f . 15)))
-
-(defun battery-hex-to-int (string)
- "Convert a hexadecimal number (a string) into a number."
- (save-match-data
- (and (string-match "^[ \t]+" string)
- (setq string (substring string (match-end 0))))
- (and (string-match "^0[xX]" string)
- (setq string (substring string (match-end 0)))))
- (battery-hex-to-int-2 string))
-
-(defun battery-hex-to-int-2 (string)
- (let ((index 0)
- (length (length string))
- (value 0)
- (elem nil))
- (while (and (< index length)
- (setq elem (assoc (downcase (aref string index))
- battery-hex-map)))
- (setq value (+ (* 16 value) (cdr elem))
- index (1+ index)))
- value))
-
\f
(provide 'battery)
--
Ralph
^ permalink raw reply [flat|nested] 4+ messages in thread* battery.el patch
@ 2004-08-09 20:25 Ralph Schleicher
0 siblings, 0 replies; 4+ messages in thread
From: Ralph Schleicher @ 2004-08-09 20:25 UTC (permalink / raw)
Hi,
below is a patch Kurt Hornik sent to me last week fixing a problem with
the latest Linux kernel. The patch is against battery.el version 1.19
from Emacs CVS. Thanks.
2004-08-09 Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
* battery.el (battery-linux-proc-acpi): Look into battery
directories matching the literal string CMB, too (required
for Linux 2.6.7).
--- battery.el~ 2004-08-09 21:40:34.000000000 +0200
+++ battery.el 2004-08-09 21:49:21.000000000 +0200
@@ -290,7 +290,7 @@
nil t)
(setq low (+ (or low 0)
(string-to-int (match-string 1))))))))
- (directory-files "/proc/acpi/battery/" t "BAT")))
+ (directory-files "/proc/acpi/battery/" t "\\(BAT\\|CMB\\)")))
(and capacity rate
(setq minutes (if (zerop rate) 0
(floor (* (/ (float (if (string= charging-state
--
Ralph
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-01-07 10:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-07 10:01 battery.el patch Ralph Schleicher
-- strict thread matches above, loose matches on Subject: below --
2004-09-14 20:33 Ralph Schleicher
[not found] ` <E1C7bwj-0001T6-HR@fencepost.gnu.org>
2004-09-15 21:59 ` Ralph Schleicher
2004-08-09 20:25 Ralph Schleicher
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.