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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.72 by root, Sat Jun 18 10:59:21 2005 UTC vs.
Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC

 /*--------------------------------*-C-*---------------------------------*
  * File:	rxvtfont.C
  *----------------------------------------------------------------------*
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
  *				- 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
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *---------------------------------------------------------------------*/
 #include "../config.h"
 #include "rxvt.h"
+#include "rxvtlib.h"
 #include "rxvtutil.h"
 #include "rxvtfont.h"
 #include <cstdlib>
 #include <wchar.h>
 #include <inttypes.h>
 #define DISPLAY  r->display->display
-#define TGC      r->TermWin.gc
+#define TGC      r->gc
 #define MAX_OVERLAP (4 + 1)	// max. character width in 4ths of the base width
 const struct rxvt_fallback_font {
   codeset cs;
   rxvt_fontprop properties ()
   {
     rxvt_fontprop p;
     p.width = p.height = 1;
+    p.ascent = rxvt_fontprop::unset;
     p.weight = rxvt_fontprop::medium;
     p.slant = rxvt_fontprop::roman;
     return p;
   }
       return false;
     if (unicode <= 0x009f)
       return true;
-    if (unicode >= 0x2500 && unicode <= 0x259f)
+    if (unicode >= 0x2500 && unicode <= 0x259f &&
+        ! OPTION_R (Opt_skipBuiltinGlyphs))
       return true;
     if (IS_COMPOSE (unicode))
       return true;
                          const text_t *text, int len,
                          int fg, int bg)
 {
   Display *disp = d.display->display;
-  clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+  clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
   XSetForeground (disp, TGC, r->pix_colors[fg]);
   while (len)
     {
       while (++text, --len && *text == NOCHAR)
         ;
       int width = text - tp;
-      int fwidth = r->TermWin.fwidth * width;
+      int fwidth = r->fwidth * width;
-      if (0x2500 <= t && t <= 0x259f)
+      if (0x2500 <= t && t <= 0x259f &&
+          ! OPTION_R (Opt_skipBuiltinGlyphs))
         {
           uint16_t offs = linedraw_offs[t - 0x2500];
           uint32_t *a = linedraw_command + (offs >> 4);
           uint32_t *b = a + (offs & 15);
           int W = fwidth;
-          int H = r->TermWin.fheight;
+          int H = r->fheight;
           int x_[16];
           int y_[16];
           for (int i = 0; i <= 8; i++)
             case NOCHAR:
               break;
             default:
               XDrawRectangle (disp, d, TGC, x + 2, y + 2,
-                              fwidth - 4, r->TermWin.fheight - 4);
+                              fwidth - 4, r->fheight - 4);
           }
       x += fwidth;
     }
 }
 bool
 rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
 {
   p.width  = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
   p.height = height;
+  p.ascent = rxvt_fontprop::unset;
   p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
   p.slant  = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
   return true;
 }
   set_properties (p, height, weight, slant, avgwidth);
   free (weight);
   free (slant);
+  p.ascent = f->ascent;
   return true;
 }
 bool
   // and it is a mess /.
   // yet we are trying to be perfect /.
   // but the result still isn't perfect /.
   bool slow = this->slow
-              || width != r->TermWin.fwidth
+              || width != r->fwidth
-              || height != r->TermWin.fheight;
+              || height != r->fheight;
-  int base = ascent; // sorry, incorrect: r->TermWin.fbase;
+  int base = ascent; // sorry, incorrect: r->fbase;
   XGCValues v;
   v.foreground = r->pix_colors[fg];
   v.font = f->fid;
           XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
           XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
         }
       else
         {
-          clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+          clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
           XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
           if (slow)
             {
               do
                 {
                   if (xc->byte1 || xc->byte2)
                     XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
-                  x += r->TermWin.fwidth;
+                  x += r->fwidth;
                   xc++; len--;
                 }
               while (len);
             }
           else
           XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
           XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
         }
       else
         {
-          clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+          clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
           XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
           if (slow)
             {
               do
                 {
                   if (*xc)
                     XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
-                  x += r->TermWin.fwidth;
+                  x += r->fwidth;
                   xc++; len--;
                 }
               while (len);
             }
           else
   FT_Face face = XftLockFace (f);
   p.width  = width;
   p.height = height;
+  p.ascent = ascent;
   p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
                ? rxvt_fontprop::bold : rxvt_fontprop::medium;
   p.slant  = face->style_flags & FT_STYLE_FLAG_ITALIC
                ? rxvt_fontprop::italic : rxvt_fontprop::roman;
           if (width    < g.width       ) width    = g.width;
           if (height   < g.height      ) height   = g.height;
           if (glheight < g.height - g.y) glheight = g.height - g.y;
         }
+      if (!width)
+        {
+          rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
+          XftFontClose (disp, f);
+          f = 0;
+          success = false;
+          break;
+        }
       if (prop.height == rxvt_fontprop::unset
           || (height <= prop.height && glheight <= prop.height)
           || height <= 2
           || !scalable)
         break;
           ftheight -= height - prop.height;
         }
       else
         ftheight = prop.height - 1;
-        XftFontClose (disp, f);
+      XftFontClose (disp, f);
-        FcPatternDel (match, FC_PIXEL_SIZE);
+      FcPatternDel (match, FC_PIXEL_SIZE);
-        FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
+      FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
     }
   FcPatternDestroy (match);
 #if 0 // do it per-character
 void
 rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
                      const text_t *text, int len,
                      int fg, int bg)
 {
-  clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+  clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
   int base = ascent; // should be fbase, but that is incorrect
   XGlyphInfo extents;
   FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32));
   FcChar32 *ep = enc;
   int ewidth = 0;
   while (len)
     {
-      int cwidth = r->TermWin.fwidth;
+      int cwidth = r->fwidth;
       FcChar32 fc = *text++; len--;
       while (len && *text == NOCHAR)
-        text++, len--, cwidth += r->TermWin.fwidth;
+        text++, len--, cwidth += r->fwidth;
       if (fc == ' ' && ep == enc) // skip leading spaces
         x += cwidth;
       else
         {
 #endif
 /////////////////////////////////////////////////////////////////////////////
 rxvt_fontset::rxvt_fontset (rxvt_t r)
-: r (r), fontdesc (0)
+: fontdesc (0), r (r)
 {
   clear ();
 }
 rxvt_fontset::~rxvt_fontset ()
 }
 void
 rxvt_fontset::clear ()
 {
-  prop.width = prop.height = prop.weight = prop.slant
+  prop.width = prop.height = prop.ascent = prop.weight = prop.slant
     = rxvt_fontprop::unset;
   for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
     FONT_UNREF (*i);
           if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
             goto next_font;
           if (!realize_font (i))
             goto next_font;
+          if (prop.ascent != rxvt_fontprop::unset)
+            max_it (f->ascent, prop.ascent);
         }
       if (f->cs == CS_UNKNOWN)
         goto next_font;

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.72 by root, Sat Jun 18 10:59:21 2005 UTC vs. Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.72 by root, Sat Jun 18 10:59:21 2005 UTC vs.
Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC