X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c5e438ecf3f6d7b8caab10e43a452f3555149309..3d88e64dfcf5dc0fd361ce0c504c67a9196ce44c:/unix/pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index cc459625..6d6a9a58 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,24 @@ 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 direct_to_font;
     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)];
@@ -60,6 +67,8 @@ struct gui_data {
     void *backhandle;
     Terminal *term;
     void *logctx;
+    struct unicode_data ucsdata;
+    Config cfg;
 };
 
 struct draw_ctx {
@@ -71,11 +80,46 @@ static int send_raw_mouse;
 
 static char *app_name = "pterm";
 
-char *x_get_default(char *key)
+char *x_get_default(const char *key)
 {
     return XGetDefault(GDK_DISPLAY(), app_name, key);
 }
 
+/*
+ * Default settings that are specific to pterm.
+ */
+FontSpec platform_default_fontspec(const char *name)
+{
+    FontSpec ret;
+    if (!strcmp(name, "Font"))
+	strcpy(ret.name, "fixed");
+    else
+	*ret.name = '\0';
+    return ret;
+}
+
+Filename platform_default_filename(const char *name)
+{
+    Filename ret;
+    if (!strcmp(name, "LogFileName"))
+	strcpy(ret.path, "putty.log");
+    else
+	*ret.path = '\0';
+    return ret;
+}
+
+char *platform_default_s(const char *name)
+{
+    return NULL;
+}
+
+int platform_default_i(const char *name, int def)
+{
+    if (!strcmp(name, "CloseOnExit"))
+	return 2;  /* maps to FORCE_ON after painful rearrangement :-( */
+    return def;
+}
+
 void ldisc_update(void *frontend, int echo, int edit)
 {
     /*
@@ -86,7 +130,7 @@ void ldisc_update(void *frontend, int echo, int edit)
      */
 }
 
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
 {
     /*
      * Logging in an xterm-alike is liable to be something you only
@@ -125,7 +169,7 @@ int font_dimension(void *frontend, int which)/* 0 for width, 1 for height */
  * mouse or a means of faking it, and there is no need to switch
  * buttons around at all.
  */
-Mouse_Button translate_button(void *frontend, Mouse_Button button)
+static Mouse_Button translate_button(Mouse_Button button)
 {
     /* struct gui_data *inst = (struct gui_data *)frontend; */
 
@@ -279,7 +323,7 @@ gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
 
 static void show_mouseptr(struct gui_data *inst, int show)
 {
-    if (!cfg.hide_mouseptr)
+    if (!inst->cfg.hide_mouseptr)
 	show = 1;
     if (show)
 	gdk_window_set_cursor(inst->area->window, inst->currcursor);
@@ -293,37 +337,37 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
     struct gui_data *inst = (struct gui_data *)data;
     int w, h, need_size = 0;
 
-    w = (event->width - 2*cfg.window_border) / inst->font_width;
-    h = (event->height - 2*cfg.window_border) / inst->font_height;
+    w = (event->width - 2*inst->cfg.window_border) / inst->font_width;
+    h = (event->height - 2*inst->cfg.window_border) / inst->font_height;
 
-    if (w != cfg.width || h != cfg.height) {
+    if (w != inst->cfg.width || h != inst->cfg.height) {
 	if (inst->pixmap) {
 	    gdk_pixmap_unref(inst->pixmap);
 	    inst->pixmap = NULL;
 	}
-	cfg.width = w;
-	cfg.height = h;
+	inst->cfg.width = w;
+	inst->cfg.height = h;
 	need_size = 1;
     }
     if (!inst->pixmap) {
 	GdkGC *gc;
 
 	inst->pixmap = gdk_pixmap_new(widget->window,
-				      (cfg.width * inst->font_width +
-				       2*cfg.window_border),
-				      (cfg.height * inst->font_height +
-				       2*cfg.window_border), -1);
+				      (inst->cfg.width * inst->font_width +
+				       2*inst->cfg.window_border),
+				      (inst->cfg.height * inst->font_height +
+				       2*inst->cfg.window_border), -1);
 
 	gc = gdk_gc_new(inst->area->window);
 	gdk_gc_set_foreground(gc, &inst->cols[18]);   /* default background */
 	gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0,
-			   cfg.width * inst->font_width + 2*cfg.window_border,
-			   cfg.height * inst->font_height + 2*cfg.window_border);
+			   inst->cfg.width * inst->font_width + 2*inst->cfg.window_border,
+			   inst->cfg.height * inst->font_height + 2*inst->cfg.window_border);
 	gdk_gc_unref(gc);
     }
 
     if (need_size) {
-	term_size(inst->term, h, w, cfg.savelines);
+	term_size(inst->term, h, w, inst->cfg.savelines);
     }
 
     return TRUE;
@@ -455,11 +499,19 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	 * at all.
 	 */
 	if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
-	    term_scroll(inst->term, 0, -cfg.height/2);
+	    term_scroll(inst->term, 0, -inst->cfg.height/2);
+	    return TRUE;
+	}
+	if (event->keyval == GDK_Page_Up && (event->state & GDK_CONTROL_MASK)) {
+	    term_scroll(inst->term, 0, -1);
 	    return TRUE;
 	}
 	if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
-	    term_scroll(inst->term, 0, +cfg.height/2);
+	    term_scroll(inst->term, 0, +inst->cfg.height/2);
+	    return TRUE;
+	}
+	if (event->keyval == GDK_Page_Down && (event->state & GDK_CONTROL_MASK)) {
+	    term_scroll(inst->term, 0, +1);
 	    return TRUE;
 	}
 
