summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2016-05-08 12:55:32 +0200
committerChristian Persch <chpe@gnome.org>2016-05-08 12:56:09 +0200
commit8dbe242198fb3a4ce453866cfb4aa9dae9c3b9c4 (patch)
treedad0740db8f12a8e63a26163fb3d98cbe5939fa3
parent090c0b50abea895a2ff0b1b1d32b26177fcf4859 (diff)
downloadvte-8dbe242198fb3a4ce453866cfb4aa9dae9c3b9c4.tar.gz
emulation: Swallow urxvt OSC 7770.44.2
Accept OSC 777 but make it a no-op. Some distros patch their vte downstream with the rejected patch from bug 711059, which leads to problems with these escape sequences being shown on the terminal when using an unpatched upstream build of vte but the system-installed patched vte.sh script, due to vte not ignoring unknown escape sequences (bug 403130). https://bugzilla.gnome.org/show_bug.cgi?id=403130 https://bugzilla.gnome.org/show_bug.cgi?id=711059 (cherry picked from commit 47879674b97aa610174ce79e427a181ca23aad8d)
-rw-r--r--src/caps.cc2
-rw-r--r--src/vteseq-n.gperf1
-rw-r--r--src/vteseq.cc7
3 files changed, 10 insertions, 0 deletions
diff --git a/src/caps.cc b/src/caps.cc
index d4ac3d8b..f5ad64a1 100644
--- a/src/caps.cc
+++ b/src/caps.cc
@@ -254,6 +254,7 @@ const char _vte_xterm_capability_strings[] =
ENTRY(OSC "117" BEL, "reset-highlight-background-color")
ENTRY(OSC "118" BEL, "reset-tek-cursor-color")
ENTRY(OSC "119" BEL, "reset-highlight-foreground-color")
+ ENTRY(OSC "777;%s" BEL, "urxvt-777")
COMMENT(/* Set text parameters, ST-terminated versions. */)
ENTRY(OSC ";%s" ST, "set-icon-and-window-title") COMMENT(/* undocumented default */)
@@ -289,6 +290,7 @@ const char _vte_xterm_capability_strings[] =
ENTRY(OSC "117" ST, "reset-highlight-background-color")
ENTRY(OSC "118" ST, "reset-tek-cursor-color")
ENTRY(OSC "119" ST, "reset-highlight-foreground-color")
+ ENTRY(OSC "777;%s" ST, "urxvt-777")
COMMENT(/* These may be bogus, I can't find docs for them anywhere (#104154). */)
ENTRY(OSC "21;%s" BEL, "set-text-property-21")
diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
index 4e2f3376..e58dd947 100644
--- a/src/vteseq-n.gperf
+++ b/src/vteseq-n.gperf
@@ -168,3 +168,4 @@ struct vteseq_n_struct {
#"reset-mouse-cursor-foreground-color", VTE_SEQUENCE_HANDLER_NULL
"set-current-directory-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_directory_uri)
"set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
+"urxvt-777", VTE_SEQUENCE_HANDLER(vte_sequence_handler_urxvt_777)
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 6223ddc2..c83391c7 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -3384,6 +3384,13 @@ vte_sequence_handler_reset_highlight_foreground_color (VteTerminalPrivate *that,
that->reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE);
}
+/* URXVT generic OSC 777 */
+
+static void
+vte_sequence_handler_urxvt_777(VteTerminalPrivate *that, GValueArray *params)
+{
+ /* Accept but ignore this for compatibility with downstream-patched vte (bug #711059)*/
+}
/* Lookup tables */