--- rxvt-unicode/src/command.C	2010/12/14 08:01:51	1.464
+++ rxvt-unicode/src/command.C	2011/02/01 00:41:01	1.475
@@ -977,10 +977,9 @@
   flush_ev.stop ();
 
 #ifdef HAVE_BG_PIXMAP
-  if (bgPixmap.flags & bgPixmap_t::hasChanged)
+  if (bg_flags & BG_NEEDS_REFRESH)
     {
-      bgPixmap.flags &= ~bgPixmap_t::hasChanged;
-//      scr_clear (true); This needs to be researched further!
+      bg_flags &= ~BG_NEEDS_REFRESH;
       scr_touch (false);
     }
 #endif
@@ -1455,7 +1454,7 @@
 
 #ifdef HAVE_BG_PIXMAP
             bool moved = false;
-            if (bgPixmap.window_position_sensitive ())
+            if (bg_window_position_sensitive ())
               {
                 int x, y;
                 if (ev.xconfigure.send_event)
@@ -1466,8 +1465,8 @@
                 else
                   get_window_origin (x, y);
 
-                if (bgPixmap.set_position (x, y)
-                    || (bgPixmap.flags & bgPixmap_t::isInvalid))
+                if (bg_set_position (x, y)
+                    || !(bg_flags & BG_IS_VALID))
                   moved = true;
               }
 #endif
@@ -1485,7 +1484,7 @@
                     if (mapped)
                       update_background ();
                     else
-                      bgPixmap.invalidate ();
+                      bg_invalidate ();
                   }
 #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 (!(bg_flags & BG_IS_VALID))
           update_background_ev.start (0.025);
 #endif
         mapped = 1;
@@ -1554,7 +1553,7 @@
             do
               {
                 scr_expose (ev.xexpose.x, ev.xexpose.y,
-                            ev.xexpose.width, ev.xexpose.height, False);
+                            ev.xexpose.width, ev.xexpose.height, false);
               }
             while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
 
@@ -1563,7 +1562,7 @@
             while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
               {
                 scr_expose (ev.xexpose.x, ev.xexpose.y,
-                            ev.xexpose.width, ev.xexpose.height, False);
+                            ev.xexpose.width, ev.xexpose.height, false);
               }
 
             want_refresh = 1;
@@ -1854,7 +1853,7 @@
         if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
-            bgPixmap.set_root_pixmap ();
+            bg_set_root_pixmap ();
             update_background ();
           }
 
@@ -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,11 +2775,11 @@
   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))))
 
 static const unsigned char csi_defaults[] =
   {
@@ -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;
         }
@@ -3456,9 +3455,7 @@
           bool changed = false;
 
           if (ISSET_PIXCOLOR (Color_tint))
-            changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
-          else
-            changed = bgPixmap.unset_tint ();
+            changed = bg_set_tint (pix_colors_focused [Color_tint]);
 
           if (changed)
             update_background ();
@@ -3474,8 +3471,8 @@
             char str[256];
 
             sprintf (str, "[%dx%d+%d+%d]",
-                     min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
-                     min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
+                     min (h_scale, 32767), min (v_scale, 32767),
+                     min (h_align, 32767), min (v_align, 32767));
             process_xterm_seq (XTerm_title, str, CHAR_ST);
           }
         else
@@ -3484,30 +3481,30 @@
 
             if (*str != ';')
               {
-                if (bgPixmap.set_file (str))	/* change pixmap */
+                if (bg_set_file (str))	/* change pixmap */
                   {
                     changed++;
                     str = strchr (str, ';');
                     if (str == NULL)
-                      bgPixmap.set_defaultGeometry ();
+                      bg_set_default_geometry ();
                     else
-                      bgPixmap.set_geometry (str+1);
+                      bg_set_geometry (str+1);
                   }
               }
             else
               {
                 str++;
-                if (bgPixmap.set_geometry (str, true))
+                if (bg_set_geometry (str, true))
                   changed++;
               }
 
             if (changed)
               {
-                if (bgPixmap.window_position_sensitive ())
+                if (bg_window_position_sensitive ())
                   {
                     int x, y;
                     get_window_origin (x, y);
-                    bgPixmap.set_position (x, y);
+                    bg_set_position (x, y);
                   }
                 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);
@@ -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;