From da122da5273a57b25edfe3e8885ea2250b88bf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Sat, 3 Aug 2019 12:08:27 +0200 Subject: [PATCH] Fix XTerm OSC 52 selection retrieval (bug#36879) When asking XTerm for the selection via OSC 52, use ST as string terminator in the request to get ST as terminator in the reply, because BEL is messy to receive in many ways. * lisp/term/xterm.el (gui-backend-get-selection): Use ST as string terminator in request and reply. Use a time-out when reading the reply. --- lisp/term/xterm.el | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index c4b0a8fb6e..4b56b2ce4a 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -946,21 +946,31 @@ gui-backend-get-selection (type data-type &context (window-system nil) ;; Only applies to terminals which have it enabled. - ((terminal-parameter nil 'xterm--get-selection) (eql t))) + ((terminal-parameter nil 'xterm--get-selection) (eql t)) + ;; Doesn't work in screen; see bug#36879. + ((eq (terminal-parameter nil 'terminal-initted) + 'terminal-init-screen) + (eql nil))) (unless (eq data-type 'STRING) (error "Unsupported data type %S" data-type)) - (let* ((screen (eq (terminal-parameter nil 'terminal-initted) - 'terminal-init-screen)) - (query (concat "\e]52;" (xterm--selection-char type) ";"))) + (let ((query (concat "\e]52;" (xterm--selection-char type) ";"))) (with-temp-buffer (set-buffer-multibyte nil) (xterm--query - (concat (when screen "\eP") query "?\a" (when screen "\e\\")) - (list (cons query (lambda () - (while (let ((char (read-char))) - (unless (eq char ?\a) - (insert char) - t)))))) + ;; Use ST as query terminator to get ST as reply terminator (bug#36879). + (concat query "?\e\\") + (list (cons query + (lambda () + ;; Read data up to the string terminator, ST. + (let (char last) + (while (and (setq char (read-char + nil nil + xterm-query-timeout)) + (not (and (eq char ?\\) + (eq last ?\e)))) + (when last + (insert last)) + (setq last char)))))) 'no-async) (base64-decode-region (point-min) (point-max)) (decode-coding-region (point-min) (point-max) 'utf-8-unix t)))) -- 2.21.0