From: Ihor Radchenko <yantar92@posteo.net>
To: Vladimir Nikishkin <lockywolf@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG] org-clock-auto-clockout does not actually use x11idle on X11 [9.6.8 (release_9.6.8-3-g21171d @ /usr/share/emacs/30.0.50/lisp/org/)]
Date: Mon, 04 Dec 2023 13:53:19 +0000 [thread overview]
Message-ID: <87il5em5v4.fsf@localhost> (raw)
In-Reply-To: <875y38b8ay.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
Ihor Radchenko <yantar92@posteo.net> writes:
> Vladimir Nikishkin <lockywolf@gmail.com> writes:
>
>> For some time I have been wondering why auto-clockout does not use
>> x11idle on my machine.
>> ...
Attaching a tentative fix.
It would help if someone can test it on other machine.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-clock-auto-clockout-Honor-system-idle-time.-Do-n.patch --]
[-- Type: text/x-patch, Size: 3391 bytes --]
From d655c095fda6d1789a20aa93d4ac3a5f269dadc9 Mon Sep 17 00:00:00 2001
Message-ID: <d655c095fda6d1789a20aa93d4ac3a5f269dadc9.1701697942.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Mon, 4 Dec 2023 14:47:53 +0100
Subject: [PATCH] org-clock-auto-clockout: Honor system idle time. Do not
spawn multiple timers
* lisp/org-clock.el (org-clock--auto-clockout-timer-obj): New internal
variable holding the auto-clockout timer.
(org-clock--auto-clockout-maybe): New function to be used in timer.
Use `org-user-idle-seconds' to check for idleness. Make sure that we
correctly handle system idle time, which may be lesser than Emacs idle
time.
(org-clock-auto-clockout): Do not create duplicate timers. Use the
new internal helper function.
Reported-by: Vladimir Nikishkin <lockywolf@gmail.com>
Link: https://orgmode.org/list/87ttqv6l2g.fsf@laptop.lockywolf.net
---
lisp/org-clock.el | 35 ++++++++++++++++++++++++++++++++---
1 file changed, 32 insertions(+), 3 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index eda312d74..a042af4f3 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1493,6 +1493,33 @@ (defun org-clock-in (&optional select start-time)
(message "Clock starts at %s - %s" ts org--msg-extra)
(run-hooks 'org-clock-in-hook))))))
+(defvar org-clock--auto-clockout-timer-obj nil
+ "Timer object holding the existing clockout timer.")
+(defun org-clock--auto-clockout-maybe ()
+ "Clock out the currently clocked in task when idle.
+See `org-clock-auto-clockout-timer' to set the idle time span.
+
+This function is to be called by a timer."
+ (when (and (numberp org-clock-auto-clockout-timer)
+ org-clock-current-task)
+ (let ((user-idle-seconds (org-user-idle-seconds)))
+ (cond
+ ;; Already idle. Clock out.
+ ((>= user-idle-seconds org-clock-auto-clockout-timer)
+ (setq org-clock--auto-clockout-timer-obj nil)
+ (org-clock-out))
+ ;; Emacs is idle but system is not. Retry assuming that system will remain idle.
+ ((>= (org-emacs-idle-seconds) org-clock-auto-clockout-timer)
+ (setq org-clock--auto-clockout-timer-obj
+ (run-with-timer
+ (- org-clock-auto-clockout-timer user-idle-seconds)
+ nil #'org-clock--auto-clockout-maybe)))
+ ;; Emacs is not idle. Check again next time we are idle.
+ (t
+ (setq org-clock--auto-clockout-timer-obj
+ (run-with-idle-timer
+ org-clock-auto-clockout-timer nil #'org-clock--auto-clockout-maybe)))))))
+
(defun org-clock-auto-clockout ()
"Clock out the currently clocked in task if Emacs is idle.
See `org-clock-auto-clockout-timer' to set the idle time span.
@@ -1500,9 +1527,11 @@ (defun org-clock-auto-clockout ()
This is only effective when `org-clock-auto-clockout-insinuate'
is present in the user configuration."
(when (and (numberp org-clock-auto-clockout-timer)
- org-clock-current-task)
- (run-with-idle-timer
- org-clock-auto-clockout-timer nil #'org-clock-out)))
+ org-clock-current-task
+ (not (timerp org-clock--auto-clockout-timer-obj)))
+ (setq org-clock--auto-clockout-timer-obj
+ (run-with-idle-timer
+ org-clock-auto-clockout-timer nil #'org-clock--auto-clockout-maybe))))
;;;###autoload
(defun org-clock-toggle-auto-clockout ()
--
2.42.0
[-- Attachment #3: Type: text/plain, Size: 224 bytes --]
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
next prev parent reply other threads:[~2023-12-04 13:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 7:02 [BUG] org-clock-auto-clockout does not actually use x11idle on X11 [9.6.8 (release_9.6.8-3-g21171d @ /usr/share/emacs/30.0.50/lisp/org/)] Vladimir Nikishkin
2023-10-15 8:26 ` Ihor Radchenko
2023-12-04 13:53 ` Ihor Radchenko [this message]
2023-12-15 11:28 ` Ihor Radchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87il5em5v4.fsf@localhost \
--to=yantar92@posteo.net \
--cc=emacs-orgmode@gnu.org \
--cc=lockywolf@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.