[vte] emulation: Remove urxvt mouse extension support
- From: Egmont Koblinger <egmontkob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] emulation: Remove urxvt mouse extension support
- Date: Sat, 14 Sep 2019 20:31:28 +0000 (UTC)
commit b8113e6dd3b6ae8d202c876b3d408125391cf9cb
Author: Egmont Koblinger <egmont gmail com>
Date: Sat Sep 14 22:28:39 2019 +0200
emulation: Remove urxvt mouse extension support
https://gitlab.gnome.org/GNOME/vte/issues/155
src/mev.c | 15 +--------------
src/modes-private.hh | 7 ++-----
src/parser-reply.hh | 1 -
src/vte.cc | 3 ---
src/vteseq.cc | 1 -
5 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/src/mev.c b/src/mev.c
index eca326d2..cff21a8c 100644
--- a/src/mev.c
+++ b/src/mev.c
@@ -45,7 +45,6 @@ enum {
tracking_all_motion = 1003,
tracking_focus = 1004,
tracking_xterm_ext = 1006,
- tracking_urxvt = 1015
};
static int tracking_mode = 0;
@@ -66,7 +65,6 @@ reset_mouse_tracking_mode(void)
decset(tracking_cell_motion, FALSE);
decset(tracking_all_motion, FALSE);
decset(tracking_xterm_ext, FALSE);
- decset(tracking_urxvt, FALSE);
fflush(stdout);
}
@@ -113,10 +111,6 @@ clear(void)
fprintf(stdout, "Xterm 1006 mouse tracking extension enabled.\r\n");
decset(tracking_xterm_ext, TRUE);
break;
- case tracking_urxvt:
- fprintf(stdout, "rxvt-unicode 1015 mouse tracking extension enabled.\r\n");
- decset(tracking_urxvt, TRUE);
- break;
default:
fprintf(stdout, "Tracking disabled.\r\n");
break;
@@ -128,7 +122,6 @@ clear(void)
fprintf(stdout, "D - Cell motion tracking.\r\n");
fprintf(stdout, "E - All motion tracking.\r\n");
fprintf(stdout, "F - Xterm 1006 extension.\r\n");
- fprintf(stdout, "G - rxvt-unicode extension.\r\n");
fprintf(stdout, "I - Focus tracking.\r\n");
fprintf(stdout, "Q - Quit.\r\n");
fprintf(stdout, "%s", _VTE_CAP_ESC "8");
@@ -208,7 +201,7 @@ parse_esc(guint8 *data,
if (data[2] == 'M')
return parse_legacy_mouse_mode(data, len);
- /* FIXME: add support for xterm extended mode (1006) and urxvt mode (1015) */
+ /* FIXME: add support for xterm extended mode (1006) */
if (data[2] == 'I' || data[2] == 'O') {
fprintf(stdout, "focus %s\r\n", data[2] == 'I' ? "in" : "out");
@@ -313,12 +306,6 @@ parse(void)
0 : tracking_xterm_ext;
i++;
break;
- case 'G':
- case 'g':
- tracking_mode = (tracking_mode == tracking_urxvt) ?
- 0 : tracking_urxvt;
- i++;
- break;
case 'I':
case 'i':
tracking_focus_mode = !tracking_focus_mode;
diff --git a/src/modes-private.hh b/src/modes-private.hh
index 6cefe40a..2dab1f8d 100644
--- a/src/modes-private.hh
+++ b/src/modes-private.hh
@@ -163,10 +163,6 @@ MODE(XTERM_SAVE_CURSOR, 1048)
MODE(XTERM_OPT_ALTBUF_SAVE_CURSOR, 1049)
MODE(XTERM_READLINE_BRACKETED_PASTE, 2004)
-/* URXVT */
-
-MODE(URXVT_MOUSE_EXT, 1015)
-
/* Not supported modes: */
/* DEC */
@@ -777,7 +773,8 @@ MODE_FIXED(RXVT_TOOLBAR, 10, ALWAYS_RESET)
MODE_FIXED(RXVT_SCROLLBAR, 30, ALWAYS_RESET)
/* MODE_FIXED(RXVT_SHIFT_KEYS, 35, ALWAYS_RESET) ! Conflicts with DECHEBM */
MODE_FIXED(RXVT_SCROLL_OUTPUT, 1010, ALWAYS_RESET)
-MODE_FIXED(RXVT_SCROLL_KEYPRES, 1011, ALWAYS_RESET)
+MODE_FIXED(RXVT_SCROLL_KEYPRESS, 1011, ALWAYS_RESET)
+MODE_FIXED(RXVT_MOUSE_EXT, 1015, ALWAYS_RESET)
/* Bold/blink uses normal (reset) or high intensity (set) colour */
MODE_FIXED(RXVT_INTENSITY_STYLES, 1021, ALWAYS_SET)
diff --git a/src/parser-reply.hh b/src/parser-reply.hh
index cf5c237d..259145d8 100644
--- a/src/parser-reply.hh
+++ b/src/parser-reply.hh
@@ -26,7 +26,6 @@ _VTE_REPLY(APC, APC, 0, NONE, NONE, ) /* application program command
_VTE_REPLY(DECEKBD, APC, 0, NONE, NONE, ) /* extended keyboard report */
_VTE_REPLY(XTERM_FOCUS_IN, CSI, 'I', NONE, NONE, ) /* XTERM focus in report */
-_VTE_REPLY(URXVT_MOUSE_EXT_REPORT, CSI, 'M', NONE, NONE, ) /* URXVT mouse mode report */
_VTE_REPLY(XTERM_MOUSE_EXT_SGR_REPORT_BUTTON_PRESS, CSI, 'M', LT, NONE, ) /* XTERM SGR mouse mode
button press report */
_VTE_REPLY(XTERM_FOCUS_OUT, CSI, 'O', NONE, NONE, ) /* XTERM focus out report */
_VTE_REPLY(DECXCPR, CSI, 'R', WHAT, NONE, ) /* extended cursor position
report */
diff --git a/src/vte.cc b/src/vte.cc
index c52241de..da2b0bad 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -5861,9 +5861,6 @@ Terminal::feed_mouse_event(vte::grid::coords const& rowcol /* confined */,
send(is_release ? VTE_REPLY_XTERM_MOUSE_EXT_SGR_REPORT_BUTTON_RELEASE
: VTE_REPLY_XTERM_MOUSE_EXT_SGR_REPORT_BUTTON_PRESS,
{cb, (int)cx, (int)cy});
- } else if (m_modes_private.URXVT_MOUSE_EXT()) {
- /* urxvt's extended mode (1015) */
- send(VTE_REPLY_URXVT_MOUSE_EXT_REPORT, {32 + cb, (int)cx, (int)cy});
} else if (cx <= 223 && cy <= 223) {
/* legacy mode */
len = g_snprintf(buf, sizeof(buf), _VTE_CAP_CSI "M%c%c%c", 32 + cb, 32 + (guchar)cx, 32 +
(guchar)cy);
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 6d85911f..771a413b 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -599,7 +599,6 @@ Terminal::set_mode_private(int mode,
case vte::terminal::modes::Private::eXTERM_MOUSE_ANY_EVENT:
case vte::terminal::modes::Private::eXTERM_MOUSE_EXT:
case vte::terminal::modes::Private::eXTERM_MOUSE_EXT_SGR:
- case vte::terminal::modes::Private::eURXVT_MOUSE_EXT:
update_mouse_protocol();
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]