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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.122 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.126 by ayin, Wed Dec 26 14:22:30 2007 UTC

  * 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 "table/linedraw.h"
 struct rxvt_font_default : rxvt_font {
   struct rxvt_fontset *fs;
   rxvt_font_default (rxvt_fontset *fs)
   : rxvt_font ()
       return false;
     if (unicode <= 0x009f)
       return true;
+#ifdef BUILTIN_GLYPHS
     if (unicode >= 0x2500 && unicode <= 0x259f &&
         !term->option (Opt_skipBuiltinGlyphs))
       return true;
+#endif
     if (IS_COMPOSE (unicode))
       return true;
     switch (unicode)
         ;
       int width = text - tp;
       int fwidth = term->fwidth * width;
+#ifdef BUILTIN_GLYPHS
       if (0x2500 <= t && t <= 0x259f)
         {
+# include "table/linedraw.h"
           uint16_t offs = linedraw_offs[t - 0x2500];
           uint32_t *a = linedraw_command + (offs >> 4);
           uint32_t *b = a + (offs & 15);
           int W = fwidth;
                               (a - 1) * 90*64, (b - 1) * 90*64);
                     break;
                 }
             }
         }
+#else
+      if (0)
+        ;
+#endif
 #if ENABLE_COMBINING
       else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
         {
           min_it (width, 2); // we only support wcwidth up to 2
     return false;
 }
 // fix the size of scalable fonts
 static bool
-replace_field (char *buf, const char *name, int index, const char old, const char *replace)
+replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
 {
   int slashes = 0;
   const char *field, *end;
   for (const char *c = name; *c; c++)
           break;
       }
   if (slashes >= 13 && (!old || *field == old))
     {
-      // TODO: check for overflow in font-name
+      size_t len = field - name;
+      *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
-      strncpy (buf, name, field - name);
+      strncpy (*ptr, name, len);
-      buf += field - name;
-      strcpy (buf, replace);
+      strcpy (*ptr + len, replace);
-      strcat (buf, end);
+      strcat (*ptr, end);
       return true;
     }
   else
     {
-      strcpy (buf, name);
+      *ptr = strdup (name);
       return false;
     }
 }
   char field_str[64]; // enough for 128 bits
   // first morph the font if required
   if (force_prop)
     {
-      char fname[1024];
+      char *fname;
       if (name[0] != '-')
         {
           f = XLoadQueryFont (disp, name);
           f = 0;
         }
       if (prop.weight != rxvt_fontprop::unset)
         {
-          replace_field (fname, name, 2, 0,
+          replace_field (&fname, name, 2, 0,
                          prop.weight < rxvt_fontprop::bold
                            ? "medium" : "bold");
-          set_name (strdup (fname));
+          set_name (fname);
         }
       if (prop.slant != rxvt_fontprop::unset)
         {
-          replace_field (fname, name, 3, 0,
+          replace_field (&fname, name, 3, 0,
                          prop.slant < rxvt_fontprop::italic
                            ? "r" : "i"); // TODO: handle "o"blique, too
-          set_name (strdup (fname));
+          set_name (fname);
         }
     }
   sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
                               ? 0 : prop.height);
   font_weight *fonts = new font_weight[count];
   for (int i = 0; i < count; i++)
     {
       rxvt_fontprop p;
-      char fname[1024];
+      char *fname;
       int diff = 0;
-      if (replace_field (fname, list[i], 6, '0', field_str))
+      if (replace_field (&fname, list[i], 6, '0', field_str))
         diff += 10; // slightly penalize scalable fonts
+      else
+        {
+          free (fname);
-      else if (replace_field (fname, list[i], 11, '0', "0"))
+          if (replace_field (&fname, list[i], 11, '0', "0"))
-        diff += 300; // more heavily penalize what looks like scaled bitmap fonts
+            diff += 300; // more heavily penalize what looks like scaled bitmap fonts
+        }
       if (!set_properties (p, fname))
         continue;
       if (prop.height != rxvt_fontprop::unset
       if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
       if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
       if (prop.slant  != rxvt_fontprop::unset) diff += abs (prop.slant  - p.slant);
       //if (prop.width  != rxvt_fontprop::unset) diff += abs (prop.width  - p.width);
-      fonts[i].name = strdup (fname);
+      fonts[i].name = fname;
       fonts[i].diff = diff;
     }
   XFreeFontNames (list);

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.122 by ayin, Wed Oct 31 09:55:24 2007 UTC vs. Revision 1.126 by ayin, Wed Dec 26 14:22:30 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.122 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.126 by ayin, Wed Dec 26 14:22:30 2007 UTC