X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/eec8f73c747cbb8e32f825ee48f29e34e8cd14b8..97c511f60934408185f60245af3c606bf20ca9e6:/unicode.c diff --git a/unicode.c b/unicode.c index 75d0576c..3c25c6ea 100644 --- a/unicode.c +++ b/unicode.c @@ -32,8 +32,9 @@ static const WCHAR unitab_xterm_std[32] = { */ /* - * Tables for ISO-8859-{1-9,13-16} derived from those downloaded + * Tables for ISO-8859-{1-10,13-16} derived from those downloaded * 2001-10-02 from -- jtn + * Table for ISO-8859-11 derived from same on 2002-11-18. -- bjh21 */ /* XXX: This could be done algorithmically, but I'm not sure it's @@ -54,7 +55,7 @@ static const wchar_t iso_8859_1[] = { 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF }; -/* ISO 8859-2:1999 (Latin-2, "Central European", "East European") */ +/* ISO/IEC 8859-2:1999 (Latin-2, "Central European", "East European") */ static const wchar_t iso_8859_2[] = { 0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, @@ -102,7 +103,7 @@ static const wchar_t iso_8859_4[] = { 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9 }; -/* ISO 8859-5:1999 (Latin/Cyrillic) */ +/* ISO/IEC 8859-5:1999 (Latin/Cyrillic) */ static const wchar_t iso_8859_5[] = { 0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, @@ -118,7 +119,7 @@ static const wchar_t iso_8859_5[] = { 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F }; -/* ISO 8859-6:1999 (Latin/Arabic) */ +/* ISO/IEC 8859-6:1999 (Latin/Arabic) */ static const wchar_t iso_8859_6[] = { 0x00A0, 0xFFFD, 0xFFFD, 0xFFFD, 0x00A4, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x060C, 0x00AD, 0xFFFD, 0xFFFD, @@ -182,15 +183,12 @@ static const wchar_t iso_8859_9[] = { 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF }; -/* ISO 8859-10:1993? (Latin-6, "Nordic" [Sami, Inuit, Icelandic]) */ -/* Translation table from RDB. unicode.org (ISO/IEC 8859-10:1998) has - * U+2015 (HORIZONTAL BAR) at codepoint 0xBD instead - * (U+2014 is EM DASH). -- jtn */ +/* ISO/IEC 8859-10:1998 (Latin-6, "Nordic" [Sami, Inuit, Icelandic]) */ static const wchar_t iso_8859_10[] = { 0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7, 0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A, 0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7, - 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2014, 0x016B, 0x014B, + 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168, @@ -201,7 +199,7 @@ static const wchar_t iso_8859_10[] = { 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138 }; -/* ISO 8859-11:2001 ("Thai", "TIS620") */ +/* ISO/IEC 8859-11:2001 ("Thai", "TIS620") */ static const wchar_t iso_8859_11[] = { 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, @@ -382,7 +380,7 @@ static const struct cp_list_item cp_list[] = { {"ISO-8859-7:1987 (Latin/Greek)", 0, 96, iso_8859_7}, {"ISO-8859-8:1999 (Latin/Hebrew)", 0, 96, iso_8859_8}, {"ISO-8859-9:1999 (Latin-5, Turkish)", 0, 96, iso_8859_9}, - {"ISO-8859-10:1993 (Latin-6, Nordic)", 0, 96, iso_8859_10}, + {"ISO-8859-10:1998 (Latin-6, Nordic)", 0, 96, iso_8859_10}, {"ISO-8859-11:2001 (Latin/Thai)", 0, 96, iso_8859_11}, {"ISO-8859-13:1998 (Latin-7, Baltic)", 0, 96, iso_8859_13}, {"ISO-8859-14:1998 (Latin-8, Celtic)", 0, 96, iso_8859_14}, @@ -418,7 +416,7 @@ static const struct cp_list_item cp_list[] = { static void link_font(WCHAR * line_tbl, WCHAR * font_tbl, WCHAR attr); -void init_ucs(void) +void init_ucs(Config *cfg) { int i, j; int used_dtf = 0; @@ -428,14 +426,14 @@ void init_ucs(void) tbuf[i] = i; /* Decide on the Line and Font codepages */ - line_codepage = decode_codepage(cfg.line_codepage); + line_codepage = decode_codepage(cfg->line_codepage); if (font_codepage <= 0) { font_codepage=0; dbcs_screenfont=0; } - if (cfg.vtmode == VT_OEMONLY) { + if (cfg->vtmode == VT_OEMONLY) { font_codepage = 437; dbcs_screenfont = 0; if (line_codepage <= 0) @@ -455,7 +453,7 @@ void init_ucs(void) if (font_codepage == 437) unitab_font[0] = unitab_font[255] = 0xFFFF; } - if (cfg.vtmode == VT_XWINDOWS) + if (cfg->vtmode == VT_XWINDOWS) memcpy(unitab_font + 1, unitab_xterm_std, sizeof(unitab_xterm_std)); @@ -463,14 +461,14 @@ void init_ucs(void) get_unitab(CP_OEMCP, unitab_oemcp, 1); /* Collect CP437 ucs table for SCO acs */ - if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_XWINDOWS) + if (cfg->vtmode == VT_OEMANSI || cfg->vtmode == VT_XWINDOWS) memcpy(unitab_scoacs, unitab_oemcp, sizeof(unitab_scoacs)); else get_unitab(437, unitab_scoacs, 1); /* Collect line set ucs table */ if (line_codepage == font_codepage && - (dbcs_screenfont || cfg.vtmode == VT_POORMAN || font_codepage==0)) { + (dbcs_screenfont || cfg->vtmode == VT_POORMAN || font_codepage==0)) { /* For DBCS and POOR fonts force direct to font */ used_dtf = 1; @@ -537,14 +535,14 @@ void init_ucs(void) unitab_ctrl[i] = 0xFF; /* Generate line->screen direct conversion links. */ - if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_XWINDOWS) + if (cfg->vtmode == VT_OEMANSI || cfg->vtmode == VT_XWINDOWS) link_font(unitab_scoacs, unitab_oemcp, ATTR_OEMCP); link_font(unitab_line, unitab_font, ATTR_ACP); link_font(unitab_scoacs, unitab_font, ATTR_ACP); link_font(unitab_xterm, unitab_font, ATTR_ACP); - if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_XWINDOWS) { + if (cfg->vtmode == VT_OEMANSI || cfg->vtmode == VT_XWINDOWS) { link_font(unitab_line, unitab_oemcp, ATTR_OEMCP); link_font(unitab_xterm, unitab_oemcp, ATTR_OEMCP); } @@ -557,7 +555,7 @@ void init_ucs(void) } /* Last chance, if !unicode then try poorman links. */ - if (cfg.vtmode != VT_UNICODE) { + if (cfg->vtmode != VT_UNICODE) { static char poorman_scoacs[] = "CueaaaaceeeiiiAAE**ooouuyOUc$YPsaiounNao?++**!<>###||||++||++++++--|-+||++--|-+----++++++++##||#aBTPEsyt******EN=+><++-=... n2* "; static char poorman_latin1[] =