--- rxvt-unicode/src/command.C	2016/07/05 16:42:21	1.581
+++ rxvt-unicode/src/command.C	2019/07/07 08:02:15	1.584
@@ -1484,16 +1484,6 @@
 
             bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
 
-            bool moved = false;
-#ifdef HAVE_BG_PIXMAP
-            if (bg_window_position_sensitive ())
-              {
-                want_position_change = true;
-                if (bg_img == 0)
-                  moved = true;
-              }
-#endif
-
             if (want_position_change)
               {
                 int x, y;
@@ -1511,7 +1501,6 @@
                     parent_x = x;
                     parent_y = y;
                     HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
-                    moved = true;
                   }
               }
 
@@ -1520,13 +1509,6 @@
                 seen_resize = 1;
                 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
               }
-            else
-              {
-#ifdef HAVE_BG_PIXMAP
-                if (moved)
-                  update_background ();
-#endif
-              }
 
             HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
           }
@@ -1545,17 +1527,6 @@
         break;
 
       case MapNotify:
-#ifdef HAVE_BG_PIXMAP
-        // This is needed at startup for the case of no window manager
-        // or a non-reparenting window manager and also because we
-        // defer bg image updates if the window is not mapped. The
-        // short delay is to optimize for multiple ConfigureNotify
-        // events at startup when the window manager reparents the
-        // window, so as to perform the computation after we have
-        // received all of them.
-        if (bg_img == 0)
-          update_background_ev.start (0.025);
-#endif
         mapped = 1;
 #ifdef TEXT_BLINK
         text_blink_ev.start ();
@@ -1860,7 +1831,7 @@
 #endif
 }
 
-#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
+#if ENABLE_PERL
 void ecb_hot
 rxvt_term::rootwin_cb (XEvent &ev)
 {
@@ -1880,13 +1851,6 @@
         if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
-#if BG_IMAGE_FROM_ROOT
-            if (option (Opt_transparent))
-              {
-                rxvt_img::new_from_root (this)->replace (root_img);
-                update_background ();
-              }
-#endif
             HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
           }
 
@@ -2392,8 +2356,8 @@
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
-      // assume 7-bit to be ascii ALWAYS
-      if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
+      // assume 7-bit to be ascii ALWAYS (always true in POSIX)
+      if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
         return *cmdbuf_ptr++;
 
       wchar_t wc;
@@ -2731,7 +2695,7 @@
         /* kidnapped escape sequence: Should be 8.3.48 */
       case C1_ESA:		/* ESC G */
         // used by original rxvt for rob nations own graphics mode
-        if (cmd_getc () == 'Q')
+        if (cmd_getc () == 'Q' && option (Opt_insecure))
           tt_printf ("\033G0\012");	/* query graphics - no graphics */
         break;
 
@@ -2950,7 +2914,7 @@
         break;
 
       case CSI_CUB:		/* 8.3.18: (1) CURSOR LEFT */
-      case CSI_HPB: 		/* 8.3.59: (1) CHARACTER POSITION BACKWARD */
+      case CSI_HPB:		/* 8.3.59: (1) CHARACTER POSITION BACKWARD */
 #ifdef ISO6429
         arg[0] = -arg[0];
 #else				/* emulate common DEC VTs */
@@ -3571,74 +3535,6 @@
         process_color_seq (op, Color_border, str, resp);
         break;
 
-#if BG_IMAGE_FROM_ROOT
-      case URxvt_Color_tint:
-        process_color_seq (op, Color_tint, str, resp);
-        {
-          bool changed = false;
-
-          if (ISSET_PIXCOLOR (Color_tint))
-            changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
-
-          if (changed)
-            update_background ();
-        }
-
-        break;
-#endif
-
-#if BG_IMAGE_FROM_FILE
-      case Rxvt_Pixmap:
-        if (!strcmp (str, "?"))
-          {
-            char str[256];
-            int h_scale = fimage.h_scale;
-            int v_scale = fimage.v_scale;
-            int h_align = fimage.h_align;
-            int v_align = fimage.v_align;
-
-            sprintf (str, "[%dx%d+%d+%d]",
-                     h_scale, v_scale,
-                     h_align, v_align);
-            process_xterm_seq (XTerm_title, str, CHAR_ST);
-          }
-        else
-          {
-            bool changed = false;
-
-            if (*str != ';')
-              {
-                try
-                  {
-                    fimage.set_file_geometry (this, str);
-                    changed = true;
-                  }
-                catch (const class rxvt_failure_exception &e)
-                  {
-                  }
-              }
-            else
-              {
-                str++;
-                if (fimage.set_geometry (str, true))
-                  changed = true;
-              }
-
-            if (changed)
-              {
-                if (bg_window_position_sensitive ())
-                  {
-                    int x, y;
-                    get_window_origin (x, y);
-                    parent_x = x;
-                    parent_y = y;
-                  }
-                update_background ();
-              }
-          }
-        break;
-#endif
-
       case XTerm_logfile:
         // TODO, when secure mode?
         break;