comparison src/w32fns.c @ 23620:2b55b8f8cdc1

(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if x font doesn't specify the charset. (x_to_w32_charset): Change >= to == when testing results of stricmp.

23619:0813c9bb52c4

    BLOCK_INPUT;

    font->hfont = CreateFontIndirect (&lf);

  if (font->hfont == NULL) 
    {
      ok = FALSE;
    } 
  else 
    {
      HDC hdc;
      HANDLE oldobj;

      hdc = GetDC (dpyinfo->root_window);
      oldobj = SelectObject (hdc, font->hfont);
      ok = GetTextMetrics (hdc, &font->tm);
      SelectObject (hdc, oldobj);
      ReleaseDC (dpyinfo->root_window, hdc);
    }

  UNBLOCK_INPUT;

    if (!ok)
      {
  w32_unload_font (dpyinfo, font);
  return (NULL);
}

    /* Do we need to create the table?  */
    if (dpyinfo->font_table_size == 0)
      {
	dpyinfo->font_table_size = 16;

x_to_w32_charset (lpcs)
    char * lpcs;
{
  if (!lpcs) return (0);

  if (stricmp (lpcs,"ansi") == 0)               return ANSI_CHARSET;
  else if (stricmp (lpcs,"iso8859-1") == 0)     return ANSI_CHARSET;
  else if (stricmp (lpcs, "symbol") >= 0)        return SYMBOL_CHARSET;
  else if (stricmp (lpcs, "jis") >= 0)          return SHIFTJIS_CHARSET;
  else if (stricmp (lpcs, "ksc5601") == 0)       return HANGEUL_CHARSET;
  else if (stricmp (lpcs, "gb2312") == 0)        return GB2312_CHARSET;
  else if (stricmp (lpcs, "big5") == 0)          return CHINESEBIG5_CHARSET;
  else if (stricmp (lpcs, "oem") >= 0)	         return OEM_CHARSET;

#ifdef EASTEUROPE_CHARSET
  else if (stricmp (lpcs, "iso8859-2") == 0)     return EASTEUROPE_CHARSET;
  else if (stricmp (lpcs, "iso8859-3") == 0)     return TURKISH_CHARSET;
  else if (stricmp (lpcs, "iso8859-4") == 0)     return BALTIC_CHARSET;

  else if (stricmp (lpcs, "tis620") == 0)        return THAI_CHARSET;
  else if (stricmp (lpcs, "mac") == 0)           return MAC_CHARSET;
#endif

#ifdef UNICODE_CHARSET
  else if (stricmp (lpcs,"iso10646") == 0)      return UNICODE_CHARSET;
  else if (stricmp (lpcs, "unicode") >= 0)       return UNICODE_CHARSET;
#endif
  else if (lpcs[0] == '#')			return atoi (lpcs + 1);
  else
    return DEFAULT_CHARSET;
}

char *

{
  if (!lplogfont) return (FALSE);
  
  memset (lplogfont, 0, sizeof (*lplogfont));

#if 1
  lplogfont->lfOutPrecision = OUT_DEFAULT_PRECIS;
  lplogfont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
  lplogfont->lfQuality = DEFAULT_QUALITY;
#else
  /* go for maximum quality */
  lplogfont->lfOutPrecision = OUT_STROKE_PRECIS;
  lplogfont->lfClipPrecision = CLIP_STROKE_PRECIS;
  lplogfont->lfQuality = PROOF_QUALITY;
#endif

  if (!lpxstr)
    return FALSE;

  /* Provide a simple escape mechanism for specifying Windows font names

23620:2b55b8f8cdc1

    BLOCK_INPUT;

    font->hfont = CreateFontIndirect (&lf);

    if (font->hfont == NULL) 
      {
	ok = FALSE;
      } 
    else 
      {
	HDC hdc;
	HANDLE oldobj;

	hdc = GetDC (dpyinfo->root_window);
	oldobj = SelectObject (hdc, font->hfont);
	ok = GetTextMetrics (hdc, &font->tm);
	SelectObject (hdc, oldobj);
	ReleaseDC (dpyinfo->root_window, hdc);
      }

    UNBLOCK_INPUT;

    if (!ok)
      {
	w32_unload_font (dpyinfo, font);
	return (NULL);
      }

    /* Do we need to create the table?  */
    if (dpyinfo->font_table_size == 0)
      {
	dpyinfo->font_table_size = 16;

x_to_w32_charset (lpcs)
    char * lpcs;
{
  if (!lpcs) return (0);

  if (stricmp (lpcs,"ansi") == 0)                return ANSI_CHARSET;
  else if (stricmp (lpcs,"iso8859-1") == 0)      return ANSI_CHARSET;
  else if (stricmp (lpcs, "symbol") == 0)        return SYMBOL_CHARSET;
  else if (stricmp (lpcs, "jis") == 0)           return SHIFTJIS_CHARSET;
  else if (stricmp (lpcs, "ksc5601") == 0)       return HANGEUL_CHARSET;
  else if (stricmp (lpcs, "gb2312") == 0)        return GB2312_CHARSET;
  else if (stricmp (lpcs, "big5") == 0)          return CHINESEBIG5_CHARSET;
  else if (stricmp (lpcs, "oem") == 0)	         return OEM_CHARSET;

#ifdef EASTEUROPE_CHARSET
  else if (stricmp (lpcs, "iso8859-2") == 0)     return EASTEUROPE_CHARSET;
  else if (stricmp (lpcs, "iso8859-3") == 0)     return TURKISH_CHARSET;
  else if (stricmp (lpcs, "iso8859-4") == 0)     return BALTIC_CHARSET;

  else if (stricmp (lpcs, "tis620") == 0)        return THAI_CHARSET;
  else if (stricmp (lpcs, "mac") == 0)           return MAC_CHARSET;
#endif

#ifdef UNICODE_CHARSET
  else if (stricmp (lpcs,"iso10646") == 0)       return UNICODE_CHARSET;
  else if (stricmp (lpcs, "unicode") == 0)       return UNICODE_CHARSET;
#endif
  else if (lpcs[0] == '#')			 return atoi (lpcs + 1);
  else
    return DEFAULT_CHARSET;
}

char *

{
  if (!lplogfont) return (FALSE);
  
  memset (lplogfont, 0, sizeof (*lplogfont));

  /* Set default value for each field.  */
#if 1
  lplogfont->lfOutPrecision = OUT_DEFAULT_PRECIS;
  lplogfont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
  lplogfont->lfQuality = DEFAULT_QUALITY;
#else
  /* go for maximum quality */
  lplogfont->lfOutPrecision = OUT_STROKE_PRECIS;
  lplogfont->lfClipPrecision = CLIP_STROKE_PRECIS;
  lplogfont->lfQuality = PROOF_QUALITY;
#endif

  lplogfont->lfCharSet = DEFAULT_CHARSET;
  lplogfont->lfWeight = FW_DONTCARE;
  lplogfont->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

  if (!lpxstr)
    return FALSE;

  /* Provide a simple escape mechanism for specifying Windows font names