X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2dc6356a02ebe2e5c0428cefc18e64882d85b4a6..62cdf1edd4ad3e56b38ec0126d2af260a2f22b08:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index 9c86b326..b7e2b934 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -39,15 +39,16 @@ struct gui_data { GtkBox *hbox; GtkAdjustment *sbar_adjust; GdkPixmap *pixmap; - GdkFont *fonts[2]; /* normal and bold (for now!) */ + GdkFont *fonts[4]; /* normal, bold, wide, widebold */ struct { int charset; int is_wide; - } fontinfo[2]; + } fontinfo[4]; GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor; GdkColor cols[NCOLOURS]; GdkColormap *colmap; wchar_t *pastein_data; + int direct_to_font; int pastein_data_len; char *pasteout_data, *pasteout_data_utf8; int pasteout_data_len, pasteout_data_utf8_len; @@ -836,18 +837,27 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) printf("\n"); #endif - /* - * The stuff we've just generated is assumed to be - * ISO-8859-1! This sounds insane, but `man XLookupString' - * agrees: strings of this type returned from the X server - * are hardcoded to 8859-1. Strictly speaking we should be - * doing this using some sort of GtkIMContext, which (if - * we're lucky) would give us our data directly in Unicode; - * but that's not supported in GTK 1.2 as far as I can - * tell, and it's poorly documented even in 2.0, so it'll - * have to wait. - */ - lpage_send(inst->ldisc, CS_ISO8859_1, output+start, end-start, 1); + if (!inst->direct_to_font) { + /* + * The stuff we've just generated is assumed to be + * ISO-8859-1! This sounds insane, but `man + * XLookupString' agrees: strings of this type returned + * from the X server are hardcoded to 8859-1. Strictly + * speaking we should be doing this using some sort of + * GtkIMContext, which (if we're lucky) would give us + * our data directly in Unicode; but that's not + * supported in GTK 1.2 as far as I can tell, and it's + * poorly documented even in 2.0, so it'll have to + * wait. + */ + lpage_send(inst->ldisc, CS_ISO8859_1, output+start, end-start, 1); + } else { + /* + * In direct-to-font mode, we just send the string + * exactly as we received it. + */ + ldisc_send(inst->ldisc, output+start, end-start, 1); + } show_mouseptr(inst, 0); term_seen_key_event(inst->term); @@ -1218,24 +1228,45 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) if (inst->pasteout_data_utf8) sfree(inst->pasteout_data_utf8); - inst->pasteout_data_utf8 = smalloc(len*6); - inst->pasteout_data_utf8_len = len*6; - { + /* + * Set up UTF-8 paste data. This only happens if we aren't in + * direct-to-font mode using the D800 hack. + */ + if (!inst->direct_to_font) { wchar_t *tmp = data; int tmplen = len; + + inst->pasteout_data_utf8 = smalloc(len*6); + inst->pasteout_data_utf8_len = len*6; inst->pasteout_data_utf8_len = 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; } - 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)) { @@ -1243,8 +1274,9 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) GDK_SELECTION_TYPE_STRING, 1); gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, inst->compound_text_atom, 1); - gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, - inst->utf8_string_atom, 1); + if (inst->pasteout_data_utf8) + gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, + inst->utf8_string_atom, 1); } } @@ -1286,15 +1318,24 @@ void request_paste(void *frontend) * comes back _then_ we can call term_do_paste(). */ - /* - * First we attempt to retrieve the selection as a UTF-8 string - * (which we will convert to the correct code page before - * sending to the session, of course). If that fails, - * selection_received() will be informed and will fall back to - * an ordinary string. - */ - gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - inst->utf8_string_atom, GDK_CURRENT_TIME); + 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 + * before sending to the session, of course). If that + * fails, selection_received() will be informed and will + * fall back to an ordinary string. + */ + gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, + inst->utf8_string_atom, GDK_CURRENT_TIME); + } else { + /* + * If we're in direct-to-font mode, we disable UTF-8 + * pasting, and go straight to ordinary string data. + */ + gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, + GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); + } } gint idle_paste_func(gpointer data); /* forward ref */ @@ -1469,12 +1510,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; - int nfg, nbg, t, fontid, shadow, rlen; - - /* - * NYI: - * - Unicode, code pages, and ATTR_WIDE for CJK support. - */ + int nfg, nbg, t, fontid, shadow, rlen, widefactor; nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT); @@ -1493,9 +1529,17 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, } fontid = shadow = 0; + + if (attr & ATTR_WIDE) { + widefactor = 2; + fontid |= 2; + } else { + widefactor = 1; + } + if ((attr & ATTR_BOLD) && !cfg.bold_colour) { - if (inst->fonts[1]) - fontid = 1; + if (inst->fonts[fontid | 1]) + fontid |= 1; else shadow = 1; } @@ -1504,8 +1548,8 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, x *= 2; if (x >= inst->term->cols) return; - if (x + len*2 > inst->term->cols) - len = (inst->term->cols-x)/2; /* trim to LH half */ + if (x + len*2*widefactor > inst->term->cols) + len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */ rlen = len * 2; } else rlen = len; @@ -1515,7 +1559,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, r.x = x*inst->font_width+cfg.window_border; r.y = y*inst->font_height+cfg.window_border; - r.width = rlen*inst->font_width; + r.width = rlen*widefactor*inst->font_width; r.height = inst->font_height; gdk_gc_set_clip_rectangle(gc, &r); } @@ -1524,7 +1568,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, gdk_draw_rectangle(inst->pixmap, gc, 1, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border, - rlen*inst->font_width, inst->font_height); + rlen*widefactor*inst->font_width, inst->font_height); gdk_gc_set_foreground(gc, &inst->cols[nfg]); { @@ -1538,8 +1582,30 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK)); } - if (inst->fontinfo[fontid].is_wide) { - gwcs = smalloc(sizeof(GdkWChar) * (len+1)); + if (inst->fonts[fontid] == NULL) { + /* + * The font for this contingency does not exist. + * Typically this means we've been given ATTR_WIDE + * character and have no wide font. So we display + * nothing at all; such is life. + */ + } else if (inst->fontinfo[fontid].is_wide) { + /* + * At least one version of gdk_draw_text_wc() has a + * weird bug whereby it reads `len' elements of the + * input string, but only draws `len/2'. Hence I'm + * going to make its input array twice as long as it + * theoretically needs to be, and pass in twice the + * actual number of characters. If a fixed gdk actually + * takes the doubled length seriously, then (a) the + * array will stand scrutiny up to the full length, (b) + * the spare elements of the array are full of zeroes + * which will probably be an empty glyph in the font, + * and (c) the clip rectangle should prevent it causing + * trouble anyway. + */ + gwcs = smalloc(sizeof(GdkWChar) * (len*2+1)); + memset(gwcs, 0, sizeof(GdkWChar) * (len*2+1)); /* * FIXME: when we have a wide-char equivalent of * from_unicode, use it instead of this. @@ -1552,12 +1618,9 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, gwcs, len*2); sfree(gwcs); } else { - wchar_t *wcstmp = wcs; - int lentmp = len; gcs = smalloc(sizeof(GdkWChar) * (len+1)); - charset_from_unicode(&wcstmp, &lentmp, gcs, len, - inst->fontinfo[fontid].charset, - NULL, ".", 1); + wc_to_mb(inst->fontinfo[fontid].charset, 0, + wcs, len, gcs, len, ".", NULL); gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, @@ -1580,7 +1643,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, uheight = inst->font_height - 1; gdk_draw_line(inst->pixmap, gc, x*inst->font_width+cfg.window_border, y*inst->font_height + uheight + cfg.window_border, - (x+len)*inst->font_width-1+cfg.window_border, + (x+len)*widefactor*inst->font_width-1+cfg.window_border, y*inst->font_height + uheight + cfg.window_border); } @@ -1594,7 +1657,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, * try thinking of a better way. :-( */ int i; - for (i = 0; i < len * inst->font_width; i++) { + for (i = 0; i < len * widefactor * inst->font_width; i++) { gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, x*inst->font_width+cfg.window_border + 2*i, y*inst->font_height+cfg.window_border, @@ -1614,7 +1677,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border+dt*i+db, - x*inst->font_width+cfg.window_border, + x*widefactor*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border+dt*(i+1), len * inst->font_width, inst->font_height-i-1); } @@ -1628,15 +1691,22 @@ void do_text(Context ctx, int x, int y, char *text, int len, struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; + int widefactor; do_text_internal(ctx, x, y, text, len, attr, lattr); + if (attr & ATTR_WIDE) { + widefactor = 2; + } else { + widefactor = 1; + } + if (lattr != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; - if (x + len*2 > inst->term->cols) - len = (inst->term->cols-x)/2; /* trim to LH half */ + if (x + len*2*widefactor > inst->term->cols) + len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */ len *= 2; } @@ -1645,7 +1715,7 @@ void do_text(Context ctx, int x, int y, char *text, int len, y*inst->font_height+cfg.window_border, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border, - len*inst->font_width, inst->font_height); + len*widefactor*inst->font_width, inst->font_height); } void do_cursor(Context ctx, int x, int y, char *text, int len, @@ -1655,7 +1725,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; - int passive; + int passive, widefactor; if (attr & TATTR_PASCURS) { attr &= ~TATTR_PASCURS; @@ -1667,12 +1737,18 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, } do_text_internal(ctx, x, y, text, len, attr, lattr); + if (attr & ATTR_WIDE) { + widefactor = 2; + } else { + widefactor = 1; + } + if (lattr != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; - if (x + len*2 > inst->term->cols) - len = (inst->term->cols-x)/2; /* trim to LH half */ + if (x + len*2*widefactor > inst->term->cols) + len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */ len *= 2; } @@ -1741,7 +1817,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, y*inst->font_height+cfg.window_border, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border, - len*inst->font_width, inst->font_height); + len*widefactor*inst->font_width, inst->font_height); } GdkCursor *make_mouse_ptr(struct gui_data *inst, int cursor_val) @@ -1923,6 +1999,18 @@ int do_cmdline(int argc, char **argv, int do_everything) strncpy(cfg.boldfont, val, sizeof(cfg.boldfont)); cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0'; + } else if (!strcmp(p, "-fw")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg.widefont, val, sizeof(cfg.widefont)); + cfg.widefont[sizeof(cfg.widefont)-1] = '\0'; + + } else if (!strcmp(p, "-fwb")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg.wideboldfont, val, sizeof(cfg.wideboldfont)); + cfg.wideboldfont[sizeof(cfg.wideboldfont)-1] = '\0'; + } else if (!strcmp(p, "-cs")) { EXPECTS_ARG; SECOND_PASS_ONLY; @@ -2066,13 +2154,20 @@ static void block_signal(int sig, int block_it) { } } -static void set_font_info(struct gui_data *inst, int fontid) +/* + * This function retrieves the character set encoding of a font. It + * returns the character set without the X11 hack (in case the user + * asks to use the font's own encoding). + */ +static int set_font_info(struct gui_data *inst, int fontid) { GdkFont *font = inst->fonts[fontid]; XFontStruct *xfs = GDK_FONT_XFONT(font); Display *disp = GDK_FONT_XDISPLAY(font); Atom charset_registry, charset_encoding; unsigned long registry_ret, encoding_ret; + int retval = CS_NONE; + charset_registry = XInternAtom(disp, "CHARSET_REGISTRY", False); charset_encoding = XInternAtom(disp, "CHARSET_ENCODING", False); inst->fontinfo[fontid].charset = CS_NONE; @@ -2084,10 +2179,13 @@ static void set_font_info(struct gui_data *inst, int fontid) enc = XGetAtomName(disp, (Atom)encoding_ret); if (reg && enc) { char *encoding = dupcat(reg, "-", enc, NULL); - inst->fontinfo[fontid].charset = charset_from_xenc(encoding); + retval = inst->fontinfo[fontid].charset = + charset_from_xenc(encoding); /* FIXME: when libcharset supports wide encodings fix this. */ - if (!strcasecmp(encoding, "iso10646-1")) + if (!strcasecmp(encoding, "iso10646-1")) { inst->fontinfo[fontid].is_wide = 1; + retval = CS_UTF8; + } /* * Hack for X line-drawing characters: if the primary @@ -2113,19 +2211,11 @@ static void set_font_info(struct gui_data *inst, int fontid) inst->fontinfo[fontid].charset = CS_ISO8859_1_X11; } - /* - * FIXME: this is a hack. Currently fonts with - * incomprehensible encodings are dealt with by - * pretending they're 8859-1. It's ugly, but it's good - * enough to stop things crashing. Should do something - * better here. - */ - if (inst->fontinfo[fontid].charset == CS_NONE) - inst->fontinfo[fontid].charset = CS_ISO8859_1; - sfree(encoding); } } + + return retval; } int main(int argc, char **argv) @@ -2133,6 +2223,7 @@ int main(int argc, char **argv) extern int pty_master_fd; /* declared in pty.c */ extern void pty_pre_init(void); /* declared in pty.c */ struct gui_data *inst; + int font_charset; /* defer any child exit handling until we're ready to deal with * it */ @@ -2160,7 +2251,7 @@ int main(int argc, char **argv) fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font); exit(1); } - set_font_info(inst, 0); + font_charset = set_font_info(inst, 0); if (cfg.boldfont[0]) { inst->fonts[1] = gdk_font_load(cfg.boldfont); if (!inst->fonts[1]) { @@ -2171,6 +2262,26 @@ int main(int argc, char **argv) set_font_info(inst, 1); } else inst->fonts[1] = NULL; + if (cfg.widefont[0]) { + inst->fonts[2] = gdk_font_load(cfg.widefont); + if (!inst->fonts[2]) { + fprintf(stderr, "pterm: unable to load wide font \"%s\"\n", + cfg.boldfont); + exit(1); + } + set_font_info(inst, 2); + } else + inst->fonts[2] = NULL; + if (cfg.wideboldfont[0]) { + inst->fonts[3] = gdk_font_load(cfg.wideboldfont); + if (!inst->fonts[3]) { + fprintf(stderr, "pterm: unable to load wide/bold font \"%s\"\n", + cfg.boldfont); + exit(1); + } + set_font_info(inst, 3); + } else + inst->fonts[3] = NULL; inst->font_width = gdk_char_width(inst->fonts[0], ' '); inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent; @@ -2178,7 +2289,7 @@ 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); - init_ucs(); + inst->direct_to_font = init_ucs(font_charset); inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);