From: Duncan Findlay via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 55883@debbugs.gnu.org
Subject: bug#55883: [PATCH] Update X Primary Selection with active regions
Date: Fri, 10 Jun 2022 18:59:47 -0700 [thread overview]
Message-ID: <CAPANw+OJ4fbEaUo6FXZ6pvVibMc2tC7P6Ee1fbAmhnDEMt2Trw@mail.gmail.com> (raw)
In-Reply-To: <834k0t104u.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]
Attached is an updated version that I believe addresses all the
concerns raised on the mailing list.
Given the changes don't split so cleanly into two any more, I've
combined them into a single patch.
Thanks!
On Thu, Jun 9, 2022 at 11:52 PM Eli Zaretskii <eliz@gnu.org> wrote:
>
> > Date: Thu, 9 Jun 2022 23:18:01 -0700
> > From: Duncan Findlay via "Bug reports for GNU Emacs,
> > the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
> >
> > Attached are two patches to allow users that use xterm's OSC 52
> > clipboard support to have their primary selection updated with the
> > active region, to better match the behavior of running Emacs in X
> > locally.
> >
> > This behavior is enabled automatically for supported terminals, and is
> > controlled by the existing `select-active-regions' variable.
> >
> > Previous discussion:
> > https://lists.gnu.org/archive/html/emacs-devel/2022-06/msg00126.html
>
> Thanks.
>
> However, the patches you posted seem to ignore the comments I made in
> the above-mentioned discussions, specifically here:
>
> https://lists.gnu.org/archive/html/emacs-devel/2022-06/msg00134.html
>
> Did you send a wrong version of the patches, perhaps?
[-- Attachment #2: 0001-Support-select-active-regions-with-xterm.patch --]
[-- Type: text/x-patch, Size: 4112 bytes --]
From bc906a8a0c67125880497c4729d7940fa4ba8bf6 Mon Sep 17 00:00:00 2001
From: Duncan Findlay <duncf@google.com>
Date: Fri, 10 Jun 2022 18:46:49 -0700
Subject: [PATCH] Support `select-active-regions' with xterm
This allows Emacs to save the active region to the user's
primary selection on supported terminals. The behavior follows
the existing `select-active-regions' variable and requires
`xterm-select-active-regions' to be non-nil.
* src/keyboard.c (command_loop_1): Check terminal parameter
`display-selections-p' for text terminals when deciding whether
to update primary selection.
* lisp/frame.el (display-selections-p): Return terminal
parameter `display-selections-p' to indicate selection support.
* lisp/term/xterm.el (xterm-select-active-regions): New
defcustom. (xterm--init-activate-set-selection): Set
the `display-selections-p' terminal parameter.
---
etc/NEWS | 6 ++++++
lisp/frame.el | 2 ++
lisp/term/xterm.el | 11 ++++++++++-
src/keyboard.c | 5 ++++-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 1789d47351..57b5d06e78 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -492,6 +492,12 @@ This is in addition to previously-supported ways of discovering 24-bit
color support: either via the "RGB" or "setf24" capabilities, or if
the 'COLORTERM' environment variable is set to the value "truecolor".
+*** Select active regions with xterm selection support.
+On terminals with xterm setSelection support, the active region may be
+saved to the X primary selection, following the
+'select-active-regions' variable. This support is enabled with
+'xterm-select-active-regions'.
+
** ERT
+++
diff --git a/lisp/frame.el b/lisp/frame.el
index 27f99fb7d2..e530afb387 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2164,6 +2164,8 @@ display-selections-p
(not (null dos-windows-version))))
((memq frame-type '(x w32 ns pgtk))
t)
+ ((terminal-parameter display 'display-selections-p)
+ t)
(t
nil))))
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index a7e257f41c..671d757c11 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -80,6 +80,13 @@ xterm-store-paste-on-kill-ring
:version "28.1"
:type 'boolean)
+(defcustom xterm-select-active-regions nil
+ "If non-nil, on a terminal with setSelection support, Emacs will
+also update the primary selection with the active region, based
+on the value of `select-active-regions'."
+ :version "29.1"
+ :type 'boolean)
+
(defconst xterm-paste-ending-sequence "\e[201~"
"Characters sent by the terminal to end a bracketed paste.")
@@ -946,7 +953,9 @@ xterm--init-activate-get-selection
(defun xterm--init-activate-set-selection ()
"Terminal initialization for `gui-set-selection'."
- (set-terminal-parameter nil 'xterm--set-selection t))
+ (set-terminal-parameter nil 'xterm--set-selection t)
+ (when xterm-select-active-regions
+ (set-terminal-parameter nil 'display-selections-p t)))
(defun xterm--init-frame-title ()
"Terminal initialization for XTerm frame titles."
diff --git a/src/keyboard.c b/src/keyboard.c
index 55d710ed62..8e3738b4c7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,3 +1,4 @@
+
/* Keyboard and mouse input; editor command loop.
Copyright (C) 1985-1989, 1993-1997, 1999-2022 Free Software Foundation,
@@ -1569,7 +1570,8 @@ command_loop_1 (void)
{
/* Even if not deactivating the mark, set PRIMARY if
`select-active-regions' is non-nil. */
- if (!NILP (Fwindow_system (Qnil))
+ if ((!NILP (Fwindow_system (Qnil)) ||
+ !NILP (Fterminal_parameter (Qnil, Qdisplay_selections_p)))
/* Even if mark_active is non-nil, the actual buffer
marker may not have been set yet (Bug#7044). */
&& XMARKER (BVAR (current_buffer, mark))->buffer
@@ -12162,6 +12164,7 @@ syms_of_keyboard (void)
DEFSYM (Qpolling_period, "polling-period");
+ DEFSYM (Qdisplay_selections_p, "display-selections-p");
DEFSYM (Qgui_set_selection, "gui-set-selection");
/* The primary selection. */
--
2.36.1.476.g0c4daa206d-goog
next prev parent reply other threads:[~2022-06-11 1:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 6:18 bug#55883: [PATCH] Update X Primary Selection with active regions Duncan Findlay via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-06-10 6:52 ` Eli Zaretskii
2022-06-11 1:59 ` Duncan Findlay via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2022-06-11 7:53 ` Eli Zaretskii
2022-06-14 5:57 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-06-14 6:36 ` Duncan Findlay via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-06-14 12:15 ` Eli Zaretskii
2022-06-15 2:01 ` Duncan Findlay via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-06-15 16:51 ` Eli Zaretskii
2022-06-18 11:13 ` Eli Zaretskii
2022-06-18 15:15 ` Basil L. Contovounesios via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-06-18 16:09 ` Eli Zaretskii
2022-06-22 1:58 ` Duncan Findlay via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-06-22 13:02 ` Eli Zaretskii
2022-06-22 15:37 ` Basil L. Contovounesios via Bug reports for GNU Emacs, the Swiss army knife of text editors
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPANw+OJ4fbEaUo6FXZ6pvVibMc2tC7P6Ee1fbAmhnDEMt2Trw@mail.gmail.com \
--to=bug-gnu-emacs@gnu.org \
--cc=55883@debbugs.gnu.org \
--cc=duncf@google.com \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).