Commit 25c09217 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/xt-mouse.el (xterm-mouse-event-read): Remove.

(xterm-mouse--read-event-sequence-1000)
(xterm-mouse--read-event-sequence-1006): Use read-event instead.
parent cbae07d5
...@@ -238,6 +238,11 @@ It is layered as: ...@@ -238,6 +238,11 @@ It is layered as:
* Incompatible Lisp Changes in Emacs 24.4 * Incompatible Lisp Changes in Emacs 24.4
** `read-event' does not return decoded chars in ttys any more.
Just as was the case in Emacs-22 and before, decoding of tty input according to
keyboard-coding-system is not performed in read-event any more. But contrary
to that past, it is still done before input-decode-map/function-key-map/...
** Removed inhibit-local-menu-bar-menus. ** Removed inhibit-local-menu-bar-menus.
** frame-local variables that affect redisplay do not work any more. ** frame-local variables that affect redisplay do not work any more.
......
2013-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
* xt-mouse.el (xterm-mouse-event-read): Remove.
(xterm-mouse--read-event-sequence-1000)
(xterm-mouse--read-event-sequence-1006): Use read-event instead.
2013-03-10 Stefan Monnier <monnier@iro.umontreal.ca> 2013-03-10 Stefan Monnier <monnier@iro.umontreal.ca>
   
* term/xterm.el (xterm-function-map): Support format used with * term/xterm.el (xterm-function-map): Support format used with
......
...@@ -135,20 +135,6 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." ...@@ -135,20 +135,6 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
(terminal-parameter nil 'xterm-mouse-y)))) (terminal-parameter nil 'xterm-mouse-y))))
pos) pos)
;; Read XTerm sequences above ASCII 127 (#x7f)
(defun xterm-mouse-event-read ()
;; We get the characters decoded by the keyboard coding system. Try
;; to recover the raw character.
(let ((c (read-event)))
(cond ;; If meta-flag is t we get a meta character
((>= c ?\M-\^@)
(- c (- ?\M-\^@ 128)))
;; Reencode the character in the keyboard coding system, if
;; this is a non-ASCII character.
((>= c #x80)
(aref (encode-coding-string (string c) (keyboard-coding-system)) 0))
(t c))))
(defun xterm-mouse-truncate-wrap (f) (defun xterm-mouse-truncate-wrap (f)
"Truncate with wrap-around." "Truncate with wrap-around."
(condition-case nil (condition-case nil
...@@ -167,7 +153,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." ...@@ -167,7 +153,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
;; Normal terminal mouse click reporting: expect three bytes, of the ;; Normal terminal mouse click reporting: expect three bytes, of the
;; form <BUTTON+32> <X+32> <Y+32>. Return a list (EVENT-TYPE X Y). ;; form <BUTTON+32> <X+32> <Y+32>. Return a list (EVENT-TYPE X Y).
(defun xterm-mouse--read-event-sequence-1000 () (defun xterm-mouse--read-event-sequence-1000 ()
(list (let ((code (- (xterm-mouse-event-read) 32))) (list (let ((code (- (read-event) 32)))
(intern (intern
;; For buttons > 3, the release-event looks differently ;; For buttons > 3, the release-event looks differently
;; (see xc/programs/xterm/button.c, function EditorButton), ;; (see xc/programs/xterm/button.c, function EditorButton),
...@@ -188,19 +174,19 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." ...@@ -188,19 +174,19 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
(setq xterm-mouse-last code) (setq xterm-mouse-last code)
(format "down-mouse-%d" (+ 1 code)))))) (format "down-mouse-%d" (+ 1 code))))))
;; x and y coordinates ;; x and y coordinates
(- (xterm-mouse-event-read) 33) (- (read-event) 33)
(- (xterm-mouse-event-read) 33))) (- (read-event) 33)))
;; XTerm's 1006-mode terminal mouse click reporting has the form ;; XTerm's 1006-mode terminal mouse click reporting has the form
;; <BUTTON> ; <X> ; <Y> <M or m>, where the button and ordinates are ;; <BUTTON> ; <X> ; <Y> <M or m>, where the button and ordinates are
;; in encoded (decimal) form. Return a list (EVENT-TYPE X Y). ;; in encoded (decimal) form. Return a list (EVENT-TYPE X Y).
(defun xterm-mouse--read-event-sequence-1006 () (defun xterm-mouse--read-event-sequence-1006 ()
(let (button-bytes x-bytes y-bytes c) (let (button-bytes x-bytes y-bytes c)
(while (not (eq (setq c (xterm-mouse-event-read)) ?\;)) (while (not (eq (setq c (read-event)) ?\;))
(push c button-bytes)) (push c button-bytes))
(while (not (eq (setq c (xterm-mouse-event-read)) ?\;)) (while (not (eq (setq c (read-event)) ?\;))
(push c x-bytes)) (push c x-bytes))
(while (not (memq (setq c (xterm-mouse-event-read)) '(?m ?M))) (while (not (memq (setq c (read-event)) '(?m ?M)))
(push c y-bytes)) (push c y-bytes))
(list (let* ((code (string-to-number (list (let* ((code (string-to-number
(apply 'string (nreverse button-bytes)))) (apply 'string (nreverse button-bytes))))
......
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