@@ -517,13 +569,13 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	/* We don't let GTK tell us what Backspace is! We know better. */
 	if (event->keyval == GDK_BackSpace &&
 	    !(event->state & GDK_SHIFT_MASK)) {
-	    output[1] = cfg.bksp_is_delete ? '\x7F' : '\x08';
+	    output[1] = inst->cfg.bksp_is_delete ? '\x7F' : '\x08';
 	    end = 2;
 	}
 	/* For Shift Backspace, do opposite of what is configured. */
 	if (event->keyval == GDK_BackSpace &&
 	    (event->state & GDK_SHIFT_MASK)) {
-	    output[1] = cfg.bksp_is_delete ? '\x08' : '\x7F';
+	    output[1] = inst->cfg.bksp_is_delete ? '\x08' : '\x7F';
 	    end = 2;
 	}
 
@@ -536,7 +588,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	/*
 	 * NetHack keypad mode.
 	 */
-	if (cfg.nethack_keypad) {
+	if (inst->cfg.nethack_keypad) {
 	    char *keys = NULL;
 	    switch (event->keyval) {
 	      case GDK_KP_1: case GDK_KP_End: keys = "bB"; break;
@@ -562,7 +614,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	/*
 	 * Application keypad mode.
 	 */
-	if (inst->term->app_keypad_keys && !cfg.no_applic_k) {
+	if (inst->term->app_keypad_keys && !inst->cfg.no_applic_k) {
 	    int xkey = 0;
 	    switch (event->keyval) {
 	      case GDK_Num_Lock: xkey = 'P'; break;
@@ -576,7 +628,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 		 * in xterm function key mode we change which two...
 		 */
 	      case GDK_KP_Add:
-		if (cfg.funky_type == 2) {
+		if (inst->cfg.funky_type == 2) {
 		    if (event->state & GDK_SHIFT_MASK)
 			xkey = 'l';
 		    else
@@ -705,7 +757,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 		break;
 	    }
 	    /* Reorder edit keys to physical order */
-	    if (cfg.funky_type == 3 && code <= 6)
+	    if (inst->cfg.funky_type == 3 && code <= 6)
 		code = "\0\2\1\4\5\3\6"[code];
 
 	    if (inst->term->vt52_mode && code > 0 && code <= 6) {
@@ -713,7 +765,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 		goto done;
 	    }
 
-	    if (cfg.funky_type == 5 &&     /* SCO function keys */
+	    if (inst->cfg.funky_type == 5 &&     /* SCO function keys */
 		code >= 11 && code <= 34) {
 		char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
 		int index = 0;
@@ -736,7 +788,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 		end = 1 + sprintf(output+1, "\x1B[%c", codes[index]);
 		goto done;
 	    }
-	    if (cfg.funky_type == 5 &&     /* SCO small keypad */
+	    if (inst->cfg.funky_type == 5 &&     /* SCO small keypad */
 		code >= 1 && code <= 6) {
 		char codes[] = "HL.FIG";
 		if (code == 3) {
@@ -747,7 +799,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 		}
 		goto done;
 	    }
-	    if ((inst->term->vt52_mode || cfg.funky_type == 4) &&
+	    if ((inst->term->vt52_mode || inst->cfg.funky_type == 4) &&
 		code >= 11 && code <= 24) {
 		int offt = 0;
 		if (code > 15)
@@ -762,18 +814,18 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 				      "\x1BO%c", code + 'P' - 11 - offt);
 		goto done;
 	    }
-	    if (cfg.funky_type == 1 && code >= 11 && code <= 15) {
+	    if (inst->cfg.funky_type == 1 && code >= 11 && code <= 15) {
 		end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11);
 		goto done;
 	    }
-	    if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
+	    if (inst->cfg.funky_type == 2 && code >= 11 && code <= 14) {
 		if (inst->term->vt52_mode)
 		    end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
 		else
 		    end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
 		goto done;
 	    }
-	    if (cfg.rxvt_homeend && (code == 1 || code == 4)) {
+	    if (inst->cfg.rxvt_homeend && (code == 1 || code == 4)) {
 		end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw");
 		goto done;
 	    }
@@ -830,7 +882,28 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	printf("\n");
 #endif
 
-	ldisc_send(inst->ldisc, 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);
 	term_out(inst->term);
@@ -875,14 +948,15 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
       default: return FALSE;	       /* don't know this event type */
     }
 
-    if (send_raw_mouse && !(cfg.mouse_override && shift) &&
+    if (send_raw_mouse && !(inst->cfg.mouse_override && shift) &&
 	act != MA_CLICK && act != MA_RELEASE)
 	return TRUE;		       /* we ignore these in raw mouse mode */
 
-    x = (event->x - cfg.window_border) / inst->font_width;
-    y = (event->y - cfg.window_border) / inst->font_height;
+    x = (event->x - inst->cfg.window_border) / inst->font_width;
+    y = (event->y - inst->cfg.window_border) / inst->font_height;
 
-    term_mouse(inst->term, button, act, x, y, shift, ctrl, alt);
+    term_mouse(inst->term, button, translate_button(button), act,
+	       x, y, shift, ctrl, alt);
 
     return TRUE;
 }
@@ -906,10 +980,11 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
     else
 	return FALSE;		       /* don't even know what button! */
 
-    x = (event->x - cfg.window_border) / inst->font_width;
-    y = (event->y - cfg.window_border) / inst->font_height;
+    x = (event->x - inst->cfg.window_border) / inst->font_width;
+    y = (event->y - inst->cfg.window_border) / inst->font_height;
 
-    term_mouse(inst->term, button, MA_DRAG, x, y, shift, ctrl, alt);
+    term_mouse(inst->term, button, translate_button(button), MA_DRAG,
+	       x, y, shift, ctrl, alt);
 
     return TRUE;
 }
@@ -934,8 +1009,8 @@ void done_with_pty(struct gui_data *inst)
 	 * Terminate now, if the Close On Exit setting is
 	 * appropriate.
 	 */
-	if (cfg.close_on_exit == COE_ALWAYS ||
-	    (cfg.close_on_exit == COE_NORMAL && clean))
+	if (inst->cfg.close_on_exit == FORCE_ON ||
+	    (inst->cfg.close_on_exit == AUTO && clean))
 	    exit(0);
 
 	/*
@@ -1041,7 +1116,7 @@ gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
 void set_raw_mouse_mode(void *frontend, int activate)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    activate = activate && !cfg.no_mouse_rep;
+    activate = activate && !inst->cfg.no_mouse_rep;
     send_raw_mouse = activate;
     if (send_raw_mouse)
 	inst->currcursor = inst->rawcursor;
@@ -1093,8 +1168,8 @@ void request_resize(void *frontend, int w, int h)
     offset_x = outer.width - inner.width;
     offset_y = outer.height - inner.height;
 
-    area_x = inst->font_width * w + 2*cfg.window_border;
-    area_y = inst->font_height * h + 2*cfg.window_border;
+    area_x = inst->font_width * w + 2*inst->cfg.window_border;
+    area_y = inst->font_height * h + 2*inst->cfg.window_border;
 
     /*
      * Now we must set the size request on the drawing area back to
@@ -1158,7 +1233,7 @@ void palette_set(void *frontend, int n, int r, int g, int b)
 void palette_reset(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    /* This maps colour indices in cfg to those used in inst->cols. */
+    /* This maps colour indices in inst->cfg to those used in inst->cols. */
     static const int ww[] = {
 	6, 7, 8, 9, 10, 11, 12, 13,
         14, 15, 16, 17, 18, 19, 20, 21,
@@ -1176,9 +1251,9 @@ void palette_reset(void *frontend)
     }
 
     for (i = 0; i < NCOLOURS; i++) {
-	inst->cols[i].red = cfg.colours[ww[i]][0] * 0x0101;
-	inst->cols[i].green = cfg.colours[ww[i]][1] * 0x0101;
-	inst->cols[i].blue = cfg.colours[ww[i]][2] * 0x0101;
+	inst->cols[i].red = inst->cfg.colours[ww[i]][0] * 0x0101;
+	inst->cols[i].green = inst->cfg.colours[ww[i]][1] * 0x0101;
+	inst->cols[i].blue = inst->cfg.colours[ww[i]][2] * 0x0101;
     }
 
     gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS,
@@ -1186,7 +1261,7 @@ void palette_reset(void *frontend)
     for (i = 0; i < NCOLOURS; i++) {
 	if (!success[i])
 	    g_error("pterm: couldn't allocate colour %d (#%02x%02x%02x)\n",
-		    i, cfg.colours[i][0], cfg.colours[i][1], cfg.colours[i][2]);
+		    i, inst->cfg.colours[i][0], inst->cfg.colours[i][1], inst->cfg.colours[i][2]);
     }
 
     set_window_background(inst);
@@ -1197,10 +1272,49 @@ 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);
-    inst->pasteout_data = smalloc(len);
-    inst->pasteout_data_len = len;
-    wc_to_mb(0, 0, data, len, inst->pasteout_data, inst->pasteout_data_len,
-	     NULL, NULL);
+    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->direct_to_font) {
+	wchar_t *tmp = data;
+	int tmplen = len;
+
+	inst->pasteout_data_utf8 = snewn(len*6, char);
+	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);
+	if (inst->pasteout_data_utf8_len == 0) {
+	    sfree(inst->pasteout_data_utf8);
+	    inst->pasteout_data_utf8 = NULL;
+	} else {
+	    inst->pasteout_data_utf8 =
+		sresize(inst->pasteout_data_utf8,
+			inst->pasteout_data_utf8_len, char);
+	}
+    } else {
+	inst->pasteout_data_utf8 = NULL;
+	inst->pasteout_data_utf8_len = 0;
+    }
+
+    inst->pasteout_data = snewn(len*6, char);
+    inst->pasteout_data_len = len*6;
+    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;
+    } else {
+	inst->pasteout_data =
+	    sresize(inst->pasteout_data, inst->pasteout_data_len, char);
+    }
 
     if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
 				GDK_CURRENT_TIME)) {
@@ -1208,6 +1322,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 +1332,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 +1348,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 +1365,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->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 */
@@ -1250,17 +1393,34 @@ 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)
 	sfree(inst->pastein_data);
 
-    inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t));
+    inst->pastein_data = snewn(seldata->length, 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 : inst->ucsdata.line_codepage),
+		 0, seldata->data, seldata->length,
+		 inst->pastein_data, inst->pastein_data_len);
 
     term_do_paste(inst->term);
 
