--- rxvt-unicode/src/command.C	2011/08/19 17:42:09	1.491
+++ rxvt-unicode/src/command.C	2011/08/31 22:39:49	1.496
@@ -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 ()));
                     }
 
@@ -2597,7 +2592,7 @@
         tt_printf ("\033/Z");	/* I am a VT100 emulating a VT52 */
         break;
       case '<':		/* turn off VT52 mode */
-        set_privmode (PrivMode_vt52, 0);
+        priv_modes &= ~PrivMode_vt52;
         break;
       case 'F':     	/* use special graphics character set */
       case 'G':           /* use regular character set */
@@ -2660,8 +2655,10 @@
 #endif
       // DECPAM/DECPNM
       case '=':
+        priv_modes |= PrivMode_aplKP;
+        break;
       case '>':
-        set_privmode (PrivMode_aplKP, ch == '=');
+        priv_modes &= ~PrivMode_aplKP;
         break;
 
       case C1_40:
@@ -3455,20 +3452,18 @@
           }
         else
           {
-            int changed = 0;
+            bool changed = false;
 
             if (*str != ';')
               {
                 if (bg_set_file (str))	/* change pixmap */
-                  {
-                    changed++;
-                  }
+                  changed = true;
               }
             else
               {
                 str++;
                 if (bg_set_geometry (str, true))
-                  changed++;
+                  changed = true;
               }
 
             if (changed)
@@ -3594,7 +3589,10 @@
       else
         state = (mode == 't') ? ! (priv_modes & bit) : mode;
 
-      set_privmode (bit, state);
+      if (state)
+        priv_modes |= bit;
+      else
+        priv_modes &= ~bit;
     }
 
   return state;
@@ -3709,7 +3707,7 @@
                * parameter.  Return from VT52 mode with an ESC < from
                * within VT52 mode
                */
-              set_privmode (PrivMode_vt52, 1);
+              priv_modes |= PrivMode_vt52;
               break;
             case 3:			/* 80/132 */
               if (priv_modes & PrivMode_132OK)
@@ -3734,11 +3732,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 */