--- rxvt-unicode/src/rxvtfont.C	2010/12/18 18:17:38	1.169
+++ rxvt-unicode/src/rxvtfont.C	2011/05/30 18:39:03	1.180
@@ -1,7 +1,7 @@
 /*----------------------------------------------------------------------*
  * File:	rxvtfont.C
  *----------------------------------------------------------------------*
- * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
  *				- original version.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -243,7 +243,7 @@
       Picture dst;
 
 # ifdef HAVE_BG_PIXMAP
-      if (term->bgPixmap.pixmap
+      if (term->bg_pixmap
           && !term->pix_colors[color].is_opaque ()
           && ((dst = XftDrawPicture (d))))
         {
@@ -526,12 +526,16 @@
              const text_t *text, int len,
              int fg, int bg)
   {
-    while (len--)
+    while (len)
       {
         int fid = fs->find_font_idx (*text);
-        (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
-        ++text;
-        x += term->fwidth;
+        int w = 1;
+        while (w < len && text[w] == NOCHAR)
+          w++;
+        (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
+        text += w;
+        len -= w;
+        x += term->fwidth * w;
       }
   }
 };
@@ -720,12 +724,12 @@
           if (!f)
             return false;
 
-          char *new_name = get_property (f, XA_FONT, name);
+          char *new_name = get_property (f, XA_FONT, 0);
 
           if (new_name)
             set_name (new_name);
           else
-            rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
+            rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
 
           XFreeFont (disp, f);
           f = 0;
@@ -792,12 +796,14 @@
             diff += 300; // more heavily penalize what looks like scaled bitmap fonts
         }
 
-      if (!set_properties (p, fname))
-        continue;
-
-      if (prop.height != rxvt_fontprop::unset
-          && p.height > prop.height) // weed out too large fonts
-        continue;
+      if (!set_properties (p, fname)
+          // also weed out too large fonts
+          || (prop.height != rxvt_fontprop::unset
+              && p.height > prop.height))
+        {
+          free (fname);
+          continue;
+        }
 
       if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
       if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
@@ -864,7 +870,8 @@
 
   if (cs == CS_UNKNOWN)
     {
-      const char *charset = get_property (f, XA_FONT, 0);
+      char *value = get_property (f, XA_FONT, 0);
+      const char *charset = value;
 
       if (!charset)
         charset = name;
@@ -877,6 +884,8 @@
       cs = codeset_from_name (charset);
       if (cs == CS_UNKNOWN)
         rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
+
+      free (value);
     }
 
   if (cs == CS_UNKNOWN)
@@ -918,7 +927,7 @@
 
   width = 1;
 
-  for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
+  for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
     {
       if (FROM_UNICODE (cs, *t) == NOCHAR)
         continue;
@@ -964,6 +973,8 @@
 bool
 rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
 {
+  careful = false;
+
   uint32_t ch = FROM_UNICODE (cs, unicode);
 
   if (ch == NOCHAR)
@@ -1215,10 +1226,12 @@
 
   for (;;)
     {
-      f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
+      p = FcPatternDuplicate (match);
+      f = XftFontOpenPattern (disp, p);
 
       if (!f)
         {
+          FcPatternDestroy (p);
           success = false;
           break;
         }
@@ -1236,7 +1249,7 @@
 
       int glheight = height;
 
-      for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
+      for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
         {
           FcChar16 ch = *t;
 
@@ -1401,22 +1414,22 @@
 #ifdef HAVE_BG_PIXMAP
           Picture dst = 0; // the only assignment is done conditionally in the following if condition
 
-          if (term->bgPixmap.pixmap
+          if (term->bg_pixmap
               && (bg == Color_transparent || bg == Color_bg
                   || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
             {
               int src_x = x, src_y = y;
 
-              if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
+              if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
                 {
                   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)
+              if (term->bg_pmap_width >= src_x + w
+                  && term->bg_pmap_height >= src_y + h)
                 {
-                  XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
+                  XCopyArea (disp, term->bg_pixmap, d2, gc,
                              src_x, src_y, w, h, 0, 0);
                 }
               else
@@ -1424,7 +1437,7 @@
                   XGCValues gcv;
 
                   gcv.fill_style  = FillTiled;
-                  gcv.tile        = term->bgPixmap.pixmap;
+                  gcv.tile        = term->bg_pixmap;
                   gcv.ts_x_origin = -src_x;
                   gcv.ts_y_origin = -src_y;
 
@@ -1609,7 +1622,7 @@
               push_font (new_font (buf, cs));
             }
           else
-            rxvt_warn ("fontset element too long (>511 bytes), ignored.");
+            rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
 
           desc = end + 1;
         }