comparison src/macterm.c @ 59034:2dd8aacd82ce

* term/mac-win.el (encoding-vector, mac-font-encoder-list) (ccl-encode-mac-centraleurroman-font): Use centraleurroman instead of centraleuropean as the name * macterm.c (endif, x_font_name_to_mac_font_name): Use maccentraleurroman instead of maccentraleuropean (mac_c_string_match, mac_do_list_fonts): Speed up font search by quickly finding a specific font without needing regexps.

59033:baa093a1f30a

#if TARGET_API_MAC_CARBON
      case kTextEncodingMacCyrillic:
	strcpy(cs, "mac-cyrillic");
	break;
      case kTextEncodingMacCentralEurRoman:
	strcpy(cs, "mac-centraleuropean");
	break;
      case kTextEncodingMacSymbol:
      case kTextEncodingMacDingbats:
	strcpy(cs, "adobe-fontspecific");
	break;

    coding_system = Qsjis;
  else if (strcmp (cs, "ksc5601.1989-0") == 0)
    coding_system = Qeuc_kr;
  else if (strcmp (cs, "mac-roman") == 0
	   || strcmp (cs, "mac-cyrillic") == 0
	   || strcmp (cs, "mac-centraleuropean") == 0
	   || strcmp (cs, "adobe-fontspecific") == 0)
    strcpy (mf, family);
  else
    sprintf (mf, "%s-%s-%s", foundry, family, cs);

    11,				/* AVGWIDTH */
    -1
  };

static Lisp_Object
mac_do_list_fonts (pattern, maxnames)
     char *pattern;
     int maxnames;
{
  int i, n_fonts = 0;
  Lisp_Object font_list = Qnil, pattern_regex, fontname;
  char *regex = (char *) alloca (strlen (pattern) * 2 + 3);
  char scaled[256];
  char *ptr;
  int scl_val[XLFD_SCL_LAST], *field, *val;

  for (i = 0; i < XLFD_SCL_LAST; i++)
    scl_val[i] = -1;

  /* If the pattern contains 14 dashes and one of PIXEL_SIZE,

    scl_val[XLFD_SCL_PIXEL_SIZE] = -1;

  ptr = regex;
  *ptr++ = '^';

  /* Turn pattern into a regexp and do a regexp match.  */
  for (; *pattern; pattern++)
    {
      if (*pattern == '?')
        *ptr++ = '.';
      else if (*pattern == '*')
        {
          *ptr++ = '.';
          *ptr++ = '*';
        }
      else
        *ptr++ = tolower (*pattern);
    }
  *ptr = '$';
  *(ptr + 1) = '\0';

  pattern_regex = build_string (regex);

  for (i = 0; i < font_name_count; i++)
    {
      fontname = build_string (font_name_table[i]);
      if (fast_string_match (pattern_regex, fontname) >= 0)
	{
	  font_list = Fcons (fontname, font_list);

          n_fonts++;
          if (maxnames > 0 && n_fonts >= maxnames)
            break;
	}
      else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0
	       && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-")))
	{
	  int former_len = ptr - font_name_table[i];

		   "-%d-%d-75-75-m-%d-%s",
		   scl_val[XLFD_SCL_PIXEL_SIZE],
		   scl_val[XLFD_SCL_POINT_SIZE],
		   scl_val[XLFD_SCL_AVGWIDTH],
		   ptr + sizeof ("-0-0-75-75-m-0-") - 1);
	  fontname = build_string (scaled);
	  if (fast_string_match (pattern_regex, fontname) >= 0)
	    {
	      font_list = Fcons (fontname, font_list);

	      n_fonts++;
	      if (maxnames > 0 && n_fonts >= maxnames)
		break;
	    }
	}
    }
  return font_list;
}

/* Return a list of at most MAXNAMES font specs matching the one in
   PATTERN.  Cache matching fonts for patterns in

59034:2dd8aacd82ce

#if TARGET_API_MAC_CARBON
      case kTextEncodingMacCyrillic:
	strcpy(cs, "mac-cyrillic");
	break;
      case kTextEncodingMacCentralEurRoman:
	strcpy(cs, "mac-centraleurroman");
	break;
      case kTextEncodingMacSymbol:
      case kTextEncodingMacDingbats:
	strcpy(cs, "adobe-fontspecific");
	break;

    coding_system = Qsjis;
  else if (strcmp (cs, "ksc5601.1989-0") == 0)
    coding_system = Qeuc_kr;
  else if (strcmp (cs, "mac-roman") == 0
	   || strcmp (cs, "mac-cyrillic") == 0
	   || strcmp (cs, "mac-centraleurroman") == 0
	   || strcmp (cs, "adobe-fontspecific") == 0)
    strcpy (mf, family);
  else
    sprintf (mf, "%s-%s-%s", foundry, family, cs);

    11,				/* AVGWIDTH */
    -1
  };

