X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6da411554bfe4c2a8ddfbb0616b0030ea5e813f5..7d22e9b256ff8fa58b3d2e6ea74102e43f52a0c7:/windows/winucs.c

diff --git a/windows/winucs.c b/windows/winucs.c
index 2412e406..2ce1693b 100644
--- a/windows/winucs.c
+++ b/windows/winucs.c
@@ -427,6 +427,7 @@ static const struct cp_list_item cp_list[] = {
     {"CP437", 437},
     {"CP620 (Mazovia)", 0, 128, mazovia},
     {"CP819", 28591},
+    {"CP852", 852},
     {"CP878", 20866},
 
     {"Use font encoding", -1},
@@ -436,24 +437,27 @@ static const struct cp_list_item cp_list[] = {
 
 static void link_font(WCHAR * line_tbl, WCHAR * font_tbl, WCHAR attr);
 
-void init_ucs(Config *cfg, struct unicode_data *ucsdata)
+void init_ucs(Conf *conf, struct unicode_data *ucsdata)
 {
     int i, j;
     int used_dtf = 0;
     char tbuf[256];
+    int vtmode;
 
     for (i = 0; i < 256; i++)
 	tbuf[i] = i;
 
     /* Decide on the Line and Font codepages */
-    ucsdata->line_codepage = decode_codepage(cfg->line_codepage);
+    ucsdata->line_codepage = decode_codepage(conf_get_str(conf,
+							  CONF_line_codepage));
 
     if (ucsdata->font_codepage <= 0) { 
 	ucsdata->font_codepage=0; 
 	ucsdata->dbcs_screenfont=0; 
     }
 
-    if (cfg->vtmode == VT_OEMONLY) {
+    vtmode = conf_get_int(conf, CONF_vtmode);
+    if (vtmode == VT_OEMONLY) {
 	ucsdata->font_codepage = 437;
 	ucsdata->dbcs_screenfont = 0;
 	if (ucsdata->line_codepage <= 0)
@@ -473,7 +477,7 @@ void init_ucs(Config *cfg, struct unicode_data *ucsdata)
 	if (ucsdata->font_codepage == 437)
 	    ucsdata->unitab_font[0] = ucsdata->unitab_font[255] = 0xFFFF;
     }
-    if (cfg->vtmode == VT_XWINDOWS)
+    if (vtmode == VT_XWINDOWS)
 	memcpy(ucsdata->unitab_font + 1, unitab_xterm_std,
 	       sizeof(unitab_xterm_std));
 
@@ -481,7 +485,7 @@ void init_ucs(Config *cfg, struct unicode_data *ucsdata)
     get_unitab(CP_OEMCP, ucsdata->unitab_oemcp, 1);
 
     /* Collect CP437 ucs table for SCO acs */
-    if (cfg->vtmode == VT_OEMANSI || cfg->vtmode == VT_XWINDOWS)
+    if (vtmode == VT_OEMANSI || vtmode == VT_XWINDOWS)
 	memcpy(ucsdata->unitab_scoacs, ucsdata->unitab_oemcp,
 	       sizeof(ucsdata->unitab_scoacs));
     else
@@ -490,7 +494,7 @@ void init_ucs(Config *cfg, struct unicode_data *ucsdata)
     /* Collect line set ucs table */
     if (ucsdata->line_codepage == ucsdata->font_codepage &&
 	(ucsdata->dbcs_screenfont ||
-	 cfg->vtmode == VT_POORMAN || ucsdata->font_codepage==0)) {
+	 vtmode == VT_POORMAN || ucsdata->font_codepage==0)) {
 
 	/* For DBCS and POOR fonts force direct to font */
 	used_dtf = 1;
@@ -560,14 +564,14 @@ void init_ucs(Config *cfg, struct unicode_data *ucsdata)
 	    ucsdata->unitab_ctrl[i] = 0xFF;
 
     /* Generate line->screen direct conversion links. */
-    if (cfg->vtmode == VT_OEMANSI || cfg->vtmode == VT_XWINDOWS)
+    if (vtmode == VT_OEMANSI || vtmode == VT_XWINDOWS)
 	link_font(ucsdata->unitab_scoacs, ucsdata->unitab_oemcp, CSET_OEMCP);
 
     link_font(ucsdata->unitab_line, ucsdata->unitab_font, CSET_ACP);
     link_font(ucsdata->unitab_scoacs, ucsdata->unitab_font, CSET_ACP);
     link_font(ucsdata->unitab_xterm, ucsdata->unitab_font, CSET_ACP);
 
-    if (cfg->vtmode == VT_OEMANSI || cfg->vtmode == VT_XWINDOWS) {
+    if (vtmode == VT_OEMANSI || vtmode == VT_XWINDOWS) {
 	link_font(ucsdata->unitab_line, ucsdata->unitab_oemcp, CSET_OEMCP);
 	link_font(ucsdata->unitab_xterm, ucsdata->unitab_oemcp, CSET_OEMCP);
     }
@@ -581,7 +585,7 @@ void init_ucs(Config *cfg, struct unicode_data *ucsdata)
     }
 
     /* Last chance, if !unicode then try poorman links. */
-    if (cfg->vtmode != VT_UNICODE) {
+    if (vtmode != VT_UNICODE) {
 	static const char poorman_scoacs[] = 
 	    "CueaaaaceeeiiiAAE**ooouuyOUc$YPsaiounNao?++**!<>###||||++||++++++--|-+||++--|-+----++++++++##||#aBTPEsyt******EN=+><++-=... n2* ";
 	static const char poorman_latin1[] =
@@ -1088,7 +1092,7 @@ int decode_codepage(char *cp_name)
 	if (tolower(d[0]) == 'c' && tolower(d[1]) == 'p')
 	    d += 2;
 	if (tolower(d[0]) == 'i' && tolower(d[1]) == 'b'
-	    && tolower(d[1]) == 'm')
+	    && tolower(d[2]) == 'm')
 	    d += 3;
 	for (s = d; *s >= '0' && *s <= '9'; s++);
 	if (*s == 0 && s != d)
@@ -1201,7 +1205,7 @@ void get_unitab(int codepage, wchar_t * unitab, int ftype)
     }
 }
 
-int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
+int wc_to_mb(int codepage, int flags, const wchar_t *wcstr, int wclen,
 	     char *mbstr, int mblen, char *defchr, int *defused,
 	     struct unicode_data *ucsdata)
 {
@@ -1239,7 +1243,7 @@ int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
 				   mbstr, mblen, defchr, defused);
 }
 
-int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
+int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen,
 	     wchar_t *wcstr, int wclen)
 {
     return MultiByteToWideChar(codepage, flags, mbstr, mblen, wcstr, wclen);