From aced2c64a71c200c65e33d5262b14d5c9a57ee71 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Wed, 23 Jan 2008 10:54:54 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes        |  1 +
 src/rxvtfont.C | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Changes b/Changes
index ea0f1867..ae6308c1 100644
--- a/Changes
+++ b/Changes
@@ -18,6 +18,7 @@ WISH: look into XAddConnectionWatch, does anybody need that?
 DUMB: support tex fonts
 
 DO NOT USE, CURRENTLY TOTALLY BROKEN W.R.T. XFT FONTS
+TODO: document #aarrggbb or (better?) remove
 9.0
 	- fix a crash bug where urxvtd would crash when urxvtc was called
           with wrong arguments (I wish debian maintainers in general would
diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index c58819e9..4fa4d92c 100644
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -238,23 +238,20 @@ rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
   else if (color >= 0)
     {
 #if XFT
-      bool done = false;
+      Picture dst;
 
 # ifdef HAVE_BG_PIXMAP
-      if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
+      if (term->bgPixmap.pixmap
+          && color >= 0 && !term->pix_colors[color].is_opaque ()
+          && ((Picture dst = XftDrawPicture (d))))
         {
-          Picture dst = XftDrawPicture (d);
+          XClearArea (disp, d, x, y, w, h, false);
 
-          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;
-            }
+          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);
         }
+      else
 # endif
-      if (!done)
         XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
 
 #else
-- 
2.34.1