@@ -1310,7 +1470,7 @@ void set_icon(void *frontend, char *title)
 void set_sbar(void *frontend, int total, int start, int page)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    if (!cfg.scrollbar)
+    if (!inst->cfg.scrollbar)
 	return;
     inst->sbar_adjust->lower = 0;
     inst->sbar_adjust->upper = total;
@@ -1327,7 +1487,7 @@ void scrollbar_moved(GtkAdjustment *adj, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
 
-    if (!cfg.scrollbar)
+    if (!inst->cfg.scrollbar)
 	return;
     if (!inst->ignore_sbar)
 	term_scroll(inst->term, 1, (int)adj->value);
@@ -1352,7 +1512,7 @@ void beep(void *frontend, int mode)
 	gdk_beep();
 }
 
-int CharWidth(Context ctx, int uc)
+int char_width(Context ctx, int uc)
 {
     /*
      * Under X, any fixed-width font really _is_ fixed-width.
@@ -1370,7 +1530,7 @@ Context get_ctx(void *frontend)
     if (!inst->area->window)
 	return NULL;
 
-    dctx = smalloc(sizeof(*dctx));
+    dctx = snew(struct draw_ctx);
     dctx->inst = inst;
     dctx->gc = gdk_gc_new(inst->area->window);
     return dctx;
@@ -1398,33 +1558,38 @@ 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;
-
-    /*
-     * 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);
+    nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+    nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
+    nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
     if (attr & ATTR_REVERSE) {
 	t = nfg;
 	nfg = nbg;
 	nbg = t;
     }
-    if (cfg.bold_colour && (attr & ATTR_BOLD))
-	nfg++;
-    if (cfg.bold_colour && (attr & ATTR_BLINK))
-	nbg++;
+    if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
+	nfg |= 1;
+    if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
+	nbg |= 1;
     if (attr & TATTR_ACTCURS) {
 	nfg = NCOLOURS-2;
 	nbg = NCOLOURS-1;
     }
 
     fontid = shadow = 0;
-    if ((attr & ATTR_BOLD) && !cfg.bold_colour) {
-	if (inst->fonts[1])
-	    fontid = 1;
+
+    if (attr & ATTR_WIDE) {
+	widefactor = 2;
+	fontid |= 2;
+    } else {
+	widefactor = 1;
+    }
+
+    if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) {
+	if (inst->fonts[fontid | 1])
+	    fontid |= 1;
 	else
 	    shadow = 1;
     }
@@ -1433,26 +1598,92 @@ 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;
+
+    {
+	GdkRectangle r;
+
+	r.x = x*inst->font_width+inst->cfg.window_border;
+	r.y = y*inst->font_height+inst->cfg.window_border;
+	r.width = rlen*widefactor*inst->font_width;
+	r.height = inst->font_height;
+	gdk_gc_set_clip_rectangle(gc, &r);
     }
 
     gdk_gc_set_foreground(gc, &inst->cols[nbg]);
     gdk_draw_rectangle(inst->pixmap, gc, 1,
-		       x*inst->font_width+cfg.window_border,
-		       y*inst->font_height+cfg.window_border,
-		       len*inst->font_width, inst->font_height);
+		       x*inst->font_width+inst->cfg.window_border,
+		       y*inst->font_height+inst->cfg.window_border,
+		       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 = snewn(len+1, wchar_t);
+	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) {
+	    /*
+	     * 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 = snewn(len*2+1, GdkWChar);
+	    memset(gwcs, 0, sizeof(GdkWChar) * (len*2+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+inst->cfg.window_border,
+			     y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+			     gwcs, len*2);
+	    sfree(gwcs);
+	} else {
+	    gcs = snewn(len+1, gchar);
+	    wc_to_mb(inst->fontinfo[fontid].charset, 0,
+		     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,
+			  gcs, len);
+	    sfree(gcs);
+	}
+	sfree(wcs);
+    }
 
     if (shadow) {
 	gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
-		      x*inst->font_width+cfg.window_border + cfg.shadowboldoffset,
-		      y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+		      x*inst->font_width+inst->cfg.window_border + inst->cfg.shadowboldoffset,
+		      y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
 		      text, len);
     }
 
@@ -1460,10 +1691,10 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 	int uheight = inst->fonts[0]->ascent + 1;
 	if (uheight >= inst->font_height)
 	    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,
-		      y*inst->font_height + uheight + cfg.window_border);
+	gdk_draw_line(inst->pixmap, gc, x*inst->font_width+inst->cfg.window_border,
+		      y*inst->font_height + uheight + inst->cfg.window_border,
+		      (x+len)*widefactor*inst->font_width-1+inst->cfg.window_border,
+		      y*inst->font_height + uheight + inst->cfg.window_border);
     }
 
     if (lattr != LATTR_NORM) {
@@ -1476,12 +1707,12 @@ 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,
-			    x*inst->font_width+cfg.window_border + 2*i+1,
-			    y*inst->font_height+cfg.window_border,
+			    x*inst->font_width+inst->cfg.window_border + 2*i,
+			    y*inst->font_height+inst->cfg.window_border,
+			    x*inst->font_width+inst->cfg.window_border + 2*i+1,
+			    y*inst->font_height+inst->cfg.window_border,
 			    len * inst->font_width - i, inst->font_height);
 	}
 	len *= 2;
@@ -1494,10 +1725,10 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 		dt = 1, db = 0;
 	    for (i = 0; i < inst->font_height; i+=2) {
 		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,
-				y*inst->font_height+cfg.window_border+dt*(i+1),
+				x*inst->font_width+inst->cfg.window_border,
+				y*inst->font_height+inst->cfg.window_border+dt*i+db,
+				x*widefactor*inst->font_width+inst->cfg.window_border,
+				y*inst->font_height+inst->cfg.window_border+dt*(i+1),
 				len * inst->font_width, inst->font_height-i-1);
 	    }
 	}
@@ -1510,24 +1741,31 @@ 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;
     }
 
     gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
-		    x*inst->font_width+cfg.window_border,
-		    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);
+		    x*inst->font_width+inst->cfg.window_border,
+		    y*inst->font_height+inst->cfg.window_border,
+		    x*inst->font_width+inst->cfg.window_border,
+		    y*inst->font_height+inst->cfg.window_border,
+		    len*widefactor*inst->font_width, inst->font_height);
 }
 
 void do_cursor(Context ctx, int x, int y, char *text, int len,
@@ -1537,28 +1775,34 @@ 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;
 	passive = 1;
     } else
 	passive = 0;
-    if ((attr & TATTR_ACTCURS) && cfg.cursor_type != 0) {
+    if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) {
 	attr &= ~TATTR_ACTCURS;
     }
     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;
     }
 
-    if (cfg.cursor_type == 0) {
+    if (inst->cfg.cursor_type == 0) {
 	/*
 	 * An active block cursor will already have been done by
 	 * the above do_text call, so we only need to do anything
@@ -1567,8 +1811,8 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	if (passive) {
 	    gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]);
 	    gdk_draw_rectangle(inst->pixmap, gc, 0,
-			       x*inst->font_width+cfg.window_border,
-			       y*inst->font_height+cfg.window_border,
+			       x*inst->font_width+inst->cfg.window_border,
+			       y*inst->font_height+inst->cfg.window_border,
 			       len*inst->font_width-1, inst->font_height-1);
 	}
     } else {
@@ -1582,13 +1826,13 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	else
 	    char_width = inst->font_width;
 
-	if (cfg.cursor_type == 1) {
+	if (inst->cfg.cursor_type == 1) {
 	    uheight = inst->fonts[0]->ascent + 1;
 	    if (uheight >= inst->font_height)
 		uheight = inst->font_height - 1;
 
-	    startx = x * inst->font_width + cfg.window_border;
-	    starty = y * inst->font_height + cfg.window_border + uheight;
+	    startx = x * inst->font_width + inst->cfg.window_border;
+	    starty = y * inst->font_height + inst->cfg.window_border + uheight;
 	    dx = 1;
 	    dy = 0;
 	    length = len * char_width;
@@ -1596,8 +1840,8 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	    int xadjust = 0;
 	    if (attr & TATTR_RIGHTCURS)
 		xadjust = char_width - 1;
-	    startx = x * inst->font_width + cfg.window_border + xadjust;
-	    starty = y * inst->font_height + cfg.window_border;
+	    startx = x * inst->font_width + inst->cfg.window_border + xadjust;
+	    starty = y * inst->font_height + inst->cfg.window_border;
 	    dx = 0;
 	    dy = 1;
 	    length = inst->font_height;
@@ -1619,11 +1863,11 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
     }
 
     gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
-		    x*inst->font_width+cfg.window_border,
-		    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);
+		    x*inst->font_width+inst->cfg.window_border,
+		    y*inst->font_height+inst->cfg.window_border,
+		    x*inst->font_width+inst->cfg.window_border,
+		    y*inst->font_height+inst->cfg.window_border,
+		    len*widefactor*inst->font_width, inst->font_height);
 }
 
 GdkCursor *make_mouse_ptr(struct gui_data *inst, int cursor_val)
@@ -1734,6 +1978,13 @@ char *get_x_display(void *frontend)
     return gdk_get_display();
 }
 
+long get_windowid(void *frontend)
+{
+    Terminal *term = (Terminal *)frontend;
+    struct gui_data *inst = (struct gui_data *)(term->frontend);
+    return (long)GDK_WINDOW_XWINDOW(inst->area->window);
+}
+
 static void help(FILE *fp) {
     if(fprintf(fp,
 "pterm option summary:\n"
@@ -1761,24 +2012,28 @@ static void help(FILE *fp) {
     }
 }
 
-int do_cmdline(int argc, char **argv, int do_everything)
+int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 {
     int err = 0;
     extern char **pty_argv;	       /* declared in pty.c */
 
     /*
-     * Macros to make argument handling easier.
+     * Macros to make argument handling easier. Note that because
+     * they need to call `continue', they cannot be contained in
+     * the usual do {...} while (0) wrapper to make them
+     * syntactically single statements; hence it is not legal to
+     * use one of these macros as an unbraced statement between
+     * `if' and `else'.
      */
-#define EXPECTS_ARG do { \
+#define EXPECTS_ARG { \
     if (--argc <= 0) { \
 	err = 1; \
 	fprintf(stderr, "pterm: %s expects an argument\n", p); \
+        continue; \
     } else \
 	val = *++argv; \
-} while (0)
-#define SECOND_PASS_ONLY do { \
-    if (!do_everything) continue; \
-} while (0)
+}
+#define SECOND_PASS_ONLY { if (!do_everything) continue; }
 
     /*
      * TODO:
@@ -1792,14 +2047,32 @@ int do_cmdline(int argc, char **argv, int do_everything)
 	if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg.font, val, sizeof(cfg.font));
-	    cfg.font[sizeof(cfg.font)-1] = '\0';
+	    strncpy(cfg->font.name, val, sizeof(cfg->font.name));
+	    cfg->font.name[sizeof(cfg->font.name)-1] = '\0';
 
 	} else if (!strcmp(p, "-fb")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg.boldfont, val, sizeof(cfg.boldfont));
-	    cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0';
+	    strncpy(cfg->boldfont.name, val, sizeof(cfg->boldfont.name));
+	    cfg->boldfont.name[sizeof(cfg->boldfont.name)-1] = '\0';
+
+	} else if (!strcmp(p, "-fw")) {
+	    EXPECTS_ARG;
+	    SECOND_PASS_ONLY;
+	    strncpy(cfg->widefont.name, val, sizeof(cfg->widefont.name));
+	    cfg->widefont.name[sizeof(cfg->widefont.name)-1] = '\0';
+
+	} else if (!strcmp(p, "-fwb")) {
+	    EXPECTS_ARG;
+	    SECOND_PASS_ONLY;
+	    strncpy(cfg->wideboldfont.name, val, sizeof(cfg->wideboldfont.name));
+	    cfg->wideboldfont.name[sizeof(cfg->wideboldfont.name)-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;
@@ -1808,9 +2081,9 @@ int do_cmdline(int argc, char **argv, int do_everything)
 
 	    flags = XParseGeometry(val, &x, &y, &w, &h);
 	    if (flags & WidthValue)
-		cfg.width = w;
+		cfg->width = w;
 	    if (flags & HeightValue)
-		cfg.height = h;
+		cfg->height = h;
 
 	    /*
 	     * Apparently setting the initial window position is
@@ -1823,7 +2096,7 @@ int do_cmdline(int argc, char **argv, int do_everything)
 	} else if (!strcmp(p, "-sl")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    cfg.savelines = atoi(val);
+	    cfg->savelines = atoi(val);
 
 	} else if (!strcmp(p, "-fg") || !strcmp(p, "-bg") ||
 		   !strcmp(p, "-bfg") || !strcmp(p, "-bbg") ||
@@ -1844,9 +2117,9 @@ int do_cmdline(int argc, char **argv, int do_everything)
 			 !strcmp(p, "-cfg") ? 4 :
 			 !strcmp(p, "-cbg") ? 5 : -1);
 		assert(index != -1);
-		cfg.colours[index][0] = col.red / 256;
-		cfg.colours[index][1] = col.green / 256;
-		cfg.colours[index][2] = col.blue / 256;
+		cfg->colours[index][0] = col.red / 256;
+		cfg->colours[index][1] = col.green / 256;
+		cfg->colours[index][2] = col.blue / 256;
 	    }
 
 	} else if (!strcmp(p, "-e")) {
@@ -1856,7 +2129,7 @@ int do_cmdline(int argc, char **argv, int do_everything)
 
 	    if (--argc > 0) {
 		int i;
-		pty_argv = smalloc((argc+1) * sizeof(char *));
+		pty_argv = snewn(argc+1, char *);
 		++argv;
 		for (i = 0; i < argc; i++)
 		    pty_argv[i] = argv[i];
@@ -1868,43 +2141,43 @@ int do_cmdline(int argc, char **argv, int do_everything)
 	} else if (!strcmp(p, "-T")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg.wintitle, val, sizeof(cfg.wintitle));
-	    cfg.wintitle[sizeof(cfg.wintitle)-1] = '\0';
+	    strncpy(cfg->wintitle, val, sizeof(cfg->wintitle));
+	    cfg->wintitle[sizeof(cfg->wintitle)-1] = '\0';
 
 	} else if (!strcmp(p, "-log")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg.logfilename, val, sizeof(cfg.logfilename));
-	    cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0';
-	    cfg.logtype = LGTYP_DEBUG;
+	    strncpy(cfg->logfilename.path, val, sizeof(cfg->logfilename.path));
+	    cfg->logfilename.path[sizeof(cfg->logfilename.path)-1] = '\0';
+	    cfg->logtype = LGTYP_DEBUG;
 
 	} else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
 	    SECOND_PASS_ONLY;
-	    cfg.stamp_utmp = 0;
+	    cfg->stamp_utmp = 0;
 
 	} else if (!strcmp(p, "-ut")) {
 	    SECOND_PASS_ONLY;
-	    cfg.stamp_utmp = 1;
+	    cfg->stamp_utmp = 1;
 
 	} else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) {
 	    SECOND_PASS_ONLY;
-	    cfg.login_shell = 0;
+	    cfg->login_shell = 0;
 
 	} else if (!strcmp(p, "-ls")) {
 	    SECOND_PASS_ONLY;
-	    cfg.login_shell = 1;
+	    cfg->login_shell = 1;
 
 	} else if (!strcmp(p, "-nethack")) {
 	    SECOND_PASS_ONLY;
-	    cfg.nethack_keypad = 1;
+	    cfg->nethack_keypad = 1;
 
 	} else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) {
 	    SECOND_PASS_ONLY;
-	    cfg.scrollbar = 0;
+	    cfg->scrollbar = 0;
 
 	} else if (!strcmp(p, "-sb")) {
 	    SECOND_PASS_ONLY;
-	    cfg.scrollbar = 0;
+	    cfg->scrollbar = 0;
 
 	} else if (!strcmp(p, "-name")) {
 	    EXPECTS_ARG;
@@ -1927,55 +2200,160 @@ int do_cmdline(int argc, char **argv, int do_everything)
     return err;
 }
 
+static void block_signal(int sig, int block_it) {
+  sigset_t ss;
+
+  sigemptyset(&ss);
+  sigaddset(&ss, sig);
+  if(sigprocmask(block_it ? SIG_BLOCK : SIG_UNBLOCK, &ss, 0) < 0) {
+    perror("sigprocmask");
+    exit(1);
+  }
+}
+
+/*
+ * 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 */
+    block_signal(SIGCHLD, 1);
 
     pty_pre_init();
 
     gtk_init(&argc, &argv);
 
-    if (do_cmdline(argc, argv, 0))     /* pre-defaults pass to get -class */
-	exit(1);
-    do_defaults(NULL, &cfg);
-    if (do_cmdline(argc, argv, 1))     /* post-defaults, do everything */
-	exit(1);
-
     /*
      * Create an instance structure and initialise to zeroes
      */
-    inst = smalloc(sizeof(*inst));
+    inst = snew(struct gui_data);
     memset(inst, 0, sizeof(*inst));
     inst->alt_keycode = -1;            /* this one needs _not_ to be zero */
 
-    inst->fonts[0] = gdk_font_load(cfg.font);
+    if (do_cmdline(argc, argv, 0, &inst->cfg))
+	exit(1);		       /* pre-defaults pass to get -class */
+    do_defaults(NULL, &inst->cfg);
+    if (do_cmdline(argc, argv, 1, &inst->cfg))
+	exit(1);		       /* post-defaults, do everything */
+
+    inst->fonts[0] = gdk_font_load(inst->cfg.font.name);
     if (!inst->fonts[0]) {
-	fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font);
+	fprintf(stderr, "pterm: unable to load font \"%s\"\n",
+		inst->cfg.font.name);
 	exit(1);
     }
-    if (cfg.boldfont[0]) {
-	inst->fonts[1] = gdk_font_load(cfg.boldfont);
+    font_charset = set_font_info(inst, 0);
+    if (inst->cfg.boldfont.name[0]) {
+	inst->fonts[1] = gdk_font_load(inst->cfg.boldfont.name);
 	if (!inst->fonts[1]) {
 	    fprintf(stderr, "pterm: unable to load bold font \"%s\"\n",
-		    cfg.boldfont);
+		    inst->cfg.boldfont.name);
 	    exit(1);
 	}
+	set_font_info(inst, 1);
     } else
 	inst->fonts[1] = NULL;
