--- rxvt-unicode/src/command.C	2010/08/21 16:07:15	1.454
+++ rxvt-unicode/src/command.C	2010/10/22 18:03:10	1.457
@@ -773,19 +773,7 @@
                 {
                   int param = map_function_key (keysym);
                   if (param > 0)
-                    {
-                      int n = sprintf (kbuf,"\033[%d~", param);
-                      /*
-                       * 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@"
-                       */
-                      kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
-                    }
+                    sprintf (kbuf,"\033[%d~", param);
                   else
                     newlen = 0;
                 }
@@ -846,8 +834,18 @@
       }
 
   /*
+   * 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
@@ -979,8 +977,9 @@
   flush_ev.stop ();
 
 #ifdef HAVE_BG_PIXMAP
-  if (bgPixmap.check_clearChanged ())
+  if (bgPixmap.flags & bgPixmap_t::hasChanged)
     {
+      bgPixmap.flags &= ~bgPixmap_t::hasChanged;
 //      scr_clear (true); This needs to be researched further!
       scr_touch (false);
     }
@@ -1434,9 +1433,6 @@
         break;
 
       case ConfigureNotify:
-        /*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);*/
         if (ev.xconfigure.window == parent[0])
           {
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))