[vte/vte-0-54] parser: Fix incorrect sequence

[Christian Persch <chpe src gnome org>]

commit 9d2802b49664a67369fdeaf5c371f9c6ab40f121
Author: Christian Persch <chpe src gnome org>
Date:   Mon Sep 3 16:10:51 2018 +0200

    parser: Fix incorrect sequence
    
    https://gitlab.gnome.org/GNOME/vte/issues/35
    (cherry picked from commit 8f4e3c199064adca159daa475774a9ce4be9df36)

 src/parser-cmd.hh |  9 +++++----
 src/parser-csi.hh |  6 +++---
 src/vteseq.cc     | 22 ++++++++++++++++++----
 3 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/src/parser-cmd.hh b/src/parser-cmd.hh
index 7c11c740..96471bd6 100644
--- a/src/parser-cmd.hh
+++ b/src/parser-cmd.hh
@@ -48,7 +48,7 @@ _VTE_CMD(DECALN) /* screen alignment pattern */
 _VTE_CMD(DECBI) /* back index */
 _VTE_CMD(DECKPAM) /* keypad application mode */
 _VTE_CMD(DECKPNM) /* keypad numeric mode */
-_VTE_CMD(DECPCTERM_OR_XTERM_RPM) /* pcterm or xterm restore private mode */
+_VTE_CMD(DECPCTERM_OR_XTERM_RPM) /* pcterm or xterm restore DEC private mode */
 _VTE_CMD(DECRC) /* restore cursor */
 _VTE_CMD(DECREQTPARM) /* request terminal parameters */
 _VTE_CMD(DECRQCRA) /* request checksum of rectangular area */
@@ -116,9 +116,8 @@ _VTE_CMD(TSR) /* tabulation stop remove */
 _VTE_CMD(VPA) /* vertical line position absolute */
 _VTE_CMD(VPR) /* vertical line position relative */
 _VTE_CMD(VT) /* vertical tab */
-_VTE_CMD(XTERM_RTM) /* xterm reset title mode */
-_VTE_CMD(XTERM_RPM) /* xterm restore private mode */
-_VTE_CMD(XTERM_SPM) /* xterm set private mode */
+_VTE_CMD(XTERM_RPM) /* xterm restore DEC private mode */
+_VTE_CMD(XTERM_SPM) /* xterm save DEC private mode */
 _VTE_CMD(XTERM_WM) /* xterm window management */
 
 /* Unimplemented in VTE: */
@@ -319,8 +318,10 @@ _VTE_NOP(XDGSYNC) /* synchronous update */
 _VTE_NOP(XTERM_IHMT) /* xterm initiate highlight mouse tracking */
 _VTE_NOP(XTERM_MLHP) /* xterm memory lock hp bugfix */
 _VTE_NOP(XTERM_MUHP) /* xterm memory unlock hp bugfix */
+_VTE_NOP(XTERM_PTRMODE) /* xterm set pointer mode */
 _VTE_NOP(XTERM_RQTCAP) /* xterm request termcap/terminfo */
 _VTE_NOP(XTERM_RRV) /* xterm reset resource value */
+_VTE_NOP(XTERM_RTM) /* xterm reset title mode */
 _VTE_NOP(XTERM_SGFX) /* xterm sixel graphics */
 _VTE_NOP(XTERM_SGR_STACK_POP) /* xterm pop SGR stack */
 _VTE_NOP(XTERM_SGR_STACK_PUSH) /* xterm push SGR stack */
diff --git a/src/parser-csi.hh b/src/parser-csi.hh
index f000559b..f88cd2ce 100644
--- a/src/parser-csi.hh
+++ b/src/parser-csi.hh
@@ -133,7 +133,7 @@ _VTE_NOQ(DECSPPCS,               CSI,    'p',  NONE,  1, MULT     ) /* select-pr
 _VTE_SEQ(DECSR,                  CSI,    'p',  NONE,  1, PLUS     ) /* secure-reset */
 _VTE_NOQ(DECLTOD,                CSI,    'p',  NONE,  1, COMMA    ) /* load-time-of-day */
 _VTE_NOQ(DECARR,                 CSI,    'p',  NONE,  1, MINUS    ) /* auto repeat rate */
