update the 7-bit-queries.patch with the version commited upstream

1 files changed, 241 insertions, 6 deletions

diff --git a/7-bit-queries.patch b/7-bit-queries.patch
index 4165d27dc771..991d3e4c1f09 100644
--- a/7-bit-queries.patch
+++ b/7-bit-queries.patch
@@ -1,19 +1,254 @@
 OSC commands returning the colour sequence must be terminated by either
-of ST, ESC \, or BEL. rxvt-unicode tries to use the same type of termination
-as was in the query but doesn't correctly handle the multiple-char sequence
-used for 7-bit queries. Force to using ESC \ instead for now.
+of ST, ESC \, or BEL. rxvt-unicode tried to use the same type of termination
+as was in the query but didn't correctly handle the multiple-char sequence
+used for 7-bit queries. This fixes it.
 
 --- src/command.C
 +++ src/command.C
-@@ -3426,9 +3426,9 @@
+@@ -3021,8 +3021,13 @@
+                 tt_printf ("%-.250s\012", rs[Rs_display_name]);
+               break;
+             case 8:			/* unofficial extension */
+-              process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
+-              break;
++              {
++                string_term st;
++                st.v[0] = CHAR_ST;
++                st.v[1] = '\0';
++                process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
++                break;
++              }
+           }
+         break;
+ 
+@@ -3217,7 +3222,7 @@
+  * ends_how is terminator used. returned input must be free()'d
+  */
+ char *
+-rxvt_term::get_to_st (unicode_t &ends_how)
++rxvt_term::get_to_st (string_term &st)
+ {
+   unicode_t ch;
+   bool seen_esc = false;
+@@ -3256,7 +3261,11 @@
+ 
+   string[n++] = '\0';
+ 
+-  ends_how = (ch == 0x5c ? C0_ESC : ch);
++  n = 0;
++  if (ch == 0x5c)
++    st.v[n++] = C0_ESC;
++  st.v[n++] = ch;
++  st.v[n] = '\0';
+ 
+   return rxvt_wcstombs (string);
+ }
+@@ -3272,8 +3281,8 @@
+    * Not handled yet
+    */
+ 
+-  unicode_t eh;
+-  char *s = get_to_st (eh);
++  string_term st;
++  char *s = get_to_st (st);
+   if (s)
+     free (s);
+ 
+@@ -3295,12 +3304,12 @@
+ 
+   if (ch == ';')
+     {
+-      unicode_t eh;
+-      char *s = get_to_st (eh);
++      string_term st;
++      char *s = get_to_st (st);
+ 
+       if (s)
+         {
+-          process_xterm_seq (arg, s, eh);
++          process_xterm_seq (arg, s, st);
+           free (s);
+         }
+     }
+@@ -3410,7 +3419,7 @@
+ }
+ 
+ void
+-rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
++rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
+ {
+   if (str[0] == '?' && !str[1])
+     {
+@@ -3426,9 +3435,9 @@
          snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
  
        if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
 -        tt_printf ("\033]%d;%d;%s%c", report, color - minCOLOR, rgba_str, resp);
-+        tt_printf ("\033]%d;%d;%s\033\\", report, color - minCOLOR, rgba_str);
++        tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
        else
 -        tt_printf ("\033]%d;%s%c", report, rgba_str, resp);
-+        tt_printf ("\033]%d;%s\033\\", report, rgba_str, resp);
++        tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
      }
    else
      set_window_color (color, str);
+@@ -3438,7 +3447,7 @@
+  * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
+  */
+ void
+-rxvt_term::process_xterm_seq (int op, char *str, char resp)
++rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
+ {
+   int color;
+   char *buf, *name;
+@@ -3483,7 +3492,7 @@
+                 && actual_format == 8)
+               str = (const char *)(value);
+ 
+-            tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
++            tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
+ 
+             XFree (value);
+           }
+@@ -3517,49 +3526,49 @@
+             if ((buf = strchr (name, ';')) != NULL)
+               *buf++ = '\0';
+ 
+-            process_color_seq (op, color, name, resp);
++            process_color_seq (op, color, name, st);
+           }
+         break;
+       case Rxvt_restoreFG:
+       case XTerm_Color00:
+-        process_color_seq (op, Color_fg, str, resp);
++        process_color_seq (op, Color_fg, str, st);
+         break;
+       case Rxvt_restoreBG:
+       case XTerm_Color01:
+-        process_color_seq (op, Color_bg, str, resp);
++        process_color_seq (op, Color_bg, str, st);
+         break;
+ #ifndef NO_CURSORCOLOR
+       case XTerm_Color_cursor:
+-        process_color_seq (op, Color_cursor, str, resp);
++        process_color_seq (op, Color_cursor, str, st);
+         break;
+ #endif
+       case XTerm_Color_pointer_fg:
+-        process_color_seq (op, Color_pointer_fg, str, resp);
++        process_color_seq (op, Color_pointer_fg, str, st);
+         break;
+       case XTerm_Color_pointer_bg:
+-        process_color_seq (op, Color_pointer_bg, str, resp);
++        process_color_seq (op, Color_pointer_bg, str, st);
+         break;
+ #ifdef OPTION_HC
+       case XTerm_Color_HC:
+-        process_color_seq (op, Color_HC, str, resp);
++        process_color_seq (op, Color_HC, str, st);
+         break;
+       case XTerm_Color_HTC:
+-        process_color_seq (op, Color_HTC, str, resp);
++        process_color_seq (op, Color_HTC, str, st);
+         break;
+ #endif
+ #ifndef NO_BOLD_UNDERLINE_REVERSE
+       case URxvt_Color_BD:
+-        process_color_seq (op, Color_BD, str, resp);
++        process_color_seq (op, Color_BD, str, st);
+         break;
+       case URxvt_Color_UL:
+-        process_color_seq (op, Color_UL, str, resp);
++        process_color_seq (op, Color_UL, str, st);
+         break;
+       case URxvt_Color_IT:
+-        process_color_seq (op, Color_IT, str, resp);
++        process_color_seq (op, Color_IT, str, st);
+         break;
+ #endif
+       case URxvt_Color_border:
+-        process_color_seq (op, Color_border, str, resp);
++        process_color_seq (op, Color_border, str, st);
+         break;
+ 
+       case XTerm_logfile:
+@@ -3587,10 +3596,10 @@
+       case URxvt_boldItalicFont:
+ #endif
+         if (query)
+-          tt_printf ("\33]%d;%-.250s%c", saveop,
++          tt_printf ("\33]%d;%-.250s%s", saveop,
+                      option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
+                        ? fontset[op - URxvt_font]->fontdesc : "",
+-                     resp);
++                     st.v);
+         else
+           {
+             const char *&res = rs[Rs_font + (op - URxvt_font)];
+@@ -3603,23 +3612,23 @@
+ 
+       case URxvt_version:
+         if (query)
+-          tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
++          tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
+                      op,
+                      rs[Rs_name], VERSION[0], VERSION[2],
+-                     resp);
++                     st.v);
+         break;
+ 
+ #if !ENABLE_MINIMAL
+       case URxvt_cellinfo:
+         if (query)
+-          tt_printf ("\33]%d;%d;%d;%d%c", saveop,
++          tt_printf ("\33]%d;%d;%d;%d%s", saveop,
+                      fwidth, fheight, fbase,
+-                     resp);
++                     st.v);
+         break;
+ 
+       case URxvt_locale:
+         if (query)
+-          tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
++          tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
+         else
+           {
+             set_locale (str);
+@@ -3644,7 +3653,7 @@
+ 
+ #if ENABLE_PERL
+       case URxvt_perl:
+-        HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
++        HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
+         break;
+ #endif
+     }
+--- src/rxvt.h
++++ src/rxvt.h
+@@ -399,6 +399,12 @@
+   C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
+   C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
+ };
++
++struct string_term
++{
++  unsigned char v[3];
++};
++
+ #define CHAR_ST                 0x9c    /* 0234 */
+ 
+ /*
+@@ -1366,11 +1372,11 @@
+   void process_escape_seq ();
+   void process_csi_seq ();
+   void process_window_ops (const int *args, unsigned int nargs);
+-  char *get_to_st (unicode_t &ends_how);
++  char *get_to_st (string_term &st);
+   void process_dcs_seq ();
+   void process_osc_seq ();
+-  void process_color_seq (int report, int color, const char *str, char resp);
+-  void process_xterm_seq (int op, char *str, char resp);
++  void process_color_seq (int report, int color, const char *str, string_term &st);
++  void process_xterm_seq (int op, char *str, string_term &st);
+   unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a);
+   int privcases (int mode, unsigned long bit);
+   void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);