+    if (inst->cfg.widefont.name[0]) {
+	inst->fonts[2] = gdk_font_load(inst->cfg.widefont.name);
+	if (!inst->fonts[2]) {
+	    fprintf(stderr, "pterm: unable to load wide font \"%s\"\n",
+		    inst->cfg.widefont.name);
+	    exit(1);
+	}
+	set_font_info(inst, 2);
+    } else
+	inst->fonts[2] = NULL;
+    if (inst->cfg.wideboldfont.name[0]) {
+	inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont.name);
+	if (!inst->fonts[3]) {
+	    fprintf(stderr, "pterm: unable to load wide/bold font \"%s\"\n",
+		    inst->cfg.wideboldfont.name);
+	    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();
+    inst->direct_to_font = init_ucs(&inst->ucsdata,
+				    inst->cfg.line_codepage, font_charset);
 
     inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-    if (cfg.wintitle[0])
-	set_title(inst, cfg.wintitle);
+    if (inst->cfg.wintitle[0])
+	set_title(inst, inst->cfg.wintitle);
     else
 	set_title(inst, "pterm");
 
@@ -1986,15 +2364,15 @@ int main(int argc, char **argv)
 
     inst->area = gtk_drawing_area_new();
     gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
-			  inst->font_width * cfg.width + 2*cfg.window_border,
-			  inst->font_height * cfg.height + 2*cfg.window_border);
-    if (cfg.scrollbar) {
+			  inst->font_width * inst->cfg.width + 2*inst->cfg.window_border,
+			  inst->font_height * inst->cfg.height + 2*inst->cfg.window_border);
+    if (inst->cfg.scrollbar) {
 	inst->sbar_adjust = GTK_ADJUSTMENT(gtk_adjustment_new(0,0,0,0,0,0));
 	inst->sbar = gtk_vscrollbar_new(inst->sbar_adjust);
     }
     inst->hbox = GTK_BOX(gtk_hbox_new(FALSE, 0));
