2015-11-13 22:58:38 +00:00
|
|
|
;;; org-timer.el --- Timer code for Org mode -*- lexical-binding: t; -*-
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
2020-01-01 18:38:46 +00:00
|
|
|
;; Copyright (C) 2008-2020 Free Software Foundation, Inc.
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
2018-01-16 16:22:00 +00:00
|
|
|
;; Homepage: https://orgmode.org
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
;;
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
;;
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; 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 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2014-12-07 07:24:54 +00:00
|
|
|
;; This file implements two types of timers for Org buffers:
|
|
|
|
|
;;
|
|
|
|
|
;; - A relative timer that counts up (from 0 or a specified offset)
|
|
|
|
|
;; - A countdown timer that counts down from a specified time
|
|
|
|
|
;;
|
|
|
|
|
;; The relative and countdown timers differ in their entry points.
|
|
|
|
|
;; Use `org-timer' or `org-timer-start' to start the relative timer,
|
|
|
|
|
;; and `org-timer-set-timer' to start the countdown timer.
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
2010-07-18 15:04:15 +00:00
|
|
|
;;; Code:
|
|
|
|
|
|
2016-09-25 15:29:06 +00:00
|
|
|
(require 'cl-lib)
|
2014-12-07 07:24:54 +00:00
|
|
|
(require 'org-clock)
|
2008-11-25 19:42:06 +00:00
|
|
|
|
2009-08-03 11:28:24 +00:00
|
|
|
(declare-function org-agenda-error "org-agenda" ())
|
2009-07-29 17:37:55 +00:00
|
|
|
|
2008-11-25 19:20:52 +00:00
|
|
|
(defvar org-timer-start-time nil
|
|
|
|
|
"t=0 for the running timer.")
|
|
|
|
|
|
2009-01-06 05:30:38 +00:00
|
|
|
(defvar org-timer-pause-time nil
|
|
|
|
|
"Time when the timer was paused.")
|
|
|
|
|
|
2014-12-07 07:24:54 +00:00
|
|
|
(defvar org-timer-countdown-timer nil
|
|
|
|
|
"Current countdown timer.
|
|
|
|
|
This is a timer object if there is an active countdown timer,
|
2015-09-22 04:15:26 +00:00
|
|
|
`paused' if there is a paused countdown timer, and nil
|
2014-12-07 07:24:54 +00:00
|
|
|
otherwise.")
|
|
|
|
|
|
|
|
|
|
(defvar org-timer-countdown-timer-title nil
|
|
|
|
|
"Title for notification displayed when a countdown finishes.")
|
|
|
|
|
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(defconst org-timer-re "\\([-+]?[0-9]+\\):\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)"
|
|
|
|
|
"Regular expression used to match timer stamps.")
|
|
|
|
|
|
|
|
|
|
(defcustom org-timer-format "%s "
|
|
|
|
|
"The format to insert the time of the timer.
|
|
|
|
|
This format must contain one instance of \"%s\" which will be replaced by
|
2014-12-07 07:24:54 +00:00
|
|
|
the value of the timer."
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
:group 'org-time
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
2015-06-02 20:49:38 +00:00
|
|
|
(defcustom org-timer-default-timer "0"
|
|
|
|
|
"The default timer when a timer is set, in minutes or hh:mm:ss format.
|
2010-05-20 14:24:44 +00:00
|
|
|
When 0, the user is prompted for a value."
|
2010-05-20 14:16:31 +00:00
|
|
|
:group 'org-time
|
2017-01-26 04:39:18 +00:00
|
|
|
:version "26.1"
|
2015-06-02 20:49:38 +00:00
|
|
|
:package-version '(Org . "8.3")
|
|
|
|
|
:type 'string)
|
2010-05-20 14:16:31 +00:00
|
|
|
|
2012-02-29 17:04:22 +00:00
|
|
|
(defcustom org-timer-display 'mode-line
|
2016-08-23 20:13:56 +00:00
|
|
|
"Define where running timer is displayed, if at all.
|
|
|
|
|
When a timer is running, Org can display it in the mode line
|
|
|
|
|
and/or frame title. Allowed values are:
|
2012-02-29 17:04:22 +00:00
|
|
|
|
|
|
|
|
both displays in both mode line and frame title
|
|
|
|
|
mode-line displays only in mode line (default)
|
|
|
|
|
frame-title displays only in frame title
|
|
|
|
|
nil current timer is not displayed"
|
|
|
|
|
:group 'org-time
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Mode line" mode-line)
|
|
|
|
|
(const :tag "Frame title" frame-title)
|
|
|
|
|
(const :tag "Both" both)
|
|
|
|
|
(const :tag "None" nil)))
|
|
|
|
|
|
2010-02-20 15:14:10 +00:00
|
|
|
(defvar org-timer-start-hook nil
|
|
|
|
|
"Hook run after relative timer is started.")
|
|
|
|
|
|
|
|
|
|
(defvar org-timer-stop-hook nil
|
2014-12-07 07:24:54 +00:00
|
|
|
"Hook run before relative or countdown timer is stopped.")
|
2010-02-20 15:14:10 +00:00
|
|
|
|
|
|
|
|
(defvar org-timer-pause-hook nil
|
2014-12-07 07:24:54 +00:00
|
|
|
"Hook run before relative or countdown timer is paused.")
|
2010-02-20 15:14:10 +00:00
|
|
|
|
2010-12-20 12:18:27 +00:00
|
|
|
(defvar org-timer-continue-hook nil
|
2014-12-07 07:24:54 +00:00
|
|
|
"Hook run after relative or countdown timer is continued.")
|
2010-12-20 12:18:27 +00:00
|
|
|
|
2010-02-20 15:14:10 +00:00
|
|
|
(defvar org-timer-set-hook nil
|
|
|
|
|
"Hook run after countdown timer is set.")
|
|
|
|
|
|
2010-02-20 19:31:44 +00:00
|
|
|
(defvar org-timer-done-hook nil
|
|
|
|
|
"Hook run after countdown timer reaches zero.")
|
|
|
|
|
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-timer-start (&optional offset)
|
|
|
|
|
"Set the starting time for the relative timer to now.
|
|
|
|
|
When called with prefix argument OFFSET, prompt the user for an offset time,
|
|
|
|
|
with the default taken from a timer stamp at point, if any.
|
|
|
|
|
If OFFSET is a string or an integer, it is directly taken to be the offset
|
|
|
|
|
without user interaction.
|
|
|
|
|
When called with a double prefix arg, all timer strings in the active
|
|
|
|
|
region will be shifted by a specific amount. You will be prompted for
|
|
|
|
|
the amount, with the default to make the first timer string in
|
|
|
|
|
the region 0:00:00."
|
|
|
|
|
(interactive "P")
|
2014-12-07 07:24:54 +00:00
|
|
|
(cond
|
|
|
|
|
((equal offset '(16))
|
|
|
|
|
(call-interactively 'org-timer-change-times-in-region))
|
|
|
|
|
(org-timer-countdown-timer
|
|
|
|
|
(user-error "Countdown timer is running. Cancel first"))
|
|
|
|
|
(t
|
2008-11-25 19:42:06 +00:00
|
|
|
(let (delta def s)
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(if (not offset)
|
|
|
|
|
(setq org-timer-start-time (current-time))
|
|
|
|
|
(cond
|
|
|
|
|
((integerp offset) (setq delta offset))
|
|
|
|
|
((stringp offset) (setq delta (org-timer-hms-to-secs offset)))
|
|
|
|
|
(t
|
|
|
|
|
(setq def (if (org-in-regexp org-timer-re)
|
|
|
|
|
(match-string 0)
|
|
|
|
|
"0:00:00")
|
2008-12-04 14:33:43 +00:00
|
|
|
s (read-string
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(format "Restart timer with offset [%s]: " def)))
|
|
|
|
|
(unless (string-match "\\S-" s) (setq s def))
|
|
|
|
|
(setq delta (org-timer-hms-to-secs (org-timer-fix-incomplete s)))))
|
Port more time-related changes
* lisp/org-agenda.el (org-agenda-check-clock-gap):
* lisp/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve-clock, (org-clock-resolve)
(org-resolve-clocks, org-resolve-clocks-if-idle)
(org-clock-in, org-clock-out, org-clock-sum, org-clocktable-steps):
* lisp/org-element.el (org-element-cache-sync-duration)
(org-element--cache-set-timer, org-element--cache-interrupt-p):
(org-element--cache-sync):
* lisp/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/org-indent.el (org-indent-add-properties):
* lisp/org-timer.el (org-timer-start):
(org-timer-pause-or-continue, org-timer-set-timer):
* lisp/org.el (org-today, org-auto-repeat-maybe): Port time-related
changes from the Emacs repo by using compatibility wrappers.
In the Emacs repo, there has been a lot of changes to Org files
involving time-related code. I've ported some of those changes but
have largely ignored any changes that break compatibility with older
Emacsen that we support. That, however, isn't a good approach because
it will be hard to do a systematic update once we bump our minimum
Emacs requirement. Instead use the recently added compatibility
wrappers where needed, which is ugly but more maintainable.
The main time-related changes this leaves unported are changes that
replace (apply #'encode-time args) calls with (encode-time args).
Until the first form is unsupported, adding a compatibility function
doesn't seem worth the churn.
Relevant Emacs commits include
c75f505dea6a560b825384cf3d277690f86840bf,
57c74793c46c6533b63836f00aecaf3ac2accb6d,
988e37fa0f922b852715671d59a0e3f682373411,
476066e89d6f0bb87220da690b8a476bf9655b80,
89c63b3522b62c0fd725f0b348927a2069238452.
2019-08-18 20:47:07 +00:00
|
|
|
(setq org-timer-start-time (org-time-since delta)))
|
2014-12-07 07:24:54 +00:00
|
|
|
(setq org-timer-pause-time nil)
|
2009-01-06 05:30:38 +00:00
|
|
|
(org-timer-set-mode-line 'on)
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(message "Timer start time set to %s, current value is %s"
|
|
|
|
|
(format-time-string "%T" org-timer-start-time)
|
2010-02-20 15:14:10 +00:00
|
|
|
(org-timer-secs-to-hms (or delta 0)))
|
2014-12-07 07:24:54 +00:00
|
|
|
(run-hooks 'org-timer-start-hook)))))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
2018-01-15 15:13:19 +00:00
|
|
|
;;;###autoload
|
2009-01-06 05:30:38 +00:00
|
|
|
(defun org-timer-pause-or-continue (&optional stop)
|
2014-12-07 07:24:54 +00:00
|
|
|
"Pause or continue the relative or countdown timer.
|
2010-07-18 15:04:15 +00:00
|
|
|
With prefix arg STOP, stop it entirely."
|
2009-01-06 05:30:38 +00:00
|
|
|
(interactive "P")
|
|
|
|
|
(cond
|
|
|
|
|
(stop (org-timer-stop))
|
|
|
|
|
((not org-timer-start-time) (error "No timer is running"))
|
|
|
|
|
(org-timer-pause-time
|
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 10:18:00 +00:00
|
|
|
(let ((start-secs (float-time org-timer-start-time))
|
|
|
|
|
(pause-secs (float-time org-timer-pause-time)))
|
2014-12-07 07:24:54 +00:00
|
|
|
(if org-timer-countdown-timer
|
2015-09-22 04:15:32 +00:00
|
|
|
(let ((new-secs (- start-secs pause-secs)))
|
|
|
|
|
(setq org-timer-countdown-timer
|
|
|
|
|
(org-timer--run-countdown-timer
|
|
|
|
|
new-secs org-timer-countdown-timer-title))
|
Port more time-related changes
* lisp/org-agenda.el (org-agenda-check-clock-gap):
* lisp/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve-clock, (org-clock-resolve)
(org-resolve-clocks, org-resolve-clocks-if-idle)
(org-clock-in, org-clock-out, org-clock-sum, org-clocktable-steps):
* lisp/org-element.el (org-element-cache-sync-duration)
(org-element--cache-set-timer, org-element--cache-interrupt-p):
(org-element--cache-sync):
* lisp/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/org-indent.el (org-indent-add-properties):
* lisp/org-timer.el (org-timer-start):
(org-timer-pause-or-continue, org-timer-set-timer):
* lisp/org.el (org-today, org-auto-repeat-maybe): Port time-related
changes from the Emacs repo by using compatibility wrappers.
In the Emacs repo, there has been a lot of changes to Org files
involving time-related code. I've ported some of those changes but
have largely ignored any changes that break compatibility with older
Emacsen that we support. That, however, isn't a good approach because
it will be hard to do a systematic update once we bump our minimum
Emacs requirement. Instead use the recently added compatibility
wrappers where needed, which is ugly but more maintainable.
The main time-related changes this leaves unported are changes that
replace (apply #'encode-time args) calls with (encode-time args).
Until the first form is unsupported, adding a compatibility function
doesn't seem worth the churn.
Relevant Emacs commits include
c75f505dea6a560b825384cf3d277690f86840bf,
57c74793c46c6533b63836f00aecaf3ac2accb6d,
988e37fa0f922b852715671d59a0e3f682373411,
476066e89d6f0bb87220da690b8a476bf9655b80,
89c63b3522b62c0fd725f0b348927a2069238452.
2019-08-18 20:47:07 +00:00
|
|
|
(setq org-timer-start-time (org-time-add nil new-secs)))
|
2014-12-07 07:24:54 +00:00
|
|
|
(setq org-timer-start-time
|
Port more time-related changes
* lisp/org-agenda.el (org-agenda-check-clock-gap):
* lisp/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve-clock, (org-clock-resolve)
(org-resolve-clocks, org-resolve-clocks-if-idle)
(org-clock-in, org-clock-out, org-clock-sum, org-clocktable-steps):
* lisp/org-element.el (org-element-cache-sync-duration)
(org-element--cache-set-timer, org-element--cache-interrupt-p):
(org-element--cache-sync):
* lisp/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/org-indent.el (org-indent-add-properties):
* lisp/org-timer.el (org-timer-start):
(org-timer-pause-or-continue, org-timer-set-timer):
* lisp/org.el (org-today, org-auto-repeat-maybe): Port time-related
changes from the Emacs repo by using compatibility wrappers.
In the Emacs repo, there has been a lot of changes to Org files
involving time-related code. I've ported some of those changes but
have largely ignored any changes that break compatibility with older
Emacsen that we support. That, however, isn't a good approach because
it will be hard to do a systematic update once we bump our minimum
Emacs requirement. Instead use the recently added compatibility
wrappers where needed, which is ugly but more maintainable.
The main time-related changes this leaves unported are changes that
replace (apply #'encode-time args) calls with (encode-time args).
Until the first form is unsupported, adding a compatibility function
doesn't seem worth the churn.
Relevant Emacs commits include
c75f505dea6a560b825384cf3d277690f86840bf,
57c74793c46c6533b63836f00aecaf3ac2accb6d,
988e37fa0f922b852715671d59a0e3f682373411,
476066e89d6f0bb87220da690b8a476bf9655b80,
89c63b3522b62c0fd725f0b348927a2069238452.
2019-08-18 20:47:07 +00:00
|
|
|
(org-time-since (- pause-secs start-secs))))
|
2014-12-07 07:24:54 +00:00
|
|
|
(setq org-timer-pause-time nil)
|
|
|
|
|
(org-timer-set-mode-line 'on)
|
|
|
|
|
(run-hooks 'org-timer-continue-hook)
|
|
|
|
|
(message "Timer continues at %s" (org-timer-value-string))))
|
2009-01-06 05:30:38 +00:00
|
|
|
(t
|
|
|
|
|
;; pause timer
|
2014-12-07 07:24:54 +00:00
|
|
|
(when org-timer-countdown-timer
|
|
|
|
|
(cancel-timer org-timer-countdown-timer)
|
2015-09-22 04:15:26 +00:00
|
|
|
(setq org-timer-countdown-timer 'paused))
|
2010-02-20 15:14:10 +00:00
|
|
|
(run-hooks 'org-timer-pause-hook)
|
2009-01-06 05:30:38 +00:00
|
|
|
(setq org-timer-pause-time (current-time))
|
2015-09-22 04:15:26 +00:00
|
|
|
(org-timer-set-mode-line 'paused)
|
2009-01-06 05:30:38 +00:00
|
|
|
(message "Timer paused at %s" (org-timer-value-string)))))
|
|
|
|
|
|
2018-01-15 15:13:19 +00:00
|
|
|
;;;###autoload
|
2009-01-06 05:30:38 +00:00
|
|
|
(defun org-timer-stop ()
|
2014-12-07 07:24:54 +00:00
|
|
|
"Stop the relative or countdown timer."
|
2009-01-06 05:30:38 +00:00
|
|
|
(interactive)
|
2014-12-07 07:24:54 +00:00
|
|
|
(unless org-timer-start-time
|
|
|
|
|
(user-error "No timer running"))
|
|
|
|
|
(when (timerp org-timer-countdown-timer)
|
|
|
|
|
(cancel-timer org-timer-countdown-timer))
|
2014-12-02 10:28:15 +00:00
|
|
|
(run-hooks 'org-timer-stop-hook)
|
|
|
|
|
(setq org-timer-start-time nil
|
2014-12-07 07:24:54 +00:00
|
|
|
org-timer-pause-time nil
|
|
|
|
|
org-timer-countdown-timer nil)
|
2014-12-02 10:28:15 +00:00
|
|
|
(org-timer-set-mode-line 'off)
|
|
|
|
|
(message "Timer stopped"))
|
2009-01-06 05:30:38 +00:00
|
|
|
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
;;;###autoload
|
2016-10-15 15:36:47 +00:00
|
|
|
(defun org-timer (&optional restart no-insert)
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
"Insert a H:MM:SS string from the timer into the buffer.
|
2016-10-15 15:36:47 +00:00
|
|
|
The first time this command is used, the timer is started.
|
2010-07-16 09:20:05 +00:00
|
|
|
|
2016-10-15 15:36:47 +00:00
|
|
|
When used with a `\\[universal-argument]' prefix, force restarting the timer.
|
|
|
|
|
|
|
|
|
|
When used with a `\\[universal-argument] \\[universal-argument]' \
|
|
|
|
|
prefix, change all the timer strings
|
|
|
|
|
in the region by a fixed amount. This can be used to re-calibrate
|
|
|
|
|
a timer that was not started at the correct moment.
|
|
|
|
|
|
|
|
|
|
If NO-INSERT is non-nil, return the string instead of inserting
|
2010-07-16 09:20:05 +00:00
|
|
|
it in the buffer."
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(interactive "P")
|
2014-12-01 07:02:19 +00:00
|
|
|
(if (equal restart '(16))
|
|
|
|
|
(org-timer-start restart)
|
|
|
|
|
(when (or (equal restart '(4)) (not org-timer-start-time))
|
|
|
|
|
(org-timer-start))
|
2016-10-15 15:36:47 +00:00
|
|
|
(if no-insert
|
2014-12-01 07:02:19 +00:00
|
|
|
(org-timer-value-string)
|
|
|
|
|
(insert (org-timer-value-string)))))
|
2009-01-06 05:30:38 +00:00
|
|
|
|
|
|
|
|
(defun org-timer-value-string ()
|
2019-02-13 12:02:28 +00:00
|
|
|
"Return current timer string."
|
2014-05-24 12:12:56 +00:00
|
|
|
(format org-timer-format
|
|
|
|
|
(org-timer-secs-to-hms
|
2019-02-13 12:02:28 +00:00
|
|
|
(let ((time (- (float-time org-timer-pause-time)
|
|
|
|
|
(float-time org-timer-start-time))))
|
|
|
|
|
(abs (floor (if org-timer-countdown-timer (- time) time)))))))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-timer-change-times-in-region (beg end delta)
|
|
|
|
|
"Change all h:mm:ss time in region by a DELTA."
|
|
|
|
|
(interactive
|
2012-08-11 17:10:44 +00:00
|
|
|
"r\nsEnter time difference like \"-1:08:26\". Default is first time to zero: ")
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(let ((re "[-+]?[0-9]+:[0-9]\\{2\\}:[0-9]\\{2\\}") p)
|
|
|
|
|
(unless (string-match "\\S-" delta)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(when (re-search-forward re end t)
|
|
|
|
|
(setq delta (match-string 0))
|
|
|
|
|
(if (equal (string-to-char delta) ?-)
|
|
|
|
|
(setq delta (substring delta 1))
|
|
|
|
|
(setq delta (concat "-" delta))))))
|
2008-11-25 19:42:06 +00:00
|
|
|
(setq delta (org-timer-hms-to-secs (org-timer-fix-incomplete delta)))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(when (= delta 0) (error "No change"))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(while (re-search-backward re beg t)
|
|
|
|
|
(setq p (point))
|
|
|
|
|
(replace-match
|
|
|
|
|
(save-match-data
|
|
|
|
|
(org-timer-secs-to-hms (+ (org-timer-hms-to-secs (match-string 0)) delta)))
|
|
|
|
|
t t)
|
|
|
|
|
(goto-char p)))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-11-25 19:20:52 +00:00
|
|
|
(defun org-timer-item (&optional arg)
|
2008-12-16 16:50:38 +00:00
|
|
|
"Insert a description-type item with the current timer value."
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(interactive "P")
|
2011-03-08 09:40:46 +00:00
|
|
|
(let ((itemp (org-in-item-p)) (pos (point)))
|
2010-12-24 12:25:37 +00:00
|
|
|
(cond
|
org-list: reorder file, rename functions, improve comments
* lisp/ob.el (org-babel-result-end): apply renaming.
* lisp/org-exp.el (org-export-mark-list-properties): apply renaming.
* lisp/org-list.el (org-list-prevs-alist): renamed from
org-list-struct-prev-alist.
(org-list-parents-alist): renamed from org-list-struct-parent-alist.
(org-list-write-struct): renamed from org-list-struct-fix-struct.
(org-list-parse-list, org-sort-list, org-list-indent-item-generic,
org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
org-move-item-down, org-next-item, org-previous-item,
org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
apply renaming.
(org-get-bullet): removed function, as it is not needed anymore.
2011-01-20 18:28:23 +00:00
|
|
|
;; In a timer list, insert with `org-list-insert-item',
|
2011-01-20 16:20:16 +00:00
|
|
|
;; then fix the list.
|
2011-03-08 09:40:46 +00:00
|
|
|
((and itemp (goto-char itemp) (org-at-item-timer-p))
|
2011-01-20 16:20:16 +00:00
|
|
|
(let* ((struct (org-list-struct))
|
org-list: reorder file, rename functions, improve comments
* lisp/ob.el (org-babel-result-end): apply renaming.
* lisp/org-exp.el (org-export-mark-list-properties): apply renaming.
* lisp/org-list.el (org-list-prevs-alist): renamed from
org-list-struct-prev-alist.
(org-list-parents-alist): renamed from org-list-struct-parent-alist.
(org-list-write-struct): renamed from org-list-struct-fix-struct.
(org-list-parse-list, org-sort-list, org-list-indent-item-generic,
org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
org-move-item-down, org-next-item, org-previous-item,
org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
apply renaming.
(org-get-bullet): removed function, as it is not needed anymore.
2011-01-20 18:28:23 +00:00
|
|
|
(prevs (org-list-prevs-alist struct))
|
2011-01-20 16:20:16 +00:00
|
|
|
(s (concat (org-timer (when arg '(4)) t) ":: ")))
|
2011-03-08 09:40:46 +00:00
|
|
|
(setq struct (org-list-insert-item pos struct prevs nil s))
|
org-list: reorder file, rename functions, improve comments
* lisp/ob.el (org-babel-result-end): apply renaming.
* lisp/org-exp.el (org-export-mark-list-properties): apply renaming.
* lisp/org-list.el (org-list-prevs-alist): renamed from
org-list-struct-prev-alist.
(org-list-parents-alist): renamed from org-list-struct-parent-alist.
(org-list-write-struct): renamed from org-list-struct-fix-struct.
(org-list-parse-list, org-sort-list, org-list-indent-item-generic,
org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
org-move-item-down, org-next-item, org-previous-item,
org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
apply renaming.
(org-get-bullet): removed function, as it is not needed anymore.
2011-01-20 18:28:23 +00:00
|
|
|
(org-list-write-struct struct (org-list-parents-alist struct))
|
2011-01-20 16:20:16 +00:00
|
|
|
(looking-at org-list-full-item-re)
|
|
|
|
|
(goto-char (match-end 0))))
|
2010-12-24 12:25:37 +00:00
|
|
|
;; In a list of another type, don't break anything: throw an error.
|
2011-03-08 09:40:46 +00:00
|
|
|
(itemp (goto-char pos) (error "This is not a timer list"))
|
2011-01-20 16:20:16 +00:00
|
|
|
;; Else, start a new list.
|
2010-12-24 12:25:37 +00:00
|
|
|
(t
|
|
|
|
|
(beginning-of-line)
|
2012-07-11 17:11:26 +00:00
|
|
|
(org-indent-line)
|
2010-12-24 12:25:37 +00:00
|
|
|
(insert "- ")
|
|
|
|
|
(org-timer (when arg '(4)))
|
|
|
|
|
(insert ":: ")))))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
|
|
|
|
(defun org-timer-fix-incomplete (hms)
|
|
|
|
|
"If hms is a H:MM:SS string with missing hour or hour and minute, fix it."
|
|
|
|
|
(if (string-match "\\(?:\\([0-9]+:\\)?\\([0-9]+:\\)\\)?\\([0-9]+\\)" hms)
|
|
|
|
|
(replace-match
|
|
|
|
|
(format "%d:%02d:%02d"
|
2008-11-25 19:42:06 +00:00
|
|
|
(if (match-end 1) (string-to-number (match-string 1 hms)) 0)
|
|
|
|
|
(if (match-end 2) (string-to-number (match-string 2 hms)) 0)
|
|
|
|
|
(string-to-number (match-string 3 hms)))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
t t hms)
|
2008-12-16 16:50:38 +00:00
|
|
|
(error "Cannot parse HMS string \"%s\"" hms)))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
|
|
|
|
|
(defun org-timer-hms-to-secs (hms)
|
|
|
|
|
"Convert h:mm:ss string to an integer time.
|
|
|
|
|
If the string starts with a minus sign, the integer will be negative."
|
|
|
|
|
(if (not (string-match
|
|
|
|
|
"\\([-+]?[0-9]+\\):\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)"
|
|
|
|
|
hms))
|
|
|
|
|
0
|
2008-11-25 19:42:06 +00:00
|
|
|
(let* ((h (string-to-number (match-string 1 hms)))
|
|
|
|
|
(m (string-to-number (match-string 2 hms)))
|
|
|
|
|
(s (string-to-number (match-string 3 hms)))
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(sign (equal (substring (match-string 1 hms) 0 1) "-")))
|
|
|
|
|
(setq h (abs h))
|
|
|
|
|
(* (if sign -1 1) (+ s (* 60 (+ m (* 60 h))))))))
|
|
|
|
|
|
|
|
|
|
(defun org-timer-secs-to-hms (s)
|
|
|
|
|
"Convert integer S into h:mm:ss.
|
2008-12-16 16:50:38 +00:00
|
|
|
If the integer is negative, the string will start with \"-\"."
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
(let (sign m h)
|
|
|
|
|
(setq sign (if (< s 0) "-" "")
|
|
|
|
|
s (abs s)
|
|
|
|
|
m (/ s 60) s (- s (* 60 m))
|
|
|
|
|
h (/ m 60) m (- m (* 60 h)))
|
|
|
|
|
(format "%s%d:%02d:%02d" sign h m s)))
|
|
|
|
|
|
2009-01-06 05:30:38 +00:00
|
|
|
(defvar org-timer-mode-line-timer nil)
|
2009-01-08 10:20:06 +00:00
|
|
|
(defvar org-timer-mode-line-string nil)
|
2009-01-06 05:30:38 +00:00
|
|
|
|
|
|
|
|
(defun org-timer-set-mode-line (value)
|
2014-12-07 07:24:54 +00:00
|
|
|
"Set the mode-line display for relative or countdown timer.
|
2015-09-22 04:15:26 +00:00
|
|
|
VALUE can be `on', `off', or `paused'."
|
2012-02-29 17:04:22 +00:00
|
|
|
(when (or (eq org-timer-display 'mode-line)
|
|
|
|
|
(eq org-timer-display 'both))
|
|
|
|
|
(or global-mode-string (setq global-mode-string '("")))
|
|
|
|
|
(or (memq 'org-timer-mode-line-string global-mode-string)
|
|
|
|
|
(setq global-mode-string
|
|
|
|
|
(append global-mode-string '(org-timer-mode-line-string)))))
|
|
|
|
|
(when (or (eq org-timer-display 'frame-title)
|
2012-08-11 17:10:44 +00:00
|
|
|
(eq org-timer-display 'both))
|
2012-02-29 17:04:22 +00:00
|
|
|
(or (memq 'org-timer-mode-line-string frame-title-format)
|
|
|
|
|
(setq frame-title-format
|
|
|
|
|
(append frame-title-format '(org-timer-mode-line-string)))))
|
2016-09-25 15:29:06 +00:00
|
|
|
(cl-case value
|
2016-09-25 19:08:36 +00:00
|
|
|
(off
|
|
|
|
|
(when org-timer-mode-line-timer
|
|
|
|
|
(cancel-timer org-timer-mode-line-timer)
|
|
|
|
|
(setq org-timer-mode-line-timer nil))
|
|
|
|
|
(when (or (eq org-timer-display 'mode-line)
|
|
|
|
|
(eq org-timer-display 'both))
|
|
|
|
|
(setq global-mode-string
|
|
|
|
|
(delq 'org-timer-mode-line-string global-mode-string)))
|
|
|
|
|
(when (or (eq org-timer-display 'frame-title)
|
|
|
|
|
(eq org-timer-display 'both))
|
|
|
|
|
(setq frame-title-format
|
|
|
|
|
(delq 'org-timer-mode-line-string frame-title-format)))
|
|
|
|
|
(force-mode-line-update))
|
|
|
|
|
(paused
|
|
|
|
|
(when org-timer-mode-line-timer
|
|
|
|
|
(cancel-timer org-timer-mode-line-timer)
|
|
|
|
|
(setq org-timer-mode-line-timer nil)))
|
|
|
|
|
(on
|
|
|
|
|
(when (or (eq org-timer-display 'mode-line)
|
|
|
|
|
(eq org-timer-display 'both))
|
|
|
|
|
(or global-mode-string (setq global-mode-string '("")))
|
|
|
|
|
(or (memq 'org-timer-mode-line-string global-mode-string)
|
|
|
|
|
(setq global-mode-string
|
|
|
|
|
(append global-mode-string '(org-timer-mode-line-string)))))
|
|
|
|
|
(when (or (eq org-timer-display 'frame-title)
|
|
|
|
|
(eq org-timer-display 'both))
|
|
|
|
|
(or (memq 'org-timer-mode-line-string frame-title-format)
|
|
|
|
|
(setq frame-title-format
|
|
|
|
|
(append frame-title-format '(org-timer-mode-line-string)))))
|
|
|
|
|
(org-timer-update-mode-line)
|
|
|
|
|
(when org-timer-mode-line-timer
|
|
|
|
|
(cancel-timer org-timer-mode-line-timer)
|
|
|
|
|
(setq org-timer-mode-line-timer nil))
|
|
|
|
|
(when org-timer-display
|
|
|
|
|
(setq org-timer-mode-line-timer
|
|
|
|
|
(run-with-timer 1 1 'org-timer-update-mode-line))))))
|
2009-01-06 05:30:38 +00:00
|
|
|
|
|
|
|
|
(defun org-timer-update-mode-line ()
|
|
|
|
|
"Update the timer time in the mode line."
|
|
|
|
|
(if org-timer-pause-time
|
|
|
|
|
nil
|
|
|
|
|
(setq org-timer-mode-line-string
|
|
|
|
|
(concat " <" (substring (org-timer-value-string) 0 -1) ">"))
|
|
|
|
|
(force-mode-line-update)))
|
|
|
|
|
|
2009-07-26 18:54:17 +00:00
|
|
|
(defun org-timer-show-remaining-time ()
|
|
|
|
|
"Display the remaining time before the timer ends."
|
|
|
|
|
(interactive)
|
2019-08-17 22:39:18 +00:00
|
|
|
(message
|
|
|
|
|
(if (not org-timer-countdown-timer)
|
|
|
|
|
"No timer set"
|
|
|
|
|
(format-seconds
|
|
|
|
|
"%m minute(s) %s seconds left before next time out"
|
|
|
|
|
;; Note: Once our minimal require is Emacs 27, we can drop this
|
|
|
|
|
;; org-time-convert-to-integer call.
|
|
|
|
|
(org-time-convert-to-integer
|
|
|
|
|
(org-time-subtract (timer--time org-timer-countdown-timer) nil))))))
|
2009-07-26 18:54:17 +00:00
|
|
|
|
2009-07-26 21:27:41 +00:00
|
|
|
;;;###autoload
|
2010-05-28 10:38:29 +00:00
|
|
|
(defun org-timer-set-timer (&optional opt)
|
2015-06-02 20:49:38 +00:00
|
|
|
"Prompt for a duration in minutes or hh:mm:ss and set a timer.
|
2010-05-28 10:38:29 +00:00
|
|
|
|
2015-08-04 20:03:02 +00:00
|
|
|
If `org-timer-default-timer' is not \"0\", suggest this value as
|
2010-05-28 10:38:29 +00:00
|
|
|
the default duration for the timer. If a timer is already set,
|
2010-10-27 16:20:27 +00:00
|
|
|
prompt the user if she wants to replace it.
|
2010-05-28 10:38:29 +00:00
|
|
|
|
|
|
|
|
Called with a numeric prefix argument, use this numeric value as
|
2015-06-02 20:49:38 +00:00
|
|
|
the duration of the timer in minutes.
|
2010-05-28 10:38:29 +00:00
|
|
|
|
2010-06-08 07:35:07 +00:00
|
|
|
Called with a `C-u' prefix arguments, use `org-timer-default-timer'
|
2010-05-28 10:38:29 +00:00
|
|
|
without prompting the user for a duration.
|
|
|
|
|
|
2010-06-08 07:35:07 +00:00
|
|
|
With two `C-u' prefix arguments, use `org-timer-default-timer'
|
2010-05-28 10:38:29 +00:00
|
|
|
without prompting the user for a duration and automatically
|
2014-03-14 11:14:49 +00:00
|
|
|
replace any running timer.
|
|
|
|
|
|
|
|
|
|
By default, the timer duration will be set to the number of
|
|
|
|
|
minutes in the Effort property, if any. You can ignore this by
|
|
|
|
|
using three `C-u' prefix arguments."
|
2010-05-28 10:38:29 +00:00
|
|
|
(interactive "P")
|
2014-12-07 07:24:54 +00:00
|
|
|
(when (and org-timer-start-time
|
|
|
|
|
(not org-timer-countdown-timer))
|
|
|
|
|
(user-error "Relative timer is running. Stop first"))
|
2015-08-04 20:03:02 +00:00
|
|
|
(let* ((default-timer
|
|
|
|
|
;; `org-timer-default-timer' used to be a number, don't choke:
|
|
|
|
|
(if (numberp org-timer-default-timer)
|
|
|
|
|
(number-to-string org-timer-default-timer)
|
|
|
|
|
org-timer-default-timer))
|
2018-06-25 15:50:44 +00:00
|
|
|
(effort-minutes (let ((effort (org-entry-get nil org-effort-property)))
|
|
|
|
|
(when (org-string-nw-p effort)
|
|
|
|
|
(floor (org-duration-to-minutes effort)))))
|
2016-06-14 19:49:44 +00:00
|
|
|
(minutes (or (and (numberp opt) (number-to-string opt))
|
|
|
|
|
(and (not (equal opt '(64)))
|
2014-05-28 08:47:05 +00:00
|
|
|
effort-minutes
|
|
|
|
|
(number-to-string effort-minutes))
|
2015-08-04 20:03:02 +00:00
|
|
|
(and (consp opt) default-timer)
|
2015-06-02 20:49:38 +00:00
|
|
|
(and (stringp opt) opt)
|
|
|
|
|
(read-from-minibuffer
|
|
|
|
|
"How much time left? (minutes or h:mm:ss) "
|
2015-08-04 20:03:02 +00:00
|
|
|
(and (not (string-equal default-timer "0")) default-timer)))))
|
2015-06-02 20:49:38 +00:00
|
|
|
(when (string-match "\\`[0-9]+\\'" minutes)
|
|
|
|
|
(setq minutes (concat minutes ":00")))
|
2010-05-20 14:16:31 +00:00
|
|
|
(if (not (string-match "[0-9]+" minutes))
|
|
|
|
|
(org-timer-show-remaining-time)
|
2015-11-13 22:58:38 +00:00
|
|
|
(let ((secs (org-timer-hms-to-secs (org-timer-fix-incomplete minutes))))
|
2015-09-22 04:15:32 +00:00
|
|
|
(if (and org-timer-countdown-timer
|
|
|
|
|
(not (or (equal opt '(16))
|
|
|
|
|
(y-or-n-p "Replace current timer? "))))
|
|
|
|
|
(message "No timer set")
|
|
|
|
|
(when (timerp org-timer-countdown-timer)
|
|
|
|
|
(cancel-timer org-timer-countdown-timer))
|
|
|
|
|
(setq org-timer-countdown-timer-title
|
|
|
|
|
(org-timer--get-timer-title))
|
|
|
|
|
(setq org-timer-countdown-timer
|
|
|
|
|
(org-timer--run-countdown-timer
|
|
|
|
|
secs org-timer-countdown-timer-title))
|
|
|
|
|
(run-hooks 'org-timer-set-hook)
|
Port more time-related changes
* lisp/org-agenda.el (org-agenda-check-clock-gap):
* lisp/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve-clock, (org-clock-resolve)
(org-resolve-clocks, org-resolve-clocks-if-idle)
(org-clock-in, org-clock-out, org-clock-sum, org-clocktable-steps):
* lisp/org-element.el (org-element-cache-sync-duration)
(org-element--cache-set-timer, org-element--cache-interrupt-p):
(org-element--cache-sync):
* lisp/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/org-indent.el (org-indent-add-properties):
* lisp/org-timer.el (org-timer-start):
(org-timer-pause-or-continue, org-timer-set-timer):
* lisp/org.el (org-today, org-auto-repeat-maybe): Port time-related
changes from the Emacs repo by using compatibility wrappers.
In the Emacs repo, there has been a lot of changes to Org files
involving time-related code. I've ported some of those changes but
have largely ignored any changes that break compatibility with older
Emacsen that we support. That, however, isn't a good approach because
it will be hard to do a systematic update once we bump our minimum
Emacs requirement. Instead use the recently added compatibility
wrappers where needed, which is ugly but more maintainable.
The main time-related changes this leaves unported are changes that
replace (apply #'encode-time args) calls with (encode-time args).
Until the first form is unsupported, adding a compatibility function
doesn't seem worth the churn.
Relevant Emacs commits include
c75f505dea6a560b825384cf3d277690f86840bf,
57c74793c46c6533b63836f00aecaf3ac2accb6d,
988e37fa0f922b852715671d59a0e3f682373411,
476066e89d6f0bb87220da690b8a476bf9655b80,
89c63b3522b62c0fd725f0b348927a2069238452.
2019-08-18 20:47:07 +00:00
|
|
|
(setq org-timer-start-time (org-time-add nil secs))
|
2015-09-22 04:15:32 +00:00
|
|
|
(setq org-timer-pause-time nil)
|
|
|
|
|
(org-timer-set-mode-line 'on))))))
|
2009-08-03 15:30:30 +00:00
|
|
|
|
2014-12-07 07:24:54 +00:00
|
|
|
(defun org-timer--run-countdown-timer (secs title)
|
|
|
|
|
"Start countdown timer that will last SECS.
|
|
|
|
|
TITLE will be appended to the notification message displayed when
|
|
|
|
|
time is up."
|
|
|
|
|
(let ((msg (format "%s: time out" title)))
|
|
|
|
|
(run-with-timer
|
|
|
|
|
secs nil `(lambda ()
|
|
|
|
|
(setq org-timer-countdown-timer nil
|
|
|
|
|
org-timer-start-time nil)
|
|
|
|
|
(org-notify ,msg ,org-clock-sound)
|
|
|
|
|
(org-timer-set-mode-line 'off)
|
|
|
|
|
(run-hooks 'org-timer-done-hook)))))
|
|
|
|
|
|
|
|
|
|
(defun org-timer--get-timer-title ()
|
2019-11-16 18:18:17 +00:00
|
|
|
"Construct timer title.
|
|
|
|
|
Try to use an Org header, otherwise use the buffer name."
|
2020-03-02 14:55:45 +00:00
|
|
|
(cond
|
|
|
|
|
((derived-mode-p 'org-agenda-mode)
|
|
|
|
|
(let* ((marker (or (get-text-property (point) 'org-marker)))
|
|
|
|
|
(hdmarker (or (get-text-property (point) 'org-hd-marker)
|
|
|
|
|
marker)))
|
|
|
|
|
(when (and marker (marker-buffer marker))
|
|
|
|
|
(with-current-buffer (marker-buffer marker)
|
|
|
|
|
(org-with-wide-buffer
|
|
|
|
|
(goto-char hdmarker)
|
|
|
|
|
(org-show-entry)
|
|
|
|
|
(or (ignore-errors (org-get-heading))
|
|
|
|
|
(buffer-name (buffer-base-buffer))))))))
|
|
|
|
|
((derived-mode-p 'org-mode)
|
|
|
|
|
(ignore-errors (org-get-heading)))
|
|
|
|
|
(t (buffer-name (buffer-base-buffer)))))
|
2014-12-07 07:24:54 +00:00
|
|
|
|
2009-01-30 06:40:10 +00:00
|
|
|
(provide 'org-timer)
|
|
|
|
|
|
2012-10-02 06:50:46 +00:00
|
|
|
;; Local variables:
|
|
|
|
|
;; generated-autoload-file: "org-loaddefs.el"
|
|
|
|
|
;; End:
|
|
|
|
|
|
Implement timer for timed notes.
This patch implements a relative time for taking timed notes, useful
for example while watching a video, or during a meeting which is also
recorded. Here are the new commands:
- `C-c C-x .' ::
Insert a relative time into the buffer. The first time
you use this, the timer will be started. When called
with a prefix argument, the timer is reset to 0.
- `C-c C-x -' ::
Insert a description list item with the current relative
time. With a prefix argument, first reset the timer to 0.
- `C-c C-x 0' ::
Reset the timer without inserting anything into the buffer.
By default, the timer is reset to 0. When called with a
`C-u' prefix, reset the timer to specific starting
offset. The user is prompted for the offset, with a
default taken from a timer string at point, if any, So this
can be used to restart taking notes after a break in the
process. When called with a double prefix argument
`C-c C-u', change all timer strings in the active
region by a certain amount. This can be used to fix timer
strings if the timer was not started at exactly the right
moment.
2008-11-25 11:07:23 +00:00
|
|
|
;;; org-timer.el ends here
|