[Emacs-diffs] Changes to emacs/lisp/xt-mouse.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/29 02:15:59

Index: xt-mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/xt-mouse.el,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- xt-mouse.el 24 Mar 2008 09:28:04 -0000      1.53
+++ xt-mouse.el 29 Mar 2008 02:15:56 -0000      1.54
@@ -205,34 +205,24 @@
 mouse functionality for such clicks is still available by holding
 down the SHIFT key while pressing the mouse button."
   :global t :group 'mouse
-  (if xterm-mouse-mode
-      ;; Turn it on
-      (progn
-       ;; Frame creation and deletion.
-        (add-hook 'terminal-init-xterm-hook
+  (let ((do-hook (if xterm-mouse-mode 'add-hook 'remove-hook)))
+    (funcall do-hook 'terminal-init-xterm-hook
                   'turn-on-xterm-mouse-tracking-on-terminal)
-
-       (add-hook 'delete-frame-functions 'xterm-mouse-handle-delete-frame)
-       
-       ;; Restore normal mouse behaviour outside Emacs.
-        (add-hook 'suspend-tty-functions
+    (funcall do-hook 'delete-terminal-functions
+             'turn-off-xterm-mouse-tracking-on-terminal)
+    (funcall do-hook 'suspend-tty-functions
                  'turn-off-xterm-mouse-tracking-on-terminal)
-       (add-hook 'resume-tty-functions
+    (funcall do-hook 'resume-tty-functions
                  'turn-on-xterm-mouse-tracking-on-terminal)
-       (add-hook 'suspend-hook 'turn-off-xterm-mouse-tracking)
-       (add-hook 'suspend-resume-hook 'turn-on-xterm-mouse-tracking)
-       (add-hook 'kill-emacs-hook 'turn-off-xterm-mouse-tracking)
+    (funcall do-hook 'suspend-hook 'turn-off-xterm-mouse-tracking)
+    (funcall do-hook 'suspend-resume-hook 'turn-on-xterm-mouse-tracking)
+    (funcall do-hook 'kill-emacs-hook 'turn-off-xterm-mouse-tracking))
+  (if xterm-mouse-mode
+      ;; Turn it on
+      (progn
        (setq mouse-position-function #'xterm-mouse-position-function)
        (turn-on-xterm-mouse-tracking))
     ;; Turn it off
-    (remove-hook 'delete-frame-functions 'xterm-mouse-handle-delete-frame)
-    (remove-hook 'suspend-tty-functions 
-                'turn-off-xterm-mouse-tracking-on-terminal)
-    (remove-hook 'resume-tty-functions 
-                'turn-on-xterm-mouse-tracking-on-terminal)
-    (remove-hook 'suspend-hook 'turn-off-xterm-mouse-tracking)
-    (remove-hook 'suspend-resume-hook 'turn-on-xterm-mouse-tracking)
-    (remove-hook 'kill-emacs-hook 'turn-off-xterm-mouse-tracking)
     (turn-off-xterm-mouse-tracking 'force)
     (setq mouse-position-function nil)))
 
@@ -269,12 +259,6 @@
     ;; pass by untranslated).
     (send-string-to-terminal "\e[?1000l" terminal)))
 
-(defun xterm-mouse-handle-delete-frame (frame)
-  "Turn off xterm mouse tracking if FRAME is the last frame on its device."
-  (when (and (eq t (frame-live-p frame))
-            (<= 1 (length (frames-on-display-list (frame-terminal frame)))))
-    (turn-off-xterm-mouse-tracking-on-terminal frame)))
-
 (provide 'xt-mouse)
 
 ;; arch-tag: 84962d4e-fae9-4c13-a9d7-ef4925a4ac03