--- rxvt-unicode/src/rxvtfont.C	2007/12/26 14:22:30	1.126
+++ rxvt-unicode/src/rxvtfont.C	2008/01/23 06:49:30	1.133
@@ -239,10 +239,12 @@
     {
 #if XFT
       bool done = false;
-#ifdef HAVE_BG_PIXMAP
-      if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
+
+# ifdef HAVE_BG_PIXMAP
+      if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
         {
           Picture dst = XftDrawPicture (d);
+
           if (dst != 0)
             {
               XClearArea (disp, d, x, y, w, h, false);
@@ -251,9 +253,10 @@
               done = true;
             }
         }
-#endif
+# endif
       if (!done)
         XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
+
 #else
       XSetForeground (disp, gc, term->pix_colors[color]);
       XFillRectangle (disp, d, gc, x, y, w, h);
@@ -633,7 +636,7 @@
     {
       size_t len = field - name;
       *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
-      strncpy (*ptr, name, len);
+      memcpy (*ptr, name, len);
       strcpy (*ptr + len, replace);
       strcat (*ptr, end);
 
@@ -1298,15 +1301,15 @@
   int w = term->fwidth * len;
   int h = term->fheight;
 
-  /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
+  /*
    * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
    * good idea from the perspective of packaging for wide variety of user configs.
    */
-  bool buffered = true
+  bool buffered = bg >= Color_transparent;
 #ifdef FORCE_UNBUFFERED_XFT
-                  && bg >= 0
+  buffered = false;
 #endif
-                  ;
+
   // cut trailing spaces
   while (len && text [len - 1] == ' ')
     len--;
@@ -1342,9 +1345,9 @@
 
   if (buffered)
     {
-      bool back_rendered = false;
       if (ep != enc)
         {
+          bool back_rendered = false;
           rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
 
 #ifdef HAVE_BG_PIXMAP
@@ -1352,12 +1355,14 @@
             {
               Picture dst = 0;
 
-              if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
+              if (bg >= 0 && term->pix_colors[bg].is_opaque ())
+                XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
+              else
                 dst = XftDrawPicture (d2);
 
-              if (bg < 0 || dst != 0)
+              if (dst)
                 {
-                  int src_x = x, src_y = y ;
+                  int src_x = x, src_y = y;
 
                   if (term->bgPixmap.is_parentOrigin ())
                     {
@@ -1401,8 +1406,8 @@
             }
 #endif
 
-          if (bg >= 0 && !back_rendered)
-            XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
+          if (!back_rendered)
+            XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
 
           XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
           XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
@@ -1534,7 +1539,7 @@
 
           if (end - desc < 511)
             {
-              strncpy (buf, desc, end - desc);
+              memcpy (buf, desc, end - desc);
               buf[end - desc] = 0;
 
               fonts.push_back (new_font (buf, cs));