X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/881da16842e210236b12a040a19bf480de3a5a92..f160b7b8908cac4a7ca37b49928b7855fe0a11fe:/unix/gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index d31037b6..dc8d6607 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -28,6 +28,7 @@
 
 #include "putty.h"
 #include "terminal.h"
+#include "gtkfont.h"
 
 #define CAT2(x,y) x ## y
 #define CAT(x,y) CAT2(x,y)
@@ -58,11 +59,7 @@ struct gui_data {
 	*restartitem;
     GtkWidget *sessionsmenu;
     GdkPixmap *pixmap;
-    GdkFont *fonts[4];                 /* normal, bold, wide, widebold */
-    struct {
-	int charset;
-	int is_wide;
-    } fontinfo[4];
+    unifont *fonts[4];                 /* normal, bold, wide, widebold */
     int xpos, ypos, gotpos, gravity;
     GdkCursor *rawcursor, *textcursor, *blankcursor, *waitcursor, *currcursor;
     GdkColor cols[NALLCOLOURS];
@@ -137,7 +134,7 @@ FontSpec platform_default_fontspec(const char *name)
 {
     FontSpec ret;
     if (!strcmp(name, "Font"))
-	strcpy(ret.name, "fixed");
+	strcpy(ret.name, "server:fixed");
     else
 	*ret.name = '\0';
     return ret;
@@ -327,7 +324,7 @@ void set_zoomed(void *frontend, int zoomed)
      */
 #if GTK_CHECK_VERSION(2,0,0)
     struct gui_data *inst = (struct gui_data *)frontend;
-    if (iconic)
+    if (zoomed)
 	gtk_window_maximize(GTK_WINDOW(inst->window));
     else
 	gtk_window_unmaximize(GTK_WINDOW(inst->window));
@@ -1353,17 +1350,29 @@ void request_resize(void *frontend, int w, int h)
      */
 #if GTK_CHECK_VERSION(2,0,0)
     gtk_widget_set_size_request(inst->area, area_x, area_y);
+    gtk_window_resize(GTK_WINDOW(inst->window),
+		      area_x + offset_x, area_y + offset_y);
 #else
     gtk_widget_set_usize(inst->area, area_x, area_y);
     gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), area_x, area_y);
-#endif
-
+    /*
+     * I can no longer remember what this call to
+     * gtk_container_dequeue_resize_handler is for. It was
+     * introduced in r3092 with no comment, and the commit log
+     * message was uninformative. I'm _guessing_ its purpose is to
+     * prevent gratuitous resize processing on the window given
+     * that we're about to resize it anyway, but I have no idea
+     * why that's so incredibly vital.
+     * 
+     * I've tried removing the call, and nothing seems to go
+     * wrong. I've backtracked to r3092 and tried removing the
+     * call there, and still nothing goes wrong. So I'm going to
+     * adopt the working hypothesis that it's superfluous; I won't
+     * actually remove it from the GTK 1.2 code, but I won't
+     * attempt to replicate its functionality in the GTK 2 code
+     * above.
+     */
     gtk_container_dequeue_resize_handler(GTK_CONTAINER(inst->window));
-
-#if GTK_CHECK_VERSION(2,0,0)
-    gtk_window_resize(GTK_WINDOW(inst->window),
-		      area_x + offset_x, area_y + offset_y);
-#else
     gdk_window_resize(inst->window->window,
 		      area_x + offset_x, area_y + offset_y);
 #endif
@@ -1462,7 +1471,7 @@ void palette_reset(void *frontend)
     /* Since Default Background may have changed, ensure that space
      * between text area and window border is refreshed. */
     set_window_background(inst);
-    if (inst->area) {
+    if (inst->area && inst->area->window) {
 	draw_backing_rect(inst);
 	gtk_widget_queue_draw(inst->area);
     }
@@ -1884,6 +1893,8 @@ int char_width(Context ctx, int uc)
      * Under X, any fixed-width font really _is_ fixed-width.
      * Double-width characters will be dealt with using a separate
      * font. For the moment we can simply return 1.
+     * 
+     * FIXME: but is that also true of Pango?
      */
     return 1;
 }
@@ -1924,7 +1935,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     struct gui_data *inst = dctx->inst;
     GdkGC *gc = dctx->gc;
     int ncombining, combining;
-    int nfg, nbg, t, fontid, shadow, rlen, widefactor;
+    int nfg, nbg, t, fontid, shadow, rlen, widefactor, bold;
     int monochrome = gtk_widget_get_visual(inst->area)->depth == 1;
 
     if (attr & TATTR_COMBINING) {
@@ -1963,10 +1974,27 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     }
 
     if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) {
-	if (inst->fonts[fontid | 1])
-	    fontid |= 1;
-	else
-	    shadow = 1;
+	bold = 1;
+	fontid |= 1;
+    } else {
+	bold = 0;
+    }
+
+    if (!inst->fonts[fontid]) {
+	int i;
+	/*
+	 * Fall back through font ids with subsets of this one's
+	 * set bits, in order.
+	 */
+	for (i = fontid; i-- > 0 ;) {
+	    if (i & ~fontid)
+		continue;	       /* some other bit is set */
+	    if (inst->fonts[i]) {
+		fontid = i;
+		break;
+	    }
+	}
+	assert(inst->fonts[fontid]);   /* we should at least have hit zero */
     }
 
     if ((lattr & LATTR_MODE) != LATTR_NORM) {
@@ -1997,82 +2025,27 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 
     gdk_gc_set_foreground(gc, &inst->cols[nfg]);
     {
-	GdkWChar *gwcs;
 	gchar *gcs;
-	wchar_t *wcs;
-	int i;
 
-	wcs = snewn(len*ncombining+1, wchar_t);
-	for (i = 0; i < len*ncombining; i++) {
-	    wcs[i] = text[i];
-	}
-
-	if (inst->fonts[fontid] == NULL && (fontid & 2)) {
-	    /*
-	     * We've been given ATTR_WIDE, but have no wide font.
-	     * Fall back to the non-wide font.
-	     */
-	    fontid &= ~2;
-	}
+	/*
+	 * FIXME: this length is hardwired on the assumption that
+	 * conversions from wide to multibyte characters will
+	 * never generate more than 10 bytes for a single wide
+	 * character.
+	 */
+	gcs = snewn(len*10+1, gchar);
 
-	if (inst->fonts[fontid] == NULL) {
-	    /*
-	     * The font for this contingency does not exist. 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 (combining = 0; combining < ncombining; combining++) {
-		for (i = 0; i <= len; i++)
-		    gwcs[i] = wcs[i + combining];
-		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);
-		if (shadow)
-		    gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
-				     x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset,
-				     y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
-				     gwcs, len*2);
-	    }
-	    sfree(gwcs);
-	} else {
-	    gcs = snewn(len+1, gchar);
-	    for (combining = 0; combining < ncombining; combining++) {
-		wc_to_mb(inst->fontinfo[fontid].charset, 0,
-			 wcs + combining, len, gcs, len, ".", NULL, NULL);
-		gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
+	for (combining = 0; combining < ncombining; combining++) {
+	    int mblen = wc_to_mb(inst->fonts[fontid]->real_charset, 0,
+				 text + combining, len, gcs, len*10+1, ".",
+				 NULL, NULL);
+	    unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid],
 			      x*inst->font_width+inst->cfg.window_border,
 			      y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
-			      gcs, len);
-		if (shadow)
-		    gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
-				  x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset,
-				  y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
-				  gcs, len);
-	    }
-	    sfree(gcs);
+			      gcs, mblen, widefactor > 1, bold, inst->font_width);
 	}
-	sfree(wcs);
+
+	sfree(gcs);
     }
 
     if (attr & ATTR_UNDER) {
@@ -2292,8 +2265,11 @@ GdkCursor *make_mouse_ptr(struct gui_data *inst, int cursor_val)
 	return NULL;
     }
 
-    if (cursor_val >= 0 && !cursor_font)
+    if (cursor_val >= 0 && !cursor_font) {
 	cursor_font = gdk_font_load("cursor");
+	if (cursor_font)
+	    gdk_font_ref(cursor_font);
+    }
 
     /*
      * Get the text extent of the cursor in question. We use the
@@ -2634,75 +2610,12 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
     return err;
 }
 
-/*
- * 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 uxsel_input_add(int fd, int rwx) {
     int flags = 0;
     if (rwx & 1) flags |= GDK_INPUT_READ;
     if (rwx & 2) flags |= GDK_INPUT_WRITE;
     if (rwx & 4) flags |= GDK_INPUT_EXCEPTION;
+    assert(flags);
     return gdk_input_add(fd, flags, fd_input_func, NULL);
 }
 
@@ -2710,158 +2623,75 @@ void uxsel_input_remove(int id) {
     gdk_input_remove(id);
 }
 
-char *guess_derived_font_name(GdkFont *font, int bold, int wide)
-{
-    XFontStruct *xfs = GDK_FONT_XFONT(font);
-    Display *disp = GDK_FONT_XDISPLAY(font);
-    Atom fontprop = XInternAtom(disp, "FONT", False);
-    unsigned long ret;
-    if (XGetFontProperty(xfs, fontprop, &ret)) {
-	char *name = XGetAtomName(disp, (Atom)ret);
-	if (name && name[0] == '-') {
-	    char *strings[13];
-	    char *dupname, *extrafree = NULL, *ret;
-	    char *p, *q;
-	    int nstr;
-
-	    p = q = dupname = dupstr(name); /* skip initial minus */
-	    nstr = 0;
-
-	    while (*p && nstr < lenof(strings)) {
-		if (*p == '-') {
-		    *p = '\0';
-		    strings[nstr++] = p+1;
-		}
-		p++;
-	    }
-
-	    if (nstr < lenof(strings))
-		return NULL;	       /* XLFD was malformed */
-
-	    if (bold)
-		strings[2] = "bold";
-
-	    if (wide) {
-		/* 4 is `wideness', which obviously may have changed. */
-		/* 5 is additional style, which may be e.g. `ja' or `ko'. */
-		strings[4] = strings[5] = "*";
-		strings[11] = extrafree = dupprintf("%d", 2*atoi(strings[11]));
-	    }
-
-	    ret = dupcat("-", strings[ 0], "-", strings[ 1], "-", strings[ 2],
-			 "-", strings[ 3], "-", strings[ 4], "-", strings[ 5],
-			 "-", strings[ 6], "-", strings[ 7], "-", strings[ 8],
-			 "-", strings[ 9], "-", strings[10], "-", strings[11],
-			 "-", strings[12], NULL);
-	    sfree(extrafree);
-	    sfree(dupname);
-
-	    return ret;
-	}
-    }
-    return NULL;
-}
-
 void setup_fonts_ucs(struct gui_data *inst)
 {
-    int font_charset;
-    char *name;
-    int guessed;
-
     if (inst->fonts[0])
-        gdk_font_unref(inst->fonts[0]);
+        unifont_destroy(inst->fonts[0]);
     if (inst->fonts[1])
-        gdk_font_unref(inst->fonts[1]);
+        unifont_destroy(inst->fonts[1]);
     if (inst->fonts[2])
-        gdk_font_unref(inst->fonts[2]);
+        unifont_destroy(inst->fonts[2]);
     if (inst->fonts[3])
-        gdk_font_unref(inst->fonts[3]);
+        unifont_destroy(inst->fonts[3]);
 
-    inst->fonts[0] = gdk_font_load(inst->cfg.font.name);
+    inst->fonts[0] = unifont_create(inst->area, inst->cfg.font.name,
+				    FALSE, FALSE,
+				    inst->cfg.shadowboldoffset,
+				    inst->cfg.shadowbold);
     if (!inst->fonts[0]) {
 	fprintf(stderr, "%s: unable to load font \"%s\"\n", appname,
 		inst->cfg.font.name);
 	exit(1);
     }
-    font_charset = set_font_info(inst, 0);
 
-    if (inst->cfg.shadowbold) {
+    if (inst->cfg.shadowbold || !inst->cfg.boldfont.name[0]) {
 	inst->fonts[1] = NULL;
     } else {
-	if (inst->cfg.boldfont.name[0]) {
-	    name = inst->cfg.boldfont.name;
-	    guessed = FALSE;
-	} else {
-	    name = guess_derived_font_name(inst->fonts[0], TRUE, FALSE);
-	    guessed = TRUE;
-	}
-	inst->fonts[1] = name ? gdk_font_load(name) : NULL;
-	if (inst->fonts[1]) {
-	    set_font_info(inst, 1);
-	} else if (!guessed) {
+	inst->fonts[1] = unifont_create(inst->area, inst->cfg.boldfont.name,
+					FALSE, TRUE,
+					inst->cfg.shadowboldoffset,
+					inst->cfg.shadowbold);
+	if (!inst->fonts[1]) {
 	    fprintf(stderr, "%s: unable to load bold font \"%s\"\n", appname,
 		    inst->cfg.boldfont.name);
 	    exit(1);
 	}
-	if (guessed)
-	    sfree(name);
     }
 
     if (inst->cfg.widefont.name[0]) {
-	name = inst->cfg.widefont.name;
-	guessed = FALSE;
+	inst->fonts[2] = unifont_create(inst->area, inst->cfg.widefont.name,
+					TRUE, FALSE,
+					inst->cfg.shadowboldoffset,
+					inst->cfg.shadowbold);
+	if (!inst->fonts[2]) {
+	    fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname,
+		    inst->cfg.widefont.name);
+	    exit(1);
+	}
     } else {
-	name = guess_derived_font_name(inst->fonts[0], FALSE, TRUE);
-	guessed = TRUE;
-    }
-    inst->fonts[2] = name ? gdk_font_load(name) : NULL;
-    if (inst->fonts[2]) {
-	set_font_info(inst, 2);
-    } else if (!guessed) {
-	fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname,
-		inst->cfg.widefont.name);
-	exit(1);
+	inst->fonts[2] = NULL;
     }
-    if (guessed)
-	sfree(name);
 
-    if (inst->cfg.shadowbold) {
+    if (inst->cfg.shadowbold || !inst->cfg.wideboldfont.name[0]) {
 	inst->fonts[3] = NULL;
     } else {
-	if (inst->cfg.wideboldfont.name[0]) {
-	    name = inst->cfg.wideboldfont.name;
-	    guessed = FALSE;
-	} else {
-	    /*
-	     * Here we have some choices. We can widen the bold font,
-	     * bolden the wide font, or widen and bolden the standard
-	     * font. Try them all, in that order!
-	     */
-	    if (inst->cfg.widefont.name[0])
-		name = guess_derived_font_name(inst->fonts[2], TRUE, FALSE);
-	    else if (inst->cfg.boldfont.name[0])
-		name = guess_derived_font_name(inst->fonts[1], FALSE, TRUE);
-	    else
-		name = guess_derived_font_name(inst->fonts[0], TRUE, TRUE);
-	    guessed = TRUE;
-	}
-	inst->fonts[3] = name ? gdk_font_load(name) : NULL;
-	if (inst->fonts[3]) {
-	    set_font_info(inst, 3);
-	} else if (!guessed) {
-	    fprintf(stderr, "%s: unable to load wide/bold font \"%s\"\n", appname,
-		    inst->cfg.wideboldfont.name);
+	inst->fonts[3] = unifont_create(inst->area,
+					inst->cfg.wideboldfont.name, TRUE,
+					TRUE, inst->cfg.shadowboldoffset,
+					inst->cfg.shadowbold);
+	if (!inst->fonts[3]) {
+	    fprintf(stderr, "%s: unable to load wide bold font \"%s\"\n", appname,
+		    inst->cfg.boldfont.name);
 	    exit(1);
 	}
-	if (guessed)
-	    sfree(name);
     }
 
-    inst->font_width = gdk_char_width(inst->fonts[0], ' ');
-    inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent;
+    inst->font_width = inst->fonts[0]->width;
+    inst->font_height = inst->fonts[0]->height;
 
     inst->direct_to_font = init_ucs(&inst->ucsdata, inst->cfg.line_codepage,
-				    inst->cfg.utf8_override, font_charset,
+				    inst->cfg.utf8_override,
+				    inst->fonts[0]->public_charset,
 				    inst->cfg.vtmode);
 }
 
@@ -3510,6 +3340,8 @@ int pt_main(int argc, char **argv)
     if (!utf8_string_atom)
         utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
 
+    inst->area = gtk_drawing_area_new();
+
     setup_fonts_ucs(inst);
     init_cutbuffers();
 
@@ -3523,7 +3355,6 @@ int pt_main(int argc, char **argv)
     inst->width = inst->cfg.width;
     inst->height = inst->cfg.height;
 
-    inst->area = gtk_drawing_area_new();
     gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
 			  inst->font_width * inst->cfg.width + 2*inst->cfg.window_border,
 			  inst->font_height * inst->cfg.height + 2*inst->cfg.window_border);