--- rxvt-unicode/src/rxvtfont.C	2010/12/30 18:19:38	1.172
+++ rxvt-unicode/src/rxvtfont.C	2014/11/14 11:06:49	1.194
@@ -1,12 +1,12 @@
 /*----------------------------------------------------------------------*
  * 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
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -24,7 +24,7 @@
 #include "rxvtutil.h"
 #include "rxvtfont.h"
 
-#include <cstdlib>
+#include <stdlib.h>
 
 #include <inttypes.h>
 
@@ -134,7 +134,6 @@
 # endif
 #endif
 
-  { CS_UNICODE,      "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
   //{ CS_UNICODE,      "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1"   }, // this gem of a font has actual dotted circles within the combining character glyphs.
 #if XFT
   { CS_UNICODE,      "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
@@ -243,7 +242,7 @@
       Picture dst;
 
 # ifdef HAVE_BG_PIXMAP
-      if (term->bgPixmap.pixmap
+      if (term->bg_img
           && !term->pix_colors[color].is_opaque ()
           && ((dst = XftDrawPicture (d))))
         {
@@ -526,12 +525,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;
       }
   }
 };
@@ -815,10 +818,10 @@
   // this loop only iterates when the guessed font-size is too small
   for (;;)
     {
-      font_weight *best = fonts + count - 1;
+      font_weight *best = fonts;
 
-      for (font_weight *w = best; w-- > fonts; )
-        if (w->diff <= best->diff)
+      for (font_weight *w = fonts + 1; w < fonts + count; w++)
+        if (w->diff < best->diff)
           best = w;
 
       if (!best->name
@@ -923,7 +926,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; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
     {
       if (FROM_UNICODE (cs, *t) == NOCHAR)
         continue;
@@ -933,7 +936,8 @@
       if (!has_char (*t, &prop, careful))
         continue;
 
-      XChar2b ch = { *t >> 8, *t };
+      // the casts are needed in C++11 (see 8.5.1)
+      XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
 
       XCharStruct g;
       int dir_ret, asc_ret, des_ret;
@@ -969,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)
@@ -1041,7 +1047,8 @@
 
   bool slow = this->slow
               || width  != term->fwidth
-              || height != term->fheight;
+              || height != term->fheight
+              || ascent != f->ascent;
 
   int base = ascent; // sorry, incorrect: term->fbase;
 
@@ -1220,10 +1227,12 @@
 
   for (;;)
     {
-      f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
+      p = FcPatternDuplicate (match);
+      f = XftFontOpenPattern (disp, p);
 
       if (!f)
         {
+          FcPatternDestroy (p);
           success = false;
           break;
         }
@@ -1241,7 +1250,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; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
         {
           FcChar16 ch = *t;
 
@@ -1406,22 +1415,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_img
               && (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_img->w >= src_x + w
+                  && term->bg_img->h >= src_y + h)
                 {
-                  XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
+                  XCopyArea (disp, term->bg_img->pm, d2, gc,
                              src_x, src_y, w, h, 0, 0);
                 }
               else
@@ -1429,7 +1438,7 @@
                   XGCValues gcv;
 
                   gcv.fill_style  = FillTiled;
-                  gcv.tile        = term->bgPixmap.pixmap;
+                  gcv.tile        = term->bg_img->pm;
                   gcv.ts_x_origin = -src_x;
                   gcv.ts_y_origin = -src_y;
 
@@ -1614,7 +1623,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;
         }
@@ -1780,7 +1789,7 @@
 
       if (!fmap[hi])
         {
-          fmap[hi] = (pagemap *)new pagemap;
+          fmap[hi] = new pagemap;
           memset (fmap[hi], 0xff, sizeof (pagemap));
         }