From 29d875f7da9b8b840af9dc3e7d4af99b0837cfea Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 2 Apr 2008 14:50:47 +0000 Subject: [PATCH] Enable the display of server-side font aliases by default in my font selector. I had previously been worried that the default of not showing aliases interacted badly with the default actual font _being_ specified as an alias. One of those defaults had to change, and I've decided which: `fixed' is staying as Unix PuTTY's default font in defiance of GTK2's vigorous encouragement of Pango. [originally from svn r7960] --- unix/GTK2.TODO | 7 ------- unix/gtkfont.c | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/unix/GTK2.TODO b/unix/GTK2.TODO index e5d4b38d..7b695a50 100644 --- a/unix/GTK2.TODO +++ b/unix/GTK2.TODO @@ -3,13 +3,6 @@ TODO for PuTTY GTK2 port before merging back into main trunk code Things to do before deciding a merge is feasible: - - Although I'm still stubbornly _supporting_ X11 fonts alongside - Pango ones in defiance of standard GTK2 policy, it might be a - good idea to at least switch the default font to Pango's - Monospace 12, not least so that font aliases don't come up - selected by default. Then again, perhaps keeping fixed as the - default is more traditional. Hmm. - - gtkcols.c is currently a minimal-work GTK2 port of my original GTK1 implementation. Someone should go through it and compare it to a real GTK2 container class, to make sure there aren't any diff --git a/unix/gtkfont.c b/unix/gtkfont.c index a2d8f40c..9b95cb3b 100644 --- a/unix/gtkfont.c +++ b/unix/gtkfont.c @@ -2304,7 +2304,8 @@ unifontsel *unifontsel_new(const char *wintitle) gtk_table_attach(GTK_TABLE(table), w, 0, 3, 7, 8, GTK_FILL, 0, 0, 0); assert(i == lenof(fs->filter_buttons)); - fs->filter_flags = FONTFLAG_CLIENTSIDE | FONTFLAG_SERVERSIDE; + fs->filter_flags = FONTFLAG_CLIENTSIDE | FONTFLAG_SERVERSIDE | + FONTFLAG_SERVERALIAS; unifontsel_set_filter_buttons(fs); /*