X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9275d77924fcf97be665386aa9d5f2bdf39d1378..1c226f2ba57eb267665b62ec6fb6660d72430800:/lisp/calendar/cal-x.el diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index b7fd8fb4c9..97fbb72af6 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el @@ -1,11 +1,11 @@ -;;; cal-x.el --- calendar windows in dedicated frames in x-windows +;;; cal-x.el --- calendar windows in dedicated frames in X ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Edward M. Reingold ;; Keywords: calendar -;; Human-Keywords: calendar, dedicated frames, x-windows +;; Human-Keywords: calendar, dedicated frames, X Window System ;; This file is part of GNU Emacs. @@ -20,12 +20,13 @@ ;; 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: -;; This collection of functions implements dedicated frames in x-windows for +;; This collection of functions implements dedicated frames in X for ;; calendar.el. ;; Comments, corrections, and improvements should be sent to @@ -36,36 +37,42 @@ ;;; Code: +(require 'calendar) + (defvar calendar-frame nil "Frame in which to display the calendar.") (defvar diary-frame nil "Frame in which to display the diary.") - + +;; This should not specify the font. That's up to the user. +;; Certainly it should not specify auto-lower and auto-raise +;; since most users won't like that. (defvar diary-frame-parameters - '((name . "Diary") (height . 10) (width . 80) (unsplittable . t) - (font . "6x13") (auto-lower . t) (auto-raise . t) (minibuffer . nil)) + '((name . "Diary") (title . "Diary") (height . 10) (width . 80) + (unsplittable . t) (minibuffer . nil)) "Parameters of the diary frame, if the diary is in its own frame. Location and color should be set in .Xdefaults.") - + (defvar calendar-frame-parameters - '((name . "Calendar") (minibuffer . nil) (height . 10) (width . 80) - (auto-raise . t) (auto-lower . t) (font . "6x13") (unsplittable . t) - (vertical-scroll-bars . nil)) + '((name . "Calendar") (title . "Calendar") (minibuffer . nil) + (height . 10) (width . 80) (unsplittable . t) (vertical-scroll-bars . nil)) "Parameters of the calendar frame, if the calendar is in a separate frame. Location and color should be set in .Xdefaults.") (defvar calendar-and-diary-frame-parameters - '((name . "Calendar") (height . 28) (width . 80) (minibuffer . nil) - (font . "6x13") (auto-raise . t) (auto-lower . t)) + '((name . "Calendar") (title . "Calendar") (height . 28) (width . 80) + (minibuffer . nil)) "Parameters of the frame that displays both the calendar and the diary. Location and color should be set in .Xdefaults.") - + (defvar calendar-after-frame-setup-hooks nil "Hooks to be run just after setting up a calendar frame. Can be used to change frame parameters, such as font, color, location, etc.") - + (defun calendar-one-frame-setup (&optional arg) - "Start calendar and display it in a dedicated frame together with the diary." - (if (not window-system) + "Start calendar and display it in a dedicated frame together with the diary. +This function requires a display capable of multiple frames, else +`calendar-basic-setup' is used instead." + (if (not (display-multi-frame-p)) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (if (frame-live-p diary-frame) (delete-frame diary-frame)) @@ -91,9 +98,32 @@ Can be used to change frame parameters, such as font, color, location, etc.") fancy-diary-buffer)) 'diary)))))) +(defun calendar-only-one-frame-setup (&optional arg) + "Start calendar and display it in a dedicated frame. +This function requires a display capable of multiple frames, else +`calendar-basic-setup' is used instead." + (if (not (display-multi-frame-p)) + (calendar-basic-setup arg) + (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) + (let ((special-display-buffer-names nil) + (view-diary-entries-initially nil)) + (save-window-excursion + (save-excursion + (setq calendar-frame + (make-frame calendar-frame-parameters)) + (run-hooks 'calendar-after-frame-setup-hooks) + (select-frame calendar-frame) + (if (eq 'icon (cdr (assoc 'visibility + (frame-parameters calendar-frame)))) + (iconify-or-deiconify-frame)) + (calendar-basic-setup arg) + (set-window-dedicated-p (selected-window) 'calendar)))))) + (defun calendar-two-frame-setup (&optional arg) - "Start calendar and diary in separate, dedicated frames." - (if (not window-system) + "Start calendar and diary in separate, dedicated frames. +This function requires a display capable of multiple frames, else +`calendar-basic-setup' is used instead." + (if (not (display-multi-frame-p)) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (if (frame-live-p diary-frame) (delete-frame diary-frame)) @@ -126,14 +156,17 @@ Can be used to change frame parameters, such as font, color, location, etc.") fancy-diary-buffer)) 'diary))))) +;; Formerly (get-file-buffer diary-file) was added to the list here, +;; but that isn't clean, and the value could even be nil. (setq special-display-buffer-names (append special-display-buffer-names (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer - fancy-diary-buffer (get-file-buffer diary-file) - calendar-buffer))) + fancy-diary-buffer + other-calendars-buffer calendar-buffer))) (run-hooks 'cal-x-load-hook) (provide 'cal-x) +;;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17 ;;; cal-x.el ends here