Commit 3c5a7a3c authored by Stefan Monnier's avatar Stefan Monnier

* t-mouse.el (gpm-mouse-enable, gpm-mouse-disable): New functions.

(gpm-mouse-mode): Make it into a proper global minor mode.
* term/linux.el (terminal-init-linux): Use gpm-mouse-enable.
parent 9b106871
2008-06-11 Stefan Monnier <monnier@iro.umontreal.ca> 2008-06-11 Stefan Monnier <monnier@iro.umontreal.ca>
* term/linux.el (terminal-init-linux): Use gpm-mouse-enable.
* t-mouse.el (gpm-mouse-enable, gpm-mouse-disable): New functions.
(gpm-mouse-mode): Make it into a proper global minor mode.
* files.el (save-some-buffers-action-alist): Only use recursive-edit * files.el (save-some-buffers-action-alist): Only use recursive-edit
if the user enabled recursive-minibuffers. if the user enabled recursive-minibuffers.
......
...@@ -41,6 +41,27 @@ ...@@ -41,6 +41,27 @@
;; Prevent warning when compiling in an Emacs without gpm support. ;; Prevent warning when compiling in an Emacs without gpm support.
(declare-function gpm-mouse-start "term.c" ()) (declare-function gpm-mouse-start "term.c" ())
(defun gpm-mouse-enable ()
"Try to enable gpm mouse support on the current terminal."
(let ((activated nil))
(unwind-protect
(progn
(unless (fboundp 'gpm-mouse-start)
(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 something failed to turn it on, try to turn it off as well,
;; just in case.
(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 ;;;###autoload
(define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1")
;;;###autoload ;;;###autoload
...@@ -52,21 +73,14 @@ otherwise turn it off. ...@@ -52,21 +73,14 @@ otherwise turn it off.
This allows the use of the mouse when operating on a GNU/Linux console, 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. in the same way as you can use the mouse under X11.
It relies on the `gpm' daemon being activated." It relies on the `gpm' daemon being activated."
:global t :group 'mouse :global t :group 'mouse :init-value t
(let ((activated nil)) (dolist (terminal (terminal-list))
(unwind-protect (when (and (eq t (terminal-live-p terminal))
(progn (not (eq gpm-mouse-mode
(unless (fboundp 'gpm-mouse-start) (terminal-parameter terminal 'gpm-mouse-active))))
(error "Emacs must be built with Gpm to use this mode")) ;; Simulate selecting a terminal by selecting one of its frames ;-(
(when gpm-mouse-mode (with-selected-frame (car (frames-on-display-list terminal))
(gpm-mouse-start) (if gpm-mouse-mode (gpm-mouse-enable) (gpm-mouse-disable))))))
(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)))))
(provide 't-mouse) (provide 't-mouse)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;; It can't really display underlines. ;; It can't really display underlines.
(tty-no-underline) (tty-no-underline)
(ignore-errors (gpm-mouse-mode 1)) (ignore-errors (if gpm-mouse-mode (gpm-mouse-enable)))
;; Make Latin-1 input characters work, too. ;; Make Latin-1 input characters work, too.
;; Meta will continue to work, because the kernel ;; Meta will continue to work, because the kernel
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment