nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 11:02:48 -05:00
Code Issues Projects Releases Wiki Activity

Deglobalise the Unicode module. Despite all my grand plans, I've

Browse Source 
just done this the very simple way - bundle all the globals into a
data structure and pass pointers around. One particularly ugly wart
is that wc_to_mb now takes a pointer to this structure as an
argument (optional, may be NULL, and unused in any Unicode layer
that's even marginally less of a mess than the Windows one). I do
need to do this properly at some point, but for now this should just
about be adequate. As usual, the Mac port has not been updated.

[originally from svn r2592]
This commit is contained in:
Simon Tatham
2003-01-14 18:28:23 +00:00
parent a185e16467
commit b2374a64fd
10 changed files with 193 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
unix/pterm.c
View File

@ -67,6 +67,7 @@ struct gui_data {
void *backhandle;
Terminal *term;
void *logctx;
struct unicode_data ucsdata;
Config cfg;
};
@ -1283,9 +1284,10 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
inst->pasteout_data = smalloc(len*6);
inst->pasteout_data_len = len*6;
inst->pasteout_data_len = wc_to_mb(line_codepage, 0, data, len,
inst->pasteout_data,
inst->pasteout_data_len, NULL, NULL);
inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
data, len, inst->pasteout_data,
inst->pasteout_data_len,
NULL, NULL, NULL);
if (inst->pasteout_data_len == 0) {
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
@ -1396,7 +1398,7 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
inst->pastein_data_len = seldata->length;
inst->pastein_data_len =
mb_to_wc((seldata->type == inst->utf8_string_atom ?
CS_UTF8 : line_codepage),
CS_UTF8 : inst->ucsdata.line_codepage),
0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
@ -1646,7 +1648,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
} else {
gcs = smalloc(sizeof(GdkWChar) * (len+1));
wc_to_mb(inst->fontinfo[fontid].charset, 0,
wcs, len, gcs, len, ".", NULL);
wcs, len, gcs, len, ".", NULL, NULL);
gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
x*inst->font_width+inst->cfg.window_border,
y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
@ -2315,7 +2317,8 @@ int main(int argc, char **argv)
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
inst->direct_to_font = init_ucs(inst->cfg.line_codepage, font_charset);
inst->direct_to_font = init_ucs(&inst->ucsdata,
inst->cfg.line_codepage, font_charset);
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@ -2415,7 +2418,7 @@ int main(int argc, char **argv)
inst->currcursor = inst->textcursor;
show_mouseptr(inst, 1);
inst->term = term_init(&inst->cfg, inst);
inst->term = term_init(&inst->cfg, &inst->ucsdata, inst);
inst->logctx = log_init(inst, &inst->cfg);
term_provide_logctx(inst->term, inst->logctx);

4
unix/unix.h
View File

@ -69,7 +69,9 @@ void (*putty_signal(int sig, void (*func)(int)))(int);
/*
* Exports from unicode.c.
*/
int init_ucs(char *line_codepage, int font_charset);
struct unicode_data;
int init_ucs(struct unicode_data *ucsdata,
char *line_codepage, int font_charset);
/*
* Spare function exported directly from uxnet.c.

45
unix/uxucs.c
View File

@ -58,7 +58,8 @@ int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
}
int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
char *mbstr, int mblen, char *defchr, int *defused)
char *mbstr, int mblen, char *defchr, int *defused,
struct unicode_data *ucsdata)
{
/* FIXME: we should remove the defused param completely... */
if (defused)
@ -104,7 +105,8 @@ int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
/*
* Return value is TRUE if pterm is to run in direct-to-font mode.
*/
int init_ucs(char *linecharset, int font_charset)
int init_ucs(struct unicode_data *ucsdata,
char *linecharset, int font_charset)
{
int i, ret = 0;
@ -114,15 +116,15 @@ int init_ucs(char *linecharset, int font_charset)
* support at all. So we set this to something which will never
* be used.
*/
font_codepage = -1;
ucsdata->font_codepage = -1;
/*
* line_codepage should be decoded from the specification in
* cfg.
*/
line_codepage = charset_from_mimeenc(linecharset);
if (line_codepage == CS_NONE)
line_codepage = charset_from_xenc(linecharset);
ucsdata->line_codepage = charset_from_mimeenc(linecharset);
if (ucsdata->line_codepage == CS_NONE)
ucsdata->line_codepage = charset_from_xenc(linecharset);
/*
* If line_codepage is _still_ CS_NONE, we assume we're using
@ -131,10 +133,10 @@ int init_ucs(char *linecharset, int font_charset)
* font we were given had an incomprehensible charset - then we
* fall back to using the D800 page.
*/
if (line_codepage == CS_NONE)
line_codepage = font_charset;
if (ucsdata->line_codepage == CS_NONE)
ucsdata->line_codepage = font_charset;
if (line_codepage == CS_NONE)
if (ucsdata->line_codepage == CS_NONE)
ret = 1;
/*
@ -148,13 +150,14 @@ int init_ucs(char *linecharset, int font_charset)
c[0] = i;
p = c;
len = 1;
if (line_codepage == CS_NONE)
unitab_line[i] = 0xD800 | i;
else if (1 == charset_to_unicode(&p, &len, wc, 1, line_codepage,
if (ucsdata->line_codepage == CS_NONE)
ucsdata->unitab_line[i] = 0xD800 | i;
else if (1 == charset_to_unicode(&p, &len, wc, 1,
ucsdata->line_codepage,
NULL, L"", 0))
unitab_line[i] = wc[0];
ucsdata->unitab_line[i] = wc[0];
else
unitab_line[i] = 0xFFFD;
ucsdata->unitab_line[i] = 0xFFFD;
}
/*
@ -175,9 +178,9 @@ int init_ucs(char *linecharset, int font_charset)
0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x0020
};
if (i >= 0x5F && i < 0x7F)
unitab_xterm[i] = unitab_xterm_std[i & 0x1F];
ucsdata->unitab_xterm[i] = unitab_xterm_std[i & 0x1F];
else
unitab_xterm[i] = unitab_line[i];
ucsdata->unitab_xterm[i] = ucsdata->unitab_line[i];
}
/*
@ -192,9 +195,9 @@ int init_ucs(char *linecharset, int font_charset)
p = c;
len = 1;
if (1 == charset_to_unicode(&p, &len, wc, 1, CS_CP437, NULL, L"", 0))
unitab_scoacs[i] = wc[0];
ucsdata->unitab_scoacs[i] = wc[0];
else
unitab_scoacs[i] = 0xFFFD;
ucsdata->unitab_scoacs[i] = 0xFFFD;
}
/*
@ -205,12 +208,12 @@ int init_ucs(char *linecharset, int font_charset)
* used in this way will be IBM or MS code pages anyway.)
*/
for (i = 0; i < 256; i++) {
int lineval = unitab_line[i];
int lineval = ucsdata->unitab_line[i];
if (lineval < ' ' || (lineval >= 0x7F && lineval < 0xA0) ||
(lineval >= 0xD800 && lineval < 0xD820) || (lineval == 0xD87F))
unitab_ctrl[i] = i;
ucsdata->unitab_ctrl[i] = i;
else
unitab_ctrl[i] = 0xFF;
ucsdata->unitab_ctrl[i] = 0xFF;
}
return ret;