X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2102eb8a3a40dbf18235c73cf23f018f411db9bc..ab0873ab80d0c927315329be0cbeb96bb4ace89a:/unix/pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index 358ba4f6..b7f93f9c 100644
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -9,6 +9,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
@@ -23,6 +24,7 @@
 #include <X11/Xutil.h>
 
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
+
 #include "putty.h"
 #include "terminal.h"
 
@@ -37,19 +39,23 @@ 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[4];
     GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor;
     GdkColor cols[NCOLOURS];
     GdkColormap *colmap;
     wchar_t *pastein_data;
     int pastein_data_len;
-    char *pasteout_data;
-    int pasteout_data_len;
+    char *pasteout_data, *pasteout_data_utf8;
+    int pasteout_data_len, pasteout_data_utf8_len;
     int font_width, font_height;
     int ignore_sbar;
     int mouseptr_visible;
     guint term_paste_idle_id;
-    GdkAtom compound_text_atom;
+    GdkAtom compound_text_atom, utf8_string_atom;
     int alt_keycode;
     int alt_digits;
     char wintitle[sizeof(((Config *)0)->wintitle)];
@@ -830,7 +836,28 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	printf("\n");
 #endif
 
-	ldisc_send(inst->ldisc, output+start, end-start, 1);
+	if (inst->fontinfo[0].charset != CS_NONE) {
+	    /*
+	     * 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);
 	term_out(inst->term);
@@ -1197,9 +1224,34 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
     struct gui_data *inst = (struct gui_data *)frontend;
     if (inst->pasteout_data)
 	sfree(inst->pasteout_data);
+    if (inst->pasteout_data_utf8)
+	sfree(inst->pasteout_data_utf8);
+
+    /*
+     * 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) {
+	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);
+    } 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(0, 0, data, len, inst->pasteout_data, inst->pasteout_data_len,
+    wc_to_mb(line_codepage, 0, data, len,
+	     inst->pasteout_data, inst->pasteout_data_len,
 	     NULL, NULL);
 
     if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
@@ -1208,6 +1260,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);
+	if (inst->pasteout_data_utf8)
+	    gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+				     inst->utf8_string_atom, 1);
     }
 }
 
@@ -1215,8 +1270,13 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
 		   guint info, guint time_stamp, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    gtk_selection_data_set(seldata, GDK_SELECTION_TYPE_STRING, 8,
-			   inst->pasteout_data, inst->pasteout_data_len);
+    if (seldata->target == inst->utf8_string_atom)
+	gtk_selection_data_set(seldata, seldata->target, 8,
+			       inst->pasteout_data_utf8,
+			       inst->pasteout_data_utf8_len);
+    else
+	gtk_selection_data_set(seldata, seldata->target, 8,
+			       inst->pasteout_data, inst->pasteout_data_len);
 }
 
 gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
@@ -1226,8 +1286,12 @@ gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
     term_deselect(inst->term);
     if (inst->pasteout_data)
 	sfree(inst->pasteout_data);
+    if (inst->pasteout_data_utf8)
+	sfree(inst->pasteout_data_utf8);
     inst->pasteout_data = NULL;
     inst->pasteout_data_len = 0;
+    inst->pasteout_data_utf8 = NULL;
+    inst->pasteout_data_utf8_len = 0;
     return TRUE;
 }
 
@@ -1239,8 +1303,25 @@ void request_paste(void *frontend)
      * moment is to call gtk_selection_convert(), and when the data
      * comes back _then_ we can call term_do_paste().
      */
-    gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
-			  GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME);
+
+    if (inst->fontinfo[0].charset != CS_NONE) {
+	/*
+	 * 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 */
@@ -1250,8 +1331,22 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 {
     struct gui_data *inst = (struct gui_data *)data;
 
+    if (seldata->target == inst->utf8_string_atom && seldata->length <= 0) {
+	/*
+	 * Failed to get a UTF-8 selection string. Try an ordinary
+	 * string.
+	 */
+	gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+			      GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME);
+	return;
+    }
+
+    /*
+     * Any other failure should just go foom.
+     */
     if (seldata->length <= 0 ||
-	seldata->type != GDK_SELECTION_TYPE_STRING)
+	(seldata->type != GDK_SELECTION_TYPE_STRING &&
+	 seldata->type != inst->utf8_string_atom))
 	return;			       /* Nothing happens. */
 
     if (inst->pastein_data)
@@ -1259,8 +1354,11 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 
     inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t));
     inst->pastein_data_len = seldata->length;
-    mb_to_wc(0, 0, seldata->data, seldata->length,
-	     inst->pastein_data, inst->pastein_data_len);
+    inst->pastein_data_len =
+	mb_to_wc((seldata->type == inst->utf8_string_atom ?
+		  CS_UTF8 : line_codepage),
+		 0, seldata->data, seldata->length,
+		 inst->pastein_data, inst->pastein_data_len);
 
     term_do_paste(inst->term);
 
@@ -1398,12 +1496,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);
@@ -1422,9 +1515,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;
     }
@@ -1433,8 +1534,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;
@@ -1444,7 +1545,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);
     }
