comparison src/nsfont.m @ 98399:6b3b02fd9846

* nsfont.m (nsfont_trait_distance): Fix bug. (nsfont_list): Return a list rather than a vector (syncs with Handa changes of 2008-05-14). (nsfont_open): Improve logging.

98398:39408ed11da9

  if (NSFONT_TRACE)
    {
      fprintf (stderr, "created font_entity:\n    ");
      debug_print (font_entity);
     }

  [suffix release];
  free (escapedFamily);
  return font_entity;
}

/* Computes Hamming distance btwn two "vectors" of 0's and 1's. */
static int
nsfont_trait_distance (unsigned int traits1, unsigned int traits2)
{
  int i, d =0;
  for (i =0; i<sizeof (unsigned int)*8; i++)
    {
      d += (traits1 & 0x1) ^ (traits2 & 0x1);
      traits1 >> 1;
      traits2 >> 1;
    }
  return d;
}

  return (dpyinfo->name_list_element);
}


/* List fonts exactly matching with FONT_SPEC on FRAME.  The value
   is a vector of font-entities.  This is the sole API that
   allocates font-entities.  */
static Lisp_Object
nsfont_list (Lisp_Object frame, Lisp_Object font_spec)
{
  Lisp_Object list = Qnil;

    }

  if (NSFONT_TRACE)
      fprintf (stderr, "    Returning %d entities.\n", XINT (Flength (list)));

  return (NILP (list) ? Qnil : Fvconcat (1, &list));/* Qnil was null_vector */
}


/* Return a font entity most closely maching with FONT_SPEC on
   FRAME.  The closeness is determined by the font backend, thus

  synthItal = !NILP (tem) && !strncmp ("synthItal", SDATA (SYMBOL_NAME (tem)),
                                       9);
  family = nsfont_get_family (font_entity);
  if (NSFONT_TRACE)
    {
      fprintf (stderr, "family: '%s'\ttraits = %ld\tbold = %d\n",
               [family UTF8String], traits, traits & NSBoldFontMask);
    }

  /* see http://cocoadev.com/forums/comments.php?DiscussionID =74 */
  fixLeopardBug = traits & NSBoldFontMask ? 10 : 5;
  nsfont = [fontMgr fontWithFamily: family

        {
          fprintf (stderr, "*** Emacs.app: unable to load backup font\n");
          return Qnil;
        }
    }

#if 0
  {
    NSNumber *cached = [fontCache objectForKey: nsfont];
    if (cached != nil && !synthItal)

98399:6b3b02fd9846

  if (NSFONT_TRACE)
    {
      fprintf (stderr, "created font_entity:\n    ");
      debug_print (font_entity);
    }

  [suffix release];
  free (escapedFamily);
  return font_entity;
}

/* Computes Hamming distance btwn two "vectors" of 0's and 1's. */
static int
nsfont_trait_distance (unsigned int traits1, unsigned int traits2)
{
  int i, d = 0;
  for (i = 0; i < sizeof (unsigned int) * 8; i++)
    {
      d += (traits1 & 0x1) ^ (traits2 & 0x1);
      traits1 >>= 1;
      traits2 >>= 1;
    }
  return d;
}

  return (dpyinfo->name_list_element);
}


/* List fonts exactly matching with FONT_SPEC on FRAME.  The value
   is a **list** of font-entities.  This is the sole API that
   allocates font-entities.  */
static Lisp_Object
nsfont_list (Lisp_Object frame, Lisp_Object font_spec)
{
  Lisp_Object list = Qnil;

    }

  if (NSFONT_TRACE)
      fprintf (stderr, "    Returning %d entities.\n", XINT (Flength (list)));

  return list;
}


/* Return a font entity most closely maching with FONT_SPEC on
   FRAME.  The closeness is determined by the font backend, thus

  synthItal = !NILP (tem) && !strncmp ("synthItal", SDATA (SYMBOL_NAME (tem)),
                                       9);
  family = nsfont_get_family (font_entity);
  if (NSFONT_TRACE)
    {
      fprintf (stderr, "family: '%s'\ttraits = %ld\tbold = %d\titalic = %d\n",
               [family UTF8String], traits, traits & NSBoldFontMask,
               traits & NSItalicFontMask);
    }

  /* see http://cocoadev.com/forums/comments.php?DiscussionID =74 */
  fixLeopardBug = traits & NSBoldFontMask ? 10 : 5;
  nsfont = [fontMgr fontWithFamily: family

        {
          fprintf (stderr, "*** Emacs.app: unable to load backup font\n");
          return Qnil;
        }
    }

//NSLog(@"%@\n",nsfont);

#if 0
  {
    NSNumber *cached = [fontCache objectForKey: nsfont];
    if (cached != nil && !synthItal)