--- rxvt-unicode/src/command.C	2010/11/24 04:07:39	1.462
+++ rxvt-unicode/src/command.C	2011/01/23 12:28:47	1.472
@@ -891,7 +891,7 @@
             return;
           }
 
-        for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
+        for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
           if (i[0] == keysym)
             {
               iso14755buf = ISO_14755_51 | i[1];
@@ -980,7 +980,6 @@
   if (bgPixmap.flags & bgPixmap_t::hasChanged)
     {
       bgPixmap.flags &= ~bgPixmap_t::hasChanged;
-//      scr_clear (true); This needs to be researched further!
       scr_touch (false);
     }
 #endif
@@ -1467,7 +1466,7 @@
                   get_window_origin (x, y);
 
                 if (bgPixmap.set_position (x, y)
-                    || (bgPixmap.flags & bgPixmap_t::isInvalid))
+                    || !(bgPixmap.flags & bgPixmap_t::isValid))
                   moved = true;
               }
 #endif
@@ -1529,7 +1528,7 @@
          * We should render background PRIOR to drawing any text, but AFTER all
          * of ConfigureNotifys for the best results.
          */
-        if (bgPixmap.flags & bgPixmap_t::isInvalid)
+        if (!(bgPixmap.flags & bgPixmap_t::isValid))
           update_background_ev.start (0.025);
 #endif
         mapped = 1;
@@ -2697,7 +2696,7 @@
       case C1_NEL:		/* ESC E */
         {
           wchar_t nlcr[] = { C0_LF, C0_CR };
-          scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
+          scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
         }
         break;
 
@@ -2776,13 +2775,13 @@
   CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
 };
 
-#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0)			\
+#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7)			\
     (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4)	\
      | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
 #define get_byte_array_bit(array, bit)				\
-    (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
+    (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
 
-const unsigned char csi_defaults[] =
+static const unsigned char csi_defaults[] =
   {
     make_byte (1,1,1,1,1,1,1,1),	/* @, A, B, C, D, E, F, G, */
     make_byte (1,1,0,0,1,1,0,0),	/* H, I, J, K, L, M, N, O, */
@@ -2883,8 +2882,8 @@
                 static const int pm_h[] = { 7, 25 };
                 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
 
-                process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
-                process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
+                process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
+                process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
               }
           break;
         }
@@ -3457,8 +3456,6 @@
 
           if (ISSET_PIXCOLOR (Color_tint))
             changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
-          else
-            changed = bgPixmap.unset_tint ();
 
           if (changed)
             update_background ();
@@ -3703,7 +3700,7 @@
       state = -1;
 
       /* basic handling */
-      for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
+      for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
         if (argtopriv[j].argval == arg[i])
           {
             state = privcases (mode, argtopriv[j].bit);
@@ -4027,7 +4024,7 @@
 /* Write data to the pty as typed by the user, pasted with the mouse,
  * or generated by us in response to a query ESC sequence.
  */
-const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
+static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
 
 void
 rxvt_term::tt_write (const char *data, unsigned int len)
@@ -4049,7 +4046,7 @@
       len  -= written;
     }
 
-  v_buffer = (char *)realloc (v_buffer, v_buflen + len);
+  v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
 
   memcpy (v_buffer + v_buflen, data, len);
   v_buflen += len;