nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Add a mechanism for determining which charset to use for a given Mac OS font,

Browse Source 
and use it.

[originally from svn r2409]
This commit is contained in:
Ben Harris 2003-01-01 19:51:13 +00:00
parent 3deb118d4b
commit 0ea7e35008
5 changed files with 194 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Recipe
View File

@ -111,7 +111,7 @@ WINMISC = misc version winstore settings tree234 winnet proxy cmdline
UXMISC = misc version uxstore settings tree234 uxnet proxy cmdline
# Character set library, for use in pterm.
CHARSET = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc
CHARSET = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc
# Standard libraries, and the same with WinSocks 1 and 2.
LIBS = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib

6
charset/charset.h
View File

@ -136,4 +136,10 @@ int charset_from_xenc(const char *name);
const char *charset_to_mimeenc(int charset);
int charset_from_mimeenc(const char *name);
/*
* Convert Mac OS script/region/font to our charset identifiers.
*/
int charset_from_macenc(int script, int region, int sysvers,
const char *fontname);
#endif /* charset_charset_h */

169
charset/macenc.c Normal file
View File

@ -0,0 +1,169 @@
/* $Id: macenc.c,v 1.1 2003/01/01 19:51:12 ben Exp $ */
/*
* Copyright (c) 2003 Ben Harris
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/*
* macenc.c -- Convert a Mac OS script/region/font combination to our
* internal charset code.
*/
#include <string.h>
#include "charset.h"
#include "internal.h"
/*
* These are defined by Mac OS's <Script.h>, but we'd like to be
* independent of that.
*/
#define smRoman 0
#define smJapanese 1
#define smTradChinese 2
#define smKorean 3
#define smArabic 4
#define smHebrew 5
#define smCyrillic 7
#define smDevenagari 9
#define smGurmukhi 10
#define smGujurati 11
#define smThai 21
#define smSimpChinese 25
#define smTibetan 26
#define smEthiopic 28
#define smCentralEuroRoman 29
#define verGreece 20
#define verIceland 21
#define verTurkey 24
#define verYugoCroatian 25
#define verRomania 39
#define verFaroeIsl 47
#define verIran 48
#define verRussia 49
#define verSlovenian 66
#define verCroatia 68
#define verBulgaria 72
#define verScottishGaelic 75
#define verManxGaelic 76
#define verBreton 77
#define verNunavut 78
#define verWelsh 79
#define verIrishGaelicScript 81
static const struct {
int script;
int region;
int sysvermin;
char const *fontname;
int charset;
} macencs[] = {
{ smRoman, -1, 0x850, "VT100", CS_MAC_VT100 },
{ smRoman, -1, 0, "VT100", CS_MAC_VT100_OLD },
/*
* From here on, this table is largely derived from
* <http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/README.TXT>,
* with _OLD version added based on the comments in individual
* mapping files.
*/
{ smRoman, -1, 0, "Symbol", CS_MAC_SYMBOL },
{ smRoman, -1, 0, "Zapf Dingbats", CS_MAC_DINGBATS },
{ smRoman, verTurkey, 0, NULL, CS_MAC_TURKISH },
{ smRoman, verYugoCroatian, 0x850, NULL, CS_MAC_CROATIAN },
{ smRoman, verYugoCroatian, 0, NULL, CS_MAC_CROATIAN_OLD },
{ smRoman, verSlovenian, 0x850, NULL, CS_MAC_CROATIAN },
{ smRoman, verSlovenian, 0, NULL, CS_MAC_CROATIAN_OLD },
{ smRoman, verCroatia, 0x850, NULL, CS_MAC_CROATIAN },
{ smRoman, verCroatia, 0, NULL, CS_MAC_CROATIAN_OLD },
{ smRoman, verIceland, 0x850, NULL, CS_MAC_ICELAND },
{ smRoman, verIceland, 0, NULL, CS_MAC_ICELAND_OLD },
{ smRoman, verFaroeIsl, 0x850, NULL, CS_MAC_ICELAND },
{ smRoman, verFaroeIsl, 0, NULL, CS_MAC_ICELAND_OLD },
{ smRoman, verRomania, 0x850, NULL, CS_MAC_ROMANIAN },
{ smRoman, verRomania, 0, NULL, CS_MAC_ROMANIAN_OLD },
#if 0 /* No mapping table on ftp.unicode.org */
{ smRoman, verIreland, 0x850, NULL, CS_MAC_CELTIC },
{ smRoman, verIreland, 0, NULL, CS_MAC_CELTIC_OLD },
{ smRoman, verScottishGaelic, 0x850, NULL, CS_MAC_CELTIC },
{ smRoman, verScottishGaelic, 0, NULL, CS_MAC_CELTIC_OLD },
{ smRoman, verManxGaelic, 0x850, NULL, CS_MAC_CELTIC },
{ smRoman, verManxGaelic, 0, NULL, CS_MAC_CELTIC_OLD },
{ smRoman, verBreton, 0x850, NULL, CS_MAC_CELTIC },
{ smRoman, verBreton, 0, NULL, CS_MAC_CELTIC_OLD },
{ smRoman, verWelsh, 0x850, NULL, CS_MAC_CELTIC },
{ smRoman, verWelsh, 0, NULL, CS_MAC_CELTIC_OLD },
{ smRoman, verIrishGaelicScript, 0x850, NULL, CS_MAC_GAELIC },
{ smRoman, verIrishGaelicScript, 0, NULL, CS_MAC_GAELIC_OLD },
#endif
{ smRoman, verGreece, 0x922, NULL, CS_MAC_GREEK },
{ smRoman, verGreece, 0, NULL, CS_MAC_GREEK_OLD },
{ smRoman, -1, 0x850, NULL, CS_MAC_ROMAN },
{ smRoman, -1, 0, NULL, CS_MAC_ROMAN_OLD },
#if 0 /* Multi-byte encodings, not yet supported */
{ smJapanese, -1, 0, NULL, CS_MAC_JAPANESE },
{ smTradChinese, -1, 0, NULL, CS_MAC_CHINTRAD },
{ smKorean, -1, 0, NULL, CS_MAC_KOREAN },
#endif
#if 0 /* Bidirectional encodings, not yet supported */
{ smArabic, verIran, 0, NULL, CS_MAC_FARSI },
{ smArabic, -1, 0, NULL, CS_MAC_ARABIC },
{ smHebrew, -1, 0, NULL, CS_MAC_HEBREW },
#endif
{ smCyrillic, -1, 0x900, NULL, CS_MAC_CYRILLIC },
{ smCyrillic, verRussia, 0, NULL, CS_MAC_CYRILLIC_OLD },
{ smCyrillic, verBulgaria, 0, NULL, CS_MAC_CYRILLIC_OLD },
{ smCyrillic, -1, 0, NULL, CS_MAC_UKRAINE },
#if 0 /* Complex Indic scripts, not yet supported */
{ smDevanagari, -1, 0, NULL, CS_MAC_DEVENAGA },
{ smGurmukhi, -1, 0, NULL, CS_MAC_GURMUKHI },
{ smGujurati, -1, 0, NULL, CS_MAC_GUJURATI },
#endif
{ smThai, -1, 0, NULL, CS_MAC_THAI },
#if 0 /* Multi-byte encoding, not yet supported */
{ smSimpChinese, -1, 0, NULL, CS_MAC_CHINSIMP },
#endif
#if 0 /* No mapping table on ftp.unicode.org */
{ smTibetan, -1, 0, NULL, CS_MAC_TIBETAN },
{ smEthiopic, -1, 0, NULL, CS_MAC_ETHIOPIC },
{ smEthiopic, verNanavut, 0, NULL, CS_MAC_INUIT },
#endif
{ smCentralEuroRoman, -1, 0, NULL, CS_MAC_CENTEURO },
};
int charset_from_macenc(int script, int region, int sysvers,
char const *fontname)
{
int i;
for (i = 0; i < (int)lenof(macencs); i++)
if ((macencs[i].script == script) &&
(macencs[i].region < 0 || macencs[i].region == region) &&
(macencs[i].sysvermin <= sysvers) &&
(macencs[i].fontname == NULL ||
strcmp(macencs[i].fontname, fontname) == 0))
return macencs[i].charset;
return CS_NONE;
}

