Roxen.git/ server/ font_handlers/ old.pike

2001-05-04

2001-05-04 14:26:14 by Jonas Wallden <jonasw@roxen.com>

• bea6383e66636848f9fb392bbd1945799c0f5ec8 (18 lines) (+11/-7) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixes a bug where fallback handling for old-style fonts was broken when
users have multiple font paths.

Rev: server/font_handlers/old.pike:1.10

2:   // Copyright © 1996 - 2000, Roxen IS.      #include <config.h> - constant cvs_version = "$Id: old.pike,v 1.9 2001/03/23 03:13:19 per Exp $"; + constant cvs_version = "$Id: old.pike,v 1.10 2001/05/04 14:26:14 jonasw Exp $";      constant name = "Compatibility bitmap fonts";   constant doc =
84:   array has_font( string name, int size )   {    string base_dir; -  array available; +  array available, fallback_available;    if( String.width( name ) > 8 )    return 0;    foreach(roxen->query("font_dirs"), string dir)    {    base_dir = dir+size+"/"+fix_name(name); -  if((available = r_get_dir(base_dir))) break; +  if (available = r_get_dir(base_dir)) +  break; +  if (!fallback_available) {    base_dir=dir+"/32/"+fix_name(name); -  available = r_get_dir(base_dir); +  fallback_available = r_get_dir(base_dir);    } -  if(!available) return 0; -  return available - ({ "CVS" }); +     } -  +  if(!available && !fallback_available) return 0; +  return (available ? available : fallback_available) - ({ "CVS" }); + }      class MyFont {    inherit Image.Font;