[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtfont.C

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.116 by root, Tue Aug 28 17:33:46 2007 UTC vs.
Revision 1.121 by ayin, Sun Oct 28 11:25:04 2007 UTC

   if (color == Color_bg || color == Color_transparent)
     XClearArea (disp, d, x, y, w, h, false);
   else if (color >= 0)
     {
 #if XFT
+      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);
+        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);
 #endif
     }
   unsigned long value;
   if (XGetFontProperty (f, property, &value))
     return XGetAtomName (term->dpy, value);
   else
-    return rxvt_strdup (repl);
+    return repl ? strdup (repl) : 0;
 }
 rxvt_fontprop
 rxvt_font_x11::properties ()
 {
   void draw (rxvt_drawable &d, int x, int y,
              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;
 };
       x_ += cwidth;
     }
   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)
                 {
+                  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 >= x + term->window_vt_x+w
+                  if (term->bgPixmap.pmap_width >= src_x+w
-                      && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
+                      && 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
                     {
                       XGCValues gcv;
                       gcv.fill_style  = FillTiled;
                       gcv.tile        = term->bgPixmap.pixmap;
-                      gcv.ts_x_origin = -x;
+                      gcv.ts_x_origin = -src_x;
-                      gcv.ts_y_origin = -y;
+                      gcv.ts_y_origin = -src_y;
                       XChangeGC (disp, gc,
                                  GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
                                  &gcv);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.116 by root, Tue Aug 28 17:33:46 2007 UTC vs. Revision 1.121 by ayin, Sun Oct 28 11:25:04 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.116 by root, Tue Aug 28 17:33:46 2007 UTC vs.
Revision 1.121 by ayin, Sun Oct 28 11:25:04 2007 UTC