static Lisp_Object
mac_c_string_match (regexp, string, nonspecial, exact)
     Lisp_Object regexp;
     const char *string, *nonspecial;
     int exact;
{
  if (exact)
    {
      if (strcmp (string, nonspecial) == 0)
	return build_string (string);
    }
  else if (strstr (string, nonspecial))
    {
      Lisp_Object str = build_string (string);

      if (fast_string_match (regexp, str) >= 0)
	return str;
    }

  return Qnil;
}

static Lisp_Object
mac_do_list_fonts (pattern, maxnames)
     char *pattern;
     int maxnames;
{
  int i, n_fonts = 0;
  Lisp_Object font_list = Qnil, pattern_regex, fontname;
  char *regex = (char *) alloca (strlen (pattern) * 2 + 3);
  char scaled[256];
  char *ptr;
  int scl_val[XLFD_SCL_LAST], *field, *val;
  char *longest_start, *cur_start, *nonspecial;
  int longest_len, cur_len, exact;

  for (i = 0; i < XLFD_SCL_LAST; i++)
    scl_val[i] = -1;

  /* If the pattern contains 14 dashes and one of PIXEL_SIZE,

    scl_val[XLFD_SCL_PIXEL_SIZE] = -1;

  ptr = regex;
  *ptr++ = '^';

  longest_start = cur_start = ptr;
  longest_len = cur_len = 0;
  exact = 1;

  /* Turn pattern into a regexp and do a regexp match.  Also find the
     longest substring containing no special characters.  */
  for (; *pattern; pattern++)
    {
      if (*pattern == '?' || *pattern == '*')
	{
	  if (cur_len > longest_len)
	    {
	      longest_start = cur_start;
	      longest_len = cur_len;
	    }
	  cur_len = 0;
	  exact = 0;

	  if (*pattern == '?')
	    *ptr++ = '.';
	  else /* if (*pattern == '*') */
	    {
	      *ptr++ = '.';
	      *ptr++ = '*';
	    }
	}
      else
	{
	  if (cur_len == 0)
	    cur_start = ptr;
	  cur_len++;

	  *ptr++ = tolower (*pattern);
	}
    }

  if (cur_len > longest_len)
    {
      longest_start = cur_start;
      longest_len = cur_len;
    }

  *ptr = '$';
  *(ptr + 1) = '\0';

  nonspecial = xmalloc (longest_len + 1);
  strncpy (nonspecial, longest_start, longest_len);
  nonspecial[longest_len] = '\0';

  pattern_regex = build_string (regex);

  for (i = 0; i < font_name_count; i++)
    {
      fontname = mac_c_string_match (pattern_regex, font_name_table[i],
				     nonspecial, exact);
      if (!NILP (fontname))
	{
	  font_list = Fcons (fontname, font_list);
	  if (exact || maxnames > 0 && ++n_fonts >= maxnames)
	    return font_list;
	}
      else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0
	       && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-")))
	{
	  int former_len = ptr - font_name_table[i];

		   "-%d-%d-75-75-m-%d-%s",
		   scl_val[XLFD_SCL_PIXEL_SIZE],
		   scl_val[XLFD_SCL_POINT_SIZE],
		   scl_val[XLFD_SCL_AVGWIDTH],
		   ptr + sizeof ("-0-0-75-75-m-0-") - 1);
	  fontname = mac_c_string_match (pattern_regex, scaled,
					 nonspecial, exact);
	  if (!NILP (fontname))
	    {
	      font_list = Fcons (fontname, font_list);
	      if (exact || maxnames > 0 && ++n_fonts >= maxnames)
		return font_list;
	    }
	}
    }

  xfree (nonspecial);

  return font_list;
}

/* Return a list of at most MAXNAMES font specs matching the one in
   PATTERN.  Cache matching fonts for patterns in