2009-01-06 05:30:38 +00:00
|
|
|
;;; org-timer.el --- The relative timer code for Org-mode
|
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-04-07 14:26:10 +00:00
|
|
|
;; Copyright (C) 2008, 2009, 2010 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
|
|
|
|
|
;; Homepage: http://orgmode.org
|
2010-05-09 04:24:20 +00:00
|
|
|
;; Version: 6.36trans
|
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
|
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; This file contains the relative timer code for Org-mode
|
|
|
|
|
|
2008-11-25 19:42:06 +00:00
|
|
|
(require 'org)
|
|
|
|
|
|
2009-07-29 17:37:55 +00:00
|
|
|
(declare-function org-show-notification "org-clock" (parameters))
|
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.")
|
|
|
|
|
|
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
|
|
|
|
|
the value of the relative timer."
|
|
|
|
|
:group 'org-time
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
2010-05-20 14:16:31 +00:00
|
|
|
(defcustom org-timer-default-timer nil
|
|
|
|
|
"The default timer when a timer is set.
|
|
|
|
|
When nil, the user is prompted for a value."
|
|
|
|
|
:group 'org-time
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
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
|
|
|
|
|
"Hook run before relative timer is stopped.")
|
|
|
|
|
|
|
|
|
|
(defvar org-timer-pause-hook nil
|
|
|
|
|
"Hook run before relative timer is paused.")
|
|
|
|
|
|
|
|
|
|
(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.")
|
|
|
|
|
|
2010-02-20 15:14:10 +00:00
|
|
|
(defvar org-timer-cancel-hook nil
|
|
|
|
|
"Hook run before countdown timer is canceled.")
|
|
|
|
|
|
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")
|
|
|
|
|
(if (equal offset '(16))
|
|
|
|
|
(call-interactively 'org-timer-change-times-in-region)
|
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)))))
|
|
|
|
|
(setq org-timer-start-time
|
|
|
|
|
(seconds-to-time
|
2009-09-02 12:37:47 +00:00
|
|
|
(- (org-float-time) (org-timer-hms-to-secs s)))))
|
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)))
|
|
|
|
|
(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
|
|
|
|
2009-01-06 05:30:38 +00:00
|
|
|
(defun org-timer-pause-or-continue (&optional stop)
|
|
|
|
|
"Pause or continue the relative timer. With prefix arg, stop it entirely."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(cond
|
|
|
|
|
(stop (org-timer-stop))
|
|
|
|
|
((not org-timer-start-time) (error "No timer is running"))
|
|
|
|
|
(org-timer-pause-time
|
|
|
|
|
;; timer is paused, continue
|
|
|
|
|
(setq org-timer-start-time
|
|
|
|
|
(seconds-to-time
|
|
|
|
|
(-
|
2009-09-02 12:37:47 +00:00
|
|
|
(org-float-time)
|
|
|
|
|
(- (org-float-time org-timer-pause-time)
|
|
|
|
|
(org-float-time org-timer-start-time))))
|
2009-01-06 05:30:38 +00:00
|
|
|
org-timer-pause-time nil)
|
|
|
|
|
(org-timer-set-mode-line 'on)
|
|
|
|
|
(message "Timer continues at %s" (org-timer-value-string)))
|
|
|
|
|
(t
|
|
|
|
|
;; pause timer
|
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))
|
|
|
|
|
(org-timer-set-mode-line 'pause)
|
|
|
|
|
(message "Timer paused at %s" (org-timer-value-string)))))
|
|
|
|
|
|
|
|
|
|
(defun org-timer-stop ()
|
|
|
|
|
"Stop the relative timer."
|
|
|
|
|
(interactive)
|
2010-02-20 15:14:10 +00:00
|
|
|
(run-hooks 'org-timer-stop-hook)
|
2009-01-06 05:30:38 +00:00
|
|
|
(setq org-timer-start-time nil
|
|
|
|
|
org-timer-pause-time nil)
|
|
|
|
|
(org-timer-set-mode-line 'off))
|
|
|
|
|
|
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 (&optional restart)
|
|
|
|
|
"Insert a H:MM:SS string from the timer into the buffer.
|
|
|
|
|
The first time this command is used, the timer is started. When used with
|
|
|
|
|
a `C-u' prefix, force restarting the timer.
|
|
|
|
|
When used with a double prefix arg `C-u C-u', change all the timer string
|
|
|
|
|
in the region by a fixed amount. This can be used to recalibrate a timer
|
|
|
|
|
that was not started at the correct moment."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(if (equal restart '(4)) (org-timer-start))
|
|
|
|
|
(or org-timer-start-time (org-timer-start))
|
2009-01-06 05:30:38 +00:00
|
|
|
(insert (org-timer-value-string)))
|
|
|
|
|
|
|
|
|
|
(defun org-timer-value-string ()
|
|
|
|
|
(format org-timer-format (org-timer-secs-to-hms (floor (org-timer-seconds)))))
|
|
|
|
|
|
|
|
|
|
(defun org-timer-seconds ()
|
2009-09-02 12:37:47 +00:00
|
|
|
(- (org-float-time (or org-timer-pause-time (current-time)))
|
|
|
|
|
(org-float-time org-timer-start-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
|
|
|
|
|
"r\nsEnter time difference like \"-1:08:26\". Default is first time to zero: ")
|
|
|
|
|
(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")
|
|
|
|
|
(let ((ind 0))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-chars-backward " \n\t")
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn
|
|
|
|
|
(org-beginning-of-item)
|
|
|
|
|
(setq ind (org-get-indentation)))
|
|
|
|
|
(error nil)))
|
|
|
|
|
(or (bolp) (newline))
|
|
|
|
|
(org-indent-line-to ind)
|
|
|
|
|
(insert "- ")
|
|
|
|
|
(org-timer (if arg '(4)))
|
|
|
|
|
(insert ":: ")))
|
|
|
|
|
|
|
|
|
|
(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)
|
2009-11-12 12:39:29 +00:00
|
|
|
"Set the mode-line display of the relative timer.
|
2009-01-06 05:30:38 +00:00
|
|
|
VALUE can be `on', `off', or `pause'."
|
|
|
|
|
(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))))
|
|
|
|
|
(cond
|
|
|
|
|
((equal value 'off)
|
|
|
|
|
(when org-timer-mode-line-timer
|
|
|
|
|
(cancel-timer org-timer-mode-line-timer)
|
|
|
|
|
(setq org-timer-mode-line-timer nil))
|
|
|
|
|
(setq global-mode-string
|
|
|
|
|
(delq 'org-timer-mode-line-string global-mode-string))
|
|
|
|
|
(force-mode-line-update))
|
|
|
|
|
((equal value 'pause)
|
|
|
|
|
(when org-timer-mode-line-timer
|
|
|
|
|
(cancel-timer org-timer-mode-line-timer)
|
|
|
|
|
(setq org-timer-mode-line-timer nil)))
|
|
|
|
|
((equal value 'on)
|
|
|
|
|
(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))))
|
|
|
|
|
(org-timer-update-mode-line)
|
|
|
|
|
(when org-timer-mode-line-timer
|
|
|
|
|
(cancel-timer org-timer-mode-line-timer))
|
|
|
|
|
(setq org-timer-mode-line-timer
|
|
|
|
|
(run-with-timer 1 1 'org-timer-update-mode-line)))))
|
|
|
|
|
|
|
|
|
|
(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)))
|
|
|
|
|
|
2010-02-25 15:03:38 +00:00
|
|
|
(defvar org-timer-current-timer nil)
|
|
|
|
|
(defun org-timer-cancel-timer ()
|
|
|
|
|
"Cancel the current timer."
|
2009-07-26 18:54:17 +00:00
|
|
|
(interactive)
|
2010-02-25 15:03:38 +00:00
|
|
|
(when (eval org-timer-current-timer)
|
|
|
|
|
(run-hooks 'org-timer-cancel-hook)
|
|
|
|
|
(cancel-timer org-timer-current-timer)
|
|
|
|
|
(setq org-timer-current-timer nil))
|
|
|
|
|
(message "Last timer canceled"))
|
2009-07-26 18:54:17 +00:00
|
|
|
|
|
|
|
|
(defun org-timer-show-remaining-time ()
|
|
|
|
|
"Display the remaining time before the timer ends."
|
|
|
|
|
(interactive)
|
|
|
|
|
(require 'time)
|
2010-02-25 15:03:38 +00:00
|
|
|
(if (not org-timer-current-timer)
|
2009-07-26 18:54:17 +00:00
|
|
|
(message "No timer set")
|
|
|
|
|
(let* ((rtime (decode-time
|
2010-02-25 15:03:38 +00:00
|
|
|
(time-subtract (timer--time org-timer-current-timer)
|
2009-07-26 18:54:17 +00:00
|
|
|
(current-time))))
|
|
|
|
|
(rsecs (nth 0 rtime))
|
|
|
|
|
(rmins (nth 1 rtime)))
|
2010-02-25 15:03:38 +00:00
|
|
|
(message "%d minute(s) %d seconds left before next time out"
|
2009-07-26 18:54:17 +00:00
|
|
|
rmins rsecs))))
|
|
|
|
|
|
2009-07-26 21:27:41 +00:00
|
|
|
;;;###autoload
|
2010-05-20 14:16:31 +00:00
|
|
|
(defun org-timer-set-timer ()
|
2009-07-26 18:54:17 +00:00
|
|
|
"Set a timer."
|
2010-05-20 14:16:31 +00:00
|
|
|
(interactive)
|
|
|
|
|
(let ((minutes
|
|
|
|
|
(read-from-minibuffer
|
|
|
|
|
"How many minutes left? "
|
|
|
|
|
(if org-timer-default-timer
|
|
|
|
|
(number-to-string org-timer-default-timer)))))
|
|
|
|
|
(if (not (string-match "[0-9]+" minutes))
|
|
|
|
|
(org-timer-show-remaining-time)
|
2009-07-26 18:54:17 +00:00
|
|
|
(let* ((mins (string-to-number (match-string 0 minutes)))
|
|
|
|
|
(secs (* mins 60))
|
2009-08-03 15:30:30 +00:00
|
|
|
(hl (cond
|
2009-07-26 18:54:17 +00:00
|
|
|
((string-match "Org Agenda" (buffer-name))
|
|
|
|
|
(let* ((marker (or (get-text-property (point) 'org-marker)
|
|
|
|
|
(org-agenda-error)))
|
|
|
|
|
(hdmarker (or (get-text-property (point) 'org-hd-marker)
|
|
|
|
|
marker))
|
|
|
|
|
(pos (marker-position marker)))
|
|
|
|
|
(with-current-buffer (marker-buffer marker)
|
|
|
|
|
(widen)
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(org-show-entry)
|
2009-08-03 11:28:24 +00:00
|
|
|
(org-get-heading))))
|
2009-07-26 18:54:17 +00:00
|
|
|
((eq major-mode 'org-mode)
|
|
|
|
|
(org-get-heading))
|
|
|
|
|
(t (error "Not in an Org buffer"))))
|
|
|
|
|
timer-set)
|
2010-05-20 14:16:31 +00:00
|
|
|
(if (or (and org-timer-current-timer
|
|
|
|
|
(y-or-n-p "Replace current timer? "))
|
|
|
|
|
(not org-timer-current-timer))
|
|
|
|
|
(progn
|
|
|
|
|
(cancel-timer org-timer-current-timer)
|
|
|
|
|
(setq org-timer-current-timer
|
|
|
|
|
(run-with-timer
|
|
|
|
|
secs nil `(lambda ()
|
|
|
|
|
(setq org-timer-current-timer nil)
|
|
|
|
|
(org-notify ,(format "%s: time out" hl) t)
|
|
|
|
|
(run-hooks 'org-timer-done-hook))))
|
|
|
|
|
(run-hooks 'org-timer-set-hook))
|
|
|
|
|
(message "No timer set"))))))
|
2009-08-03 15:30:30 +00:00
|
|
|
|
2009-01-30 06:40:10 +00:00
|
|
|
(provide 'org-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
|
|
|
;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107
|
|
|
|
|
|
|
|
|
|
;;; org-timer.el ends here
|