--- rxvt-unicode/src/command.C	2007/08/10 22:10:36	1.343
+++ rxvt-unicode/src/command.C	2007/08/15 06:48:16	1.346
@@ -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,
@@ -1490,7 +1489,7 @@
                 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
                 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
                   {
-                    bgPixmap.render_background ();
+                    bgPixmap.render ();
                     scr_touch (true);
                   }
 #endif
@@ -1500,7 +1499,7 @@
 
 #ifdef ENABLE_TRANSPARENCY
             if (option (Opt_transparent))
-              bgPixmap.render_background ();
+              bgPixmap.render ();
 #endif
           }
         break;
@@ -1579,11 +1578,6 @@
                 scrollBar.setIdle ();
                 scrollbar_show (0);
               }
-
-#ifdef ENABLE_TRANSPARENCY
-            if (am_transparent && ev.xany.window == parent[0])
-              XClearWindow (dpy, ev.xany.window);
-#endif
           }
         break;
 
@@ -1841,7 +1835,7 @@
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
             bgPixmap.set_root_pixmap ();
-            bgPixmap.render_background ();
+            bgPixmap.render ();
           }
         break;
     }
@@ -3442,11 +3436,7 @@
           else
             changed = bgPixmap.unset_tint ();
           if (changed)
-            {
-              bgPixmap.render_background ();
-              if (am_transparent)
-                want_full_refresh = want_refresh = 1;
-            }
+            bgPixmap.render ();
         }
 
         break;
@@ -3486,7 +3476,7 @@
               }
             if (changed)
               {
-                bgPixmap.render_background ();
+                bgPixmap.render ();
                 scr_touch (true);
               }
           }
@@ -3623,12 +3613,10 @@
   int state;
 
   static const struct
-    {
-      const int       argval;
-      const unsigned long bit;
-    }
-
-  argtopriv[] = {
+  {
+    const int       argval;
+    const unsigned long bit;
+  } argtopriv[] = {
                   { 1, PrivMode_aplCUR },
                   { 2, PrivMode_vt52 },
                   { 3, PrivMode_132 },