X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/c12ecb0af9679cc0e2fa0409931c34c035763469..510ef922707de6ef64235cf5cd7fdc546bd0b50a:/lisp/t-mouse.el

diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index e88067b7fe..10d5ba71ed 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -4,14 +4,15 @@
 ;; Maintainer: FSF
 ;; Keywords: mouse gpm linux
 
-;; Copyright (C) 1994, 1995, 1998, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1998, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +20,7 @@
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -39,18 +38,11 @@
 
 ;;; Code:
 
-;;;###autoload
-(define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1")
-;;;###autoload
-(define-minor-mode gpm-mouse-mode
-  "Toggle gpm-mouse mode to use the mouse in GNU/Linux consoles.
-With prefix arg, turn gpm-mouse mode on if arg is positive,
-otherwise turn it off.
+;; Prevent warning when compiling in an Emacs without gpm support.
+(declare-function gpm-mouse-start "term.c" ())
 
-This allows the use of the mouse when operating on a GNU/Linux console,
-in the same way as you can use the mouse under X11.
-It relies on the `gpm' daemon being activated."
-  :global t :group 'mouse
+(defun gpm-mouse-enable ()
+  "Try to enable gpm mouse support on the current terminal."
   (let ((activated nil))
     (unwind-protect
         (progn
@@ -58,13 +50,37 @@ It relies on the `gpm' daemon being activated."
             (error "Emacs must be built with Gpm to use this mode"))
           (when gpm-mouse-mode
             (gpm-mouse-start)
+            (set-terminal-parameter nil 'gpm-mouse-active t)
             (setq activated t)))
-      ;; If the user asked to turn it off do that.
       ;; If something failed to turn it on, try to turn it off as well,
       ;; just in case.
-      (when (and (fboundp 'gpm-mouse-stop) (not activated))
-        (setq gpm-mouse-mode nil)
-        (gpm-mouse-stop)))))
+      (unless activated (gpm-mouse-disable)))))
+
+(defun gpm-mouse-disable ()
+  "Try to disable gpm mouse support on the current terminal."
+  (when (fboundp 'gpm-mouse-stop)
+    (gpm-mouse-stop))
+  (set-terminal-parameter nil 'gpm-mouse-active nil))
+
+;;;###autoload
+(define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1")
+;;;###autoload
+(define-minor-mode gpm-mouse-mode
+  "Toggle gpm-mouse mode to use the mouse in GNU/Linux consoles.
+With prefix arg, turn gpm-mouse mode on if arg is positive,
+otherwise turn it off.
+
+This allows the use of the mouse when operating on a GNU/Linux console,
+in the same way as you can use the mouse under X11.
+It relies on the `gpm' daemon being activated."
+  :global t :group 'mouse :init-value t
+  (dolist (terminal (terminal-list))
+    (when (and (eq t (terminal-live-p terminal))
+               (not (eq gpm-mouse-mode
+                        (terminal-parameter terminal 'gpm-mouse-active))))
+      ;; Simulate selecting a terminal by selecting one of its frames ;-(
+      (with-selected-frame (car (frames-on-display-list terminal))
+        (if gpm-mouse-mode (gpm-mouse-enable) (gpm-mouse-disable))))))
 
 (provide 't-mouse)