5
mac/mac.h
View File

@ -13,6 +13,8 @@
#include <Palettes.h>
#include <UnicodeConverter.h>
#include "charset.h"
struct mac_gestalts {
long sysvers;
long qdvers;
@ -53,7 +55,8 @@ typedef struct {
ControlHandle scrollbar;
WCTabHandle wctab;
int raw_mouse;
UnicodeToTextInfo uni_to_font;
UnicodeToTextInfo uni_to_font; /* Only one of uni_to_font and */
charset_t font_charset; /* font_charset is used at a time. */
} Session;
/* from macdlg.c */

24
mac/macterm.c
View File

@ -1,4 +1,4 @@
/* $Id: macterm.c,v 1.29 2002/12/31 22:49:03 ben Exp $ */
/* $Id: macterm.c,v 1.30 2003/01/01 19:51:13 ben Exp $ */
/*
* Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris
@ -232,14 +232,12 @@ static void mac_initfont(Session *s) {
if (s->uni_to_font != NULL)
DisposeUnicodeToTextInfo(&s->uni_to_font);
if (mac_gestalts.encvvers == 0 ||
if (mac_gestalts.encvvers != 0 &&
UpgradeScriptInfoToTextEncoding(kTextScriptDontCare,
kTextLanguageDontCare,
kTextRegionDontCare, macfont,
&enc) != noErr ||
CreateUnicodeToTextInfoByEncoding(enc, &s->uni_to_font) != noErr) {
s->uni_to_font = NULL;
} else {
&enc) == noErr &&
CreateUnicodeToTextInfoByEncoding(enc, &s->uni_to_font) == noErr) {
if (uni_to_font_fallback_upp == NULL)
uni_to_font_fallback_upp =
NewUnicodeToTextFallbackProc(&uni_to_font_fallback);
@ -250,6 +248,12 @@ static void mac_initfont(Session *s) {
DisposeUnicodeToTextInfo(&s->uni_to_font);
s->uni_to_font = NULL;
}
} else {
s->uni_to_font = NULL;
s->font_charset =
charset_from_macenc(FontToScript(s->fontnum),
GetScriptManagerVariable(smRegionCode),
mac_gestalts.sysvers, s->cfg.font);
}
mac_adjustsize(s, s->term->rows, s->term->cols);
@ -981,13 +985,13 @@ void do_text(Context ctx, int x, int y, char *text, int len,
if (err != noErr && err != kTECUsedFallbacksStatus)
/* XXX Should handle this more sensibly */
return;
} else {
} else if (s->font_charset != CS_NONE) {
/* XXX this is bogus if wchar_t and UniChar are different sizes. */
unitextptr = (wchar_t *)unitextbuf;
/* XXX Should choose charset based on script, font etc. */
olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
CS_MAC_ROMAN, NULL, ".", 1);
}
s->font_charset, NULL, ".", 1);
} else
return;
a.s = s;
a.text = mactextbuf;