allow cycling through 1, 5 and 15 minutes load averages

[Pavel Janík]

Hi,

any objections against this? Can I use customized variable as a variable
reflecting the current state or should I use it only as a default value for
another variable? Should the default be customizable at all? What do you
think?

2001-12-15  Pavel Janík  <address@hidden>

        These changes allow cycling through past 1, 5 and 15 minutes
        load-average displayed in the mode-line.
        
        * time.el (display-time-load-average): New customizable option.
        (display-time-cycle-load-average): New function.
        (display-time-update): Use them.

--- time.el.~1.70.~     Mon Oct 29 20:06:53 2001
+++ time.el     Sat Dec 15 10:35:43 2001
@@ -51,6 +51,15 @@
                 (function))
   :group 'display-time)
 
+(defcustom display-time-load-average 0
+  "*Which load-average value will be shown in the mode-line.
+Almost every system can provide values of load for past 1 minute, past 5 or
+past 15 minutes. The default is to display 1 minute load average."
+  :type '(choice (const :tag "1 minute load" 0)
+                (const :tag "5 minutes load" 1)
+                (const :tag "15 minutes load" 2))
+  :group 'display-time)
+
 ;;;###autoload
 (defcustom display-time-day-and-date nil "\
 *Non-nil means \\[display-time] should display day and date as well as time."
@@ -191,6 +200,13 @@
                          display-time-interval)
          (timer-activate timer)))))
 
+(defun display-time-next-load-average ()
+  (interactive)
+  (if (= 3 (setq display-time-load-average (1+ display-time-load-average)))
+      (setq display-time-load-average 0))
+  (display-time-update)
+  (sit-for 0))
+
 ;; Update the display-time info for the mode line
 ;; but don't redisplay right now.  This is used for
 ;; things like Rmail `g' that want to force an update
@@ -199,13 +215,20 @@
   (let* ((now (current-time))
         (time (current-time-string now))
          (load (condition-case ()
-                   (if (zerop (car (load-average))) ""
+                   (if (zerop (nth display-time-load-average (load-average))) 
""
                     ;; The load average number is mysterious, so
-                    ;; propvide some help.
-                     (let ((str (format " %03d" (car (load-average)))))
+                    ;; provide some help.
+                     (let ((str (format " %03d" (nth display-time-load-average 
(load-average)))))
                       (propertize
                        (concat (substring str 0 -2) "." (substring str -2))
-                       'help-echo "System load average")))
+                       'local-map (make-mode-line-mouse-map 'mouse-2 
+                                                            
'display-time-next-load-average)
+                       'help-echo (concat "System load average for past "
+                                          (if (= 0 display-time-load-average)
+                                              "1 minute"
+                                            (if (= 1 display-time-load-average)
+                                                "5 minutes"
+                                              "15 minutes")) "; mouse-2: next" 
))))
                  (error "")))
          (mail-spool-file (or display-time-mail-file
                               (getenv "MAIL")

-- 
Pavel Janík

Architect: Someone who knows the difference between that which could be
done and that which should be done.
                  -- Larry McVoy