--- rxvt-unicode/src/command.C 2007/08/15 22:41:52 1.347 +++ rxvt-unicode/src/command.C 2007/09/09 10:14:40 1.351 @@ -561,11 +561,11 @@ 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) @@ -576,7 +576,7 @@ /* FALLTHROUGH */ # endif case XK_Delete: - strcpy (kbuf, key_delete); + strcpy (kbuf, rs[Rs_delete_key]); break; #endif case XK_Tab: @@ -1476,6 +1476,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)) @@ -1490,8 +1493,7 @@ { #ifdef ENABLE_TRANSPARENCY if (option (Opt_transparent)) - if (bgPixmap.render ()) - scr_touch (false); + update_background (); #endif } HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); @@ -1829,7 +1831,7 @@ || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) { bgPixmap.set_root_pixmap (); - bgPixmap.render (); + update_background (); } break; } @@ -2795,9 +2797,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; @@ -3430,7 +3431,7 @@ else changed = bgPixmap.unset_tint (); if (changed) - bgPixmap.render (); + update_background (); } break; @@ -3469,10 +3470,7 @@ str = strchr (str, ';'); } if (changed) - { - bgPixmap.render (); - scr_touch (true); - } + update_background (); } break; #endif