-_VTE_SEQ(XTERM_SPM,              CSI,    'p',  GT,    0, NONE     ) /* xterm-set-private-mode */
+_VTE_NOQ(XTERM_PTRMODE,          CSI,    'p',  GT,    0, NONE     ) /* xterm set pointer mode */
 _VTE_SEQ(DECRQM_DEC,             CSI,    'p',  WHAT,  1, CASH     ) /* request-mode-dec */
 _VTE_NOQ(DECLL,                  CSI,    'q',  NONE,  0, NONE     ) /* load-leds */
 _VTE_SEQ(DECSCUSR,               CSI,    'q',  NONE,  1, SPACE    ) /* set-cursor-style */
@@ -149,11 +149,11 @@ _VTE_NOQ(DECCARA,                CSI,    'r',  NONE,  1, CASH     ) /* change-at
 _VTE_NOQ(DECSCS,                 CSI,    'r',  NONE,  1, MULT     ) /* select-communication-speed */
 _VTE_NOQ(DECSMKR,                CSI,    'r',  NONE,  1, PLUS     ) /* select-modifier-key-reporting */
 _VTE_NOQ(DECSEST,                CSI,    'r',  NONE,  1, MINUS    ) /* energy saver time */
-_VTE_SEQ(DECPCTERM_OR_XTERM_RPM, CSI,    'r',  WHAT,  0, NONE     ) /* pcterm or xterm-restore-private-mode 
*/
+_VTE_SEQ(DECPCTERM_OR_XTERM_RPM, CSI,    'r',  WHAT,  0, NONE     ) /* pcterm or xterm restore DEC private 
mode */
 _VTE_SEQ(DECSLRM,                CSI,    's',  NONE,  0, NONE     ) /* set-left-and-right-margins */
 _VTE_NOQ(DECSPRTT,               CSI,    's',  NONE,  1, CASH     ) /* select-printer-type */
 _VTE_NOQ(DECSFC,                 CSI,    's',  NONE,  1, MULT     ) /* select-flow-control */
-_VTE_SEQ(XTERM_SPM,              CSI,    's',  WHAT,  0, NONE     ) /* xterm-set-private-mode */
+_VTE_SEQ(XTERM_SPM,              CSI,    's',  WHAT,  0, NONE     ) /* xterm save private mode */
 _VTE_SEQ(XTERM_WM,               CSI,    't',  NONE,  0, NONE     ) /* xterm-window-management */
 _VTE_NOQ(DECSWBV,                CSI,    't',  NONE,  1, SPACE    ) /* set-warning-bell-volume */
 _VTE_NOQ(DECSRFR,                CSI,    't',  NONE,  1, DQUOTE   ) /* select-refresh-rate */
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 2a46f2e3..eabcbbaa 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -3160,8 +3160,8 @@ void
 Terminal::DECPCTERM_OR_XTERM_RPM(vte::parser::Sequence const& seq)
 {
         /*
-         * There's a conflict between DECPCTERM and XTERM-RPM.
-         * XTERM-RPM takes a single argument, DECPCTERM takes 2.
+         * There's a conflict between DECPCTERM and XTERM_RPM.
+         * XTERM_RPM takes a single argument, DECPCTERM takes 2.
          * Note that since both admit default values (which may be
          * omitted at the end of the sequence), this only an approximation.
          */
@@ -8145,7 +8145,7 @@ void
 Terminal::XTERM_RPM(vte::parser::Sequence const& seq)
 {
         /*
-         * XTERM_RPM - xterm-restore-private-mode
+         * XTERM_RPM - xterm restore DEC private mode
          *
          * Defaults: none
          *
@@ -8272,7 +8272,7 @@ void
 Terminal::XTERM_SPM(vte::parser::Sequence const& seq)
 {
         /*
-         * XTERM_SPM - xterm-set-private-mode
+         * XTERM_SPM - xterm save DEC private mode
          *
          * Defaults: none
          *
@@ -8282,6 +8282,20 @@ Terminal::XTERM_SPM(vte::parser::Sequence const& seq)
         save_mode_private(seq, true);
 }
 
+void
+Terminal::XTERM_PTRMODE(vte::parser::Sequence const& seq)
+{
+        /*
+         * XTERM_PTRMODE - xterm set pointer mode
+         *
+         * Defaults: none
+         *
+         * References: XTERM
+         *
+         * Probably not worth implementing.
+         */
+}
+
 void
 Terminal::XTERM_SRV(vte::parser::Sequence const& seq)
 {