--- rxvt-unicode/src/command.C	2011/08/21 20:17:40	1.493
+++ rxvt-unicode/src/command.C	2011/08/28 18:48:41	1.495
@@ -1668,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);
@@ -2046,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;
@@ -2061,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
@@ -2080,7 +2080,7 @@
                     {
                       scr_page ((ev.button == Button1 ? DN : UP),
                                 (nrow
-                                 * scrollbar_position (ev.y)
+                                 * scrollBar.position (ev.y)
                                  / scrollBar.size ()));
                     }
 
@@ -3727,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 */