2015-09-29 01:39:14 +03:00
|
|
|
|
;;; battery.el --- display battery status information
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2019-05-26 00:58:28 -07:00
|
|
|
|
;; Author: Ralph Schleicher <rs@ralph-schleicher.de>
|
1998-02-25 22:44:24 +00:00
|
|
|
|
;; Keywords: hardware
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1997-07-09 00:29:46 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1997-06-22 20:08:32 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1997-07-09 00:29:46 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1997-06-22 20:08:32 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
2016-11-06 00:33:43 -07:00
|
|
|
|
;; There is at present support for GNU/Linux, macOS and Windows. This
|
2008-04-29 00:59:37 +00:00
|
|
|
|
;; library supports both the `/proc/apm' file format of Linux version
|
|
|
|
|
|
;; 1.3.58 or newer and the `/proc/acpi/' directory structure of Linux
|
2016-11-06 00:33:43 -07:00
|
|
|
|
;; 2.4.20 and 2.6. Darwin (macOS) is supported by using the `pmset'
|
2008-04-29 00:59:37 +00:00
|
|
|
|
;; program. Windows is supported by the GetSystemPowerStatus API call.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
|
|
(require 'timer)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 07:51:54 -04:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defgroup battery nil
|
|
|
|
|
|
"Display battery status information."
|
|
|
|
|
|
:prefix "battery-"
|
|
|
|
|
|
:group 'hardware)
|
|
|
|
|
|
|
2016-04-16 14:39:35 +03:00
|
|
|
|
(defcustom battery-linux-sysfs-regexp "[bB][aA][tT][0-9]?$"
|
|
|
|
|
|
"Regexp for folder names to be searched under
|
|
|
|
|
|
/sys/class/power_supply/ that contain battery information."
|
2016-11-17 00:39:43 +09:00
|
|
|
|
:version "26.1"
|
2016-04-16 14:39:35 +03:00
|
|
|
|
:type 'regexp
|
|
|
|
|
|
:group 'battery)
|
2012-04-11 22:04:29 -04:00
|
|
|
|
|
2016-12-02 12:17:38 +02:00
|
|
|
|
(defcustom battery-upower-device "battery_BAT1"
|
2016-12-02 13:11:53 -05:00
|
|
|
|
"Upower battery device name."
|
2016-12-02 12:17:38 +02:00
|
|
|
|
:version "26.1"
|
|
|
|
|
|
:type 'string
|
|
|
|
|
|
:group 'battery)
|
|
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defcustom battery-status-function
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(cond ((and (eq system-type 'gnu/linux)
|
|
|
|
|
|
(file-readable-p "/proc/apm"))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
#'battery-linux-proc-apm)
|
2003-09-06 19:28:08 +00:00
|
|
|
|
((and (eq system-type 'gnu/linux)
|
|
|
|
|
|
(file-directory-p "/proc/acpi/battery"))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
#'battery-linux-proc-acpi)
|
2008-08-08 17:46:49 +00:00
|
|
|
|
((and (eq system-type 'gnu/linux)
|
|
|
|
|
|
(file-directory-p "/sys/class/power_supply/")
|
2012-04-11 22:04:29 -04:00
|
|
|
|
(directory-files "/sys/class/power_supply/" nil
|
2016-04-16 14:39:35 +03:00
|
|
|
|
battery-linux-sysfs-regexp))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
#'battery-linux-sysfs)
|
2012-12-16 11:17:50 +08:00
|
|
|
|
((and (eq system-type 'berkeley-unix)
|
|
|
|
|
|
(file-executable-p "/usr/sbin/apm"))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
#'battery-bsd-apm)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
((and (eq system-type 'darwin)
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(condition-case nil
|
|
|
|
|
|
(with-temp-buffer
|
2005-08-11 13:28:47 +00:00
|
|
|
|
(and (eq (call-process "pmset" nil t nil "-g" "ps") 0)
|
|
|
|
|
|
(> (buffer-size) 0)))
|
|
|
|
|
|
(error nil)))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
#'battery-pmset)
|
2012-09-17 03:55:02 -08:00
|
|
|
|
((fboundp 'w32-battery-status)
|
2015-03-06 23:42:10 -05:00
|
|
|
|
#'w32-battery-status))
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Function for getting battery status information.
|
2001-02-15 00:10:06 +00:00
|
|
|
|
The function has to return an alist of conversion definitions.
|
|
|
|
|
|
Its cons cells are of the form
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(CONVERSION . REPLACEMENT-TEXT)
|
|
|
|
|
|
|
|
|
|
|
|
CONVERSION is the character code of a \"conversion specification\"
|
1998-03-07 18:19:38 +00:00
|
|
|
|
introduced by a `%' character in a control string."
|
2001-02-15 00:10:06 +00:00
|
|
|
|
:type '(choice (const nil) function)
|
1998-03-07 18:19:38 +00:00
|
|
|
|
:group 'battery)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defcustom battery-echo-area-format
|
2015-03-06 23:42:10 -05:00
|
|
|
|
"Power %L, battery %B (%p%% load, remaining time %t)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Control string formatting the string to display in the echo area.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
Ordinary characters in the control string are printed as-is, while
|
|
|
|
|
|
conversion specifications introduced by a `%' character in the control
|
|
|
|
|
|
string are substituted as defined by the current value of the variable
|
2006-03-11 15:08:42 +00:00
|
|
|
|
`battery-status-function'. Here are the ones generally available:
|
|
|
|
|
|
%c Current capacity (mAh or mWh)
|
|
|
|
|
|
%r Current rate of charge or discharge
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status: empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%d Temperature (in degrees Celsius)
|
|
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%p Battery load percentage
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
1998-03-07 18:19:38 +00:00
|
|
|
|
:type '(choice string (const nil))
|
|
|
|
|
|
:group 'battery)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defvar battery-mode-line-string nil
|
|
|
|
|
|
"String to display in the mode line.")
|
2004-12-27 16:40:50 +00:00
|
|
|
|
;;;###autoload (put 'battery-mode-line-string 'risky-local-variable t)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2011-06-27 04:04:55 -04:00
|
|
|
|
(defcustom battery-mode-line-limit 100
|
|
|
|
|
|
"Percentage of full battery load below which display battery status"
|
Add missing :version tags to new defgroups and defcustoms
* window.el (window-sides-slots):
* tool-bar.el (tool-bar-position):
* term/xterm.el (xterm-extra-capabilities):
* ses.el (ses-self-reference-early-detection):
* progmodes/verilog-mode.el (verilog-auto-declare-nettype)
(verilog-auto-wire-type)
(verilog-auto-delete-trailing-whitespace)
(verilog-auto-reset-blocking-in-non, verilog-auto-inst-sort)
(verilog-auto-tieoff-declaration):
* progmodes/sql.el (sql-login-hook, sql-ansi-statement-starters)
(sql-oracle-statement-starters, sql-oracle-scan-on):
* progmodes/prolog.el (prolog-align-comments-flag)
(prolog-indent-mline-comments-flag, prolog-object-end-to-0-flag)
(prolog-left-indent-regexp, prolog-paren-indent-p)
(prolog-paren-indent, prolog-parse-mode, prolog-keywords)
(prolog-types, prolog-mode-specificators)
(prolog-determinism-specificators, prolog-directives)
(prolog-electric-newline-flag, prolog-hungry-delete-key-flag)
(prolog-electric-dot-flag)
(prolog-electric-dot-full-predicate-template)
(prolog-electric-underscore-flag, prolog-electric-tab-flag)
(prolog-electric-if-then-else-flag, prolog-electric-colon-flag)
(prolog-electric-dash-flag, prolog-old-sicstus-keys-flag)
(prolog-program-switches, prolog-prompt-regexp)
(prolog-debug-on-string, prolog-debug-off-string)
(prolog-trace-on-string, prolog-trace-off-string)
(prolog-zip-on-string, prolog-zip-off-string)
(prolog-use-standard-consult-compile-method-flag)
(prolog-use-prolog-tokenizer-flag, prolog-imenu-flag)
(prolog-imenu-max-lines, prolog-info-predicate-index)
(prolog-underscore-wordchar-flag, prolog-use-sicstus-sd)
(prolog-char-quote-workaround):
* progmodes/cc-vars.el (c-defun-tactic):
* net/tramp.el (tramp-encoding-command-interactive)
(tramp-local-end-of-line):
* net/soap-client.el (soap-client):
* net/netrc.el (netrc-file):
* net/gnutls.el (gnutls):
* minibuffer.el (completion-category-overrides)
(completion-cycle-threshold)
(completion-pcm-complete-word-inserts-delimiters):
* man.el (Man-name-local-regexp):
* mail/feedmail.el (feedmail-display-full-frame):
* international/characters.el (glyphless-char-display-control):
* eshell/em-ls.el (eshell-ls-date-format):
* emacs-lisp/cl-indent.el (lisp-lambda-list-keyword-alignment)
(lisp-lambda-list-keyword-parameter-indentation)
(lisp-lambda-list-keyword-parameter-alignment):
* doc-view.el (doc-view-image-width, doc-view-unoconv-program):
* dired-x.el (dired-omit-verbose):
* cus-theme.el (custom-theme-allow-multiple-selections):
* calc/calc.el (calc-highlight-selections-with-faces)
(calc-lu-field-reference, calc-lu-power-reference)
(calc-note-threshold):
* battery.el (battery-mode-line-limit):
* arc-mode.el (archive-7z-extract, archive-7z-expunge)
(archive-7z-update):
* allout.el (allout-prefixed-keybindings)
(allout-unprefixed-keybindings)
(allout-inhibit-auto-fill-on-headline)
(allout-flattened-numbering-abbreviation):
* allout-widgets.el (allout-widgets-auto-activation)
(allout-widgets-icons-dark-subdir)
(allout-widgets-icons-light-subdir, allout-widgets-icon-types)
(allout-widgets-theme-dark-background)
(allout-widgets-theme-light-background)
(allout-widgets-item-image-properties-emacs)
(allout-widgets-item-image-properties-xemacs)
(allout-widgets-run-unit-tests-on-load)
(allout-widgets-time-decoration-activity)
(allout-widgets-hook-error-post-time)
(allout-widgets-track-decoration):
* gnus/sieve-manage.el (sieve-manage-default-stream):
* gnus/shr.el (shr):
* gnus/nnir.el (nnir-ignored-newsgroups, nnir-summary-line-format)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-notmuch-program)
(nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix)
(nnir-method-default-engines):
* gnus/message.el (message-cite-reply-position):
* gnus/gssapi.el (gssapi-program):
* gnus/gravatar.el (gravatar):
* gnus/gnus-sum.el (gnus-refer-thread-use-nnir):
* gnus/gnus-registry.el (gnus-registry-unfollowed-addresses)
(gnus-registry-max-pruned-entries):
* gnus/gnus-picon.el (gnus-picon-inhibit-top-level-domains):
* gnus/gnus-int.el (gnus-after-set-mark-hook)
(gnus-before-update-mark-hook):
* gnus/gnus-async.el (gnus-async-post-fetch-function):
* gnus/auth-source.el (auth-source-cache-expiry):
Add missing :version tags to new defcustoms and defgroups.
2012-02-11 14:13:29 -08:00
|
|
|
|
:version "24.1"
|
2011-06-27 04:04:55 -04:00
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'battery)
|
|
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defcustom battery-mode-line-format
|
2008-04-29 00:59:37 +00:00
|
|
|
|
(cond ((eq battery-status-function 'battery-linux-proc-acpi)
|
2013-03-05 09:13:01 -08:00
|
|
|
|
"[%b%p%%,%d°C]")
|
2008-04-29 00:59:37 +00:00
|
|
|
|
(battery-status-function
|
2005-07-05 08:14:42 +00:00
|
|
|
|
"[%b%p%%]"))
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Control string formatting the string to display in the mode line.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
Ordinary characters in the control string are printed as-is, while
|
|
|
|
|
|
conversion specifications introduced by a `%' character in the control
|
|
|
|
|
|
string are substituted as defined by the current value of the variable
|
2006-03-11 15:08:42 +00:00
|
|
|
|
`battery-status-function'. Here are the ones generally available:
|
|
|
|
|
|
%c Current capacity (mAh or mWh)
|
|
|
|
|
|
%r Current rate of charge or discharge
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status: empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%d Temperature (in degrees Celsius)
|
|
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%p Battery load percentage
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
1998-03-07 18:19:38 +00:00
|
|
|
|
:type '(choice string (const nil))
|
|
|
|
|
|
:group 'battery)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom battery-update-interval 60
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Seconds after which the battery status will be updated."
|
1998-03-07 18:19:38 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'battery)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(defcustom battery-load-low 25
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Upper bound of low battery load percentage.
|
2005-07-05 08:14:42 +00:00
|
|
|
|
A battery load percentage below this number is considered low."
|
|
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'battery)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom battery-load-critical 10
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Upper bound of critical battery load percentage.
|
2005-07-05 08:14:42 +00:00
|
|
|
|
A battery load percentage below this number is considered critical."
|
|
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'battery)
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(defvar battery-update-timer nil
|
|
|
|
|
|
"Interval timer object.")
|
|
|
|
|
|
|
1998-03-06 17:45:55 +00:00
|
|
|
|
;;;###autoload
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(defun battery ()
|
|
|
|
|
|
"Display battery status information in the echo area.
|
1999-12-14 10:19:59 +00:00
|
|
|
|
The text being displayed in the echo area is controlled by the variables
|
1997-06-22 20:08:32 +00:00
|
|
|
|
`battery-echo-area-format' and `battery-status-function'."
|
|
|
|
|
|
(interactive)
|
|
|
|
|
|
(message "%s" (if (and battery-echo-area-format battery-status-function)
|
|
|
|
|
|
(battery-format battery-echo-area-format
|
|
|
|
|
|
(funcall battery-status-function))
|
|
|
|
|
|
"Battery status not available")))
|
|
|
|
|
|
|
1998-03-06 17:45:55 +00:00
|
|
|
|
;;;###autoload
|
2005-01-04 21:15:09 +00:00
|
|
|
|
(define-minor-mode display-battery-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 08:54:24 -04:00
|
|
|
|
"Toggle battery status display in mode line (Display Battery mode).
|
|
|
|
|
|
|
|
|
|
|
|
The text displayed in the mode line is controlled by
|
1997-06-22 20:08:32 +00:00
|
|
|
|
`battery-mode-line-format' and `battery-status-function'.
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 08:54:24 -04:00
|
|
|
|
The mode line is be updated every `battery-update-interval'
|
1997-06-22 20:08:32 +00:00
|
|
|
|
seconds."
|
2005-04-04 08:53:15 +00:00
|
|
|
|
:global t :group 'battery
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(setq battery-mode-line-string "")
|
|
|
|
|
|
(or global-mode-string (setq global-mode-string '("")))
|
|
|
|
|
|
(and battery-update-timer (cancel-timer battery-update-timer))
|
2011-08-25 22:49:57 +03:00
|
|
|
|
(if (and battery-status-function battery-mode-line-format)
|
|
|
|
|
|
(if (not display-battery-mode)
|
|
|
|
|
|
(setq global-mode-string
|
|
|
|
|
|
(delq 'battery-mode-line-string global-mode-string))
|
|
|
|
|
|
(add-to-list 'global-mode-string 'battery-mode-line-string t)
|
|
|
|
|
|
(setq battery-update-timer (run-at-time nil battery-update-interval
|
|
|
|
|
|
'battery-update-handler))
|
|
|
|
|
|
(battery-update))
|
|
|
|
|
|
(message "Battery status not available")
|
|
|
|
|
|
(setq display-battery-mode nil)))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defun battery-update-handler ()
|
|
|
|
|
|
(battery-update)
|
|
|
|
|
|
(sit-for 0))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-update ()
|
|
|
|
|
|
"Update battery status information in the mode line."
|
2014-04-25 14:01:18 -04:00
|
|
|
|
(let* ((data (and battery-status-function (funcall battery-status-function)))
|
|
|
|
|
|
(percentage (car (read-from-string (cdr (assq ?p data))))))
|
2011-06-27 04:04:55 -04:00
|
|
|
|
(setq battery-mode-line-string
|
|
|
|
|
|
(propertize (if (and battery-mode-line-format
|
2014-04-25 14:01:18 -04:00
|
|
|
|
(numberp percentage)
|
|
|
|
|
|
(<= percentage battery-mode-line-limit))
|
|
|
|
|
|
(battery-format battery-mode-line-format data)
|
2011-06-27 04:04:55 -04:00
|
|
|
|
"")
|
|
|
|
|
|
'face
|
2014-04-25 14:01:18 -04:00
|
|
|
|
(and (numberp percentage)
|
|
|
|
|
|
(<= percentage battery-load-critical)
|
|
|
|
|
|
'error)
|
2011-06-27 04:04:55 -04:00
|
|
|
|
'help-echo "Battery status information")))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(force-mode-line-update))
|
|
|
|
|
|
|
|
|
|
|
|
;;; `/proc/apm' interface for Linux.
|
|
|
|
|
|
|
|
|
|
|
|
(defconst battery-linux-proc-apm-regexp
|
|
|
|
|
|
(concat "^\\([^ ]+\\)" ; Driver version.
|
|
|
|
|
|
" \\([^ ]+\\)" ; APM BIOS version.
|
|
|
|
|
|
" 0x\\([0-9a-f]+\\)" ; APM BIOS flags.
|
|
|
|
|
|
" 0x\\([0-9a-f]+\\)" ; AC line status.
|
|
|
|
|
|
" 0x\\([0-9a-f]+\\)" ; Battery status.
|
|
|
|
|
|
" 0x\\([0-9a-f]+\\)" ; Battery flags.
|
1998-02-25 22:44:24 +00:00
|
|
|
|
" \\(-?[0-9]+\\)%" ; Load percentage.
|
|
|
|
|
|
" \\(-?[0-9]+\\)" ; Remaining time.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
" \\(.*\\)" ; Time unit.
|
|
|
|
|
|
"$")
|
|
|
|
|
|
"Regular expression matching contents of `/proc/apm'.")
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-linux-proc-apm ()
|
2012-01-02 18:18:48 -05:00
|
|
|
|
"Get APM status information from Linux (the kernel).
|
1997-06-22 20:08:32 +00:00
|
|
|
|
This function works only with the new `/proc/apm' format introduced
|
|
|
|
|
|
in Linux version 1.3.58.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%v Linux driver version
|
|
|
|
|
|
%V APM BIOS version
|
|
|
|
|
|
%I APM BIOS status (verbose)
|
|
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
2005-07-01 11:03:19 +00:00
|
|
|
|
%p Battery load percentage
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(let (driver-version bios-version bios-interface line-status
|
|
|
|
|
|
battery-status battery-status-symbol load-percentage
|
2005-07-01 11:03:19 +00:00
|
|
|
|
seconds minutes hours remaining-time tem)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(ignore-errors (insert-file-contents "/proc/apm"))
|
|
|
|
|
|
(when (re-search-forward battery-linux-proc-apm-regexp)
|
|
|
|
|
|
(setq driver-version (match-string 1))
|
|
|
|
|
|
(setq bios-version (match-string 2))
|
|
|
|
|
|
(setq tem (string-to-number (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 (string-to-number (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 (string-to-number (match-string 6) 16))
|
|
|
|
|
|
(if (= tem 255)
|
|
|
|
|
|
(setq battery-status "N/A")
|
|
|
|
|
|
(setq tem (string-to-number (match-string 5) 16))
|
|
|
|
|
|
(cond ((= tem 0) (setq battery-status "high"
|
|
|
|
|
|
battery-status-symbol ""))
|
|
|
|
|
|
((= tem 1) (setq battery-status "low"
|
|
|
|
|
|
battery-status-symbol "-"))
|
|
|
|
|
|
((= tem 2) (setq battery-status "critical"
|
|
|
|
|
|
battery-status-symbol "!"))
|
|
|
|
|
|
((= tem 3) (setq battery-status "charging"
|
|
|
|
|
|
battery-status-symbol "+")))
|
|
|
|
|
|
(setq load-percentage (match-string 7))
|
|
|
|
|
|
(setq seconds (string-to-number (match-string 8)))
|
|
|
|
|
|
(and (string-equal (match-string 9) "min")
|
|
|
|
|
|
(setq seconds (* 60 seconds)))
|
|
|
|
|
|
(setq minutes (/ seconds 60)
|
|
|
|
|
|
hours (/ seconds 3600))
|
|
|
|
|
|
(setq remaining-time
|
|
|
|
|
|
(format "%d:%02d" hours (- minutes (* 60 hours))))))))
|
1998-02-25 22:44:24 +00:00
|
|
|
|
(list (cons ?v (or driver-version "N/A"))
|
|
|
|
|
|
(cons ?V (or bios-version "N/A"))
|
|
|
|
|
|
(cons ?I (or bios-interface "N/A"))
|
|
|
|
|
|
(cons ?L (or line-status "N/A"))
|
|
|
|
|
|
(cons ?B (or battery-status "N/A"))
|
|
|
|
|
|
(cons ?b (or battery-status-symbol ""))
|
|
|
|
|
|
(cons ?p (or load-percentage "N/A"))
|
|
|
|
|
|
(cons ?s (or (and seconds (number-to-string seconds)) "N/A"))
|
|
|
|
|
|
(cons ?m (or (and minutes (number-to-string minutes)) "N/A"))
|
|
|
|
|
|
(cons ?h (or (and hours (number-to-string hours)) "N/A"))
|
|
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2003-09-06 19:28:08 +00:00
|
|
|
|
|
|
|
|
|
|
;;; `/proc/acpi/' interface for Linux.
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-linux-proc-acpi ()
|
2012-01-02 18:18:48 -05:00
|
|
|
|
"Get ACPI status information from Linux (the kernel).
|
2008-08-08 17:46:49 +00:00
|
|
|
|
This function works only with the `/proc/acpi/' format introduced
|
2003-09-06 19:28:08 +00:00
|
|
|
|
in Linux version 2.4.20 and 2.6.0.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%c Current capacity (mAh)
|
2005-07-01 11:03:19 +00:00
|
|
|
|
%r Current rate
|
2003-09-06 19:28:08 +00:00
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%d Temperature (in degrees Celsius)
|
|
|
|
|
|
%L AC line status (verbose)
|
2005-07-01 11:03:19 +00:00
|
|
|
|
%p Battery load percentage
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(let ((design-capacity 0)
|
2006-01-19 17:49:13 +00:00
|
|
|
|
(last-full-capacity 0)
|
|
|
|
|
|
full-capacity
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(warn 0)
|
|
|
|
|
|
(low 0)
|
|
|
|
|
|
capacity rate rate-type charging-state minutes hours)
|
|
|
|
|
|
;; ACPI provides information about each battery present in the system in
|
|
|
|
|
|
;; a separate subdirectory. We are going to merge the available
|
2004-09-18 11:50:18 +00:00
|
|
|
|
;; information together since displaying for a variable amount of
|
|
|
|
|
|
;; batteries seems overkill for format-strings.
|
|
|
|
|
|
(with-temp-buffer
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(dolist (dir (ignore-errors (directory-files "/proc/acpi/battery/"
|
|
|
|
|
|
t "\\`[^.]")))
|
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
|
(ignore-errors (insert-file-contents (expand-file-name "state" dir)))
|
|
|
|
|
|
(when (re-search-forward "present: +yes$" nil t)
|
|
|
|
|
|
(and (re-search-forward "charging state: +\\(.*\\)$" nil t)
|
2006-03-11 15:08:42 +00:00
|
|
|
|
(member charging-state '("unknown" "charged" nil))
|
2004-09-18 21:33:44 +00:00
|
|
|
|
;; 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)
|
2012-04-11 01:24:31 +02:00
|
|
|
|
(setq rate (+ (or rate 0) (string-to-number (match-string 1))))
|
|
|
|
|
|
(when (> rate 0)
|
|
|
|
|
|
(setq rate-type (or (and rate-type
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(if (string= rate-type (match-string 2))
|
|
|
|
|
|
rate-type
|
|
|
|
|
|
(error
|
|
|
|
|
|
"Inconsistent rate types (%s vs. %s)"
|
|
|
|
|
|
rate-type (match-string 2))))
|
2012-04-11 01:24:31 +02:00
|
|
|
|
(match-string 2)))))
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$"
|
|
|
|
|
|
nil t)
|
|
|
|
|
|
(setq capacity
|
|
|
|
|
|
(+ (or capacity 0) (string-to-number (match-string 1))))))
|
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
|
(ignore-errors (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)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 07:51:54 -04:00
|
|
|
|
(cl-incf design-capacity (string-to-number (match-string 1))))
|
2006-01-19 17:49:13 +00:00
|
|
|
|
(when (re-search-forward "last full capacity: +\\([0-9]+\\) m[AW]h$"
|
|
|
|
|
|
nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 07:51:54 -04:00
|
|
|
|
(cl-incf last-full-capacity (string-to-number (match-string 1))))
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(when (re-search-forward
|
|
|
|
|
|
"design capacity warning: +\\([0-9]+\\) m[AW]h$" nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 07:51:54 -04:00
|
|
|
|
(cl-incf warn (string-to-number (match-string 1))))
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(when (re-search-forward "design capacity low: +\\([0-9]+\\) m[AW]h$"
|
|
|
|
|
|
nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 07:51:54 -04:00
|
|
|
|
(cl-incf low (string-to-number (match-string 1)))))))
|
2006-01-19 17:49:13 +00:00
|
|
|
|
(setq full-capacity (if (> last-full-capacity 0)
|
|
|
|
|
|
last-full-capacity design-capacity))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
(and capacity rate
|
2004-06-04 16:05:56 +00:00
|
|
|
|
(setq minutes (if (zerop rate) 0
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
|
(floor (* (if (string= charging-state
|
|
|
|
|
|
"charging")
|
|
|
|
|
|
(- full-capacity capacity)
|
|
|
|
|
|
capacity)
|
|
|
|
|
|
60)
|
|
|
|
|
|
rate))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
hours (/ minutes 60)))
|
|
|
|
|
|
(list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(cons ?L (or (battery-search-for-one-match-in-files
|
|
|
|
|
|
(mapcar (lambda (e) (concat e "/state"))
|
2007-01-10 01:20:10 +00:00
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(directory-files "/proc/acpi/ac_adapter/"
|
|
|
|
|
|
t "\\`[^.]")))
|
2006-11-05 13:22:30 +00:00
|
|
|
|
"state: +\\(.*\\)$" 1)
|
|
|
|
|
|
|
2003-09-06 19:28:08 +00:00
|
|
|
|
"N/A"))
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(cons ?d (or (battery-search-for-one-match-in-files
|
|
|
|
|
|
(mapcar (lambda (e) (concat e "/temperature"))
|
2007-01-10 01:20:10 +00:00
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(directory-files "/proc/acpi/thermal_zone/"
|
|
|
|
|
|
t "\\`[^.]")))
|
2006-11-05 13:22:30 +00:00
|
|
|
|
"temperature: +\\([0-9]+\\) C$" 1)
|
|
|
|
|
|
|
2003-09-06 19:28:08 +00:00
|
|
|
|
"N/A"))
|
2004-06-04 16:05:56 +00:00
|
|
|
|
(cons ?r (or (and rate (concat (number-to-string rate) " "
|
|
|
|
|
|
rate-type)) "N/A"))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
(cons ?B (or charging-state "N/A"))
|
|
|
|
|
|
(cons ?b (or (and (string= charging-state "charging") "+")
|
2006-03-11 22:34:46 +00:00
|
|
|
|
(and capacity (< capacity low) "!")
|
|
|
|
|
|
(and capacity (< capacity warn) "-")
|
2003-09-06 19:28:08 +00:00
|
|
|
|
""))
|
|
|
|
|
|
(cons ?h (or (and hours (number-to-string hours)) "N/A"))
|
|
|
|
|
|
(cons ?m (or (and minutes (number-to-string minutes)) "N/A"))
|
|
|
|
|
|
(cons ?t (or (and minutes
|
|
|
|
|
|
(format "%d:%02d" hours (- minutes (* 60 hours))))
|
|
|
|
|
|
"N/A"))
|
2006-01-19 17:49:13 +00:00
|
|
|
|
(cons ?p (or (and full-capacity capacity
|
2006-11-01 14:24:37 +00:00
|
|
|
|
(> full-capacity 0)
|
2003-09-06 19:28:08 +00:00
|
|
|
|
(number-to-string
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
|
(floor (* 100 capacity) full-capacity)))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
"N/A")))))
|
|
|
|
|
|
|
2008-08-08 17:46:49 +00:00
|
|
|
|
|
|
|
|
|
|
;;; `/sys/class/power_supply/BATN' interface for Linux.
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-linux-sysfs ()
|
|
|
|
|
|
"Get ACPI status information from Linux kernel.
|
|
|
|
|
|
This function works only with the new `/sys/class/power_supply/'
|
|
|
|
|
|
format introduced in Linux version 2.4.25.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%c Current capacity (mAh or mWh)
|
2011-12-21 07:20:40 -05:00
|
|
|
|
%r Current rate
|
2008-08-08 17:46:49 +00:00
|
|
|
|
%B Battery status (verbose)
|
2011-12-21 07:20:40 -05:00
|
|
|
|
%d Temperature (in degrees Celsius)
|
2008-08-08 17:46:49 +00:00
|
|
|
|
%p Battery load percentage
|
2011-12-21 07:20:40 -05:00
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(let (charging-state temperature hours
|
|
|
|
|
|
;; Some batteries report charges and current, other energy and power.
|
|
|
|
|
|
;; In order to reliably be able to combine those data, we convert them
|
|
|
|
|
|
;; all to energy/power (since we can't combine different charges if
|
|
|
|
|
|
;; they're not at the same voltage).
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(energy-full 0.0)
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(energy-now 0.0)
|
|
|
|
|
|
(power-now 0.0)
|
|
|
|
|
|
(voltage-now 10.8)) ;Arbitrary default, in case the info is missing.
|
2008-08-08 17:46:49 +00:00
|
|
|
|
;; SysFS provides information about each battery present in the
|
|
|
|
|
|
;; system in a separate subdirectory. We are going to merge the
|
|
|
|
|
|
;; available information together.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(dolist (dir (ignore-errors
|
|
|
|
|
|
(directory-files
|
2012-04-11 22:04:29 -04:00
|
|
|
|
"/sys/class/power_supply/" t
|
2016-04-16 14:39:35 +03:00
|
|
|
|
battery-linux-sysfs-regexp)))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
|
(ignore-errors (insert-file-contents
|
|
|
|
|
|
(expand-file-name "uevent" dir)))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(when (re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_VOLTAGE_NOW=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq voltage-now (/ (string-to-number (match-string 1)) 1000000.0)))
|
|
|
|
|
|
(goto-char (point-min))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(when (re-search-forward "POWER_SUPPLY_PRESENT=1$" nil t)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(and (re-search-forward "POWER_SUPPLY_STATUS=\\(.*\\)$" nil t)
|
|
|
|
|
|
(member charging-state '("Unknown" "Full" nil))
|
|
|
|
|
|
(setq charging-state (match-string 1)))
|
2014-03-22 17:08:47 -07:00
|
|
|
|
(goto-char (point-min))
|
2011-12-21 07:20:40 -05:00
|
|
|
|
(when (re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_\\(CURRENT\\|POWER\\)_NOW=\\([0-9]*\\)$"
|
|
|
|
|
|
nil t)
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(cl-incf power-now
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
|
(* (string-to-number (match-string 2))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(if (eq (char-after (match-beginning 1)) ?C)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
|
voltage-now 1))))
|
2014-03-22 17:08:47 -07:00
|
|
|
|
(goto-char (point-min))
|
2011-12-21 07:20:40 -05:00
|
|
|
|
(when (re-search-forward "POWER_SUPPLY_TEMP=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq temperature (match-string 1)))
|
2014-03-22 17:08:47 -07:00
|
|
|
|
(goto-char (point-min))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(let (full-string now-string)
|
|
|
|
|
|
;; Sysfs may list either charge (mAh) or energy (mWh).
|
|
|
|
|
|
;; Keep track of both, and choose which to report later.
|
|
|
|
|
|
(cond ((and (re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_CHARGE_FULL=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq full-string (match-string 1))
|
|
|
|
|
|
(re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_CHARGE_NOW=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq now-string (match-string 1)))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(cl-incf energy-full (* (string-to-number full-string)
|
|
|
|
|
|
voltage-now))
|
|
|
|
|
|
(cl-incf energy-now (* (string-to-number now-string)
|
|
|
|
|
|
voltage-now)))
|
2014-03-22 17:08:47 -07:00
|
|
|
|
((and (progn (goto-char (point-min)) t)
|
|
|
|
|
|
(re-search-forward
|
2008-08-08 17:46:49 +00:00
|
|
|
|
"POWER_SUPPLY_ENERGY_FULL=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq full-string (match-string 1))
|
|
|
|
|
|
(re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_ENERGY_NOW=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq now-string (match-string 1)))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(cl-incf energy-full (string-to-number full-string))
|
|
|
|
|
|
(cl-incf energy-now (string-to-number now-string)))))
|
2011-12-21 07:20:40 -05:00
|
|
|
|
(goto-char (point-min))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(unless (zerop power-now)
|
2011-12-21 07:20:40 -05:00
|
|
|
|
(let ((remaining (if (string= charging-state "Discharging")
|
|
|
|
|
|
energy-now
|
|
|
|
|
|
(- energy-full energy-now))))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(setq hours (/ remaining power-now)))))))
|
|
|
|
|
|
(list (cons ?c (cond ((or (> energy-full 0) (> energy-now 0))
|
|
|
|
|
|
(number-to-string (/ energy-now voltage-now)))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(t "N/A")))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(cons ?r (if (> power-now 0.0)
|
|
|
|
|
|
(format "%.1f" (/ power-now 1000000.0))
|
|
|
|
|
|
"N/A"))
|
2011-12-21 07:20:40 -05:00
|
|
|
|
(cons ?m (if hours (format "%d" (* hours 60)) "N/A"))
|
|
|
|
|
|
(cons ?h (if hours (format "%d" hours) "N/A"))
|
|
|
|
|
|
(cons ?t (if hours
|
|
|
|
|
|
(format "%d:%02d" hours (* (- hours (floor hours)) 60))
|
|
|
|
|
|
"N/A"))
|
|
|
|
|
|
(cons ?d (or temperature "N/A"))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(cons ?B (or charging-state "N/A"))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(cons ?p (cond ((and (> energy-full 0) (> energy-now 0))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(format "%.1f"
|
|
|
|
|
|
(/ (* 100 energy-now) energy-full)))
|
|
|
|
|
|
(t "N/A")))
|
2015-03-06 23:42:10 -05:00
|
|
|
|
(cons ?L (cond
|
|
|
|
|
|
((battery-search-for-one-match-in-files
|
|
|
|
|
|
(list "/sys/class/power_supply/AC/online"
|
|
|
|
|
|
"/sys/class/power_supply/ACAD/online"
|
|
|
|
|
|
"/sys/class/power_supply/ADP1/online")
|
|
|
|
|
|
"1" 0)
|
|
|
|
|
|
"AC")
|
|
|
|
|
|
((battery-search-for-one-match-in-files
|
|
|
|
|
|
(list "/sys/class/power_supply/AC/online"
|
|
|
|
|
|
"/sys/class/power_supply/ACAD/online"
|
|
|
|
|
|
"/sys/class/power_supply/ADP1/online")
|
|
|
|
|
|
"0" 0)
|
|
|
|
|
|
"BAT")
|
|
|
|
|
|
(t "N/A"))))))
|
2012-12-16 11:17:50 +08:00
|
|
|
|
|
2016-12-02 12:17:38 +02:00
|
|
|
|
|
2017-01-29 19:34:35 +01:00
|
|
|
|
(declare-function dbus-get-property "dbus.el"
|
|
|
|
|
|
(bus service path interface property))
|
|
|
|
|
|
|
2016-12-02 12:17:38 +02:00
|
|
|
|
;;; `upowerd' interface.
|
|
|
|
|
|
(defsubst battery-upower-prop (pname &optional device)
|
|
|
|
|
|
(dbus-get-property
|
|
|
|
|
|
:system
|
|
|
|
|
|
"org.freedesktop.UPower"
|
|
|
|
|
|
(concat "/org/freedesktop/UPower/devices/" (or device battery-upower-device))
|
|
|
|
|
|
"org.freedesktop.UPower"
|
|
|
|
|
|
pname))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-upower ()
|
|
|
|
|
|
"Get battery status from dbus Upower interface.
|
|
|
|
|
|
This function works only in systems with `upowerd' daemon
|
|
|
|
|
|
running.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%c Current capacity (mWh)
|
|
|
|
|
|
%p Battery load percentage
|
|
|
|
|
|
%r Current rate
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
|
|
|
|
|
(let ((percents (battery-upower-prop "Percentage"))
|
|
|
|
|
|
(time-to-empty (battery-upower-prop "TimeToEmpty"))
|
|
|
|
|
|
(time-to-full (battery-upower-prop "TimeToFull"))
|
|
|
|
|
|
(state (battery-upower-prop "State"))
|
|
|
|
|
|
(online (battery-upower-prop "Online" "line_power_ACAD"))
|
|
|
|
|
|
(energy (battery-upower-prop "Energy"))
|
|
|
|
|
|
(energy-rate (battery-upower-prop "EnergyRate"))
|
|
|
|
|
|
(battery-states '((0 . "unknown") (1 . "charging")
|
|
|
|
|
|
(2 . "discharging") (3 . "empty")
|
|
|
|
|
|
(4 . "fully-charged") (5 . "pending-charge")
|
|
|
|
|
|
(6 . "pending-discharge")))
|
|
|
|
|
|
seconds minutes hours remaining-time)
|
|
|
|
|
|
(cond ((and online time-to-full)
|
|
|
|
|
|
(setq seconds time-to-full))
|
|
|
|
|
|
((and (not online) time-to-empty)
|
|
|
|
|
|
(setq seconds time-to-empty)))
|
|
|
|
|
|
(when seconds
|
|
|
|
|
|
(setq minutes (/ seconds 60)
|
|
|
|
|
|
hours (/ minutes 60)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
|
remaining-time (format "%d:%02d" hours (mod minutes 60))))
|
2016-12-02 12:17:38 +02:00
|
|
|
|
(list (cons ?c (or (and energy
|
|
|
|
|
|
(number-to-string (round (* 1000 energy))))
|
|
|
|
|
|
"N/A"))
|
|
|
|
|
|
(cons ?p (or (and percents (number-to-string (round percents)))
|
|
|
|
|
|
"N/A"))
|
|
|
|
|
|
(cons ?r (or (and energy-rate
|
|
|
|
|
|
(concat (number-to-string energy-rate) " W"))
|
|
|
|
|
|
"N/A"))
|
|
|
|
|
|
(cons ?B (or (and state (cdr (assoc state battery-states)))
|
|
|
|
|
|
"unknown"))
|
|
|
|
|
|
(cons ?L (or (and online "on-line") "off-line"))
|
|
|
|
|
|
(cons ?s (or (and seconds (number-to-string seconds)) "N/A"))
|
|
|
|
|
|
(cons ?m (or (and minutes (number-to-string minutes)) "N/A"))
|
|
|
|
|
|
(cons ?h (or (and hours (number-to-string hours)) "N/A"))
|
|
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
|
|
|
|
|
|
2012-12-16 11:17:50 +08:00
|
|
|
|
|
|
|
|
|
|
;;; `apm' interface for BSD.
|
|
|
|
|
|
(defun battery-bsd-apm ()
|
|
|
|
|
|
"Get APM status information from BSD apm binary.
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%P Advanced power saving mode state (verbose)
|
|
|
|
|
|
%p Battery charge percentage
|
|
|
|
|
|
%s Remaining battery charge time in seconds
|
|
|
|
|
|
%m Remaining battery charge time in minutes
|
|
|
|
|
|
%h Remaining battery charge time in hours
|
|
|
|
|
|
%t Remaining battery charge time in the form `h:min'"
|
|
|
|
|
|
(let* ((os-name (car (split-string
|
2019-03-13 10:10:19 -04:00
|
|
|
|
;; FIXME: Can't we use something like `system-type'?
|
|
|
|
|
|
(shell-command-to-string "/usr/bin/uname"))))
|
|
|
|
|
|
(apm-flag (pcase os-name
|
|
|
|
|
|
("OpenBSD" "mP")
|
|
|
|
|
|
("FreeBSD" "st")
|
|
|
|
|
|
(_ "ms")))
|
|
|
|
|
|
(apm-cmd (concat "/usr/sbin/apm -abl" apm-flag))
|
|
|
|
|
|
(apm-output (split-string (shell-command-to-string apm-cmd)))
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(indices (pcase os-name
|
|
|
|
|
|
;; FreeBSD's manpage documents that multiple
|
|
|
|
|
|
;; outputs are ordered by "the order in which
|
|
|
|
|
|
;; they're listed in the manpage", which is alphabetical
|
|
|
|
|
|
;; and is also the order in which we pass them.
|
|
|
|
|
|
("FreeBSD" '((ac . 0)
|
|
|
|
|
|
(battery-status . 1)
|
|
|
|
|
|
(battery-percent . 2)
|
|
|
|
|
|
(apm-mode . 3)
|
|
|
|
|
|
(battery-life . 4)))
|
|
|
|
|
|
;; For NetBSD and OpenBSD, the manpage doesn't document
|
|
|
|
|
|
;; the order. The previous code used this order, so let's
|
|
|
|
|
|
;; assume it's right.
|
|
|
|
|
|
(_ '((ac . 3)
|
|
|
|
|
|
(battery-status . 0)
|
|
|
|
|
|
(battery-percent . 1)
|
|
|
|
|
|
(apm-mode . 4)
|
|
|
|
|
|
(battery-life . 2)))))
|
2019-03-13 10:10:19 -04:00
|
|
|
|
;; Battery status
|
|
|
|
|
|
(battery-status
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(pcase (string-to-number
|
|
|
|
|
|
(nth (alist-get 'battery-status indices) apm-output))
|
|
|
|
|
|
(0 '("high" . ""))
|
|
|
|
|
|
(1 '("low" . "-"))
|
|
|
|
|
|
(2 '("critical" . "!"))
|
|
|
|
|
|
(3 '("charging" . "+"))
|
|
|
|
|
|
(4 '("absent" . nil))))
|
2019-03-13 10:10:19 -04:00
|
|
|
|
;; Battery percentage
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(battery-percentage
|
|
|
|
|
|
(nth (alist-get 'battery-percent indices) apm-output))
|
2019-03-13 10:10:19 -04:00
|
|
|
|
;; Battery life
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(battery-life (nth (alist-get 'battery-life indices) apm-output))
|
2019-03-13 10:10:19 -04:00
|
|
|
|
;; AC status
|
|
|
|
|
|
(line-status
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(pcase (string-to-number (nth (alist-get 'ac indices) apm-output))
|
|
|
|
|
|
(0 "disconnected")
|
|
|
|
|
|
(1 "connected")
|
|
|
|
|
|
(2 "backup power")))
|
2019-03-13 10:10:19 -04:00
|
|
|
|
;; Advanced power savings mode
|
|
|
|
|
|
(apm-mode
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(let ((apm (string-to-number
|
|
|
|
|
|
(nth (alist-get 'apm-mode indices) apm-output))))
|
2019-03-13 10:10:19 -04:00
|
|
|
|
(if (string= os-name "OpenBSD")
|
2019-03-13 10:27:46 -04:00
|
|
|
|
(pcase apm
|
|
|
|
|
|
(0 "manual")
|
|
|
|
|
|
(1 "automatic")
|
|
|
|
|
|
(2 "cool running"))
|
|
|
|
|
|
(if (eql apm 1) "on" "off"))))
|
2012-12-16 11:17:50 +08:00
|
|
|
|
seconds minutes hours remaining-time)
|
|
|
|
|
|
(unless (member battery-life '("unknown" "-1"))
|
|
|
|
|
|
(if (member os-name '("OpenBSD" "NetBSD"))
|
|
|
|
|
|
(setq minutes (string-to-number battery-life)
|
|
|
|
|
|
seconds (* 60 minutes))
|
|
|
|
|
|
(setq seconds (string-to-number battery-life)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
|
minutes (truncate seconds 60)))
|
|
|
|
|
|
(setq hours (truncate minutes 60)
|
|
|
|
|
|
remaining-time (format "%d:%02d" hours (mod minutes 60))))
|
2012-12-16 11:17:50 +08:00
|
|
|
|
(list (cons ?L (or line-status "N/A"))
|
|
|
|
|
|
(cons ?B (or (car battery-status) "N/A"))
|
|
|
|
|
|
(cons ?b (or (cdr battery-status) "N/A"))
|
|
|
|
|
|
(cons ?p (if (string= battery-percentage "255")
|
|
|
|
|
|
"N/A"
|
|
|
|
|
|
battery-percentage))
|
|
|
|
|
|
(cons ?P (or apm-mode "N/A"))
|
|
|
|
|
|
(cons ?s (or (and seconds (number-to-string seconds)) "N/A"))
|
|
|
|
|
|
(cons ?m (or (and minutes (number-to-string minutes)) "N/A"))
|
|
|
|
|
|
(cons ?h (or (and hours (number-to-string hours)) "N/A"))
|
|
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
|
|
|
|
|
|
2005-07-05 08:14:42 +00:00
|
|
|
|
|
2016-11-06 00:33:43 -07:00
|
|
|
|
;;; `pmset' interface for Darwin (macOS).
|
2005-07-05 08:14:42 +00:00
|
|
|
|
|
|
|
|
|
|
(defun battery-pmset ()
|
|
|
|
|
|
"Get battery status information using `pmset'.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%L Power source (verbose)
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%p Battery load percentage
|
|
|
|
|
|
%h Remaining time in hours
|
|
|
|
|
|
%m Remaining time in minutes
|
|
|
|
|
|
%t Remaining time in the form `h:min'"
|
|
|
|
|
|
(let (power-source load-percentage battery-status battery-status-symbol
|
|
|
|
|
|
remaining-time hours minutes)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(ignore-errors (call-process "pmset" nil t nil "-g" "ps"))
|
|
|
|
|
|
(goto-char (point-min))
|
2013-10-23 15:44:28 -04:00
|
|
|
|
(when (re-search-forward "\\(?:Currentl?y\\|Now\\) drawing from '\\(AC\\|Battery\\) Power'" nil t)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(setq power-source (match-string 1))
|
2016-09-29 20:22:00 +01:00
|
|
|
|
(when (re-search-forward "^ -InternalBattery-0\\([ \t]+(id=[0-9]+)\\)*[ \t]+" nil t)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(when (looking-at "\\([0-9]\\{1,3\\}\\)%")
|
|
|
|
|
|
(setq load-percentage (match-string 1))
|
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
|
(cond ((looking-at "; charging")
|
|
|
|
|
|
(setq battery-status "charging"
|
|
|
|
|
|
battery-status-symbol "+"))
|
|
|
|
|
|
((< (string-to-number load-percentage) battery-load-critical)
|
|
|
|
|
|
(setq battery-status "critical"
|
|
|
|
|
|
battery-status-symbol "!"))
|
2016-02-20 18:33:48 +11:00
|
|
|
|
((< (string-to-number load-percentage) battery-load-low)
|
|
|
|
|
|
(setq battery-status "low"
|
|
|
|
|
|
battery-status-symbol "-"))
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(t
|
|
|
|
|
|
(setq battery-status "high"
|
|
|
|
|
|
battery-status-symbol "")))
|
|
|
|
|
|
(when (re-search-forward "\\(\\([0-9]+\\):\\([0-9]+\\)\\) remaining" nil t)
|
|
|
|
|
|
(setq remaining-time (match-string 1))
|
|
|
|
|
|
(let ((h (string-to-number (match-string 2)))
|
|
|
|
|
|
(m (string-to-number (match-string 3))))
|
|
|
|
|
|
(setq hours (number-to-string (+ h (if (< m 30) 0 1)))
|
|
|
|
|
|
minutes (number-to-string (+ (* h 60) m)))))))))
|
|
|
|
|
|
(list (cons ?L (or power-source "N/A"))
|
|
|
|
|
|
(cons ?p (or load-percentage "N/A"))
|
|
|
|
|
|
(cons ?B (or battery-status "N/A"))
|
|
|
|
|
|
(cons ?b (or battery-status-symbol ""))
|
|
|
|
|
|
(cons ?h (or hours "N/A"))
|
|
|
|
|
|
(cons ?m (or minutes "N/A"))
|
|
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Private functions.
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-format (format alist)
|
|
|
|
|
|
"Substitute %-sequences in FORMAT."
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
|
"%."
|
|
|
|
|
|
(lambda (str)
|
|
|
|
|
|
(let ((char (aref str 1)))
|
|
|
|
|
|
(if (eq char ?%) "%"
|
|
|
|
|
|
(or (cdr (assoc char alist)) ""))))
|
|
|
|
|
|
format t t))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(defun battery-search-for-one-match-in-files (files regexp match-num)
|
|
|
|
|
|
"Search REGEXP in the content of the files listed in FILES.
|
2007-01-08 23:00:24 +00:00
|
|
|
|
If a match occurred, return the parenthesized expression numbered by
|
2006-11-05 13:22:30 +00:00
|
|
|
|
MATCH-NUM in the match. Otherwise, return nil."
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(catch 'found
|
|
|
|
|
|
(dolist (file files)
|
|
|
|
|
|
(and (ignore-errors (insert-file-contents file nil nil nil 'replace))
|
|
|
|
|
|
(re-search-forward regexp nil t)
|
|
|
|
|
|
(throw 'found (match-string match-num)))))))
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(provide 'battery)
|
|
|
|
|
|
|
|
|
|
|
|
;;; battery.el ends here
|