Mercurial > emacs

changeset 101816:5e57e0473132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(turn-on-xterm-mouse-tracking-on-terminal) (turn-off-xterm-mouse-tracking-on-terminal): Do not turn on the mode on the initial terminal.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 05 Feb 2009 07:12:27 +0000
parents f237c13dd6f5
children 47b9194b4a87
files lisp/ChangeLog lisp/xt-mouse.el
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Feb 05 07:09:47 2009 +0000
+++ b/lisp/ChangeLog	Thu Feb 05 07:12:27 2009 +0000
@@ -1,3 +1,9 @@
+2009-02-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
+	(turn-off-xterm-mouse-tracking-on-terminal): Do not turn on the
+	mode on the initial terminal.
+
 2009-02-05  Nick Roberts  <nickrob@snap.net.nz>
 
 	* vc-dir.el (vc-dir-find-file-other-window): Allow mouse events.
--- a/lisp/xt-mouse.el	Thu Feb 05 07:09:47 2009 +0000
+++ b/lisp/xt-mouse.el	Thu Feb 05 07:12:27 2009 +0000
@@ -236,7 +236,10 @@
 
 (defun turn-on-xterm-mouse-tracking-on-terminal (&optional terminal)
   "Enable xterm mouse tracking on TERMINAL."
-  (when (and xterm-mouse-mode (eq t (terminal-live-p terminal)))
+  (when (and xterm-mouse-mode (eq t (terminal-live-p terminal))
+	     ;; Avoid the initial terminal which is not a termcap device.
+	     ;; FIXME: is there more elegant way to detect the initial terminal?
+	     (not (string= (terminal-name terminal) "initial_terminal")))
     (unless (terminal-parameter terminal 'xterm-mouse-mode)
       ;; Simulate selecting a terminal by selecting one of its frames ;-(
       (with-selected-frame (car (frames-on-display-list terminal))
@@ -249,7 +252,10 @@
   ;; Only send the disable command to those terminals to which we've already
   ;; sent the enable command.
   (when (and (terminal-parameter terminal 'xterm-mouse-mode)
-             (eq t (terminal-live-p terminal)))
+             (eq t (terminal-live-p terminal))
+	     ;; Avoid the initial terminal which is not a termcap device.
+	     ;; FIXME: is there more elegant way to detect the initial terminal?
+	     (not (string= (terminal-name terminal) "initial_terminal")))
     ;; We could remove the key-binding and unset the `xterm-mouse-mode'
     ;; terminal parameter, but it seems less harmful to send this escape
     ;; command too many times (or to catch an unintended key sequence), than