--- rxvt-unicode/src/command.C	2010/04/02 19:27:38	1.446
+++ rxvt-unicode/src/command.C	2010/11/18 17:28:12	1.458
@@ -977,8 +977,9 @@
   flush_ev.stop ();
 
 #ifdef HAVE_BG_PIXMAP
-  if (bgPixmap.check_clearChanged ())
+  if (bgPixmap.flags & bgPixmap_t::hasChanged)
     {
+      bgPixmap.flags &= ~bgPixmap_t::hasChanged;
 //      scr_clear (true); This needs to be researched further!
       scr_touch (false);
     }
@@ -1432,9 +1433,6 @@
         break;
 
       case ConfigureNotify:
-        /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
-              ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
-              szHint.width, szHint.height);*/
         if (ev.xconfigure.window == parent[0])
           {
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
@@ -1485,12 +1483,12 @@
 
       case MapNotify:
 #ifdef HAVE_BG_PIXMAP
-        /* This is needed spcifically to fix the case of no window manager or a
+        /* This is needed specifically to fix the case of no window manager or a
          * non-reparenting window manager. In those cases we never get first
          * ConfigureNotify. Also that speeds startup under normal WM, by taking
-         * care of multiplicity of ConfigureNotify events arriwing while WM does
+         * care of multiplicity of ConfigureNotify events arriving while WM does
          * reparenting.
-         * We should not render background immidiately, as there could be several
+         * We should not render background immediately, as there could be several
          * ConfigureNotify's to follow. Lets take care of all of them in one scoop
          * by scheduling background redraw as soon as we can, but giving a short
          * bit of time for ConfigureNotifies to arrive.
@@ -1871,7 +1869,7 @@
 #ifdef MOUSE_REPORT_DOUBLECLICK
           if (ev.button == MEvent.button && clickintime)
             {
-              /* same button, within alloted time */
+              /* same button, within allowed time */
               MEvent.clicks++;
 
               if (MEvent.clicks > 1)
@@ -2152,7 +2150,7 @@
 
           case Button2:
             if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
-	      selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
+              selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
             break;
 
 #ifdef MOUSE_WHEEL
@@ -3233,13 +3231,12 @@
 void
 rxvt_term::process_dcs_seq ()
 {
-  char *s;
-  unicode_t eh;
-
   /*
    * Not handled yet
    */
-  s = get_to_st (eh);
+
+  unicode_t eh;
+  char *s = get_to_st (eh);
   if (s)
     free (s);
 
@@ -3253,15 +3250,15 @@
 void
 rxvt_term::process_osc_seq ()
 {
-  unicode_t ch, eh;
   int arg;
 
-  ch = cmd_getc ();
+  unicode_t ch = cmd_getc ();
   for (arg = 0; isdigit (ch); ch = cmd_getc ())
     arg = arg * 10 + (ch - '0');
 
   if (ch == ';')
     {
+      unicode_t eh;
       char *s = get_to_st (eh);
 
       if (s)
@@ -3396,15 +3393,18 @@
       case XTerm_Color_pointer_bg:
         process_color_seq (op, Color_pointer_bg, str, resp);
         break;
-#ifndef NO_BOLD_UNDERLINE_REVERSE
-      case XTerm_Color_RV:
-        process_color_seq (op, Color_RV, str, resp);
+#ifdef OPTION_HC
+      case XTerm_Color_HC:
+        process_color_seq (op, Color_HC, str, resp);
+        break;
+      case XTerm_Color_HTC:
+        process_color_seq (op, Color_HTC, str, resp);
         break;
-      case Rxvt_Color_BD:
+#endif
+#ifndef NO_BOLD_UNDERLINE_REVERSE
       case URxvt_Color_BD:
         process_color_seq (op, Color_BD, str, resp);
         break;
-      case Rxvt_Color_UL:
       case URxvt_Color_UL:
         process_color_seq (op, Color_UL, str, resp);
         break;
@@ -3450,21 +3450,19 @@
 
             if (*str != ';')
               {
-                /* reset to default scaling :*/
-                bgPixmap.unset_geometry ();
                 if (bgPixmap.set_file (str))	/* change pixmap */
                   changed++;
                 str = strchr (str, ';');
                 if (str == NULL)
                   bgPixmap.set_defaultGeometry ();
+                else
+                  bgPixmap.set_geometry (str+1);
               }
-
-            while (str)
+            else
               {
                 str++;
-                if (bgPixmap.set_geometry (str))
+                if (bgPixmap.set_geometry (str, true))
                   changed++;
-                str = strchr (str, ';');
               }
 
             if (changed)
@@ -3581,6 +3579,7 @@
         state = (SavedModes & bit) ? 1 : 0;	/* no overlapping */
       else
         state = (mode == 't') ? ! (priv_modes & bit) : mode;
+
       set_privmode (bit, state);
     }
 
@@ -3609,7 +3608,7 @@
                  // 8, auto-repeat keys         // DECARM
                   { 9, PrivMode_MouseX10 },
                  // 18 end FF to printer after print screen
-                 // 19 Print screen prints full screen/scorll region
+                 // 19 Print screen prints full screen/scroll region
                   { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
 #ifdef scrollBar_esc
                   { scrollBar_esc, PrivMode_scrollBar },