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.
git-svn-id: svn://svn.tartarus.org/sgt/putty@2425
cda61777-01e9-0310-a592-
d414129be87e
GdkColor cols[NCOLOURS];
GdkColormap *colmap;
wchar_t *pastein_data;
GdkColor cols[NCOLOURS];
GdkColormap *colmap;
wchar_t *pastein_data;
int pastein_data_len;
char *pasteout_data, *pasteout_data_utf8;
int pasteout_data_len, pasteout_data_utf8_len;
int pastein_data_len;
char *pasteout_data, *pasteout_data_utf8;
int pasteout_data_len, pasteout_data_utf8_len;
- if (inst->fontinfo[0].charset != CS_NONE) {
+ if (!inst->direct_to_font) {
/*
* The stuff we've just generated is assumed to be
* ISO-8859-1! This sounds insane, but `man
/*
* The stuff we've just generated is assumed to be
* ISO-8859-1! This sounds insane, but `man
* Set up UTF-8 paste data. This only happens if we aren't in
* direct-to-font mode using the D800 hack.
*/
* Set up UTF-8 paste data. This only happens if we aren't in
* direct-to-font mode using the D800 hack.
*/
- if (inst->fontinfo[0].charset != CS_NONE) {
+ if (!inst->direct_to_font) {
wchar_t *tmp = data;
int tmplen = len;
wchar_t *tmp = data;
int tmplen = len;
charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
inst->pasteout_data_utf8_len,
CS_UTF8, NULL, NULL, 0);
charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
inst->pasteout_data_utf8_len,
CS_UTF8, NULL, NULL, 0);
- inst->pasteout_data_utf8 =
- srealloc(inst->pasteout_data_utf8, inst->pasteout_data_utf8_len);
+ if (inst->pasteout_data_utf8_len == 0) {
+ 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 {
inst->pasteout_data_utf8 = NULL;
inst->pasteout_data_utf8_len = 0;
}
} else {
inst->pasteout_data_utf8 = NULL;
inst->pasteout_data_utf8_len = 0;
}
- inst->pasteout_data = smalloc(len);
- inst->pasteout_data_len = len;
- wc_to_mb(line_codepage, 0, data, len,
- inst->pasteout_data, inst->pasteout_data_len,
- NULL, NULL);
+ 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);
+ 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,
GDK_CURRENT_TIME)) {
if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
GDK_CURRENT_TIME)) {
* 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
* string (which we will convert to the correct code page
/*
* First we attempt to retrieve the selection as a UTF-8
* string (which we will convert to the correct code page
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", 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);
/*
* Exports from unicode.c.
*/
/*
* Exports from unicode.c.
*/
-void init_ucs(int font_charset);
+int init_ucs(int font_charset);
-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)
/*
* In the platform-independent parts of the code, font_codepage
/*
* In the platform-independent parts of the code, font_codepage
if (line_codepage == CS_NONE)
line_codepage = font_charset;
if (line_codepage == CS_NONE)
line_codepage = font_charset;
+ if (line_codepage == CS_NONE)
+ ret = 1;
+
/*
* Set up unitab_line, by translating each individual character
* in the line codepage into Unicode.
/*
* Set up unitab_line, by translating each individual character
* in the line codepage into Unicode.
else
unitab_ctrl[i] = 0xFF;
}
else
unitab_ctrl[i] = 0xFF;
}