ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
org-mode/lisp/org-timer.el

510 lines
18 KiB
EmacsLisp
Raw Normal View History

org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
;;; org-timer.el --- 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 06:07:23 -05:00
Backport remaining changes from commit 7e09ef0 Add changes from Emacs repo that should have been backported with bb77dd2. Update copyright year to 2015 7e09ef09a479731d01b1ca46e94ddadd73ac98e3 Paul Eggert Thu Jan 1 14:26:41 2015 -0800
2015-01-01 17:26:41 -05:00
;; Copyright (C) 2008-2015 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 06:07:23 -05:00
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;;
;; 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:
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05: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 06:07:23 -05:00
Docstring fixes part 6
2010-07-18 11:04:15 -04:00
;;; Code:
Fix compiler issues related to the timer. Also, one function had a wrong name, my-hms-to-secs....
2008-11-25 14:42:06 -05:00
(require 'org)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(require 'org-clock)
Fix compiler issues related to the timer. Also, one function had a wrong name, my-hms-to-secs....
2008-11-25 14:42:06 -05:00
Keep compiler happy
2009-08-03 07:28:24 -04:00
(declare-function org-agenda-error "org-agenda" ())
Declare org-show-notification as a function of org-clock.el.
2009-07-29 13:37:55 -04:00
Finalize the relative-timer setup. This cleans up the implementation of the timer. Most important change is that, after starting a time list with `C-c C-x -', you can then simply use M-RET to add new items, which is addictive!
2008-11-25 14:20:52 -05:00
(defvar org-timer-start-time nil
"t=0 for the running timer.")
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(defvar org-timer-pause-time nil
"Time when the timer was paused.")
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(defvar org-timer-countdown-timer nil
"Current countdown timer.
This is a timer object if there is an active countdown timer,
'paused' if there is a paused countdown timer, and nil
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 06:07:23 -05: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
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05: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 06:07:23 -05:00
:group 'org-time
:type 'string)
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
(defcustom org-timer-default-timer "0"
"The default timer when a timer is set, in minutes or hh:mm:ss format.
Use the type "number" for the new variable org-timer-default-timer
2010-05-20 10:24:44 -04:00
When 0, the user is prompted for a value."
Define and use a new variable: org-timer-default-timer This variable defaults to nil. When non-nil, this is the default value when the user is prompted for a timer. This patch also improves org-timer-set-timer so that the user can replace the current timer by a new one.
2010-05-20 10:16:31 -04:00
:group 'org-time
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
:version "25.1"
:package-version '(Org . "8.3")
:type 'string)
Define and use a new variable: org-timer-default-timer This variable defaults to nil. When non-nil, this is the default value when the user is prompted for a timer. This patch also improves org-timer-set-timer so that the user can replace the current timer by a new one.
2010-05-20 10:16:31 -04:00
Option for clock and timer to be displayed in frame-title * org-clock.el: New option `org-clock-clocked-in-display' to control whether the current clock is displayed in the mode line and/or frame title. * org-timer.el: New option `org-timer-display' to control whether the current timer is displayed in the mode line and/or frame title. This allows the clock and timer to be displayed in the frame title instead of, or as well as, the mode line. This is useful for people with limited space in the mode line but with ample space in the frame title.
2012-02-29 12:04:22 -05:00
(defcustom org-timer-display 'mode-line
"When a timer is running, org-mode can display it in the mode
line and/or frame title.
Allowed values are:
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)))
Add some hooks to org-timer.el Patch by Austin Frank.
2010-02-20 10:14:10 -05:00
(defvar org-timer-start-hook nil
"Hook run after relative timer is started.")
(defvar org-timer-stop-hook nil
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
"Hook run before relative or countdown timer is stopped.")
Add some hooks to org-timer.el Patch by Austin Frank.
2010-02-20 10:14:10 -05:00
(defvar org-timer-pause-hook nil
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
"Hook run before relative or countdown timer is paused.")
Add some hooks to org-timer.el Patch by Austin Frank.
2010-02-20 10:14:10 -05:00
Timer: Run a hook when relative timer is continued * lisp/org-timer.el (org-timer-continue-hook): Define the variable (org-timer-pause-or-continue): Run hook after relative timer is continued There was a hook run when the relative timer is paused (and for most other actions), but none for continuing afterwards. One use for this would be to pause/continue playback in a media-player app with the same keystroke used to pause/continue the timer. TINYCHANGE Patch by Christian Moe
2010-12-20 07:18:27 -05:00
(defvar org-timer-continue-hook nil
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
"Hook run after relative or countdown timer is continued.")
Timer: Run a hook when relative timer is continued * lisp/org-timer.el (org-timer-continue-hook): Define the variable (org-timer-pause-or-continue): Run hook after relative timer is continued There was a hook run when the relative timer is paused (and for most other actions), but none for continuing afterwards. One use for this would be to pause/continue playback in a media-player app with the same keystroke used to pause/continue the timer. TINYCHANGE Patch by Christian Moe
2010-12-20 07:18:27 -05:00
Add some hooks to org-timer.el Patch by Austin Frank.
2010-02-20 10:14:10 -05:00
(defvar org-timer-set-hook nil
"Hook run after countdown timer is set.")
One more hook in org-timer.el
2010-02-20 14:31:44 -05: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 06:07:23 -05: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")
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05: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
Fix compiler issues related to the timer. Also, one function had a wrong name, my-hms-to-secs....
2008-11-25 14:42:06 -05: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 06:07:23 -05: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")
Remove unnecessary whitespace.
2008-12-04 09:33:43 -05: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 06:07:23 -05: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
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
;; Pass `current-time' result to `org-float-time'
;; (instead of calling without arguments) so that only
;; `current-time' has to be overriden in tests.
(- (org-float-time (current-time)) delta))))
(setq org-timer-pause-time nil)
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05: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 06:07:23 -05:00
(message "Timer start time set to %s, current value is %s"
(format-time-string "%T" org-timer-start-time)
Add some hooks to org-timer.el Patch by Austin Frank.
2010-02-20 10:14:10 -05:00
(org-timer-secs-to-hms (or delta 0)))
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05: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 06:07:23 -05:00
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(defun org-timer-pause-or-continue (&optional stop)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
"Pause or continue the relative or countdown timer.
Docstring fixes part 6
2010-07-18 11:04:15 -04:00
With prefix arg STOP, stop it entirely."
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(interactive "P")
(cond
(stop (org-timer-stop))
((not org-timer-start-time) (error "No timer is running"))
(org-timer-pause-time
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(let ((start-secs (org-float-time org-timer-start-time))
(pause-secs (org-float-time org-timer-pause-time)))
(if org-timer-countdown-timer
(progn
(let ((new-secs (- start-secs pause-secs)))
(setq org-timer-countdown-timer
(org-timer--run-countdown-timer
new-secs org-timer-countdown-timer-title))
(setq org-timer-start-time
(time-add (current-time) (seconds-to-time new-secs)))))
(setq org-timer-start-time
;; Pass `current-time' result to `org-float-time'
;; (instead of calling without arguments) so that only
;; `current-time' has to be overriden in tests.
(seconds-to-time (- (org-float-time (current-time))
(- pause-secs start-secs)))))
(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))))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(t
;; pause timer
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(when org-timer-countdown-timer
(cancel-timer org-timer-countdown-timer)
(setq org-timer-countdown-timer 'pause))
Add some hooks to org-timer.el Patch by Austin Frank.
2010-02-20 10:14:10 -05:00
(run-hooks 'org-timer-pause-hook)
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05: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 ()
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
"Stop the relative or countdown timer."
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(interactive)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(unless org-timer-start-time
(user-error "No timer running"))
(when (timerp org-timer-countdown-timer)
(cancel-timer org-timer-countdown-timer))
org-timer: Fix "No running timer" error * lisp/org-timer.el (org-timer-stop): Do not look after `org-timer-current-timer', which is a variable related to countdown timer, whereas the function is related to relative timer. Reported-by: Randy Smith <perlstalker@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/93081>
2014-12-02 05:28:15 -05:00
(run-hooks 'org-timer-stop-hook)
(setq org-timer-start-time nil
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
org-timer-pause-time nil
org-timer-countdown-timer nil)
org-timer: Fix "No running timer" error * lisp/org-timer.el (org-timer-stop): Do not look after `org-timer-current-timer', which is a variable related to countdown timer, whereas the function is related to relative timer. Reported-by: Randy Smith <perlstalker@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/93081>
2014-12-02 05:28:15 -05:00
(org-timer-set-mode-line 'off)
(message "Timer stopped"))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05: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 06:07:23 -05:00
;;;###autoload
Less latency in org-timer-item. * org-timer.el (org-timer-item): Refactoring. Compute timer string before inserting it in the buffer * org-timer.el (org-timer): added an optional argument to return timer string instead of inserting it.
2010-07-16 05:20:05 -04:00
(defun org-timer (&optional restart no-insert-p)
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 06:07:23 -05:00
"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
Docstring fixes part 6
2010-07-18 11:04:15 -04:00
a \\[universal-argument] prefix, force restarting the timer.
org-timer: Fix the docstring.
2010-09-02 16:32:32 -04:00
When used with a double prefix argument \\[universal-argument], change all the timer 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 06:07:23 -05:00
in the region by a fixed amount. This can be used to recalibrate a timer
Less latency in org-timer-item. * org-timer.el (org-timer-item): Refactoring. Compute timer string before inserting it in the buffer * org-timer.el (org-timer): added an optional argument to return timer string instead of inserting it.
2010-07-16 05:20:05 -04:00
that was not started at the correct moment.
If NO-INSERT-P is non-nil, return the string instead of inserting
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 06:07:23 -05:00
(interactive "P")
org-timer.el (org-timer): Recognize double prefix * lisp/org-timer.el (org-timer): Follow the behavior described in the docstring for a double prefix argument.
2014-12-01 02:02:19 -05:00
(if (equal restart '(16))
(org-timer-start restart)
(when (or (equal restart '(4)) (not org-timer-start-time))
(org-timer-start))
(if no-insert-p
(org-timer-value-string)
(insert (org-timer-value-string)))))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(defun org-timer-value-string ()
org-timer.el (org-timer-value-string): Always return a positive value * org-timer.el (org-timer-value-string): Always return a positive value. Add docstring.
2014-05-24 08:12:56 -04:00
"Set the timer string."
(format org-timer-format
(org-timer-secs-to-hms
(abs (floor (org-timer-seconds))))))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(defun org-timer-seconds ()
Merge branch 'maint' into backport-master
2015-07-26 23:56:50 -04:00
;; Pass `current-time' result to `org-float-time' (instead of
;; calling without arguments) so that only `current-time' has to be
;; overriden in tests.
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(if org-timer-countdown-timer
`org-timer-set-timer': display a countdown in the modeline for. This was requested long time ago by Frederic Couchet and more recently by Łukasz Stelmach.
2010-09-02 17:40:44 -04:00
(- (org-float-time org-timer-start-time)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(org-float-time (or org-timer-pause-time (current-time))))
`org-timer-set-timer': display a countdown in the modeline for. This was requested long time ago by Frederic Couchet and more recently by Łukasz Stelmach.
2010-09-02 17:40:44 -04: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 06:07:23 -05:00
;;;###autoload
(defun org-timer-change-times-in-region (beg end delta)
"Change all h:mm:ss time in region by a DELTA."
(interactive
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04: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 06:07:23 -05: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))))))
Fix compiler issues related to the timer. Also, one function had a wrong name, my-hms-to-secs....
2008-11-25 14:42:06 -05: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 06:07:23 -05: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
Finalize the relative-timer setup. This cleans up the implementation of the timer. Most important change is that, after starting a time list with `C-c C-x -', you can then simply use M-RET to add new items, which is addictive!
2008-11-25 14:20:52 -05:00
(defun org-timer-item (&optional arg)
Fix typos in org-timer.el
2008-12-16 11:50:38 -05: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 06:07:23 -05:00
(interactive "P")
org-timer: fix bug with `org-timer-item' * lisp/org-timer.el (org-timer-item): save-excursion prevents `org-list-struct' to get the list structure when point isn't on the first line of the item.
2011-03-08 04:40:46 -05:00
(let ((itemp (org-in-item-p)) (pos (point)))
org-list: rewrite of insert-item code. * org-list.el (org-list-separating-blank-lines-number): use new accessors. (org-list-insert-item-generic): use list structures to insert a new item. (org-list-exchange-items): refactor and comment code. Now return new struct instead of modifying it, as list sorting would sometimes eat first item. (org-move-item-down,org-move-item-up): reflect changes to `org-list-exchange-items'. (org-insert-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result. * org-timer.el (org-timer-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result.
2010-12-24 07:25:37 -05: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 13:28:23 -05:00
;; In a timer list, insert with `org-list-insert-item',
org-list: separate tasks needed to insert a new item more clearly * lisp/org-list.el (org-list-insert-item-generic): change arguments. The function now accepts structure and previous items alist. This allow to insert an item programmatically more easily. (org-insert-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure and updating checkboxes. * lisp/org-timer.el (org-timer-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure.
2011-01-20 11:20:16 -05:00
;; then fix the list.
org-timer: fix bug with `org-timer-item' * lisp/org-timer.el (org-timer-item): save-excursion prevents `org-list-struct' to get the list structure when point isn't on the first line of the item.
2011-03-08 04:40:46 -05:00
((and itemp (goto-char itemp) (org-at-item-timer-p))
org-list: separate tasks needed to insert a new item more clearly * lisp/org-list.el (org-list-insert-item-generic): change arguments. The function now accepts structure and previous items alist. This allow to insert an item programmatically more easily. (org-insert-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure and updating checkboxes. * lisp/org-timer.el (org-timer-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure.
2011-01-20 11:20:16 -05: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 13:28:23 -05:00
(prevs (org-list-prevs-alist struct))
org-list: separate tasks needed to insert a new item more clearly * lisp/org-list.el (org-list-insert-item-generic): change arguments. The function now accepts structure and previous items alist. This allow to insert an item programmatically more easily. (org-insert-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure and updating checkboxes. * lisp/org-timer.el (org-timer-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure.
2011-01-20 11:20:16 -05:00
(s (concat (org-timer (when arg '(4)) t) ":: ")))
org-timer: fix bug with `org-timer-item' * lisp/org-timer.el (org-timer-item): save-excursion prevents `org-list-struct' to get the list structure when point isn't on the first line of the item.
2011-03-08 04:40:46 -05: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 13:28:23 -05:00
(org-list-write-struct struct (org-list-parents-alist struct))
org-list: separate tasks needed to insert a new item more clearly * lisp/org-list.el (org-list-insert-item-generic): change arguments. The function now accepts structure and previous items alist. This allow to insert an item programmatically more easily. (org-insert-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure and updating checkboxes. * lisp/org-timer.el (org-timer-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure.
2011-01-20 11:20:16 -05:00
(looking-at org-list-full-item-re)
(goto-char (match-end 0))))
org-list: rewrite of insert-item code. * org-list.el (org-list-separating-blank-lines-number): use new accessors. (org-list-insert-item-generic): use list structures to insert a new item. (org-list-exchange-items): refactor and comment code. Now return new struct instead of modifying it, as list sorting would sometimes eat first item. (org-move-item-down,org-move-item-up): reflect changes to `org-list-exchange-items'. (org-insert-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result. * org-timer.el (org-timer-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result.
2010-12-24 07:25:37 -05:00
;; In a list of another type, don't break anything: throw an error.
org-timer: fix bug with `org-timer-item' * lisp/org-timer.el (org-timer-item): save-excursion prevents `org-list-struct' to get the list structure when point isn't on the first line of the item.
2011-03-08 04:40:46 -05:00
(itemp (goto-char pos) (error "This is not a timer list"))
org-list: separate tasks needed to insert a new item more clearly * lisp/org-list.el (org-list-insert-item-generic): change arguments. The function now accepts structure and previous items alist. This allow to insert an item programmatically more easily. (org-insert-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure and updating checkboxes. * lisp/org-timer.el (org-timer-item): Apply changes to org-list-insert-item-generic. The function now takes care about repairing structure.
2011-01-20 11:20:16 -05:00
;; Else, start a new list.
org-list: rewrite of insert-item code. * org-list.el (org-list-separating-blank-lines-number): use new accessors. (org-list-insert-item-generic): use list structures to insert a new item. (org-list-exchange-items): refactor and comment code. Now return new struct instead of modifying it, as list sorting would sometimes eat first item. (org-move-item-down,org-move-item-up): reflect changes to `org-list-exchange-items'. (org-insert-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result. * org-timer.el (org-timer-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result.
2010-12-24 07:25:37 -05:00
(t
(beginning-of-line)
Rename `org-indent-line-function' to `org-indent-line'. * org.el (org-mode, org-add-log-setup) (org-get-property-block, org-entry-put) (org-property-next-allowed-value, org-return) (org-indent-line): Rename `org-indent-line-function' to `org-indent-line'. * org-timer.el (org-timer-item): Ditto. * org-table.el (org-table-store-formulas): Ditto. * org-clock.el (org-clock-in, org-clock-find-position): Ditto.
2012-07-11 13:11:26 -04:00
(org-indent-line)
org-list: rewrite of insert-item code. * org-list.el (org-list-separating-blank-lines-number): use new accessors. (org-list-insert-item-generic): use list structures to insert a new item. (org-list-exchange-items): refactor and comment code. Now return new struct instead of modifying it, as list sorting would sometimes eat first item. (org-move-item-down,org-move-item-up): reflect changes to `org-list-exchange-items'. (org-insert-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result. * org-timer.el (org-timer-item): as `org-in-item-p' also computes item beginning when applicable, reuse the result.
2010-12-24 07:25:37 -05: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 06:07:23 -05: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"
Fix compiler issues related to the timer. Also, one function had a wrong name, my-hms-to-secs....
2008-11-25 14:42:06 -05: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 06:07:23 -05:00
t t hms)
Fix typos in org-timer.el
2008-12-16 11:50:38 -05: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 06:07:23 -05: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
Fix compiler issues related to the timer. Also, one function had a wrong name, my-hms-to-secs....
2008-11-25 14:42:06 -05: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 06:07:23 -05: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.
Fix typos in org-timer.el
2008-12-16 11:50:38 -05: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 06:07:23 -05: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)))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(defvar org-timer-mode-line-timer nil)
Maintenance: Define a variable.
2009-01-08 05:20:06 -05:00
(defvar org-timer-mode-line-string nil)
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(defun org-timer-set-mode-line (value)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
"Set the mode-line display for relative or countdown timer.
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
VALUE can be `on', `off', or `pause'."
Option for clock and timer to be displayed in frame-title * org-clock.el: New option `org-clock-clocked-in-display' to control whether the current clock is displayed in the mode line and/or frame title. * org-timer.el: New option `org-timer-display' to control whether the current timer is displayed in the mode line and/or frame title. This allows the clock and timer to be displayed in the frame title instead of, or as well as, the mode line. This is useful for people with limited space in the mode line but with ample space in the frame title.
2012-02-29 12:04:22 -05: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)
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
(eq org-timer-display 'both))
Option for clock and timer to be displayed in frame-title * org-clock.el: New option `org-clock-clocked-in-display' to control whether the current clock is displayed in the mode line and/or frame title. * org-timer.el: New option `org-timer-display' to control whether the current timer is displayed in the mode line and/or frame title. This allows the clock and timer to be displayed in the frame title instead of, or as well as, the mode line. This is useful for people with limited space in the mode line but with ample space in the frame title.
2012-02-29 12:04:22 -05:00
(or (memq 'org-timer-mode-line-string frame-title-format)
(setq frame-title-format
(append frame-title-format '(org-timer-mode-line-string)))))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(cond
((equal value 'off)
(when org-timer-mode-line-timer
(cancel-timer org-timer-mode-line-timer)
(setq org-timer-mode-line-timer nil))
org-timer.el: Check `org-timer-display' in `org-timer-set-mode-line' when value is 'off * lisp/org-timer.el (org-timer-set-mode-line): Check `org-timer-display' when value is 'off. This solves the error of (org-timer-set-mode-line 'off) when `org-timer-display' is 'mode-line. In this case `frame-title-format' may not be a list. TINYCHANGE
2012-08-29 13:54:44 -04:00
(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)))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(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)
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04: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)
(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)))))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05:00
(org-timer-update-mode-line)
(when org-timer-mode-line-timer
Option for clock and timer to be displayed in frame-title * org-clock.el: New option `org-clock-clocked-in-display' to control whether the current clock is displayed in the mode line and/or frame title. * org-timer.el: New option `org-timer-display' to control whether the current timer is displayed in the mode line and/or frame title. This allows the clock and timer to be displayed in the frame title instead of, or as well as, the mode line. This is useful for people with limited space in the mode line but with ample space in the frame title.
2012-02-29 12:04:22 -05:00
(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))))))
Timer: Pause and continue, and mode-line display. The relative timer is now shown in the mode-line while running. There is a new command to pause and continue it. Thanks to Alan Davis for driving this change.
2009-01-06 00:30:38 -05: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)))
New timer functionality to set a timer from a headline. This commit defines three new functions in org-timer.el: - org-timer-set-timer, bound to `C-c C-x ;' in Org buffers and to `;' in Org agenda buffers. This function sets a timer for the headline the cursor is currently it. Up to three timers can be set. - org-timer-show-remaining-time: this shows the remaining time for the last set timer. - org-timer-reset-timers: this reset all timers. This functionality was requested by Samuel Wales and emulates that of tea-time.el -- see the emacswiki doc about tea-time.el: http://www.emacswiki.org/emacs/tea-time
2009-07-26 14:54:17 -04:00
(defun org-timer-show-remaining-time ()
"Display the remaining time before the timer ends."
(interactive)
(require 'time)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(if (not org-timer-countdown-timer)
New timer functionality to set a timer from a headline. This commit defines three new functions in org-timer.el: - org-timer-set-timer, bound to `C-c C-x ;' in Org buffers and to `;' in Org agenda buffers. This function sets a timer for the headline the cursor is currently it. Up to three timers can be set. - org-timer-show-remaining-time: this shows the remaining time for the last set timer. - org-timer-reset-timers: this reset all timers. This functionality was requested by Samuel Wales and emulates that of tea-time.el -- see the emacswiki doc about tea-time.el: http://www.emacswiki.org/emacs/tea-time
2009-07-26 14:54:17 -04:00
(message "No timer set")
(let* ((rtime (decode-time
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(time-subtract (timer--time org-timer-countdown-timer)
New timer functionality to set a timer from a headline. This commit defines three new functions in org-timer.el: - org-timer-set-timer, bound to `C-c C-x ;' in Org buffers and to `;' in Org agenda buffers. This function sets a timer for the headline the cursor is currently it. Up to three timers can be set. - org-timer-show-remaining-time: this shows the remaining time for the last set timer. - org-timer-reset-timers: this reset all timers. This functionality was requested by Samuel Wales and emulates that of tea-time.el -- see the emacswiki doc about tea-time.el: http://www.emacswiki.org/emacs/tea-time
2009-07-26 14:54:17 -04:00
(current-time))))
(rsecs (nth 0 rtime))
(rmins (nth 1 rtime)))
Update org-timer.el so that we only allow one timer. Also get rid of a bug: as timers where not properly canceled, `org-timer-show-remaining-time' was not giving the proper result. Thanks to Frédéric Couchet for this catch.
2010-02-25 10:03:38 -05:00
(message "%d minute(s) %d seconds left before next time out"
New timer functionality to set a timer from a headline. This commit defines three new functions in org-timer.el: - org-timer-set-timer, bound to `C-c C-x ;' in Org buffers and to `;' in Org agenda buffers. This function sets a timer for the headline the cursor is currently it. Up to three timers can be set. - org-timer-show-remaining-time: this shows the remaining time for the last set timer. - org-timer-reset-timers: this reset all timers. This functionality was requested by Samuel Wales and emulates that of tea-time.el -- see the emacswiki doc about tea-time.el: http://www.emacswiki.org/emacs/tea-time
2009-07-26 14:54:17 -04:00
rmins rsecs))))
Add autoload cookie to org-timer-set-timer.
2009-07-26 17:27:41 -04:00
;;;###autoload
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
(defun org-timer-set-timer (&optional opt)
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
"Prompt for a duration in minutes or hh:mm:ss and set a timer.
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
org-timer.el (org-timer-set-timer): Don't choke at wrong type * org-timer.el (org-timer-set-timer): Don't choke at wrong type for `org-timer-default-timer'.
2015-08-04 16:03:02 -04:00
If `org-timer-default-timer' is not \"0\", suggest this value as
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
the default duration for the timer. If a timer is already set,
Update Changes.org and org.texi to reflect changes in org-timer.el Update org.texi with a new section: Countdown timer. Update ORGWEBPAGE/Changes.org with a section about timer/clock. Also fix a small typo in a org-timer.el.
2010-10-27 12:20:27 -04:00
prompt the user if she wants to replace it.
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
Called with a numeric prefix argument, use this numeric value as
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
the duration of the timer in minutes.
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
* org-timer.el (org-timer-set-timer): Fix typo in the docstring.
2010-06-08 03:35:07 -04:00
Called with a `C-u' prefix arguments, use `org-timer-default-timer'
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
without prompting the user for a duration.
* org-timer.el (org-timer-set-timer): Fix typo in the docstring.
2010-06-08 03:35:07 -04:00
With two `C-u' prefix arguments, use `org-timer-default-timer'
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
without prompting the user for a duration and automatically
org-timer.el: Use the number of minutes in the Effort property * org-timer.el (org-timer-cancel-timer, org-timer-stop): Enhance message. (org-timer-set-timer): Use the number of minutes in the Effort property as the default timer value. Three prefix arguments will ignore the Effort value property.
2014-03-14 07:14:49 -04: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."
`org-timer-set-timer': new prefix argument. Called with a numeric prefix argument, `org-timer-set-timer' uses this numeric value as the duration of the timer. Called with a `C-u' prefix argument, use `org-timer-default-timer' without prompting the user for a duration. With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer."
2010-05-28 06:38:29 -04:00
(interactive "P")
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(when (and org-timer-start-time
(not org-timer-countdown-timer))
(user-error "Relative timer is running. Stop first"))
org-timer.el (org-timer-set-timer): Don't choke at wrong type * org-timer.el (org-timer-set-timer): Don't choke at wrong type for `org-timer-default-timer'.
2015-08-04 16:03:02 -04: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))
(effort-minutes (ignore-errors (org-get-at-eol 'effort-minutes 1)))
Small refactoring and fix a bug in `org-timer-set-timer' * org.el (org-refresh-property): New function. (org-refresh-properties, org-set-effort) (org-property-next-allowed-value): Use it. * org-timer.el (org-timer-set-timer): Get the correct number of minutes from text properties, both in an `org-mode' and `org-agenda-mode' buffer.
2014-05-28 04:47:05 -04:00
(minutes (or (and (not (equal opt '(64)))
effort-minutes
(number-to-string effort-minutes))
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
(and (numberp opt) (number-to-string opt))
org-timer.el (org-timer-set-timer): Don't choke at wrong type * org-timer.el (org-timer-set-timer): Don't choke at wrong type for `org-timer-default-timer'.
2015-08-04 16:03:02 -04:00
(and (consp opt) default-timer)
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
(and (stringp opt) opt)
(read-from-minibuffer
"How much time left? (minutes or h:mm:ss) "
org-timer.el (org-timer-set-timer): Don't choke at wrong type * org-timer.el (org-timer-set-timer): Don't choke at wrong type for `org-timer-default-timer'.
2015-08-04 16:03:02 -04:00
(and (not (string-equal default-timer "0")) default-timer)))))
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
(when (string-match "\\`[0-9]+\\'" minutes)
(setq minutes (concat minutes ":00")))
Define and use a new variable: org-timer-default-timer This variable defaults to nil. When non-nil, this is the default value when the user is prompted for a timer. This patch also improves org-timer-set-timer so that the user can replace the current timer by a new one.
2010-05-20 10:16:31 -04:00
(if (not (string-match "[0-9]+" minutes))
(org-timer-show-remaining-time)
org-timer.el: hh:mm:ss format for setting a timer * lisp/org-timer.el (org-timer-set-timer): Add support for hh:mm:ss format. (org-timer-default-timer): Type changed from number to string. * testing/lisp/test-org-timer.el (test-org-timer/set-timer): Add hh:mm:ss format in the test.
2015-06-02 16:49:38 -04:00
(let ((secs (org-timer-hms-to-secs (org-timer-fix-incomplete minutes)))
(hl (org-timer--get-timer-title)))
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(if (or (not org-timer-countdown-timer)
(equal opt '(16))
(y-or-n-p "Replace current timer? "))
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
(progn
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(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))
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
(run-hooks 'org-timer-set-hook)
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05:00
(setq org-timer-start-time
(time-add (current-time) (seconds-to-time secs)))
(setq org-timer-pause-time nil)
Massive code clean-up. Delete trailing whitespaces. Indent all sexps correctly. Sentences end with double spaces.
2012-08-11 13:10:44 -04:00
(org-timer-set-mode-line 'on))
(message "No timer set"))))))
Fix white-space errors
2009-08-03 11:30:30 -04:00
org-timer.el: Merge API for the two timers * lisp/org-timer.el (org-timer-stop): Support countdown timers in addition to relative timers. * lisp/org-timer.el (org-timer-cancel-timer): Remove function. * lisp/org-timer.el (org-timer-pause-or-continue): Support countdown timers in addition to relative timers. * testing/lisp/test-org-timer.el: New file. * doc/org.texi: Merge relative and countdown timer nodes. Several previous issues are fixed with these changes. - org-timer-set-timer and org-timer-cancel-timer did not reset org-timer-start-time after countdown completed. - Because org-timer-start did not return org-timer-pause-time to nil, the modeline remained stuck at the paused time. - When org-timer-start was called with a countdown timer, the modeline was updated for the new relative timer, but the countdown timer remained scheduled. - When org-timer-pause-or-continue was called with a countdown timer running, the modeline was put in a paused state, but the countdown timer remained scheduled. - When org-timer-stop was called with a countdown timer running, the timer was removed from the modeline, but the countdown timer remained scheduled. - When org-timer-set-timer was called with a paused relative timer, the relative timer was not reset properly (org-timer-pause-time was still non-nil) and the modeline remained in the paused state of the relative timer, even though the countdown timer was scheduled with run-with-timer. - Running org-timer-set-timer at the beginning of an empty buffer resulted in an args-out-of-range error (due to the org-get-at-eol call).
2014-12-07 02:24:54 -05: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 ()
"Construct timer title from heading or file name of Org buffer."
(cond
((derived-mode-p 'org-agenda-mode)
(let* ((marker (or (get-text-property (point) 'org-marker)
(org-agenda-error)))
(hdmarker (or (get-text-property (point) 'org-hd-marker)
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)
(or (ignore-errors (org-get-heading))
(buffer-name (buffer-base-buffer))))
(t (error "Not in an Org buffer"))))
Release 6.20g
2009-01-30 01:40:10 -05:00
(provide 'org-timer)
Use generated-autoload-file: "org-loaddefs.el" as a local variable.
2012-10-02 02:50:46 -04: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 06:07:23 -05:00
;;; org-timer.el ends here