xemacs-beta: lisp/vm/vm-window.el comparison

comparison lisp/vm/vm-window.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	05472e90ae02
children	c0c698873ce1

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 ;;; Window management code for VM
-;;; Copyright (C) 1989-1997 Kyle E. Jones
+;;; Copyright (C) 1989, 1990, 1991, 1993, 1994, 1995 Kyle E. Jones
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 1, or (at your option)
 ;;; any later version.
 ;;; along with this program; if not, write to the Free Software
 ;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 (provide 'vm-window)
-(defun vm-display (buffer display commands configs
+(defun vm-display (buffer display commands configs)
-		   &optional do-not-raise)
 ;; the clearinghouse VM display function.
 ;;
 ;; First arg BUFFER non-nil is a buffer to display or undisplay.
 ;; nil means there is no request to display or undisplay a
 ;; buffer.
 ;;
 ;; If display/undisplay is not requested, only window
 ;; configuration is done, and only then if the value of
 ;; this-command is found in the COMMANDS list.
 (vm-save-buffer-excursion
-(let* ((w (and buffer (vm-get-buffer-window buffer)))
+(let ((w (and buffer (vm-get-buffer-window buffer))))
-	  (wf (and w (vm-window-frame w))))
 (and buffer (set-buffer buffer))
-(if (and w display (not do-not-raise))
+;     (and w display (vm-raise-frame (vm-window-frame w)))
-	 (vm-raise-frame wf))
+(and w display (vm-window-frame w))
-(if (and w display (not (eq (vm-selected-frame) wf)))
+(and w display (not (eq (vm-selected-frame) (vm-window-frame w)))
-	 (vm-select-frame wf))
+	  (vm-select-frame (vm-window-frame w)))
 (cond ((and buffer display)
 	    (if (and vm-display-buffer-hook
 		     (null (vm-get-visible-buffer-window buffer)))
 		(progn (run-hooks 'vm-display-buffer-hook)
-		       (switch-to-buffer buffer))
+		       (switch-to-buffer buffer)
+		       (vm-record-current-window-configuration nil))
 	      (if (not (and (memq this-command commands)
 			    (apply 'vm-set-window-configuration configs)
 			    (vm-get-visible-buffer-window buffer)))
 		  (vm-display-buffer buffer))))
 	   ((and buffer (not display))
 	    (if (and vm-undisplay-buffer-hook
 		     (vm-get-visible-buffer-window buffer))
-		(progn (set-buffer buffer)
+		(progn (run-hooks 'vm-undisplay-buffer-hook)
-		       (run-hooks 'vm-undisplay-buffer-hook))
+		       (vm-record-current-window-configuration nil))
 	      (if (not (and (memq this-command commands)
 			    (apply 'vm-set-window-configuration configs)))
 		  (vm-undisplay-buffer buffer))))
 	   ((memq this-command commands)
 	    (apply 'vm-set-window-configuration configs))))))
 (defun vm-display-buffer (buffer)
 (let ((pop-up-windows (eq vm-mutable-windows t))
-	(pop-up-frames (and pop-up-frames vm-mutable-frames)))
+	(pop-up-frames vm-mutable-frames))
+(vm-record-current-window-configuration nil)
 (if (or pop-up-frames
 	    (and (eq vm-mutable-windows t)
 		 (symbolp
 		  (vm-buffer-to-label
 		   (window-buffer
 	(select-window (display-buffer buffer))
 (switch-to-buffer buffer))))
 (defun vm-undisplay-buffer (buffer)
 (vm-save-buffer-excursion
-(let ((vm-mutable-frames (and vm-mutable-frames pop-up-frames)))
+(vm-delete-windows-or-frames-on buffer)
-(vm-maybe-delete-windows-or-frames-on buffer))
+(let ((w (vm-get-buffer-window buffer)))
-(let (w)
+(and w (set-window-buffer w (other-buffer))))))
-(while (setq w (vm-get-buffer-window buffer))
-(set-window-buffer w (other-buffer buffer))))))
 (defun vm-load-window-configurations (file)
 (save-excursion
 (let ((work-buffer nil))
 (unwind-protect
 (save-excursion
 (let ((work-buffer nil))
 (unwind-protect
 	  (progn
 	    (set-buffer (setq work-buffer (get-buffer-create "*vm-wconfig*")))
-	    ;; for XEmacs/MULE
-	    (and vm-xemacs-mule-p
-		 (set-buffer-file-coding-system 'no-conversion))
 	    (erase-buffer)
 	    (print vm-window-configurations (current-buffer))
 	    (write-region (point-min) (point-max) file nil 0))
 	(and work-buffer (kill-buffer work-buffer))))))
 		 (throw 'done nil)
 	       (setq summary (current-buffer))
 	       (setq message vm-mail-buffer)))
 	    ((eq major-mode 'vm-mode)
 	     (setq message (current-buffer)))
-	    ((eq major-mode 'vm-presentation-mode)
-	     (setq message vm-mail-buffer))
 	    ((eq major-mode 'vm-virtual-mode)
 	     (setq message (current-buffer)))
 	    ((eq major-mode 'mail-mode)
 	     (if (or (null vm-mail-buffer) (null (buffer-name vm-mail-buffer)))
 		 (throw 'done nil)
-	       (setq message vm-mail-buffer
+	       (setq message vm-mail-buffer)))
-		     ;; assume that the proximity implies affinity
-		     composition (current-buffer))))
 	    ((eq vm-system-state 'editing)
 	     (if (or (null vm-mail-buffer) (null (buffer-name vm-mail-buffer)))
 		 (throw 'done nil)
 	       (setq edit (current-buffer))
 	       (setq message vm-mail-buffer)))
 	    ;; not in a VM related buffer, bail...
 	    (t (throw 'done nil)))
 (set-buffer message)
-(vm-check-for-killed-presentation)
+;; if this configuration is already the current one, don't
-(if vm-presentation-buffer
+;; set it up again.
-	  (setq message vm-presentation-buffer))
+(if (or (and vm-mutable-frames (eq (car config) vm-window-configuration))
+	      (and (not vm-mutable-frames)
+		   (listp vm-window-configuration)
+		   (eq (car config)
+		       (cdr (assq selected-frame vm-window-configuration)))))
+	  (throw 'done nil))
 (vm-check-for-killed-summary)
 (or summary (setq summary (or vm-summary-buffer nonexistent-summary)))
 (or composition (setq composition nonexistent))
 (or edit (setq edit nonexistent))
 (tapestry-replace-tapestry-element (nth 1 config) 'buffer-name
 					    (if (symbolp x)
 						(symbol-value x)
 					      x ))))
 (set-tapestry (nth 1 config) 1)
 (and (get-buffer nonexistent)
-	   (vm-maybe-delete-windows-or-frames-on nonexistent))
+	   (vm-delete-windows-or-frames-on nonexistent))
 (if (and (vm-get-buffer-window nonexistent-summary)
 	       (not (vm-get-buffer-window message)))
 	  ;; user asked for summary to be displayed but doesn't
 	  ;; have one, nor is the folder buffer displayed.  Help
 	  ;; the user not to lose here.
 	  (vm-replace-buffer-in-windows nonexistent-summary message)
 	(and (get-buffer nonexistent-summary)
-	     (vm-maybe-delete-windows-or-frames-on nonexistent-summary)))
+	     (vm-delete-windows-or-frames-on nonexistent-summary)))
+(vm-record-current-window-configuration config)
 config )))
+(defun vm-record-current-window-configuration (config)
+;; this function continues to be a no-op.
+;;
+;; the idea behind this function is that VM can remember what
+;; the current window configuration is and not rebuild the
+;; configuration for the next command if it matches what we
+;; have recorded.
+;;
+;; the problem with this idea is that the user can do things
+;; like C-x 0 and VM has no way of knowing.  So VM thinks the
+;; right configuration is displayed when in fact it is not,
+;; which can cause incorrect displays.
+'(let (cell)
+(if (and (listp vm-window-configuration)
+	     (setq cell (assq (vm-selected-frame) vm-window-configuration)))
+	(setcdr cell (car config))
+(setq vm-window-configuration
+	    (cons
+	     (cons (vm-selected-frame) (car config))
+	     vm-window-configuration)))))
 (defun vm-save-window-configuration (tag)
 "Name and save the current window configuration.
 With this command you associate the current window setup with an
 action.  Each time you perform this action VM will duplicate this
 specific configurations are searched for first, then the category
 configurations and then the default configuration.  The first
 configuration found is the one that is applied.
 The value of vm-mutable-windows must be non-nil for VM to use
-window configurations."
+window configurations.
+If vm-mutable-frames is non-nil and Emacs is running under X
+windows, then VM will use all existing frames.  Otherwise VM will
+restrict its changes to the frame in which it was started."
 (interactive
 (let ((last-command last-command)
 	 (this-command this-command))
 (if (null vm-window-configuration-file)
 	 (error "Configurable windows not enabled.  Set vm-window-configuration-file to enable."))
 	(vm-iconify-frame-xxx))))
 (defun vm-window-loop (action obj-1 &optional obj-2)
 (let ((delete-me nil)
 	(done nil)
-	(all-frames (if vm-search-other-frames t nil))
+	(all-frames (if vm-mutable-frames t nil))
 	start w)
 (setq start (next-window (selected-window) 'nomini all-frames)
 	  w start)
 (and obj-1 (setq obj-1 (get-buffer obj-1)))
 (while (not done)
 	(while (not done)
 	  (if delete-me
 	      (progn
 		(condition-case nil
 		    (progn
-		      (if (vm-created-this-frame-p delete-me)
+		      (vm-delete-frame delete-me)
-			  (vm-delete-frame delete-me))
 		      (if (eq delete-me start)
 			  (setq start nil)))
 		  (error nil))
 		(setq delete-me nil)))
 	  (cond ((and (eq action 'delete)
 	(if delete-me
 	    (progn
 	      (vm-error-free-call 'vm-delete-frame delete-me)
 	      (setq delete-me nil))))))
-(defun vm-maybe-delete-windows-or-frames-on (buffer)
+(defun vm-delete-windows-or-frames-on (buffer)
 (and (eq vm-mutable-windows t) (vm-window-loop 'delete buffer))
 (and vm-mutable-frames (vm-frame-loop 'delete buffer)))
 (defun vm-replace-buffer-in-windows (old new)
 (vm-window-loop 'replace old new))
 (defun vm-bury-buffer (&optional buffer)
 (or buffer (setq buffer (current-buffer)))
-(if vm-xemacs-p
+(if (vm-xemacs-p)
 (if (vm-multiple-frames-possible-p)
 	  (vm-frame-loop 'bury buffer)
 	(bury-buffer buffer))
 (bury-buffer buffer)))
 (wrong-number-of-arguments
 	(get-buffer-window buffer))))))
 (defun vm-set-hooks-for-frame-deletion ()
 (make-local-variable 'vm-undisplay-buffer-hook)
+(make-local-variable 'kill-buffer-hook)
 (add-hook 'vm-undisplay-buffer-hook 'vm-delete-buffer-frame)
 (add-hook 'kill-buffer-hook 'vm-delete-buffer-frame))
-(defun vm-created-this-frame-p (&optional frame)
-(memq (or frame (vm-selected-frame)) vm-frame-list))
 (defun vm-delete-buffer-frame ()
-;; kludge.  we only want to this to run on VM related buffers
+(save-excursion
-;; but this function is generally on a global hook.  Check for
+(let ((w (vm-get-visible-buffer-window (current-buffer)))
-;; vm-undisplay-buffer-hook set; this is a good sign that this
+	  (b (current-buffer)))
-;; is a VM buffer.
+(and w (eq (vm-selected-frame) (vm-window-frame w))
-(if vm-undisplay-buffer-hook
+	   (vm-error-free-call 'vm-delete-frame (vm-window-frame w)))
-(save-excursion
+(and w (let ((vm-mutable-frames t))
-	;; run once only per buffer.
+	       (vm-delete-windows-or-frames-on b)))))
-	(remove-hook 'vm-undisplay-buffer-hook 'vm-delete-buffer-frame)
+;; do it only once
-	(let* ((w (vm-get-visible-buffer-window (current-buffer)))
+(remove-hook 'vm-undisplay-buffer-hook 'vm-delete-buffer-frame)
-	       (b (current-buffer))
+(remove-hook 'kill-buffer-hook 'vm-delete-buffer-frame))
-	       (wf (and w (vm-window-frame w))))
-	  (and w (eq (vm-selected-frame) wf) (vm-created-this-frame-p wf)
-	       (vm-error-free-call 'vm-delete-frame wf))
-	  (and w (let ((vm-mutable-frames t))
-		   (vm-maybe-delete-windows-or-frames-on b)))))))
-(defun vm-register-frame (frame)
-(setq vm-frame-list (cons frame vm-frame-list)))
 (defun vm-goto-new-frame (&rest types)
 (let ((params nil))
 (while (and types (null params))
 (setq params (car (cdr (assq (car types) vm-frame-parameter-alist)))
 	   (select-frame (make-frame params)))
 	  ((fboundp 'make-screen)
 	   (select-screen (make-screen params)))
 	  ((fboundp 'new-screen)
 	   (select-screen (new-screen params))))
-(vm-register-frame (vm-selected-frame))
 (and vm-warp-mouse-to-new-frame
 	 (vm-warp-mouse-to-frame-maybe (vm-selected-frame)))))
-(defun vm-goto-new-summary-frame-maybe ()
-(if (and vm-mutable-frames vm-frame-per-summary
-	   (vm-multiple-frames-possible-p))
-(let ((w (vm-get-buffer-window vm-summary-buffer)))
-	(if (null w)
-	    (progn
-	      (vm-goto-new-frame 'summary)
-	      (vm-set-hooks-for-frame-deletion))
-	  (save-excursion
-	    (select-window w)
-	    (and vm-warp-mouse-to-new-frame
-		 (vm-warp-mouse-to-frame-maybe (vm-window-frame w))))))))
-(defun vm-goto-new-folder-frame-maybe (&rest types)
-(if (and vm-mutable-frames vm-frame-per-folder
-	   (vm-multiple-frames-possible-p))
-(let ((w (or (vm-get-buffer-window (current-buffer))
-		   ;; summary == folder for the purpose
-		   ;; of frame reuse.
-		   (and vm-summary-buffer
-			(vm-get-buffer-window vm-summary-buffer))
-		   ;; presentation == folder for the purpose
-		   ;; of frame reuse.
-		   (and vm-presentation-buffer
-			(vm-get-buffer-window vm-presentation-buffer)))))
-	(if (null w)
-	    (progn
-	      (apply 'vm-goto-new-frame types)
-	      (vm-set-hooks-for-frame-deletion))
-	  (save-excursion
-	    (select-window w)
-	    (and vm-warp-mouse-to-new-frame
-		 (vm-warp-mouse-to-frame-maybe (vm-window-frame w))))))))
 (defun vm-warp-mouse-to-frame-maybe (&optional frame)
 (or frame (setq frame (vm-selected-frame)))
-(if (vm-mouse-support-possible-here-p)
+(if (vm-mouse-support-possible-p)
 (cond ((vm-mouse-xemacs-mouse-p)
 	     (cond ((fboundp 'mouse-position);; XEmacs 19.12
 		    (let ((mp (mouse-position)))
 		      (if (and (car mp)
 			       (eq (window-frame (car mp)) (selected-frame)))
 (symbol-function
 (cond ((fboundp 'frame-visible-p) 'frame-visible-p)
 	     ((fboundp 'screen-visible-p) 'screen-visible-p)
 	     (t 'ignore))))
-(if (fboundp 'frame-iconified-p)
-(fset 'vm-frame-iconified-p 'frame-iconified-p)
-(defun vm-frame-iconified-p (&optional frame)
-(eq (vm-frame-visible-p frame) 'icon)))
-;; frame-totally-visible-p is broken under XEmacs 19.14 and is
-;; absent under Emacs 19.34.  So vm-frame-per-summary won't work
-;; quite right under these Emacs versions.  XEmacs 19.15 should
-;; have a working version of this function.
-;; 2 April 1997, frame-totally-visible-p apparently still broken
-;; under 19.15.  I give up for now.
-;;(if (and (fboundp 'frame-totally-visible-p)
-;;	 vm-xemacs-p
-;;	 (or (>= emacs-major-version 20)
-;;	     (>= emacs-minor-version 15)))
-;;    (fset 'vm-frame-totally-visible-p 'frame-totally-visible-p)
-;;  (fset 'vm-frame-totally-visible-p 'vm-frame-visible-p))
-(fset 'vm-frame-totally-visible-p 'vm-frame-visible-p)
 (fset 'vm-window-frame
 (symbol-function
 (cond ((fboundp 'window-frame) 'window-frame)
 	     ((fboundp 'window-screen) 'window-screen)
 	     (t 'ignore))))

Mercurial > hg > xemacs-beta

comparison lisp/vm/vm-window.el @ 70:131b0175ea99 r20-0b30