--- rxvt-unicode/src/command.C	2007/12/14 06:04:56	1.382
+++ rxvt-unicode/src/command.C	2007/12/30 23:45:42	1.387
@@ -200,7 +200,7 @@
 
   int width = wcswidth (fname, wcslen (fname));
 
-  max_it (width, 8+5); // for char + hey
+  max_it (width, 8+5); // for char + hex
   max_it (width, strlen (attr));
 
   if (y >= 0)
@@ -222,7 +222,7 @@
       sprintf (buf, "%8x", ch);
       scr_overlay_set (0, y, buf);
       scr_overlay_set (9, y, '=');
-# if !UNICODE3
+# if !UNICODE_3
       if (ch >= 0x10000)
         ch = 0xfffd;
 # endif
@@ -1213,6 +1213,8 @@
 
   if (revents & ev::WRITE)
     pty_write ();
+
+  refresh_check ();
 }
 
 void
@@ -1457,6 +1459,7 @@
                   update_background ();
 #endif
               }
+
             HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
           }
         break;
@@ -1794,6 +1797,7 @@
             bgPixmap.set_root_pixmap ();
             update_background ();
           }
+
         break;
     }
 # endif
@@ -2005,7 +2009,7 @@
             switch (ev.button)
               {
                 case Button2:
-                  switch (scrollbar_align)
+                  switch (scrollBar.align)
                     {
                       case R_SB_ALIGN_TOP:
                         csrO = 0;
@@ -2027,7 +2031,7 @@
                   break;
 
                 case Button1:
-                  if (scrollbar_align == R_SB_ALIGN_CENTRE)
+                  if (scrollBar.align == R_SB_ALIGN_CENTRE)
                     csrO = ev.y - scrollBar.top;
                   /* FALLTHROUGH */
 
@@ -2313,8 +2317,6 @@
         }
     }
 
-  refresh_check ();
-
   return flag;
 }
 
@@ -3391,10 +3393,12 @@
         process_color_seq (op, Color_tint, str, resp);
         {
           bool changed = false;
+
           if (ISSET_PIXCOLOR (Color_tint))
             changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
           else
             changed = bgPixmap.unset_tint ();
+
           if (changed)
             update_background ();
         }
@@ -3427,6 +3431,7 @@
                 if (str == NULL)
                   bgPixmap.set_defaultGeometry ();
               }
+
             while (str)
               {
                 str++;
@@ -3434,8 +3439,9 @@
                   changed++;
                 str = strchr (str, ';');
               }
+
             if (changed)
-                update_background ();
+              update_background ();
           }
         break;
 #endif