comparison src/w32fns.c @ 34284:3a21ff35392b

(xlfd_charset_of_font): Don't overwrite fontname argument. (w32_codepage_for_font): Rename CP_INVALID to CP_UNKNOWN. (w32_list_fonts): Don't choke if pattern doesn't specify a codepage.

34283:335a6482fca0

char * xlfd_charset_of_font (char * fontname)
{
  char *charset, *encoding;

  encoding = strrchr(fontname, '-');
  if (!encoding)
    return NULL;

  *encoding = 0;
  charset = strrchr(fontname, '-');
  *encoding = '-';

  if (!charset || strcmp(charset, "-*-*") == 0)
    return NULL;

  return charset + 1;

  /* Extract charset part of font string.  */
  charset = xlfd_charset_of_font (fontname);

  if (!charset)
    return CP_INVALID;

  charset_str = (char *) alloca (strlen (charset));
  strcpy (charset_str, charset);

  /* Remove leading "*-".  */

        *end = '\0';
      }

  entry = Fassoc (build_string(charset), Vw32_charset_info_alist);
  if (NILP (entry))
    return CP_INVALID;

  codepage = Fcdr (Fcdr (entry));

  if (NILP (codepage))
    return CP_8BIT;
  else if (XFASTINT (codepage) == XFASTINT (Qt))
    return CP_UNICODE;
  else if (INTEGERP (codepage))
    return XINT (codepage);
  else
    return CP_INVALID;
}


BOOL 
w32_to_x_font (lplogfont, lpxstr, len, specific_charset)

      /* Avoid expensive EnumFontFamilies functions if we are not
         going to be able to output one of these anyway. */
      codepage = w32_codepage_for_font (XSTRING (tpat)->data);
      if (codepage != CP_8BIT && codepage != CP_UNICODE
          && codepage != CP_DEFAULT && !IsValidCodePage(codepage))
        continue;

      /* See if we cached the result for this particular query.
         The cache is an alist of the form:
           ((PATTERN (FONTNAME . WIDTH) ...) ...)

34284:3a21ff35392b

char * xlfd_charset_of_font (char * fontname)
{
  char *charset, *encoding;

  encoding = strrchr(fontname, '-');
  if (!encoding || encoding == fontname)
    return NULL;

  charset = strrchr(encoding - 1, '-');

  if (!charset || strcmp(charset, "-*-*") == 0)
    return NULL;

  return charset + 1;

  /* Extract charset part of font string.  */
  charset = xlfd_charset_of_font (fontname);

  if (!charset)
    return CP_UNKNOWN;

  charset_str = (char *) alloca (strlen (charset));
  strcpy (charset_str, charset);

  /* Remove leading "*-".  */

        *end = '\0';
      }

  entry = Fassoc (build_string(charset), Vw32_charset_info_alist);
  if (NILP (entry))
    return CP_UNKNOWN;

  codepage = Fcdr (Fcdr (entry));

  if (NILP (codepage))
    return CP_8BIT;
  else if (XFASTINT (codepage) == XFASTINT (Qt))
    return CP_UNICODE;
  else if (INTEGERP (codepage))
    return XINT (codepage);
  else
    return CP_UNKNOWN;
}


BOOL 
w32_to_x_font (lplogfont, lpxstr, len, specific_charset)

      /* Avoid expensive EnumFontFamilies functions if we are not
         going to be able to output one of these anyway. */
      codepage = w32_codepage_for_font (XSTRING (tpat)->data);
      if (codepage != CP_8BIT && codepage != CP_UNICODE
          && codepage != CP_DEFAULT && codepage != CP_UNKNOWN
	  && !IsValidCodePage(codepage))
        continue;

      /* See if we cached the result for this particular query.
         The cache is an alist of the form:
           ((PATTERN (FONTNAME . WIDTH) ...) ...)