;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
;;; Code:
+(eval-when-compile (require 'calendar))
+(require 'easymenu)
+
(define-key calendar-mode-map [menu-bar edit] 'undefined)
+(define-key calendar-mode-map [menu-bar search] 'undefined)
(define-key calendar-mode-map [down-mouse-2] 'calendar-mouse-2-date-menu)
(define-key calendar-mode-map [mouse-2] 'ignore)
(define-key calendar-mode-map [menu-bar diary view]
'("Other File" . view-other-diary-entries))
-(define-key calendar-mode-map [menu-bar holidays]
+(define-key calendar-mode-map [menu-bar Holidays]
(cons "Holidays" (make-sparse-keymap "Holidays")))
-(define-key calendar-mode-map [menu-bar holidays unmark]
- '("Unmark" . calendar-unmark))
-(define-key calendar-mode-map [menu-bar holidays mark]
- '("Mark" . mark-calendar-holidays))
-(define-key calendar-mode-map [menu-bar holidays 3-mon]
- '("3 Months" . list-calendar-holidays))
-(define-key calendar-mode-map [menu-bar holidays 1-day]
- '("One Day" . calendar-cursor-holidays))
-
(define-key calendar-mode-map [menu-bar goto]
(cons "Goto" (make-sparse-keymap "Goto")))
'("Julian Date" . calendar-goto-julian-date))
(define-key calendar-mode-map [menu-bar goto islamic]
'("Islamic Date" . calendar-goto-islamic-date))
+(define-key calendar-mode-map [menu-bar goto persian]
+ '("Persian Date" . calendar-goto-persian-date))
(define-key calendar-mode-map [menu-bar goto hebrew]
'("Hebrew Date" . calendar-goto-hebrew-date))
(define-key calendar-mode-map [menu-bar goto astro]
(define-key calendar-mode-map [menu-bar scroll fwd-1]
'("Forward 1 Month" . scroll-calendar-left))
-(put 'calendar-forward-day 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-backward-day 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-forward-week 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-backward-week 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-forward-month 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-backward-month 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-forward-year 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-backward-year 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-beginning-of-year 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-end-of-year 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-beginning-of-month 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-end-of-month 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-end-of-week 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-beginning-of-week 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-mouse-print-dates 'menu-enable '(calendar-event-to-date))
-(put 'calendar-sunrise-sunset 'menu-enable '(calendar-event-to-date))
-(put 'calendar-cursor-holidays 'menu-enable '(calendar-cursor-to-date))
-(put 'view-diary-entries 'menu-enable '(calendar-cursor-to-date))
-(put 'view-other-diary-entries 'menu-enable '(calendar-cursor-to-date))
-(put 'calendar-mouse-insert-hebrew-diary-entry
- 'menu-enable
- '(calendar-cursor-to-date))
-(put 'calendar-mouse-insert-islamic-diary-entry
- 'menu-enable
- '(calendar-cursor-to-date))
-(put 'insert-cyclic-diary-entry 'menu-enable '(calendar-cursor-to-date))
-(put 'insert-block-diary-entry 'menu-enable '(calendar-cursor-to-date))
-(put 'insert-anniversary-diary-entry 'menu-enable '(calendar-cursor-to-date))
-(put 'insert-yearly-diary-entry 'menu-enable '(calendar-cursor-to-date))
-(put 'insert-monthly-diary-entry 'menu-enable '(calendar-cursor-to-date))
-(put 'insert-weekly-diary-entry 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-day 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week2 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week3 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week4 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week5 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week6 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-month 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-month-landscape 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-year 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-filofax-year 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-year-landscape 'menu-enable '(calendar-cursor-to-date))
+(defun cal-menu-list-holidays-year ()
+ "Display a list of the holidays of the selected date's year."
+ (interactive)
+ (let ((year (extract-calendar-year (calendar-cursor-to-date))))
+ (list-holidays year year)))
+
+(defun cal-menu-list-holidays-following-year ()
+ "Display a list of the holidays of the following year."
+ (interactive)
+ (let ((year (1+ (extract-calendar-year (calendar-cursor-to-date)))))
+ (list-holidays year year)))
+
+(defun cal-menu-list-holidays-previous-year ()
+ "Display a list of the holidays of the previous year."
+ (interactive)
+ (let ((year (1- (extract-calendar-year (calendar-cursor-to-date)))))
+ (list-holidays year year)))
+
+(defun cal-menu-update ()
+ ;; Update the holiday part of calendar menu bar for the current display.
+ (condition-case nil
+ (if (eq major-mode 'calendar-mode)
+ (let ((l))
+ (calendar-for-loop;; Show 11 years--5 before, 5 after year of
+ ;; middle month
+ i from (- displayed-year 5) to (+ displayed-year 5) do
+ (setq l (cons (vector (format "For Year %s" i)
+ (list (list 'lambda 'nil '(interactive)
+ (list 'list-holidays i i)))
+ t)
+ l)))
+ (setq l (cons ["Mark Holidays" mark-calendar-holidays t]
+ (cons ["Unmark Calendar" calendar-unmark t]
+ (cons ["--" '("--") t] l))))
+ (easy-menu-change nil "Holidays" (nreverse l))
+ (define-key calendar-mode-map [menu-bar Holidays separator]
+ '("--"))
+ (define-key calendar-mode-map [menu-bar Holidays today]
+ `(,(format "For Today (%s)"
+ (calendar-date-string (calendar-current-date) t t))
+ . cal-menu-today-holidays))
+ (let ((title
+ (let ((m1 displayed-month)
+ (y1 displayed-year)
+ (m2 displayed-month)
+ (y2 displayed-year))
+ (increment-calendar-month m1 y1 -1)
+ (increment-calendar-month m2 y2 1)
+ (if (= y1 y2)
+ (format "%s-%s, %d"
+ (calendar-month-name m1 3)
+ (calendar-month-name m2 3)
+ y2)
+ (format "%s, %d-%s, %d"
+ (calendar-month-name m1 3)
+ y1
+ (calendar-month-name m2 3)
+ y2)))))
+ (define-key calendar-mode-map [menu-bar Holidays 3-month]
+ `(,(format "For Window (%s)" title)
+ . list-calendar-holidays)))
+ (let ((date (calendar-cursor-to-date)))
+ (if date
+ (define-key calendar-mode-map [menu-bar Holidays 1-day]
+ `(,(format "For Cursor Date (%s)"
+ (calendar-date-string date t t))
+ . calendar-cursor-holidays))))))
+ ;; Try to avoid entering infinite beep mode in case of errors.
+ (error (ding))))
(defun calendar-event-to-date (&optional error)
"Date of last event.
If event is not on a specific date, signals an error if optional parameter
ERROR is t, otherwise just returns nil."
(save-excursion
+ (set-buffer (window-buffer (posn-window (event-start last-input-event))))
(goto-char (posn-point (event-start last-input-event)))
(calendar-cursor-to-date error)))
"Show sunrise/sunset times for mouse-selected date."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(calendar-sunrise-sunset)))
-(defun calendar-mouse-holidays ()
- "Show holidays for mouse-selected date."
+(defun cal-menu-today-holidays ()
+ "Show holidays for today's date."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-cursor-to-date (calendar-current-date))
(calendar-cursor-holidays)))
+(defun calendar-mouse-holidays ()
+ "Pop up menu of holidays for mouse selected date."
+ (interactive)
+ (let* ((date (calendar-event-to-date))
+ (l (mapcar '(lambda (x) (list x))
+ (check-calendar-holidays date)))
+ (selection
+ (x-popup-menu
+ event
+ (list
+ (format "Holidays for %s" (calendar-date-string date))
+ (append
+ (list (format "Holidays for %s" (calendar-date-string date)))
+ (if l l '("None")))))))
+ (and selection (call-interactively selection))))
+
(defun calendar-mouse-view-diary-entries ()
- "View diary entries on mouse-selected date."
+ "Pop up menu of diary entries for mouse selected date."
(interactive)
- (save-excursion
- (calendar-goto-date (calendar-event-to-date))
- (view-diary-entries 1)))
+ (let* ((date (calendar-event-to-date))
+ (l (mapcar '(lambda (x) (list (car (cdr x))))
+ (let ((diary-list-include-blanks nil)
+ (diary-display-hook 'ignore))
+ (list-diary-entries date 1))))
+ (selection
+ (x-popup-menu
+ event
+ (list
+ (format "Diary entries for %s" (calendar-date-string date))
+ (append
+ (list (format "Diary entries for %s" (calendar-date-string date)))
+ (if l l '("None")))))))
+ (and selection (call-interactively selection))))
(defun calendar-mouse-view-other-diary-entries ()
- "View diary entries from alternative file on mouse-selected date."
+ "Pop up menu of diary entries from alternative file on mouse-selected date."
(interactive)
- (save-excursion
- (calendar-goto-date (calendar-event-to-date))
- (call-interactively 'view-other-diary-entries)))
+ (let* ((date (calendar-event-to-date))
+ (l (mapcar '(lambda (x) (list (car (cdr x))))
+ (let ((diary-list-include-blanks nil)
+ (diary-display-hook 'ignore)
+ (diary-file (read-file-name
+ "Enter diary file name: "
+ default-directory nil t)))
+ (list-diary-entries date 1))))
+ (selection
+ (x-popup-menu
+ event
+ (list
+ (format "Diary entries from %s for %s"
+ diary-file
+ (calendar-date-string date))
+ (append
+ (list (format "Diary entries from %s for %s"
+ diary-file
+ (calendar-date-string date)))
+ (if l l '("None")))))))
+ (and selection (call-interactively selection))))
(defun calendar-mouse-insert-diary-entry ()
"Insert diary entry for mouse-selected date."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(insert-diary-entry nil)))
(defun calendar-mouse-set-mark ()
"Mark the date under the cursor."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(calendar-set-mark nil)))
(defun cal-tex-mouse-day ()
"Make a buffer with LaTeX commands for the day mouse is on."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-day nil)))
(defun cal-tex-mouse-week ()
Holidays are included if `cal-tex-holidays' is t."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-week nil)))
(defun cal-tex-mouse-week2 ()
The printed output will be on two pages."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-week2 nil)))
-(defun cal-tex-mouse-week3 ()
+(defun cal-tex-mouse-week-iso ()
"One page calendar for week indicated by cursor.
Holidays are included if `cal-tex-holidays' is t."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
- (cal-tex-cursor-week3 nil)))
+ (calendar-mouse-goto-date (calendar-event-to-date))
+ (cal-tex-cursor-week-iso nil)))
-(defun cal-tex-mouse-week4 ()
+(defun cal-tex-mouse-week-monday ()
"One page calendar for week indicated by cursor."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
- (cal-tex-cursor-week4 nil)))
+ (calendar-mouse-goto-date (calendar-event-to-date))
+ (cal-tex-cursor-week-monday nil)))
+
+(defun cal-tex-mouse-filofax-daily ()
+ "Day-per-page Filofax calendar for week indicated by cursor."
+ (interactive)
+ (save-excursion
+ (calendar-mouse-goto-date (calendar-event-to-date))
+ (cal-tex-cursor-filofax-daily nil)))
-(defun cal-tex-mouse-week5 ()
+(defun cal-tex-mouse-filofax-2week ()
"One page Filofax calendar for week indicated by cursor."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
- (cal-tex-cursor-week5 nil)))
+ (calendar-mouse-goto-date (calendar-event-to-date))
+ (cal-tex-cursor-filofax-2week nil)))
-(defun cal-tex-mouse-week6 ()
+(defun cal-tex-mouse-filofax-week ()
"Two page Filofax calendar for week indicated by cursor."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
- (cal-tex-cursor-week6 nil)))
+ (calendar-mouse-goto-date (calendar-event-to-date))
+ (cal-tex-cursor-filofax-week nil)))
(defun cal-tex-mouse-month ()
"Make a buffer with LaTeX commands for the month cursor is on.
Calendar is condensed onto one page."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-month nil)))
(defun cal-tex-mouse-month-landscape ()
The output is in landscape format, one month to a page."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-month-landscape nil)))
(defun cal-tex-mouse-year ()
"Make a buffer with LaTeX commands for the year cursor is on."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-year nil)))
(defun cal-tex-mouse-filofax-year ()
"Make a buffer with LaTeX commands for Filofax calendar of year cursor is on."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-filofax-year nil)))
(defun cal-tex-mouse-year-landscape ()
"Make a buffer with LaTeX commands for the year cursor is on."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(cal-tex-cursor-year-landscape nil)))
(defun calendar-mouse-print-dates ()
(x-popup-menu
event
(list
- "Date Menu"
+ (concat (calendar-date-string date) " (Gregorian)")
(append
(list
(concat (calendar-date-string date) " (Gregorian)")
(list (format "Julian date: %s"
(calendar-julian-date-string date)))
(list
- (format "Astronomical (Julian) day number (after noon UTC): %s"
+ (format "Astronomical (Julian) day number (at noon UTC): %s.0"
(calendar-astro-date-string date)))
+ (list
+ (format "Fixed (RD) date: %s"
+ (calendar-absolute-from-gregorian date)))
(list (format "Hebrew date (before sunset): %s"
- (calendar-hebrew-date-string date))))
+ (calendar-hebrew-date-string date)))
+ (list (format "Persian date: %s"
+ (calendar-persian-date-string date))))
(let ((i (calendar-islamic-date-string date)))
(if (not (string-equal i ""))
(list (list (format "Islamic date (before sunset): %s" i)))))
-; too slow to leave this in all the time!
-; (list
-; (list (format "Chinese date: %s" (calendar-chinese-date-string date))))
-; so instead,
- (list '("Chinese date (select to echo Chinese date)"
- . calendar-mouse-chinese-date))
+ (list
+ (list (format "Chinese date: %s"
+ (calendar-chinese-date-string date))))
+; (list '("Chinese date (select to echo Chinese date)"
+; . calendar-mouse-chinese-date))
(let ((c (calendar-coptic-date-string date)))
(if (not (string-equal c ""))
(list (list (format "Coptic date: %s" c)))))
"Show Chinese equivalent for mouse-selected date."
(interactive)
(save-excursion
- (calendar-goto-date (calendar-event-to-date))
+ (calendar-mouse-goto-date (calendar-event-to-date))
(calendar-print-chinese-date)))
+(defun calendar-mouse-goto-date (date)
+ (set-buffer (window-buffer (posn-window (event-start last-input-event))))
+ (calendar-goto-date date))
+
(defun calendar-mouse-2-date-menu (event)
"Pop up menu for Mouse-2 for selected date in the calendar window."
(interactive "e")
(selection
(x-popup-menu
event
- (list "Menu"
+ (list (calendar-date-string date t nil)
(list
- (calendar-date-string date t nil)
+ ""
'("Holidays" . calendar-mouse-holidays)
'("Mark date" . calendar-mouse-set-mark)
'("Sunrise/sunset" . calendar-mouse-sunrise/sunset)
(let* ((selection
(x-popup-menu
event
- (list "Menu"
+ (list (calendar-date-string date t nil)
(list
- (calendar-date-string date t nil)
+ ""
'("Daily (1 page)" . cal-tex-mouse-day)
'("Weekly (1 page)" . cal-tex-mouse-week)
'("Weekly (2 pages)" . cal-tex-mouse-week2)
- '("Weekly (other style; 1 page)" . cal-tex-mouse-week3)
- '("Weekly (yet another style; 1 page)" . cal-tex-mouse-week4)
+ '("Weekly (other style; 1 page)" . cal-tex-mouse-week-iso)
+ '("Weekly (yet another style; 1 page)" .
+ cal-tex-mouse-week-monday)
'("Monthly" . cal-tex-mouse-month)
'("Monthly (landscape)" . cal-tex-mouse-month-landscape)
'("Yearly" . cal-tex-mouse-year)
(let* ((selection
(x-popup-menu
event
- (list "Menu"
+ (list (calendar-date-string date t nil)
(list
- (calendar-date-string date t nil)
- '("Filofax Weekly (1 page)" . cal-tex-mouse-week5)
- '("Filofax Weekly (2 pages)" . cal-tex-mouse-week6)
+ ""
+ '("Filofax Daily (one-day-per-page)" .
+ cal-tex-mouse-filofax-daily)
+ '("Filofax Weekly (2-weeks-at-a-glance)" .
+ cal-tex-mouse-filofax-2week)
+ '("Filofax Weekly (week-at-a-glance)" .
+ cal-tex-mouse-filofax-week)
'("Filofax Yearly" . cal-tex-mouse-filofax-year)
)))))
(and selection (call-interactively selection))))
HCoop / bpt / emacs.git / blobdiff