--- rxvt-unicode/src/command.C	2011/07/09 13:40:13	1.489
+++ rxvt-unicode/src/command.C	2011/08/28 18:48:41	1.495
@@ -1475,12 +1475,7 @@
               {
 #ifdef HAVE_BG_PIXMAP
                 if (moved)
-                  {
-                    if (mapped)
-                      update_background ();
-                    else
-                      bg_invalidate ();
-                  }
+                  update_background ();
 #endif
               }
 
@@ -1673,7 +1668,7 @@
                           &unused_root_x, &unused_root_y,
                           &ev.xbutton.x, &ev.xbutton.y,
                           &unused_mask);
-            scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
+            scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
                          scrollBar.size ());
             want_refresh = 1;
             scrollBar.show (1);
@@ -2051,9 +2046,9 @@
                     }
 
                   if (scrollBar.style == R_SB_XTERM
-                      || scrollbar_above_slider (ev.y)
-                      || scrollbar_below_slider (ev.y))
-                    scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
+                      || scrollBar.above_slider (ev.y)
+                      || scrollBar.below_slider (ev.y))
+                    scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
 
                   scrollBar.state = STATE_MOTION;
                   break;
@@ -2066,13 +2061,13 @@
                 case Button3:
                   if (scrollBar.style != R_SB_XTERM)
                     {
-                      if (scrollbar_above_slider (ev.y))
+                      if (scrollBar.above_slider (ev.y))
 # ifdef RXVT_SCROLL_FULL
                         scr_page (UP, nrow - 1);
 # else
                         scr_page (UP, nrow / 4);
 # endif
-                      else if (scrollbar_below_slider (ev.y))
+                      else if (scrollBar.below_slider (ev.y))
 # ifdef RXVT_SCROLL_FULL
                         scr_page (DN, nrow - 1);
 # else
@@ -2085,7 +2080,7 @@
                     {
                       scr_page ((ev.button == Button1 ? DN : UP),
                                 (nrow
-                                 * scrollbar_position (ev.y)
+                                 * scrollBar.position (ev.y)
                                  / scrollBar.size ()));
                     }
 
@@ -2658,6 +2653,7 @@
         scr_forwardindex ();
         break;
 #endif
+      // DECPAM/DECPNM
       case '=':
       case '>':
         set_privmode (PrivMode_aplKP, ch == '=');
@@ -3454,25 +3450,18 @@
           }
         else
           {
-            int changed = 0;
+            bool changed = false;
 
             if (*str != ';')
               {
                 if (bg_set_file (str))	/* change pixmap */
-                  {
-                    changed++;
-                    str = strchr (str, ';');
-                    if (str == NULL)
-                      bg_set_default_geometry ();
-                    else
-                      bg_set_geometry (str+1);
-                  }
+                  changed = true;
               }
             else
               {
                 str++;
                 if (bg_set_geometry (str, true))
-                  changed++;
+                  changed = true;
               }
 
             if (changed)
@@ -3617,7 +3606,7 @@
     const unsigned long bit;
   } argtopriv[] = {
                   { 1, PrivMode_aplCUR },       // DECCKM
-                  { 2, PrivMode_vt52 },
+                  { 2, PrivMode_vt52 },         // DECANM
                   { 3, PrivMode_132 },          // DECCOLM
                   { 4, PrivMode_smoothScroll }, // DECSCLM
                   { 5, PrivMode_rVideo },       // DECSCNM
@@ -3627,7 +3616,7 @@
                   { 9, PrivMode_MouseX10 },
                  // 18 end FF to printer after print screen
                  // 19 Print screen prints full screen/scroll region
-                  { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
+                  { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
 #ifdef scrollBar_esc
                   { scrollBar_esc, PrivMode_scrollBar },
 #endif
@@ -3638,7 +3627,7 @@
                  // 45 margin bell NYI
                  // 46 start logging
                   { 47, PrivMode_Screen },
-                  { 66, PrivMode_aplKP },       // DECPAM/DECPNM
+                  { 66, PrivMode_aplKP },       // DECNKM
 #ifndef NO_BACKSPACE_KEY
                   { 67, PrivMode_BackSpace },   // DECBKM
 #endif
@@ -3738,11 +3727,9 @@
               break;
 #ifdef scrollBar_esc
             case scrollBar_esc:
-              if (scrollBar.map (state))
-                {
-                  resize_all_windows (0, 0, 0);
-                  scr_touch (true);
-                }
+              scrollBar.map (state);
+              resize_all_windows (0, 0, 0);
+              scr_touch (true);
               break;
 #endif
             case 25:		/* visible/invisible cursor */