--- rxvt-unicode/src/rxvtfont.C	2007/08/28 17:33:46	1.116
+++ rxvt-unicode/src/rxvtfont.C	2007/10/31 09:55:24	1.122
@@ -45,12 +45,12 @@
   { CS_ISO8859_1,    "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1"           },
   { CS_ISO8859_15,   "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15"          },
   { CS_ISO8859_15,   "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15"          },
-                                                                   
-#if ENCODING_EU                                                    
-  // cyrillic                                                      
+
+#if ENCODING_EU
+  // cyrillic
   { CS_KOI8_R,        "-*-*-*-r-*--*-*-*-*-c-*-koi8-r"             },
   { CS_KOI8_U,        "-*-*-*-r-*--*-*-*-*-c-*-koi8-u"             },
-                                                                   
+
   { CS_ISO8859_2,    "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2"           },
   { CS_ISO8859_3,    "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3"           },
   { CS_ISO8859_4,    "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4"           },
@@ -67,7 +67,7 @@
 
 # if XFT
   { CS_KOI8_U,       "xft::lang=ru"                                },
-                                                                   
+
   { CS_ISO8859_5,    "xft::lang=ru"                                },
   { CS_ISO8859_6,    "xft::lang=ar"                                },
   { CS_ISO8859_7,    "xft::lang=el"                                },
@@ -233,13 +233,28 @@
 {
   dTermDisplay;
   dTermGC;
-  
+
   if (color == Color_bg || color == Color_transparent)
     XClearArea (disp, d, x, y, w, h, false);
   else if (color >= 0)
     {
 #if XFT
-      XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
+      bool done = false;
+#ifdef HAVE_BG_PIXMAP
+      if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
+        {
+          Picture dst = XftDrawPicture (d);
+          if (dst != 0)
+            {
+              XClearArea (disp, d, x, y, w, h, false);
+              Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
+              XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
+              done = true;
+            }
+        }
+#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);
@@ -392,7 +407,7 @@
                     if (a)
                       {
                         static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
- 
+
                         gcv.fill_style = FillStippled;
                         gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
                         gcv.ts_x_origin = x;
@@ -499,7 +514,7 @@
   if (XGetFontProperty (f, property, &value))
     return XGetAtomName (term->dpy, value);
   else
-    return rxvt_strdup (repl);
+    return repl ? strdup (repl) : 0;
 }
 
 rxvt_fontprop
@@ -661,7 +676,7 @@
 
       if (prop.weight != rxvt_fontprop::unset)
         {
-          replace_field (fname, name, 2, 0, 
+          replace_field (fname, name, 2, 0,
                          prop.weight < rxvt_fontprop::bold
                            ? "medium" : "bold");
           set_name (strdup (fname));
@@ -815,7 +830,7 @@
       if (encm)
         N += (f->max_byte1 - f->min_byte1)
              * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
-       
+
       while (N)
         {
           if (f->per_char[N].width > width)
@@ -977,7 +992,7 @@
           clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
 
           XChangeGC (disp, gc, GCForeground | GCFont, &v);
-          
+
           if (slow)
             {
               do
@@ -1009,7 +1024,7 @@
           clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
 
           XChangeGC (disp, gc, GCForeground | GCFont, &v);
-          
+
           if (slow)
             {
               do
@@ -1045,7 +1060,7 @@
              const text_t *text, int len,
              int fg, int bg);
 
-  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
+  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
 
 protected:
   XftFont *f;
@@ -1275,7 +1290,7 @@
   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 
+   * 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
@@ -1297,7 +1312,7 @@
 
       while (len && *text == NOCHAR)
         text++, len--, cwidth += term->fwidth;
-      
+
       if (fc != ' ') // skip spaces
         {
           FT_UInt glyph = XftCharIndex (disp, f, fc);
@@ -1318,26 +1333,34 @@
 
   if (buffered)
     {
+      bool back_rendered = false;
       if (ep != enc)
         {
           rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
-          bool back_rendered = false;
 
 #ifdef HAVE_BG_PIXMAP
           if (term->bgPixmap.pixmap)
             {
               Picture dst = 0;
+
               if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
                 dst = XftDrawPicture (d2);
-                
+
               if (bg < 0 || dst != 0)
                 {
-                  if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w
-                      && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
+                  int src_x = x, src_y = y ;
+
+                  if (term->bgPixmap.is_parentOrigin ())
+                    {
+                      src_x += term->window_vt_x;
+                      src_y += term->window_vt_y;
+                    }
+
+                  if (term->bgPixmap.pmap_width >= src_x+w
+                      && term->bgPixmap.pmap_height >= src_y+h)
                     {
                       XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
-                                 x + term->window_vt_x, y + term->window_vt_y,
-                                 w, h, 0, 0);
+                                 src_x, src_y, w, h, 0, 0);
                     }
                   else
                     {
@@ -1345,8 +1368,8 @@
 
                       gcv.fill_style  = FillTiled;
                       gcv.tile        = term->bgPixmap.pixmap;
-                      gcv.ts_x_origin = -x;
-                      gcv.ts_y_origin = -y;
+                      gcv.ts_x_origin = -src_x;
+                      gcv.ts_y_origin = -src_y;
 
                       XChangeGC (disp, gc,
                                  GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
@@ -1424,7 +1447,7 @@
 rxvt_fontset::new_font (const char *name, codeset cs)
 {
   rxvt_font *f;
-  
+
   if (!name || !*name)
     {
       name = "";
@@ -1653,7 +1676,7 @@
                       char fontname[4096];
                       sprintf (fontname, "xft:%-.4090s", font);
 
-                      fonts.push_back (new_font (fontname, CS_UNICODE)); 
+                      fonts.push_back (new_font (fontname, CS_UNICODE));
                     }
 
                   free (font);