--- rxvt-unicode/src/command.C	2008/01/20 13:45:21	1.395
+++ rxvt-unicode/src/command.C	2008/02/14 23:53:05	1.406
@@ -304,7 +304,6 @@
 rxvt_term::key_press (XKeyEvent &ev)
 {
   int ctrl, meta, shft, len;
-  unsigned int newlen;
   KeySym keysym;
   int valid_keysym;
   char kbuf[KBUFSZ];
@@ -549,9 +548,8 @@
 
       if (keysym >= 0xFF00 && keysym <= 0xFFFF)
         {
-            {
               bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
-              newlen = 1;
+              unsigned int newlen = 1;
 #ifdef XK_KP_Home
               static const KeySym keypadtrans[] = {
                 XK_KP_7, // XK_KP_Home
@@ -791,7 +789,6 @@
 
               if (newlen)
                 len = strlen (kbuf);
-            }
 
           /*
            * Pass meta for all function keys, if 'meta' option set
@@ -1092,8 +1089,8 @@
 void
 rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
 {
-  if ((scrollbar_isUp () || scrollbar_isDn ())
-      && scr_page (scrollbar_isUp () ? UP : DN, 1))
+  if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
+      && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
     {
       want_refresh = 1;
       refresh_check ();
@@ -1440,9 +1437,9 @@
         break;
 
       case ConfigureNotify:
-       /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
+        /*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); */
+              szHint.width, szHint.height);*/
         if (ev.xconfigure.window == parent[0])
           {
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
@@ -1555,7 +1552,7 @@
 
             if (scrollBar.state && ev.xany.window == scrollBar.win)
               {
-                scrollBar.setIdle ();
+                scrollBar.state = STATE_IDLE;
                 scrollbar_show (0);
               }
           }
@@ -1653,7 +1650,7 @@
 #endif
               }
           }
-        else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
+        else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
           {
             while (XCheckTypedWindowEvent (dpy, scrollBar.win,
                                            MotionNotify, &ev))
@@ -1949,7 +1946,14 @@
    */
   if (scrollBar.state && ev.window == scrollBar.win)
     {
-      scrollBar.setIdle ();
+      page_dirn direction = NO_DIR;
+
+      if (scrollBar.upButton (ev.y))
+        direction = UP; /* up */
+      else if (scrollBar.dnButton (ev.y))
+        direction = DN;  /* down */
+
+      scrollBar.state = STATE_IDLE;
       /*
        * Rxvt-style scrollbar:
        * move up if mouse is above slider
@@ -1968,15 +1972,9 @@
            * arrow buttons - send up/down
            * click on scrollbar - send pageup/down
            */
-          if ((scrollBar.style == R_SB_NEXT
-               && scrollbarnext_upButton (ev.y))
-              || (scrollBar.style == R_SB_RXVT
-                  && scrollbarrxvt_upButton (ev.y)))
+          if (direction == UP)
             tt_printf ("\033[A");
-          else if ((scrollBar.style == R_SB_NEXT
-                    && scrollbarnext_dnButton (ev.y))
-                   || (scrollBar.style == R_SB_RXVT
-                       && scrollbarrxvt_dnButton (ev.y)))
+          else if (direction == DN)
             tt_printf ("\033[B");
           else
             switch (ev.button)
@@ -1994,37 +1992,19 @@
         }
       else
 #endif /* NO_SCROLLBAR_REPORT */
-
         {
-          char upordown = 0;
-
-          if (scrollBar.style == R_SB_NEXT)
-            {
-              if (scrollbarnext_upButton (ev.y))
-                upordown = -1;	/* up */
-              else if (scrollbarnext_dnButton (ev.y))
-                upordown = 1;	/* down */
-            }
-          else if (scrollBar.style == R_SB_RXVT)
-            {
-              if (scrollbarrxvt_upButton (ev.y))
-                upordown = -1;	/* up */
-              else if (scrollbarrxvt_dnButton (ev.y))
-                upordown = 1;	/* down */
-            }
-
-          if (upordown)
+          if (direction != NO_DIR)
             {
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
               if (!cont_scroll_ev.is_active ())
                 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
 #endif
-              if (scr_page (upordown < 0 ? UP : DN, 1))
+              if (scr_page (direction, 1))
                 {
-                  if (upordown < 0)
-                    scrollBar.setUp ();
+                  if (direction == UP)
+                    scrollBar.state = STATE_UP;
                   else
-                    scrollBar.setDn ();
+                    scrollBar.state = STATE_DOWN;
                 }
             }
           else
@@ -2049,7 +2029,7 @@
                       || scrollbar_below_slider (ev.y))
                     scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
 
-                  scrollBar.setMotion ();
+                  scrollBar.state = STATE_MOTION;
                   break;
 
                 case Button1:
@@ -2073,7 +2053,7 @@
                         scr_page (DN, nrow / 4);
 # endif
                       else
-                        scrollBar.setMotion ();
+                        scrollBar.state = STATE_MOTION;
                     }
                   else
                     {
@@ -2100,9 +2080,9 @@
   if (!bypass_keystate)
     reportmode = !! (priv_modes & PrivMode_mouse_report);
 
-  if (scrollbar_isUpDn ())
+  if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
     {
-      scrollBar.setIdle ();
+      scrollBar.state = STATE_IDLE;
       scrollbar_show (0);
     }
 
@@ -3632,6 +3612,7 @@
                  // 1048 save and restore cursor
                   { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
                  // 1051, 1052, 1060, 1061 keyboard emulation NYI
+                  { 2004, PrivMode_BracketPaste },
                 };
 
   if (nargs == 0)