From mboxrd@z Thu Jan 1 00:00:00 1970 From: James TD Smith Subject: [PATCH 1/7] Some improvements to the modeline clock display Date: Fri, 25 Jul 2008 00:46:08 +0100 Message-ID: <20080724234608.23478.48564.stgit@nyarlathotep.internal.mohorovi.cc> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KMAVq-0003Oz-HM for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KMAVl-0003Lr-VL for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:21 -0400 Received: from [199.232.76.173] (port=33520 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KMAVl-0003Lg-NJ for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:17 -0400 Received: from 81-86-40-42.dsl.pipex.com ([81.86.40.42]:56344 helo=yog-sothoth.mohorovi.cc) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KMAVk-0005p9-Ta for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:17 -0400 Received: from nyarlathotep.internal.mohorovi.cc (Debian-exim@nyarlathotep.internal.mohorovi.cc [10.0.0.5]) by yog-sothoth.mohorovi.cc (8.13.4/8.13.4) with ESMTP id m6ONlAQb002342 for ; Fri, 25 Jul 2008 00:47:10 +0100 (BST) (envelope-from ahktenzero@mohorovi.cc) Received: from [127.0.0.1] (helo=nyarlathotep.internal.mohorovi.cc ident=ahktenzero) by nyarlathotep.internal.mohorovi.cc with esmtp (Exim 4.69) (envelope-from ) id 1KMAVc-00067G-Q5 for emacs-orgmode@gnu.org; Fri, 25 Jul 2008 00:46:08 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Allow users to specify a maximum length for the modeline clock. Add an option to limit the length of the clock string in the modeline. When the limit is in effect, the full item text is included in the tooltip on the clock string. Make clicking on the clock string now goes to the currently clocked item. --- lisp/ChangeLog | 17 ++++++++++------- lisp/org-clock.el | 36 ++++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4571cb4..903aa8c 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2008-07-25 James TD Smith + + * lisp/org-clock.el (org-update-mode-line): Support limiting the + modeline clock string, and display the full todo value in the + tooltip. Set a local keymap so mouse-3 on the clock string goes to + the currently clocked task. + (org-clock-string-limit): Add a custom value for the maximum + length of the clock string in the modeline. + (org-clock-mode-map): Add a keymap for the modeline string + 2008-07-24 Carsten Dominik * org-exp.el (org-export-as-html): Add attributes also in mailto @@ -5,13 +15,6 @@ * org.el (org-autoload): Add `org-dblock-write:columnview'. - - - - - - - 2008-07-23 Carsten Dominik * org-exp.el (org-export-region-as-html, org-export-as-html): Make diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 6caf839..6d49906 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -86,6 +86,10 @@ The function is called with point at the beginning of the headline." :group 'org-clock :type 'function) +(defcustom org-clock-string-limit 0 + "Maximum length of clock strings in the modeline. 0 means no limit" + :group 'org-clock + :type 'integer) ;;; The clock for measuring work time. @@ -107,6 +111,9 @@ of a different task.") (defvar org-clock-interrupted-task (make-marker) "Marker pointing to the task that has been interrupted by the current clock.") +(defvar org-clock-mode-map (make-sparse-keymap)) +(define-key org-clock-mode-map [mode-line mouse-2] 'org-clock-goto) + (defun org-clock-history-push (&optional pos buffer) "Push a marker to the clock history." (setq org-clock-history-length (max 1 (min 35 org-clock-history-length))) @@ -190,15 +197,23 @@ of a different task.") (when (and cat task) (insert (format "[%c] %-15s %s\n" i cat task)) (cons i marker))))) - + (defun org-update-mode-line () (let* ((delta (- (time-to-seconds (current-time)) - (time-to-seconds org-clock-start-time))) + (time-to-seconds org-clock-start-time))) (h (floor delta 3600)) (m (floor (- delta (* 3600 h)) 60))) (setq org-mode-line-string - (propertize (format (concat "-[" org-time-clocksum-format " (%s)]") h m org-clock-heading) - 'help-echo "Org-mode clock is running")) + (propertize (let ((clock-string (format (concat "-[" org-time-clocksum-format " (%s)]") + h m org-clock-heading)) + (help-text "Org-mode clock is running")) + (if (and (> org-clock-string-limit 0) + (> (length clock-string) org-clock-string-limit)) + (propertize (substring clock-string 0 org-clock-string-limit) + 'help-echo (concat help-text ": " org-clock-heading)) + (propertize clock-string 'help-echo help-text))) + 'local-map org-clock-mode-map + 'mouse-face '(face mode-line-highlight))) (force-mode-line-update))) (defvar org-clock-mode-line-entry nil @@ -253,12 +268,13 @@ the clocking selection, associated with the letter `d'." org-clock-in-switch-to-state "\\>")))) (org-todo org-clock-in-switch-to-state)) - (if (and org-clock-heading-function - (functionp org-clock-heading-function)) - (setq org-clock-heading (funcall org-clock-heading-function)) - (if (looking-at org-complex-heading-regexp) - (setq org-clock-heading (match-string 4)) - (setq org-clock-heading "???"))) + (setq org-clock-heading + (cond ((and org-clock-heading-function + (functionp org-clock-heading-function)) + (funcall org-clock-heading-function)) + ((looking-at org-complex-heading-regexp) + (match-string 4)) + (t "???"))) (setq org-clock-heading (propertize org-clock-heading 'face nil)) (org-clock-find-position)