-    if (cfg.scrollbar) {
-	if (cfg.scrollbar_on_left)
+    if (inst->cfg.scrollbar) {
+	if (inst->cfg.scrollbar_on_left)
 	    gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
 	else
 	    gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0);
@@ -2005,11 +2383,11 @@ int main(int argc, char **argv)
 
     {
 	GdkGeometry geom;
-	geom.min_width = inst->font_width + 2*cfg.window_border;
-	geom.min_height = inst->font_height + 2*cfg.window_border;
+	geom.min_width = inst->font_width + 2*inst->cfg.window_border;
+	geom.min_height = inst->font_height + 2*inst->cfg.window_border;
 	geom.max_width = geom.max_height = -1;
-	geom.base_width = 2*cfg.window_border;
-	geom.base_height = 2*cfg.window_border;
+	geom.base_width = 2*inst->cfg.window_border;
+	geom.base_height = 2*inst->cfg.window_border;
 	geom.width_inc = inst->font_width;
 	geom.height_inc = inst->font_height;
 	geom.min_aspect = geom.max_aspect = 0;
@@ -2046,7 +2424,7 @@ int main(int argc, char **argv)
 		       GTK_SIGNAL_FUNC(selection_get), inst);
     gtk_signal_connect(GTK_OBJECT(inst->area), "selection_clear_event",
 		       GTK_SIGNAL_FUNC(selection_clear), inst);
-    if (cfg.scrollbar)
+    if (inst->cfg.scrollbar)
 	gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed",
 			   GTK_SIGNAL_FUNC(scrollbar_moved), inst);
     gtk_timeout_add(20, timer_func, inst);
