1999-09-11 20:40:09 +00:00
|
|
|
|
;;; winner.el --- Restore old window configurations
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2001-07-09 12:14:45 +00:00
|
|
|
|
;; Copyright (C) 1997, 1998, 2001 Free Software Foundation. Inc.
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2000-03-09 13:32:23 +00:00
|
|
|
|
;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
|
1997-04-15 05:03:20 +00:00
|
|
|
|
;; Created: 27 Feb 1997
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Time-stamp: <2002-02-20 22:06:58 ivarru>
|
2000-03-07 10:10:40 +00:00
|
|
|
|
;; Keywords: convenience frames
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
1997-04-15 05:07:44 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
1997-04-15 05:03:20 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; any later version.
|
|
|
|
|
|
1997-04-15 05:07:44 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1997-04-15 05:03:20 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; 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, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
1997-08-27 04:13:52 +00:00
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
;; Winner mode is a global minor mode that records the changes in the
|
|
|
|
|
;; window configuration (i.e. how the frames are partitioned into
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; windows) so that the changes can be "undone" using the command
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
;; `winner-undo'. By default this one is bound to the key sequence
|
|
|
|
|
;; ctrl-x left. If you change your mind (while undoing), you can
|
|
|
|
|
;; press ctrl-x right (calling `winner-redo'). Even though it uses
|
|
|
|
|
;; some features of Emacs20.3, winner.el should also work with
|
|
|
|
|
;; Emacs19.34 and XEmacs20, provided that the installed version of
|
|
|
|
|
;; custom is not obsolete.
|
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Winner mode was improved August 1998.
|
|
|
|
|
;; Further improvements February 2002.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(eval-when-compile
|
2000-03-07 10:10:40 +00:00
|
|
|
|
(require 'cl))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
2000-03-07 10:10:40 +00:00
|
|
|
|
(eval-when-compile
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(cond
|
1999-09-15 23:47:44 +00:00
|
|
|
|
((eq (aref (emacs-version) 0) ?X)
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defmacro winner-active-region ()
|
|
|
|
|
'(region-active-p))
|
|
|
|
|
(defsetf winner-active-region () (store)
|
|
|
|
|
`(if ,store (zmacs-activate-region)
|
|
|
|
|
(zmacs-deactivate-region))))
|
|
|
|
|
(t (defmacro winner-active-region ()
|
|
|
|
|
'mark-active)
|
|
|
|
|
(defsetf winner-active-region () (store)
|
|
|
|
|
`(setq mark-active ,store)))) )
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(eval-and-compile
|
|
|
|
|
(cond
|
|
|
|
|
((eq (aref (emacs-version) 0) ?X)
|
|
|
|
|
(defalias 'winner-edges 'window-pixel-edges)
|
|
|
|
|
(defsubst winner-window-list ()
|
|
|
|
|
(remq (minibuffer-window)
|
|
|
|
|
(window-list nil 0))))
|
|
|
|
|
(t (defalias 'winner-edges 'window-edges)
|
|
|
|
|
(defsubst winner-window-list ()
|
|
|
|
|
(window-list nil 0)))) )
|
|
|
|
|
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(require 'ring)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(when (fboundp 'defgroup)
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defgroup winner nil
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
"Restoring window configurations."
|
|
|
|
|
:group 'windows))
|
|
|
|
|
|
|
|
|
|
(unless (fboundp 'defcustom)
|
|
|
|
|
(defmacro defcustom (symbol &optional initvalue docs &rest rest)
|
|
|
|
|
(list 'defvar symbol initvalue docs)))
|
|
|
|
|
|
2000-03-07 10:10:40 +00:00
|
|
|
|
;;;###autoload
|
1998-02-25 00:28:55 +00:00
|
|
|
|
(defcustom winner-mode nil
|
|
|
|
|
"Toggle winner-mode.
|
1999-04-27 18:48:11 +00:00
|
|
|
|
Setting this variable directly does not take effect;
|
|
|
|
|
use either \\[customize] or the function `winner-mode'."
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
:set #'(lambda (symbol value)
|
|
|
|
|
(winner-mode (or value 0)))
|
1998-02-25 00:28:55 +00:00
|
|
|
|
:initialize 'custom-initialize-default
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'winner
|
1998-02-25 00:28:55 +00:00
|
|
|
|
:require 'winner)
|
|
|
|
|
|
|
|
|
|
(defcustom winner-dont-bind-my-keys nil
|
|
|
|
|
"If non-nil: Do not use `winner-mode-map' in Winner mode."
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
:type 'boolean
|
1998-02-25 00:28:55 +00:00
|
|
|
|
:group 'winner)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(defcustom winner-ring-size 200
|
|
|
|
|
"Maximum number of stored window configurations per frame."
|
|
|
|
|
:type 'integer
|
1998-02-25 00:28:55 +00:00
|
|
|
|
:group 'winner)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(defcustom winner-boring-buffers '("*Completions*")
|
|
|
|
|
"`winner-undo' will not restore windows displaying any of these \
|
|
|
|
|
buffers.
|
|
|
|
|
You may want to include buffer names such as *Help*, *Apropos*,
|
|
|
|
|
*Buffer List*, *info* and *Compile-Log*."
|
|
|
|
|
:type '(repeat string)
|
|
|
|
|
:group 'winner)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;;;; Saving old configurations (internal variables and subroutines)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;;; Current configuration
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; List the windows according to their edges.
|
|
|
|
|
(defun winner-sorted-window-list ()
|
|
|
|
|
(sort (winner-window-list)
|
|
|
|
|
(lambda (x y)
|
|
|
|
|
(loop for a in (winner-edges x)
|
|
|
|
|
for b in (winner-edges y)
|
|
|
|
|
while (= a b)
|
|
|
|
|
finally return (< a b)))))
|
|
|
|
|
|
|
|
|
|
(defun winner-win-data ()
|
|
|
|
|
;; Essential properties of the windows in the selected frame.
|
|
|
|
|
(loop for win in (winner-sorted-window-list)
|
|
|
|
|
collect (cons (winner-edges win) (window-buffer win))))
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; This variable is updated with the current window configuration
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; every time it changes.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defvar winner-currents nil)
|
|
|
|
|
|
|
|
|
|
;; The current configuration (+ the buffers involved).
|
|
|
|
|
(defsubst winner-conf ()
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(cons (current-window-configuration)
|
|
|
|
|
(winner-win-data)))
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
|
|
|
|
;; Save current configuration.
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; (Called below by `winner-save-old-configurations').
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defun winner-remember ()
|
|
|
|
|
(let ((entry (assq (selected-frame) winner-currents)))
|
|
|
|
|
(if entry (setcdr entry (winner-conf))
|
|
|
|
|
(push (cons (selected-frame) (winner-conf))
|
|
|
|
|
winner-currents))))
|
|
|
|
|
|
|
|
|
|
;; Consult `winner-currents'.
|
|
|
|
|
(defun winner-configuration (&optional frame)
|
|
|
|
|
(or (cdr (assq (or frame (selected-frame)) winner-currents))
|
|
|
|
|
(letf (((selected-frame) frame))
|
|
|
|
|
(winner-conf))))
|
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
|
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;;; Saved configurations
|
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
;; This variable contains the window cofiguration rings.
|
|
|
|
|
;; The key in this alist is the frame.
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(defvar winner-ring-alist nil)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
;; Find the right ring. If it does not exist, create one.
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(defsubst winner-ring (frame)
|
|
|
|
|
(or (cdr (assq frame winner-ring-alist))
|
|
|
|
|
(progn
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(let ((ring (make-ring winner-ring-size)))
|
|
|
|
|
(ring-insert ring (winner-configuration frame))
|
|
|
|
|
(push (cons frame ring) winner-ring-alist)
|
|
|
|
|
ring))))
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; If the same command is called several times in a row,
|
|
|
|
|
;; we only save one window configuration.
|
|
|
|
|
(defvar winner-last-command nil)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; Frames affected by the previous command.
|
|
|
|
|
(defvar winner-last-frames nil)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2001-07-09 12:14:45 +00:00
|
|
|
|
|
|
|
|
|
(defun winner-equal (a b)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
"Check whether two Winner configurations (as produced by
|
|
|
|
|
`winner-conf') are equal."
|
|
|
|
|
(equal (cdr a) (cdr b)))
|
2001-07-09 12:14:45 +00:00
|
|
|
|
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; Save the current window configuration, if it has changed.
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; If so return frame, otherwise return nil.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defun winner-insert-if-new (frame)
|
|
|
|
|
(unless (or (memq frame winner-last-frames)
|
|
|
|
|
(eq this-command 'winner-redo))
|
|
|
|
|
(let ((conf (winner-configuration frame))
|
|
|
|
|
(ring (winner-ring frame)))
|
|
|
|
|
(when (and (not (ring-empty-p ring))
|
|
|
|
|
(winner-equal conf (ring-ref ring 0)))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; When the previous configuration was very similar,
|
|
|
|
|
;; keep only the latest.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(ring-remove ring 0))
|
|
|
|
|
(ring-insert ring conf)
|
|
|
|
|
(push frame winner-last-frames)
|
|
|
|
|
frame)))
|
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Hooks
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; Frames affected by the current command.
|
|
|
|
|
(defvar winner-modified-list nil)
|
|
|
|
|
|
|
|
|
|
;; Called whenever the window configuration changes
|
|
|
|
|
;; (a `window-configuration-change-hook').
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(defun winner-change-fun ()
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(unless (or (memq (selected-frame) winner-modified-list)
|
|
|
|
|
(/= 0 (minibuffer-depth)))
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(push (selected-frame) winner-modified-list)))
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; A `post-command-hook' for emacsen with
|
|
|
|
|
;; `window-configuration-change-hook'.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defun winner-save-old-configurations ()
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(when (zerop (minibuffer-depth))
|
|
|
|
|
(unless (eq this-command winner-last-command)
|
|
|
|
|
(setq winner-last-frames nil)
|
|
|
|
|
(setq winner-last-command this-command))
|
|
|
|
|
(dolist (frame winner-modified-list)
|
|
|
|
|
(winner-insert-if-new frame))
|
|
|
|
|
(setq winner-modified-list nil)
|
|
|
|
|
(winner-remember)))
|
|
|
|
|
|
|
|
|
|
;; A `minibuffer-setup-hook'.
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(defun winner-save-unconditionally ()
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(unless (eq this-command winner-last-command)
|
|
|
|
|
(setq winner-last-frames nil)
|
|
|
|
|
(setq winner-last-command this-command))
|
|
|
|
|
(winner-insert-if-new (selected-frame))
|
|
|
|
|
(winner-remember))
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; A `post-command-hook' for other emacsen.
|
|
|
|
|
;; Also called by `winner-undo' before "undoing".
|
|
|
|
|
(defun winner-save-conditionally ()
|
|
|
|
|
(when (zerop (minibuffer-depth))
|
|
|
|
|
(winner-save-unconditionally)))
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;;;; Restoring configurations
|
|
|
|
|
|
|
|
|
|
;; Works almost as `set-window-configuration',
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; but does not change the contents or the size of the minibuffer,
|
|
|
|
|
;; and tries to preserve the selected window.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defun winner-set-conf (winconf)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(let* ((miniwin (minibuffer-window))
|
|
|
|
|
(chosen (selected-window))
|
|
|
|
|
(minisize (window-height miniwin)))
|
|
|
|
|
(letf (((window-buffer miniwin))
|
|
|
|
|
((window-point miniwin)))
|
|
|
|
|
(set-window-configuration winconf))
|
|
|
|
|
(cond
|
|
|
|
|
((window-live-p chosen) (select-window chosen))
|
|
|
|
|
((window-minibuffer-p (selected-window))
|
|
|
|
|
(other-window 1)))
|
|
|
|
|
(when (/= minisize (window-height miniwin))
|
|
|
|
|
(letf (((selected-window) miniwin) )
|
|
|
|
|
(setf (window-height) minisize)))))
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defvar winner-point-alist nil)
|
|
|
|
|
;; `set-window-configuration' restores old points and marks. This is
|
|
|
|
|
;; not what we want, so we make a list of the "real" (i.e. new) points
|
|
|
|
|
;; and marks before undoing window configurations.
|
|
|
|
|
;;
|
|
|
|
|
;; Format of entries: (buffer (mark . mark-active) (window . point) ..)
|
|
|
|
|
|
|
|
|
|
(defun winner-make-point-alist ()
|
|
|
|
|
(letf (((current-buffer)))
|
|
|
|
|
(loop with alist
|
2002-02-26 16:09:19 +00:00
|
|
|
|
for win in (winner-window-list)
|
|
|
|
|
for entry =
|
|
|
|
|
(or (assq (window-buffer win) alist)
|
|
|
|
|
(car (push (list (set-buffer (window-buffer win))
|
|
|
|
|
(cons (mark t) (winner-active-region)))
|
|
|
|
|
alist)))
|
|
|
|
|
do (push (cons win (window-point win))
|
|
|
|
|
(cddr entry))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
finally return alist)))
|
|
|
|
|
|
|
|
|
|
(defun winner-get-point (buf win)
|
|
|
|
|
;; Consult (and possibly extend) `winner-point-alist'.
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Returns nil iff buf no longer exists.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(when (buffer-name buf)
|
|
|
|
|
(let ((entry (assq buf winner-point-alist)))
|
|
|
|
|
(cond
|
|
|
|
|
(entry
|
|
|
|
|
(or (cdr (assq win (cddr entry)))
|
|
|
|
|
(cdr (assq nil (cddr entry)))
|
|
|
|
|
(letf (((current-buffer) buf))
|
|
|
|
|
(push (cons nil (point)) (cddr entry))
|
|
|
|
|
(point))))
|
|
|
|
|
(t (letf (((current-buffer) buf))
|
|
|
|
|
(push (list buf
|
|
|
|
|
(cons (mark t) (winner-active-region))
|
|
|
|
|
(cons nil (point)))
|
|
|
|
|
winner-point-alist)
|
|
|
|
|
(point)))))))
|
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Make sure point does not end up in the minibuffer and delete
|
|
|
|
|
;; windows displaying dead or boring buffers
|
|
|
|
|
;; (c.f. `winner-boring-buffers'). Return nil iff all the windows
|
|
|
|
|
;; should be deleted. Preserve correct points and marks.
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(defun winner-set (conf)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; For the format of `conf', see `winner-conf'.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(let* ((buffers nil)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(alive
|
|
|
|
|
;; Possibly update `winner-point-alist'
|
|
|
|
|
(loop for buf in (mapcar 'cdr (cdr conf))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
for pos = (winner-get-point buf nil)
|
|
|
|
|
if (and pos (not (memq buf buffers)))
|
|
|
|
|
do (push buf buffers)
|
|
|
|
|
collect pos)))
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(winner-set-conf (car conf))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(let (xwins) ; to be deleted
|
|
|
|
|
|
|
|
|
|
;; Restore points
|
|
|
|
|
(dolist (win (winner-sorted-window-list))
|
|
|
|
|
(unless (and (pop alive)
|
|
|
|
|
(setf (window-point win)
|
|
|
|
|
(winner-get-point (window-buffer win) win))
|
|
|
|
|
(not (member (buffer-name (window-buffer win))
|
|
|
|
|
winner-boring-buffers)))
|
|
|
|
|
(push win xwins))) ; delete this window
|
|
|
|
|
|
|
|
|
|
;; Restore marks
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(letf (((current-buffer)))
|
|
|
|
|
(loop for buf in buffers
|
|
|
|
|
for entry = (cadr (assq buf winner-point-alist))
|
|
|
|
|
do (progn (set-buffer buf)
|
|
|
|
|
(set-mark (car entry))
|
|
|
|
|
(setf (winner-active-region) (cdr entry)))))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Delete windows, whose buffers are dead or boring.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;; Return t if this is still a possible configuration.
|
|
|
|
|
(or (null xwins)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(progn
|
|
|
|
|
(mapc 'delete-window (cdr xwins)) ; delete all but one
|
|
|
|
|
(unless (one-window-p t)
|
|
|
|
|
(delete-window (car xwins))
|
|
|
|
|
t))))))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Winner mode (a minor mode)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
1998-02-25 00:28:55 +00:00
|
|
|
|
(defcustom winner-mode-hook nil
|
|
|
|
|
"Functions to run whenever Winner mode is turned on."
|
|
|
|
|
:type 'hook
|
1998-02-25 05:06:02 +00:00
|
|
|
|
:group 'winner)
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
1998-02-25 05:06:02 +00:00
|
|
|
|
(defcustom winner-mode-leave-hook nil
|
1998-02-25 00:28:55 +00:00
|
|
|
|
"Functions to run whenever Winner mode is turned off."
|
|
|
|
|
:type 'hook
|
1998-02-25 05:06:02 +00:00
|
|
|
|
:group 'winner)
|
1997-08-27 04:13:52 +00:00
|
|
|
|
|
1997-04-15 05:03:20 +00:00
|
|
|
|
(defvar winner-mode-map nil "Keymap for Winner mode.")
|
1997-04-15 05:07:44 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Check if `window-configuration-change-hook' is working.
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(defun winner-hook-installed-p ()
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(let ((winner-var nil)
|
|
|
|
|
(window-configuration-change-hook
|
|
|
|
|
'((lambda () (setq winner-var t)))))
|
|
|
|
|
(split-window)
|
|
|
|
|
winner-var)))
|
|
|
|
|
|
2000-03-07 10:10:40 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
1997-04-15 05:03:20 +00:00
|
|
|
|
(defun winner-mode (&optional arg)
|
|
|
|
|
"Toggle Winner mode.
|
|
|
|
|
With arg, turn Winner mode on if and only if arg is positive."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((on-p (if arg (> (prefix-numeric-value arg) 0)
|
|
|
|
|
(not winner-mode))))
|
|
|
|
|
(cond
|
1997-08-27 04:13:52 +00:00
|
|
|
|
;; Turn mode on
|
|
|
|
|
(on-p
|
|
|
|
|
(setq winner-mode t)
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(cond
|
|
|
|
|
((winner-hook-installed-p)
|
|
|
|
|
(add-hook 'window-configuration-change-hook 'winner-change-fun)
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(add-hook 'post-command-hook 'winner-save-old-configurations))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(t (add-hook 'post-command-hook 'winner-save-conditionally)))
|
|
|
|
|
(add-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(setq winner-modified-list (frame-list))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(winner-save-old-configurations)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(run-hooks 'winner-mode-hook)
|
|
|
|
|
(when (interactive-p) (message "Winner mode enabled")))
|
1997-08-27 04:13:52 +00:00
|
|
|
|
;; Turn mode off
|
|
|
|
|
(winner-mode
|
|
|
|
|
(setq winner-mode nil)
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(remove-hook 'window-configuration-change-hook 'winner-change-fun)
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(remove-hook 'post-command-hook 'winner-save-old-configurations)
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(remove-hook 'post-command-hook 'winner-save-conditionally)
|
|
|
|
|
(remove-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
|
|
|
|
|
(run-hooks 'winner-mode-leave-hook)
|
|
|
|
|
(when (interactive-p) (message "Winner mode disabled"))))))
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
;; Inspired by undo (simple.el)
|
1999-04-08 01:41:12 +00:00
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defvar winner-undo-frame nil)
|
|
|
|
|
|
1999-04-08 01:41:12 +00:00
|
|
|
|
(defvar winner-pending-undo-ring nil
|
|
|
|
|
"The ring currently used by winner undo.")
|
|
|
|
|
(defvar winner-undo-counter nil)
|
|
|
|
|
(defvar winner-undone-data nil) ; There confs have been passed.
|
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(defun winner-undo ()
|
1997-08-27 04:13:52 +00:00
|
|
|
|
"Switch back to an earlier window configuration saved by Winner mode.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
In other words, \"undo\" changes in window configuration."
|
|
|
|
|
(interactive)
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(cond
|
|
|
|
|
((not winner-mode) (error "Winner mode is turned off"))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(t (unless (and (eq last-command 'winner-undo)
|
|
|
|
|
(eq winner-undo-frame (selected-frame)))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(winner-save-conditionally) ; current configuration->stack
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(setq winner-undo-frame (selected-frame))
|
|
|
|
|
(setq winner-point-alist (winner-make-point-alist))
|
|
|
|
|
(setq winner-pending-undo-ring (winner-ring (selected-frame)))
|
|
|
|
|
(setq winner-undo-counter 0)
|
|
|
|
|
(setq winner-undone-data (list (winner-win-data))))
|
|
|
|
|
(incf winner-undo-counter) ; starting at 1
|
|
|
|
|
(when (and (winner-undo-this)
|
|
|
|
|
(not (window-minibuffer-p (selected-window))))
|
|
|
|
|
(message "Winner undo (%d / %d)"
|
|
|
|
|
winner-undo-counter
|
|
|
|
|
(1- (ring-length winner-pending-undo-ring)))))))
|
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(defun winner-undo-this () ; The heart of winner undo.
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(loop
|
|
|
|
|
(cond
|
|
|
|
|
((>= winner-undo-counter (ring-length winner-pending-undo-ring))
|
|
|
|
|
(message "No further window configuration undo information")
|
|
|
|
|
(return nil))
|
|
|
|
|
|
|
|
|
|
((and ; If possible configuration
|
|
|
|
|
(winner-set (ring-ref winner-pending-undo-ring
|
|
|
|
|
winner-undo-counter))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
; .. and new configuration
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(let ((data (winner-win-data)))
|
|
|
|
|
(and (not (member data winner-undone-data))
|
|
|
|
|
(push data winner-undone-data))))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(return t)) ; .. then everything is fine.
|
|
|
|
|
(t ;; Otherwise, discharge it (and try the next one).
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(ring-remove winner-pending-undo-ring winner-undo-counter)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun winner-redo () ; If you change your mind.
|
1997-08-27 04:13:52 +00:00
|
|
|
|
"Restore a more recent window configuration saved by Winner mode."
|
|
|
|
|
(interactive)
|
|
|
|
|
(cond
|
|
|
|
|
((eq last-command 'winner-undo)
|
|
|
|
|
(winner-set
|
2002-02-26 16:09:19 +00:00
|
|
|
|
(if (zerop (minibuffer-depth))
|
|
|
|
|
(ring-remove winner-pending-undo-ring 0)
|
|
|
|
|
(ring-ref winner-pending-undo-ring 0)))
|
1999-09-11 20:40:09 +00:00
|
|
|
|
(unless (eq (selected-window) (minibuffer-window))
|
|
|
|
|
(message "Winner undid undo")))
|
1997-08-27 04:13:52 +00:00
|
|
|
|
(t (error "Previous command was not a winner-undo"))))
|
2002-02-26 16:09:19 +00:00
|
|
|
|
|
1999-09-11 20:40:09 +00:00
|
|
|
|
;;; To be evaluated when the package is loaded:
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
|
1997-04-15 05:03:20 +00:00
|
|
|
|
(unless winner-mode-map
|
|
|
|
|
(setq winner-mode-map (make-sparse-keymap))
|
Use list syntax for key definitions.
(winner-mode, winner-save-unconditionally)
(winner-hook-installed-p): Save window configuration after
every command if window-configuration-change-hook is not present.
(winner-save-new-configurations, winner-insert-if-new):
Compare a new window configuration
with the previous configuration before saving it.
(winner-insert-if-new, winner-ring)
(winner-configuration, winner-set): Save buffer list together
with the window configurations, so that windows that can no
longer be correctly restored can instead be deleted.
(winner-undo): Compare restored configuration
with other configurations that have been reviewed and skip
this one if it looks similar.
(winner-insert-if-new, winner-save-new-configurations)
(winner-save-unconditionally): Just save the final
configuration if the same command (changing the window
configuration) is applied several times in a row.
(winner-switch): Removed the command
`winner-switch' (and the variables connected to it), since
because of the change above, any "switching package" may now
be used without disturbing winner-mode too much.
(winner-change-fun): Removed the pushnew
command, so that `cl' will not have to be loaded.
(winner-set-conf): Introduced "wrapper" around
`set-window-configuration', so that `winner-undo' may be
called from the minibuffer.
1998-03-09 22:42:13 +00:00
|
|
|
|
(define-key winner-mode-map [(control x) left] 'winner-undo)
|
|
|
|
|
(define-key winner-mode-map [(control x) right] 'winner-redo))
|
1997-04-15 05:03:20 +00:00
|
|
|
|
|
|
|
|
|
(unless (or (assq 'winner-mode minor-mode-map-alist)
|
|
|
|
|
winner-dont-bind-my-keys)
|
|
|
|
|
(push (cons 'winner-mode winner-mode-map)
|
|
|
|
|
minor-mode-map-alist))
|
|
|
|
|
|
|
|
|
|
(provide 'winner)
|
|
|
|
|
|
1997-04-15 05:07:44 +00:00
|
|
|
|
;;; winner.el ends here
|