; Fix breakage from previous commit

[gnu-emacs] / lisp / t-mouse.el

diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 6026f6a70deed2bd72fe7c64133bc76710a27443..5ea1bdd3449cdd5ec3fadcfa5777e160c4be896c 100644 (file)
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -1,11 +1,11 @@
 ;;; t-mouse.el --- mouse support within the text terminal
 
 ;; Author: Nick Roberts <nickrob@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mouse gpm linux
 
-;; Copyright (C) 1994, 1995, 1998, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 1998, 2006-2016 Free Software Foundation,
+;; Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -34,25 +34,15 @@
 ;; mev.  Now the interface with gpm is directly through a Unix socket, so this
 ;; file is reduced to a single minor mode macro call.
 
-;; 
+;;
 \f
 ;;; Code:
 
 ;; Prevent warning when compiling in an Emacs without gpm support.
 (declare-function gpm-mouse-start "term.c" ())
 
-;;;###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
+(defun gpm-mouse-enable ()
+  "Try to enable gpm mouse support on the current terminal."
   (let ((activated nil))
     (unwind-protect
         (progn
@@ -60,15 +50,43 @@ 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 mouse support in GNU/Linux consoles (GPM Mouse mode).
+With a prefix argument ARG, enable GPM Mouse mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
+
+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.
+
+Note that when `gpm-mouse-mode' is enabled, you cannot use the
+mouse to transfer text between Emacs and other programs which use
+GPM.  This is due to limitations in GPM and the Linux kernel."
+  :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)
 
-;; arch-tag: a63163b3-bfbe-4eb2-ab4f-201cd164b05d
 ;;; t-mouse.el ends here