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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC vs.
Revision 1.20 by pcg, Fri Feb 20 22:27:23 2004 UTC

 #include "rxvt.h"
 #include "defaultfont.h"
 #include <cstdlib>
-#define DISPLAY  r->Xdisplay
+#define DISPLAY  r->display->display
 #define DRAWABLE r->TermWin.vt
 #define GC       r->TermWin.gc
 const struct rxvt_fallback_font {
   codeset cs;
 static void *enc_buf;
 static uint32_t enc_len;
 static inline void *
-get_enc_buf (int len)
+get_enc_buf (uint32_t len)
 {
   if (len > enc_len)
     {
       free (enc_buf);
       enc_buf = malloc (len);
   return enc_buf;
 }
 static const char *
-enc_char (const text_t *text, int len, codeset cs, bool &zero)
+enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
 {
   uint8_t *buf = (uint8_t *)get_enc_buf (len);
   while (len--)
     {
   return (const char *)enc_buf;
 }
 static const XChar2b *
-enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)
+enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
 {
   XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
   while (len--)
     {
   XFontStruct *f = XLoadQueryFont (DISPLAY, name);
   if (f)
     {
-      // the font should really exists now. if not, we have a problem
+      // the font should really exist now. if not, we have a problem
       // (e.g. if the user did xset fp rehash just when we were searching fonts).
       // in that case, just return garbage.
       bool ret = set_properties (p, f);
       XFreeFont (DISPLAY, f);
       return ret;
   f = XLoadQueryFont (DISPLAY, name);
   if (!f)
     return false;
-  unsigned long value;
   const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
   const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
   if (registry && encoding)
     {
   /* check wether the character exists in _this_ font. horrible. */
   XCharStruct *xcs;
   if (encm)
     {
-      int byte1 = ch >> 8;
+      unsigned char byte1 = ch >> 8;
-      int byte2 = ch & 255;
+      unsigned char byte2 = ch & 255;
       if (byte1 < f->min_byte1 || byte1 > f->max_byte1
           || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
         return false;
 };
 void
 rxvt_font_xft::clear ()
 {
+  if (d)
+    {
+      XftDrawDestroy (d);
+      d = 0;
+    }
   if (f)
     {
       XftFontClose (DISPLAY, f);
       f = 0;
-    }
-  if (d)
-    {
-      XftDrawDestroy (d);
-      d = 0;
     }
 }
 rxvt_fontprop
 rxvt_font_xft::properties ()
         FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
     }
   XftUnlockFace (f);
+  d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
+  if (!d)
+    return false;
   return true;
 }
 bool
 rxvt_font_xft::has_codepoint (uint32_t unicode)
 void
 rxvt_font_xft::draw (int x, int y,
                      const text_t *text, int len,
                      int fg, int bg)
 {
-  if (!d)
-    {
-      dR;
-      d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
-    }
   if (bg >= 0 && bg != Color_bg)
     XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
   else
     clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
 #endif
 /////////////////////////////////////////////////////////////////////////////
 rxvt_fontset::rxvt_fontset (rxvt_t r)
-#ifdef EXPLICIT_CONTEXT
-: r(r)
+: r (r)
-#endif
 {
   clear ();
 }
 rxvt_fontset::~rxvt_fontset ()
 }
 void
 rxvt_fontset::clear ()
 {
-  for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
+  for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
     FONT_UNREF (*i);
   fonts.clear ();
   base_id = 0;
   base_prop.height = 0x7fffffff;
           if (*desc == '[')
             {
               fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
-              const char *extra = desc++;
+              //const char *extra = desc++; // not yet used
               desc = strchr (desc, ']');
               if (!desc)
                 {
   if (!base_id)
     base_id = 1;
   // we currently need a base-font, no matter what
-  if (fonts.size () <= base_id || !realize_font (base_id))
+  if ((int)fonts.size () <= base_id || !realize_font (base_id))
     {
-      puts ("unable to load specified font(s), falling back to 'fixed'\n");
+      puts ("unable to load specified font (s), falling back to 'fixed'\n");
       add_fonts ("fixed");
       base_id = fonts.size () - 1;
     }
-  if (fonts.size () <= base_id || !realize_font (base_id))
+  if ((int)fonts.size () <= base_id || !realize_font (base_id))
     {
       fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
       exit (1);
     }
 }
 int
 rxvt_fontset::find_font (uint32_t unicode)
 {
-  for (int i = 0; i < fonts.size (); i++)
+  for (unsigned int i = 0; i < fonts.size (); i++)
     {
       rxvt_font *f = fonts[i];
       if (!f->loaded)
         {

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC vs. Revision 1.20 by pcg, Fri Feb 20 22:27:23 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC vs.
Revision 1.20 by pcg, Fri Feb 20 22:27:23 2004 UTC