--- rxvt-unicode/src/command.C	2011/08/31 22:39:49	1.496
+++ rxvt-unicode/src/command.C	2011/11/24 11:28:51	1.500
@@ -778,14 +778,29 @@
           if (newlen)
             len = strlen (kbuf);
 
-          /*
-           * Pass meta for all function keys, if 'meta' option set
-           */
+          if (len > 0)
+            {
+              /*
+               * Pass meta for all function keys, if 'meta' option set
+               */
 #ifdef META8_OPTION
-          if (meta && (meta_char == 0x80) && len > 0)
-            kbuf[len - 1] |= 0x80;
+              if (meta && (meta_char == 0x80))
+                kbuf[len - 1] |= 0x80;
 #endif
 
+              /*
+               * pass Shift/Control indicators for function keys ending with `~'
+               *
+               * eg,
+               *   Prior = "ESC[5~"
+               *   Shift+Prior = "ESC[5$"
+               *   Ctrl+Prior = "ESC[5^"
+               *   Ctrl+Shift+Prior = "ESC[5@"
+               */
+              if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
+                kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
+            }
+
         }
       else if (ctrl && keysym == XK_minus)
         {
@@ -828,20 +843,6 @@
         want_refresh = 1;
       }
 
-  /*
-   * these modifications only affect the static keybuffer
-   * pass Shift/Control indicators for function keys ending with `~'
-   *
-   * eg,
-   *   Prior = "ESC[5~"
-   *   Shift+Prior = "ESC[5$"
-   *   Ctrl+Prior = "ESC[5^"
-   *   Ctrl+Shift+Prior = "ESC[5@"
-   * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
-   */
-  if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
-    kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
-
   /* escape prefix */
   if (meta
 #ifdef META8_OPTION
@@ -1044,8 +1045,8 @@
 void
 rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
 {
-  if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
-      && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
+  if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
+      && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
     {
       want_refresh = 1;
       refresh_check ();
@@ -1559,7 +1560,7 @@
 
             if (scrollBar.state && ev.xany.window == scrollBar.win)
               {
-                scrollBar.state = STATE_IDLE;
+                scrollBar.state = SB_STATE_IDLE;
                 scrollBar.show (0);
               }
           }
@@ -1657,7 +1658,7 @@
 #endif
               }
           }
-        else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
+        else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
           {
             while (XCheckTypedWindowEvent (dpy, scrollBar.win,
                                            MotionNotify, &ev))
@@ -1718,6 +1719,7 @@
       h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
       XSetWMHints (dpy, parent, h);
       urgency_hint = enable;
+      XFree (h);
     }
 }
 #endif
@@ -1974,7 +1976,7 @@
       else if (scrollBar.dnButton (ev.y))
         direction = DN;  /* down */
 
-      scrollBar.state = STATE_IDLE;
+      scrollBar.state = SB_STATE_IDLE;
       /*
        * Rxvt-style scrollbar:
        * move up if mouse is above slider
@@ -2023,9 +2025,9 @@
               if (scr_page (direction, 1))
                 {
                   if (direction == UP)
-                    scrollBar.state = STATE_UP;
+                    scrollBar.state = SB_STATE_UP;
                   else
-                    scrollBar.state = STATE_DOWN;
+                    scrollBar.state = SB_STATE_DOWN;
                 }
             }
           else
@@ -2034,32 +2036,32 @@
                 case Button2:
                   switch (scrollBar.align)
                     {
-                      case R_SB_ALIGN_TOP:
+                      case SB_ALIGN_TOP:
                         csrO = 0;
                         break;
-                      case R_SB_ALIGN_CENTRE:
+                      case SB_ALIGN_CENTRE:
                         csrO = (scrollBar.bot - scrollBar.top) / 2;
                         break;
-                      case R_SB_ALIGN_BOTTOM:
+                      case SB_ALIGN_BOTTOM:
                         csrO = scrollBar.bot - scrollBar.top;
                         break;
                     }
 
-                  if (scrollBar.style == R_SB_XTERM
+                  if (scrollBar.style == SB_STYLE_XTERM
                       || scrollBar.above_slider (ev.y)
                       || scrollBar.below_slider (ev.y))
                     scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
 
-                  scrollBar.state = STATE_MOTION;
+                  scrollBar.state = SB_STATE_MOTION;
                   break;
 
                 case Button1:
-                  if (scrollBar.align == R_SB_ALIGN_CENTRE)
+                  if (scrollBar.align == SB_ALIGN_CENTRE)
                     csrO = ev.y - scrollBar.top;
                   /* FALLTHROUGH */
 
                 case Button3:
-                  if (scrollBar.style != R_SB_XTERM)
+                  if (scrollBar.style != SB_STYLE_XTERM)
                     {
                       if (scrollBar.above_slider (ev.y))
 # ifdef RXVT_SCROLL_FULL
@@ -2074,7 +2076,7 @@
                         scr_page (DN, nrow / 4);
 # endif
                       else
-                        scrollBar.state = STATE_MOTION;
+                        scrollBar.state = SB_STATE_MOTION;
                     }
                   else
                     {
@@ -2101,9 +2103,9 @@
   if (!bypass_keystate)
     reportmode = !! (priv_modes & PrivMode_mouse_report);
 
-  if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
+  if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
     {
-      scrollBar.state = STATE_IDLE;
+      scrollBar.state = SB_STATE_IDLE;
       scrollBar.show (0);
     }
 
@@ -2887,11 +2889,11 @@
 #endif
 
       case CSI_CUU:		/* 8.3.22: (1) CURSOR UP */
-      case CSI_VPR:		/* 8.3.161: (1) LINE POSITION FORWARD */
+      case CSI_VPB:		/* 8.3.160: (1) LINE POSITION BACKWARD */
         arg[0] = -arg[0];
         /* FALLTHROUGH */
       case CSI_CUD:		/* 8.3.19: (1) CURSOR DOWN */
-      case CSI_VPB:		/* 8.3.160: (1) LINE POSITION BACKWARD */
+      case CSI_VPR:		/* 8.3.161: (1) LINE POSITION FORWARD */
         scr_gotorc (arg[0], 0, RELATIVE);
         break;