From: Glenn Morris Date: Tue, 14 May 2013 02:04:02 +0000 (-0400) Subject: Make sup-mouse.el obsolete X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~97 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=27c8b6eb73a856e8c44272a8bf780f2ba2ea984d;p=emacs.git Make sup-mouse.el obsolete * doc/emacs/ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el. * term/sup-mouse.el: Move to obsolete/. * etc/NEWS: Mention this. --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 0fff6931d00..1d72ba18860 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2013-05-14 Glenn Morris + + * ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el. + 2013-05-09 Glenn Morris * sending.texi (Mail Sending): Fix typo. diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 0d0ed9e37f4..92874ad6276 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -1058,8 +1058,7 @@ contributed extensively to the MS-Windows port of Emacs. @item Wolfgang Rupprecht wrote Emacs 19's floating-point support (including -@file{float-sup.el} and @file{floatfns.c}), and @file{sup-mouse.el}, -support for the Supdup mouse on lisp machines. +@file{float-sup.el} and @file{floatfns.c}). @item Kevin Ryde wrote @file{info-xref.el}, a library for checking diff --git a/etc/NEWS b/etc/NEWS index fd65bad2740..144adf15506 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -298,6 +298,9 @@ module. *** longlines.el is obsolete; use visual-line-mode instead. ++++ +*** sup-mouse.el. + *** terminal.el is obsolete; use term.el instead. +++ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bd5a20ffe13..79165b37cc0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-05-14 Glenn Morris + + * term/sup-mouse.el: Move to obsolete/. + 2013-05-13 Glenn Morris * cus-dep.el (defcustom-mh, defgroup-mh, defface-mh): diff --git a/lisp/obsolete/sup-mouse.el b/lisp/obsolete/sup-mouse.el new file mode 100644 index 00000000000..8df32dcd06d --- /dev/null +++ b/lisp/obsolete/sup-mouse.el @@ -0,0 +1,203 @@ +;;; sup-mouse.el --- supdup mouse support for lisp machines + +;; Copyright (C) 1985-1986, 2001-2013 Free Software Foundation, Inc. + +;; Author: Wolfgang Rupprecht +;; Maintainer: FSF +;; Created: 21 Nov 1986 +;; Keywords: hardware +;; Obsolete-since: 24.4 + +;; (from code originally written by John Robinson@bbn for the bitgraph) + +;; This file is part of GNU Emacs. + +;; 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 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +;;; User customization option: + +(defcustom sup-mouse-fast-select-window nil + "Non-nil means mouse hits select new window, then execute. +Otherwise just select." + :type 'boolean + :group 'mouse) + +(defconst mouse-left 0) +(defconst mouse-center 1) +(defconst mouse-right 2) + +(defconst mouse-2left 4) +(defconst mouse-2center 5) +(defconst mouse-2right 6) + +(defconst mouse-3left 8) +(defconst mouse-3center 9) +(defconst mouse-3right 10) + +;;; Defuns: + +(defun sup-mouse-report () + "This function is called directly by the mouse, it parses and +executes the mouse commands. + + L move point * |---- These apply for mouse click in a window. +2L delete word | +3L copy word | If sup-mouse-fast-select-window is nil, + C move point and yank * | just selects that window. +2C yank pop | + R set mark * | +2R delete region | +3R copy region | + +on mode line on \"scroll bar\" in minibuffer + L scroll-up line to top execute-extended-command + C proportional goto-char line to middle mouse-help + R scroll-down line to bottom eval-expression" + + (interactive) + (let* +;; expect a string of :;;c + ((buttons (sup-get-tty-num ?\;)) + (x (sup-get-tty-num ?\;)) + (y (sup-get-tty-num ?c)) + (window (sup-pos-to-window x y)) + (edges (window-edges window)) + (old-window (selected-window)) + (in-minibuf-p (eq y (1- (frame-height)))) + (same-window-p (and (not in-minibuf-p) (eq window old-window))) + (in-mode-line-p (eq y (1- (nth 3 edges)))) + (in-scrollbar-p (>= x (1- (nth 2 edges))))) + (setq x (- x (nth 0 edges))) + (setq y (- y (nth 1 edges))) + +; (error "mouse-hit %d %d %d" buttons x y) ;;;; debug + + (cond (in-mode-line-p + (select-window window) + (cond ((= buttons mouse-left) + (scroll-up)) + ((= buttons mouse-right) + (scroll-down)) + ((= buttons mouse-center) + (goto-char (/ (* x + (- (point-max) (point-min))) + (1- (window-width)))) + (beginning-of-line) + (what-cursor-position))) + (select-window old-window)) + (in-scrollbar-p + (select-window window) + (scroll-up + (cond ((= buttons mouse-left) + y) + ((= buttons mouse-right) + (+ y (- 2 (window-height)))) + ((= buttons mouse-center) + (/ (+ 2 y y (- (window-height))) 2)) + (t + 0))) + (select-window old-window)) + (same-window-p + (cond ((= buttons mouse-left) + (sup-move-point-to-x-y x y)) + ((= buttons mouse-2left) + (sup-move-point-to-x-y x y) + (kill-word 1)) + ((= buttons mouse-3left) + (sup-move-point-to-x-y x y) + (save-excursion + (copy-region-as-kill + (point) (progn (forward-word 1) (point)))) + (setq this-command 'yank) + ) + ((= buttons mouse-right) + (push-mark) + (sup-move-point-to-x-y x y) + (exchange-point-and-mark)) + ((= buttons mouse-2right) + (push-mark) + (sup-move-point-to-x-y x y) + (kill-region (mark) (point))) + ((= buttons mouse-3right) + (push-mark) + (sup-move-point-to-x-y x y) + (copy-region-as-kill (mark) (point)) + (setq this-command 'yank)) + ((= buttons mouse-center) + (sup-move-point-to-x-y x y) + (setq this-command 'yank) + (yank)) + ((= buttons mouse-2center) + (yank-pop 1)) + ) + ) + (in-minibuf-p + (cond ((= buttons mouse-right) + (call-interactively 'eval-expression)) + ((= buttons mouse-left) + (call-interactively 'execute-extended-command)) + ((= buttons mouse-center) + (describe-function 'sup-mouse-report)); silly self help + )) + (t ;in another window + (select-window window) + (cond ((not sup-mouse-fast-select-window)) + ((= buttons mouse-left) + (sup-move-point-to-x-y x y)) + ((= buttons mouse-right) + (push-mark) + (sup-move-point-to-x-y x y) + (exchange-point-and-mark)) + ((= buttons mouse-center) + (sup-move-point-to-x-y x y) + (setq this-command 'yank) + (yank)) + )) + ))) + + +(defun sup-get-tty-num (term-char) + "Read from terminal until TERM-CHAR is read, and return intervening number. +Upon non-numeric not matching TERM-CHAR signal an error." + (let + ((num 0) + (char (read-char))) + (while (and (>= char ?0) + (<= char ?9)) + (setq num (+ (* num 10) (- char ?0))) + (setq char (read-char))) + (or (eq term-char char) + (error "Invalid data format in mouse command")) + num)) + +(defun sup-move-point-to-x-y (x y) + "Position cursor in window coordinates. +X and Y are 0-based character positions in the window." + (move-to-window-line y) + (move-to-column x) + ) + +(defun sup-pos-to-window (x y) + "Find window corresponding to frame coordinates. +X and Y are 0-based character positions on the frame." + (get-window-with-predicate (lambda (w) + (coordinates-in-window-p (cons x y) w)))) + +(provide 'sup-mouse) + +;;; sup-mouse.el ends here diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el deleted file mode 100644 index 8a207ed01af..00000000000 --- a/lisp/term/sup-mouse.el +++ /dev/null @@ -1,200 +0,0 @@ -;;; sup-mouse.el --- supdup mouse support for lisp machines - -;; Copyright (C) 1985-1986, 2001-2013 Free Software Foundation, Inc. - -;; Author: Wolfgang Rupprecht -;; Maintainer: FSF -;; Created: 21 Nov 1986 -;; Keywords: hardware - -;; (from code originally written by John Robinson@bbn for the bitgraph) - -;; This file is part of GNU Emacs. - -;; 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 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 -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see . - -;;; Commentary: - -;;; Code: - -;;; User customization option: - -(defcustom sup-mouse-fast-select-window nil - "Non-nil means mouse hits select new window, then execute. -Otherwise just select." - :type 'boolean - :group 'mouse) - -(defconst mouse-left 0) -(defconst mouse-center 1) -(defconst mouse-right 2) - -(defconst mouse-2left 4) -(defconst mouse-2center 5) -(defconst mouse-2right 6) - -(defconst mouse-3left 8) -(defconst mouse-3center 9) -(defconst mouse-3right 10) - -;;; Defuns: - -(defun sup-mouse-report () - "This function is called directly by the mouse, it parses and -executes the mouse commands. - - L move point * |---- These apply for mouse click in a window. -2L delete word | -3L copy word | If sup-mouse-fast-select-window is nil, - C move point and yank * | just selects that window. -2C yank pop | - R set mark * | -2R delete region | -3R copy region | - -on mode line on \"scroll bar\" in minibuffer - L scroll-up line to top execute-extended-command - C proportional goto-char line to middle mouse-help - R scroll-down line to bottom eval-expression" - - (interactive) - (let* -;; expect a string of :;;c - ((buttons (sup-get-tty-num ?\;)) - (x (sup-get-tty-num ?\;)) - (y (sup-get-tty-num ?c)) - (window (sup-pos-to-window x y)) - (edges (window-edges window)) - (old-window (selected-window)) - (in-minibuf-p (eq y (1- (frame-height)))) - (same-window-p (and (not in-minibuf-p) (eq window old-window))) - (in-mode-line-p (eq y (1- (nth 3 edges)))) - (in-scrollbar-p (>= x (1- (nth 2 edges))))) - (setq x (- x (nth 0 edges))) - (setq y (- y (nth 1 edges))) - -; (error "mouse-hit %d %d %d" buttons x y) ;;;; debug - - (cond (in-mode-line-p - (select-window window) - (cond ((= buttons mouse-left) - (scroll-up)) - ((= buttons mouse-right) - (scroll-down)) - ((= buttons mouse-center) - (goto-char (/ (* x - (- (point-max) (point-min))) - (1- (window-width)))) - (beginning-of-line) - (what-cursor-position))) - (select-window old-window)) - (in-scrollbar-p - (select-window window) - (scroll-up - (cond ((= buttons mouse-left) - y) - ((= buttons mouse-right) - (+ y (- 2 (window-height)))) - ((= buttons mouse-center) - (/ (+ 2 y y (- (window-height))) 2)) - (t - 0))) - (select-window old-window)) - (same-window-p - (cond ((= buttons mouse-left) - (sup-move-point-to-x-y x y)) - ((= buttons mouse-2left) - (sup-move-point-to-x-y x y) - (kill-word 1)) - ((= buttons mouse-3left) - (sup-move-point-to-x-y x y) - (save-excursion - (copy-region-as-kill - (point) (progn (forward-word 1) (point)))) - (setq this-command 'yank) - ) - ((= buttons mouse-right) - (push-mark) - (sup-move-point-to-x-y x y) - (exchange-point-and-mark)) - ((= buttons mouse-2right) - (push-mark) - (sup-move-point-to-x-y x y) - (kill-region (mark) (point))) - ((= buttons mouse-3right) - (push-mark) - (sup-move-point-to-x-y x y) - (copy-region-as-kill (mark) (point)) - (setq this-command 'yank)) - ((= buttons mouse-center) - (sup-move-point-to-x-y x y) - (setq this-command 'yank) - (yank)) - ((= buttons mouse-2center) - (yank-pop 1)) - ) - ) - (in-minibuf-p - (cond ((= buttons mouse-right) - (call-interactively 'eval-expression)) - ((= buttons mouse-left) - (call-interactively 'execute-extended-command)) - ((= buttons mouse-center) - (describe-function 'sup-mouse-report)); silly self help - )) - (t ;in another window - (select-window window) - (cond ((not sup-mouse-fast-select-window)) - ((= buttons mouse-left) - (sup-move-point-to-x-y x y)) - ((= buttons mouse-right) - (push-mark) - (sup-move-point-to-x-y x y) - (exchange-point-and-mark)) - ((= buttons mouse-center) - (sup-move-point-to-x-y x y) - (setq this-command 'yank) - (yank)) - )) - ))) - - -(defun sup-get-tty-num (term-char) - "Read from terminal until TERM-CHAR is read, and return intervening number. -Upon non-numeric not matching TERM-CHAR signal an error." - (let - ((num 0) - (char (read-char))) - (while (and (>= char ?0) - (<= char ?9)) - (setq num (+ (* num 10) (- char ?0))) - (setq char (read-char))) - (or (eq term-char char) - (error "Invalid data format in mouse command")) - num)) - -(defun sup-move-point-to-x-y (x y) - "Position cursor in window coordinates. -X and Y are 0-based character positions in the window." - (move-to-window-line y) - (move-to-column x) - ) - -(defun sup-pos-to-window (x y) - "Find window corresponding to frame coordinates. -X and Y are 0-based character positions on the frame." - (get-window-with-predicate (lambda (w) - (coordinates-in-window-p (cons x y) w)))) - -;;; sup-mouse.el ends here