@@ -2056,7 +2434,7 @@ int main(int argc, char **argv)
 			  GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
 
     gtk_widget_show(inst->area);
-    if (cfg.scrollbar)
+    if (inst->cfg.scrollbar)
 	gtk_widget_show(inst->sbar);
     gtk_widget_show(GTK_WIDGET(inst->hbox));
     gtk_widget_show(inst->window);
@@ -2070,19 +2448,21 @@ int main(int argc, char **argv)
     inst->currcursor = inst->textcursor;
     show_mouseptr(inst, 1);
 
-    inst->term = term_init(inst);
-    inst->logctx = log_init(inst);
+    inst->term = term_init(&inst->cfg, &inst->ucsdata, inst);
+    inst->logctx = log_init(inst, &inst->cfg);
     term_provide_logctx(inst->term, inst->logctx);
 
     inst->back = &pty_backend;
-    inst->back->init((void *)inst->term, &inst->backhandle, NULL, 0, NULL, 0);
+    inst->back->init((void *)inst->term, &inst->backhandle, &inst->cfg,
+		     NULL, 0, NULL, 0);
     inst->back->provide_logctx(inst->backhandle, inst->logctx);
 
     term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
 
-    term_size(inst->term, cfg.height, cfg.width, cfg.savelines);
+    term_size(inst->term, inst->cfg.height, inst->cfg.width, inst->cfg.savelines);
 
-    inst->ldisc = ldisc_create(inst->term, inst->back, inst->backhandle, inst);
+    inst->ldisc =
+	ldisc_create(&inst->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;
@@ -2090,6 +2470,10 @@ int main(int argc, char **argv)
     inst->master_func_id = gdk_input_add(pty_master_fd, GDK_INPUT_READ,
 					 pty_input_func, inst);
 
+    /* now we're reday to deal with the child exit handler being
+     * called */
+    block_signal(SIGCHLD, 0);
+    
     gtk_main();
 
     return 0;