nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Fixes to direct-to-font mode: I'd inadvertently enabled it for any

Browse Source 
font whose encoding comes up as CS_NONE - but this is also true for
iso10646-1 fonts, since libcharset doesn't support wide-character
encodings! Hence UTF-8 cut and paste was enabled in ordinary modes,
but disabled in UTF-8 mode, which was a bit embarrassing. Now we
have a dedicated flag variable indicating direct-to-font mode.

[originally from svn r2425]
This commit is contained in:
Simon Tatham 2003-01-02 16:17:56 +00:00
parent 70458d6434
commit ea5be2db38
3 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
unix/pterm.c
View File

@ -48,6 +48,7 @@ struct gui_data {
GdkColor cols[NCOLOURS]; GdkColor cols[NCOLOURS];
GdkColormap *colmap; GdkColormap *colmap;
wchar_t *pastein_data; wchar_t *pastein_data;
int direct_to_font;
int pastein_data_len; int pastein_data_len;
char *pasteout_data, *pasteout_data_utf8; char *pasteout_data, *pasteout_data_utf8;
int pasteout_data_len, pasteout_data_utf8_len; int pasteout_data_len, pasteout_data_utf8_len;
@ -836,7 +837,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
printf("\n"); printf("\n");
#endif #endif
if (inst->fontinfo[0].charset != CS_NONE) { if (!inst->direct_to_font) {
/* /*
* The stuff we've just generated is assumed to be * The stuff we've just generated is assumed to be
* ISO-8859-1! This sounds insane, but `man * ISO-8859-1! This sounds insane, but `man
@ -1231,7 +1232,7 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
* Set up UTF-8 paste data. This only happens if we aren't in * Set up UTF-8 paste data. This only happens if we aren't in
* direct-to-font mode using the D800 hack. * direct-to-font mode using the D800 hack.
*/ */
if (inst->fontinfo[0].charset != CS_NONE) { if (!inst->direct_to_font) {
wchar_t *tmp = data; wchar_t *tmp = data;
int tmplen = len; int tmplen = len;
@ -1241,18 +1242,31 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8, charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
inst->pasteout_data_utf8_len, inst->pasteout_data_utf8_len,
CS_UTF8, NULL, NULL, 0); CS_UTF8, NULL, NULL, 0);
inst->pasteout_data_utf8 = if (inst->pasteout_data_utf8_len == 0) {
srealloc(inst->pasteout_data_utf8, inst->pasteout_data_utf8_len); sfree(inst->pasteout_data_utf8);
inst->pasteout_data_utf8 = NULL;
} else {
inst->pasteout_data_utf8 =
srealloc(inst->pasteout_data_utf8,
inst->pasteout_data_utf8_len);
}
} else { } else {
inst->pasteout_data_utf8 = NULL; inst->pasteout_data_utf8 = NULL;
inst->pasteout_data_utf8_len = 0; inst->pasteout_data_utf8_len = 0;
} }
inst->pasteout_data = smalloc(len); inst->pasteout_data = smalloc(len*6);
inst->pasteout_data_len = len; inst->pasteout_data_len = len*6;
wc_to_mb(line_codepage, 0, data, len, inst->pasteout_data_len = wc_to_mb(line_codepage, 0, data, len,
inst->pasteout_data, inst->pasteout_data_len, inst->pasteout_data,
NULL, NULL); inst->pasteout_data_len, NULL, NULL);
if (inst->pasteout_data_len == 0) {
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
} else {
inst->pasteout_data =
srealloc(inst->pasteout_data, inst->pasteout_data_len);
}
if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY, if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
GDK_CURRENT_TIME)) { GDK_CURRENT_TIME)) {
@ -1304,7 +1318,7 @@ void request_paste(void *frontend)
* comes back _then_ we can call term_do_paste(). * comes back _then_ we can call term_do_paste().
*/ */
if (inst->fontinfo[0].charset != CS_NONE) { if (!inst->direct_to_font) {
/* /*
* First we attempt to retrieve the selection as a UTF-8 * First we attempt to retrieve the selection as a UTF-8
* string (which we will convert to the correct code page * string (which we will convert to the correct code page
@ -2260,7 +2274,7 @@ int main(int argc, char **argv)
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE); inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE); inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
init_ucs(font_charset); inst->direct_to_font = init_ucs(font_charset);
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

2
unix/unix.h
View File

@ -69,6 +69,6 @@ void (*putty_signal(int sig, void (*func)(int)))(int);
/* /*
* Exports from unicode.c. * Exports from unicode.c.
*/ */
void init_ucs(int font_charset); int init_ucs(int font_charset);
#endif #endif

12
unix/uxucs.c
View File

@ -101,9 +101,12 @@ int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
} }
} }
void init_ucs(int font_charset) /*
* Return value is TRUE if pterm is to run in direct-to-font mode.
*/
int init_ucs(int font_charset)
{ {
int i; int i, ret = 0;
/* /*
* In the platform-independent parts of the code, font_codepage * In the platform-independent parts of the code, font_codepage
@ -131,6 +134,9 @@ void init_ucs(int font_charset)
if (line_codepage == CS_NONE) if (line_codepage == CS_NONE)
line_codepage = font_charset; line_codepage = font_charset;
if (line_codepage == CS_NONE)
ret = 1;
/* /*
* Set up unitab_line, by translating each individual character * Set up unitab_line, by translating each individual character
* in the line codepage into Unicode. * in the line codepage into Unicode.
@ -206,4 +212,6 @@ void init_ucs(int font_charset)
else else
unitab_ctrl[i] = 0xFF; unitab_ctrl[i] = 0xFF;
} }
return ret;
} }