--- rxvt-unicode/src/command.C	2007/08/13 22:41:34	1.345
+++ rxvt-unicode/src/command.C	2007/09/09 10:35:00	1.352
@@ -97,7 +97,6 @@
 
   XK_Shift_Lock,	0x21eb,
   XK_ISO_Lock,		0x21eb,
-  XK_ISO_Lock,		0x21eb,
   XK_Caps_Lock,		0x21ec,
   XK_Num_Lock,		0x21ed,
   XK_ISO_Level3_Shift,	0x21ee,
@@ -550,6 +549,7 @@
       if (keysym >= 0xFF00 && keysym <= 0xFFFF)
         {
             {
+              bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
               newlen = 1;
               switch (keysym)
                 {
@@ -562,14 +562,14 @@
                         kbuf[1] = '\0';
                       }
                     else
-                      strcpy (kbuf, key_backspace);
+                      strcpy (kbuf, rs[Rs_backspace_key]);
                     break;
 #endif
 #ifndef NO_DELETE_KEY
-# ifdef XK_KP_Prior
+# ifdef XK_KP_Delete
                   case XK_KP_Delete:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033On");
                         break;
@@ -577,7 +577,7 @@
                     /* FALLTHROUGH */
 # endif
                   case XK_Delete:
-                    strcpy (kbuf, key_delete);
+                    strcpy (kbuf, rs[Rs_delete_key]);
                     break;
 #endif
                   case XK_Tab:
@@ -602,7 +602,7 @@
                   case XK_KP_Down:	/* \033Or or standard */
                   case XK_KP_Right:	/* \033Ov or standard */
                   case XK_KP_Left:	/* \033Ot or standard */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033OZ");
                         kbuf[2] = "txvr"[keysym - XK_KP_Left];
@@ -635,7 +635,7 @@
 # ifdef XK_KP_Prior
                   case XK_KP_Prior:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033Oy");
                         break;
@@ -648,7 +648,7 @@
 # ifdef XK_KP_Next
                   case XK_KP_Next:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033Os");
                         break;
@@ -661,7 +661,7 @@
 #endif
                   case XK_KP_Enter:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033OM");
                         break;
@@ -714,7 +714,7 @@
                   case XK_KP_8:		/* "\033Ox" : "8" */
                   case XK_KP_9:		/* "\033Oy" : "9" */
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033Oj");
                         kbuf[2] += (keysym - XK_KP_Multiply);
@@ -733,7 +733,7 @@
 #ifdef XK_KP_Insert
                   case XK_KP_Insert:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033Op");
                         break;
@@ -756,7 +756,7 @@
 #ifdef XK_KP_End
                   case XK_KP_End:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033Oq");
                         break;
@@ -769,7 +769,7 @@
 #ifdef XK_KP_Home
                   case XK_KP_Home:
                     /* allow shift to override */
-                    if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
+                    if (kp)
                       {
                         strcpy (kbuf, "\033Ow");
                         break;
@@ -1477,6 +1477,9 @@
         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))
@@ -1486,22 +1489,15 @@
               {
                 seen_resize = 1;
                 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
-#ifdef XPM_BACKGROUND
-                /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
-                if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
-                  {
-                    bgPixmap.render ();
-                    scr_touch (true);
-                  }
-#endif
               }
-
-            HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
-
+            else
+              {
 #ifdef ENABLE_TRANSPARENCY
-            if (option (Opt_transparent))
-              bgPixmap.render ();
+                if (option (Opt_transparent))
+                  update_background ();
 #endif
+              }
+            HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
           }
         break;
 
@@ -1836,7 +1832,7 @@
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
             bgPixmap.set_root_pixmap ();
-            bgPixmap.render ();
+            update_background ();
           }
         break;
     }
@@ -2802,9 +2798,8 @@
   unicode_t ch, priv, i;
   unsigned int nargs, p;
   int n, ndef;
-  int arg[ESC_ARGS];
+  int arg[ESC_ARGS] = { };
 
-  memset (arg, 0, sizeof (arg));
   nargs = 0;
 
   priv = 0;
@@ -3437,7 +3432,7 @@
           else
             changed = bgPixmap.unset_tint ();
           if (changed)
-            bgPixmap.render ();
+            update_background ();
         }
 
         break;
@@ -3476,10 +3471,7 @@
                 str = strchr (str, ';');
               }
             if (changed)
-              {
-                bgPixmap.render ();
-                scr_touch (true);
-              }
+                update_background ();
           }
         break;
 #endif