@@ -1453,13 +1554,52 @@ 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]);
-    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,
-		  text, len);
+    {
+	GdkWChar *gwcs;
+	gchar *gcs;
+	wchar_t *wcs;
+	int i;
+
+	wcs = smalloc(sizeof(wchar_t) * (len+1));
+	for (i = 0; i < len; i++) {
+	    wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
+	}
+
+	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) {
+	    gwcs = smalloc(sizeof(GdkWChar) * (len+1));
+	    /*
+	     * FIXME: when we have a wide-char equivalent of
+	     * from_unicode, use it instead of this.
+	     */
+	    for (i = 0; i <= len; i++)
+		gwcs[i] = wcs[i];
+	    gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
+			     x*inst->font_width+cfg.window_border,
+			     y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+			     gwcs, len*2);
+	    sfree(gwcs);
+	} else {
+	    gcs = smalloc(sizeof(GdkWChar) * (len+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,
+			  gcs, len);
+	    sfree(gcs);
+	}
+	sfree(wcs);
+    }
 
     if (shadow) {
 	gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
@@ -1474,7 +1614,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);
     }
 
@@ -1488,7 +1628,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,
@@ -1508,7 +1648,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);
 	    }
@@ -1522,15 +1662,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;
     }
 
@@ -1539,7 +1686,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,
@@ -1549,7 +1696,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;
@@ -1561,12 +1708,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;
     }
 
@@ -1635,7 +1788,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)
@@ -1817,6 +1970,24 @@ 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;
+	    strncpy(cfg.line_codepage, val, sizeof(cfg.line_codepage));
+	    cfg.line_codepage[sizeof(cfg.line_codepage)-1] = '\0';
+
 	} else if (!strcmp(p, "-geometry")) {
 	    int flags, x, y, w, h;
 	    EXPECTS_ARG;
@@ -1954,11 +2125,76 @@ static void block_signal(int sig, int block_it) {
   }
 }
 
+/*
+ * 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;
+    inst->fontinfo[fontid].is_wide = 0;
+    if (XGetFontProperty(xfs, charset_registry, &registry_ret) &&
+	XGetFontProperty(xfs, charset_encoding, &encoding_ret)) {
+	char *reg, *enc;
+	reg = XGetAtomName(disp, (Atom)registry_ret);
+	enc = XGetAtomName(disp, (Atom)encoding_ret);
+	if (reg && enc) {
+	    char *encoding = dupcat(reg, "-", enc, NULL);
+	    retval = inst->fontinfo[fontid].charset =
+		charset_from_xenc(encoding);
+	    /* FIXME: when libcharset supports wide encodings fix this. */
+	    if (!strcasecmp(encoding, "iso10646-1")) {
+		inst->fontinfo[fontid].is_wide = 1;
+		retval = CS_UTF8;
+	    }
+
+	    /*
+	     * Hack for X line-drawing characters: if the primary
+	     * font is encoded as ISO-8859-anything, and has valid
+	     * glyphs in the first 32 char positions, it is assumed
+	     * that those glyphs are the VT100 line-drawing
+	     * character set.
+	     * 
+	     * Actually, we'll hack even harder by only checking
+	     * position 0x19 (vertical line, VT100 linedrawing
+	     * `x'). Then we can check it easily by seeing if the
+	     * ascent and descent differ.
+	     */
+	    if (inst->fontinfo[fontid].charset == CS_ISO8859_1) {
+		int lb, rb, wid, asc, desc;
+		gchar text[2];
+
+		text[1] = '\0';
+		text[0] = '\x12';
+		gdk_string_extents(inst->fonts[fontid], text,
+				   &lb, &rb, &wid, &asc, &desc);
+		if (asc != desc)
+		    inst->fontinfo[fontid].charset = CS_ISO8859_1_X11;
+	    }
+
+	    sfree(encoding);
+	}
+    }
+
+    return retval;
+}
+
 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 */
@@ -1986,6 +2222,7 @@ int main(int argc, char **argv)
 	fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font);
 	exit(1);
     }
+    font_charset = set_font_info(inst, 0);
     if (cfg.boldfont[0]) {
 	inst->fonts[1] = gdk_font_load(cfg.boldfont);
 	if (!inst->fonts[1]) {
@@ -1993,15 +2230,37 @@ int main(int argc, char **argv)
 		    cfg.boldfont);
 	    exit(1);
 	}
+	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;
 
     inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
+    inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
 
-    init_ucs();
+    init_ucs(font_charset);
 
     inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
@@ -2101,7 +2360,7 @@ int main(int argc, char **argv)
     inst->currcursor = inst->textcursor;
     show_mouseptr(inst, 1);
 
-    inst->term = term_init(inst);
+    inst->term = term_init(&cfg, inst);
     inst->logctx = log_init(inst);
     term_provide_logctx(inst->term, inst->logctx);
 
@@ -2113,7 +2372,8 @@ int main(int argc, char **argv)
 
     term_size(inst->term, cfg.height, cfg.width, cfg.savelines);
 
-    inst->ldisc = ldisc_create(inst->term, inst->back, inst->backhandle, inst);
+    inst->ldisc =
+	ldisc_create(&cfg, inst->term, inst->back, inst->backhandle, inst);
     ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
 
     inst->master_fd = pty_master_fd;