Portions copyright Robert de Bath, Joris van Rantwijk, Delian
Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
-Kuhn, and CORE SDI S.A.
+Kuhn, Colin Watson, and CORE SDI S.A.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
# Same thing on Unix.
UXTERM = TERMINAL uxcfg sercfg uxucs uxprint timing
-GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkcols xkeysym
+GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym
OSXTERM = UXTERM osxwin osxdlg osxctrls
# Non-SSH back ends (putty, puttytel, plink).
* has a drop-down list built in. (Note that a _non_-
* editable drop-down list is done as a special case of a
* list box.)
+ *
+ * Don't try setting has_list and password on the same
+ * control; front ends are not required to support that
+ * combination.
*/
int has_list;
/*
* the respective widths of `ncols' columns, which together
* will exactly fit the width of the list box. Otherwise
* `percentages' must be NULL.
+ *
+ * There should never be more than one column in a
+ * drop-down list (one with height==0), because front ends
+ * may have to implement it as a special case of an
+ * editable combo box.
*/
int ncols; /* number of columns */
int *percentages; /* % width of each column */
Portions copyright Robert de Bath, Joris van Rantwijk, Delian
Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
-Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn,
-and CORE SDI S.A.
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+Kuhn, Colin Watson, and CORE SDI S.A.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
"Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
- "Kuhn, and CORE SDI S.A.\n"
+ "Kuhn, Colin Watson, and CORE SDI S.A.\n"
"\n"
"Permission is hereby granted, free of charge, to any person "
"obtaining a copy of this software and associated documentation "
"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
"Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
- "Kuhn, and CORE SDI S.A.\n"
+ "Kuhn, Colin Watson, and CORE SDI S.A.\n"
"\n"
"Permission is hereby granted, free of charge, to any person "
"obtaining a copy of this software and associated documentation "
# It's separate from mkfiles.pl because it won't work (and isn't needed)
# on a non-Unix system.
+# It's nice to be able to run this from inside the unix subdir as
+# well as from outside.
+test -f unix.h && cd ..
+
# Persuade automake to give us a copy of its install-sh. This is a
# pain because I don't actually want to have to _use_ automake.
# Instead, I construct a trivial unrelated automake project in a
"# You can define this path to point at your tools if you need to\n".
"# TOOLPATH = /opt/gcc/bin\n".
"CC = \$(TOOLPATH)cc\n".
+ "# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n".
+ "# (depending on what works on your system) if you want to enforce\n".
+ "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n".
+ "# if you want to enforce 2.0. The default is to try 2.0 and fall back\n".
+ "# to 1.2 if it isn't found.\n".
+ "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
"\n".
&splitline("CFLAGS = -O2 -Wall -Werror -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
- " `gtk-config --cflags`").
+ " `\$(GTK_CONFIG) --cflags`").
" -D _FILE_OFFSET_BITS=64\n".
- "XLDFLAGS = \$(LDFLAGS) `gtk-config --libs`\n".
+ "XLDFLAGS = \$(LDFLAGS) `\$(GTK_CONFIG) --libs`\n".
"ULDFLAGS = \$(LDFLAGS)\n".
"INSTALL=install\n",
"INSTALL_PROGRAM=\$(INSTALL)\n",
#include <sys/types.h>
#include <utmp.h>])
-AM_PATH_GTK([1.2.0], [all_targets="all-cli all-gtk"], [all_targets="all-cli"])
+# Look for both GTK 1 and GTK 2.
+AM_PATH_GTK([1.2.0], [gtk=1], [gtk=none])
+AM_PATH_GTK_2_0([2.0.0], [gtk=2], [])
+if test "$gtk" = "none"; then
+ all_targets="all-cli"
+else
+ all_targets="all-cli all-gtk"
+fi
+if test "$gtk" = "2"; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+ AC_CHECK_FUNCS([pango_font_family_is_monospace pango_font_map_list_families])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+fi
AC_SUBST([all_targets])
AC_SEARCH_LIBS([socket], [xnet])
#ifndef HAVE_SYS_SELECT_H
# define HAVE_NO_SYS_SELECT_H
#endif
+#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+# define PANGO_PRE_1POINT4
+#endif
+#ifndef HAVE_PANGO_FONT_MAP_LIST_FAMILIES
+# define PANGO_PRE_1POINT6
+#endif
])
*/
#include "gtkcols.h"
+#include <gtk/gtk.h>
static void columns_init(Columns *cols);
static void columns_class_init(ColumnsClass *klass);
static void columns_map(GtkWidget *widget);
static void columns_unmap(GtkWidget *widget);
+#if !GTK_CHECK_VERSION(2,0,0)
static void columns_draw(GtkWidget *widget, GdkRectangle *area);
static gint columns_expose(GtkWidget *widget, GdkEventExpose *event);
+#endif
static void columns_base_add(GtkContainer *container, GtkWidget *widget);
static void columns_remove(GtkContainer *container, GtkWidget *widget);
static void columns_forall(GtkContainer *container, gboolean include_internals,
GtkCallback callback, gpointer callback_data);
+#if !GTK_CHECK_VERSION(2,0,0)
static gint columns_focus(GtkContainer *container, GtkDirectionType dir);
+#endif
static GtkType columns_child_type(GtkContainer *container);
static void columns_size_request(GtkWidget *widget, GtkRequisition *req);
static void columns_size_allocate(GtkWidget *widget, GtkAllocation *alloc);
static GtkContainerClass *parent_class = NULL;
+#if !GTK_CHECK_VERSION(2,0,0)
GtkType columns_get_type(void)
{
static GtkType columns_type = 0;
return columns_type;
}
+#else
+GType columns_get_type(void)
+{
+ static GType columns_type = 0;
+
+ if (!columns_type) {
+ static const GTypeInfo columns_info = {
+ sizeof(ColumnsClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) columns_class_init,
+ NULL,
+ NULL,
+ sizeof(Columns),
+ 0,
+ (GInstanceInitFunc)columns_init,
+ };
+
+ columns_type = g_type_register_static(GTK_TYPE_CONTAINER, "Columns",
+ &columns_info, 0);
+ }
+
+ return columns_type;
+}
+#endif
+#if !GTK_CHECK_VERSION(2,0,0)
static gint (*columns_inherited_focus)(GtkContainer *container,
GtkDirectionType direction);
+#endif
static void columns_class_init(ColumnsClass *klass)
{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
-
- object_class = (GtkObjectClass *)klass;
- widget_class = (GtkWidgetClass *)klass;
- container_class = (GtkContainerClass *)klass;
-
+#if !GTK_CHECK_VERSION(2,0,0)
+ /* GtkObjectClass *object_class = (GtkObjectClass *)klass; */
+ GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+ GtkContainerClass *container_class = (GtkContainerClass *)klass;
+#else
+ /* GObjectClass *object_class = G_OBJECT_CLASS(klass); */
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+ GtkContainerClass *container_class = GTK_CONTAINER_CLASS(klass);
+#endif
+
+#if !GTK_CHECK_VERSION(2,0,0)
parent_class = gtk_type_class(GTK_TYPE_CONTAINER);
-
- /*
- * FIXME: do we have to do all this faffing with set_arg,
- * get_arg and child_arg_type? Ick.
- */
+#else
+ parent_class = g_type_class_peek_parent(klass);
+#endif
widget_class->map = columns_map;
widget_class->unmap = columns_unmap;
+#if !GTK_CHECK_VERSION(2,0,0)
widget_class->draw = columns_draw;
widget_class->expose_event = columns_expose;
+#endif
widget_class->size_request = columns_size_request;
widget_class->size_allocate = columns_size_allocate;
container_class->remove = columns_remove;
container_class->forall = columns_forall;
container_class->child_type = columns_child_type;
+#if !GTK_CHECK_VERSION(2,0,0)
/* Save the previous value of this method. */
if (!columns_inherited_focus)
columns_inherited_focus = container_class->focus;
container_class->focus = columns_focus;
+#endif
}
static void columns_init(Columns *cols)
gtk_widget_unmap(child->widget);
}
}
+#if !GTK_CHECK_VERSION(2,0,0)
static void columns_draw(GtkWidget *widget, GdkRectangle *area)
{
Columns *cols;
}
return FALSE;
}
+#endif
static void columns_base_add(GtkContainer *container, GtkWidget *widget)
{
cols->taborder = g_list_remove_link(cols->taborder, children);
g_list_free(children);
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_container_set_focus_chain(container, cols->taborder);
+#endif
break;
}
}
{
Columns *cols;
+#if !GTK_CHECK_VERSION(2,0,0)
cols = gtk_type_new(columns_get_type());
+#else
+ cols = g_object_new(TYPE_COLUMNS, NULL);
+#endif
+
cols->spacing = spacing;
return GTK_WIDGET(cols);
gtk_widget_set_parent(child, GTK_WIDGET(cols));
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_container_set_focus_chain(GTK_CONTAINER(cols), cols->taborder);
+#endif
+
if (GTK_WIDGET_REALIZED(cols))
gtk_widget_realize(child);
cols->taborder = g_list_remove_link(cols->taborder, children);
g_list_free(children);
cols->taborder = g_list_append(cols->taborder, widget);
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_container_set_focus_chain(GTK_CONTAINER(cols), cols->taborder);
+#endif
break;
}
}
+#if !GTK_CHECK_VERSION(2,0,0)
/*
* Override GtkContainer's focus movement so the user can
* explicitly specify the tab order.
} else
return columns_inherited_focus(container, dir);
}
+#endif
/*
* Now here comes the interesting bit. The actual layout part is
* gtkdlg.c - GTK implementation of the PuTTY configuration box.
*/
-/*
- * TODO when porting to GTK 2.0:
- *
- * - GtkTree is apparently deprecated and we should switch to
- * GtkTreeView instead.
- * - GtkLabel has a built-in mnemonic scheme, so we should at
- * least consider switching to that from the current adhockery.
- */
-
#include <assert.h>
#include <stdarg.h>
#include <ctype.h>
#include <X11/Xutil.h>
#include "gtkcols.h"
+#include "gtkfont.h"
#ifdef TESTMODE
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
void *privdata;
int privdata_needs_free;
GtkWidget **buttons; int nbuttons; /* for radio buttons */
- GtkWidget *entry; /* for editbox, combobox, filesel, fontsel */
+ GtkWidget *entry; /* for editbox, filesel, fontsel */
GtkWidget *button; /* for filesel, fontsel */
- GtkWidget *list; /* for combobox, listbox */
+#if !GTK_CHECK_VERSION(2,4,0)
+ GtkWidget *list; /* for listbox (in GTK1), combobox (<=GTK2.3) */
GtkWidget *menu; /* for optionmenu (==droplist) */
GtkWidget *optmenu; /* also for optionmenu */
+#else
+ GtkWidget *combo; /* for combo box (either editable or not) */
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ GtkWidget *treeview; /* for listbox (GTK2), droplist+combo (>=2.4) */
+ GtkListStore *listmodel; /* for all types of list box */
+#endif
GtkWidget *text; /* for text */
GtkWidget *label; /* for dlg_label_change */
GtkAdjustment *adj; /* for the scrollbar in a list box */
+ guint entrysig;
guint textsig;
int nclicks;
};
* due to automatic processing and should not flag a user event. */
int flags;
struct Shortcuts *shortcuts;
- GtkWidget *window, *cancelbutton, *currtreeitem, **treeitems;
+ GtkWidget *window, *cancelbutton;
union control *currfocus, *lastfocus;
+#if !GTK_CHECK_VERSION(2,0,0)
+ GtkWidget *currtreeitem, **treeitems;
int ntreeitems;
+#endif
int retval;
};
#define FLAG_UPDATING_COMBO_LIST 1
+#define FLAG_UPDATING_LISTBOX 2
enum { /* values for Shortcut.action */
SHORTCUT_EMPTY, /* no shortcut on this key */
SHORTCUT_UCTRL_DOWN, /* uctrl is a draglist, move Down */
};
+#if GTK_CHECK_VERSION(2,0,0)
+enum {
+ TREESTORE_PATH,
+ TREESTORE_PARAMS,
+ TREESTORE_NUM
+};
+#endif
+
/*
* Forward references.
*/
static void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
int chr, int action, void *ptr);
static void shortcut_highlight(GtkWidget *label, int chr);
-static int listitem_single_key(GtkWidget *item, GdkEventKey *event,
- gpointer data);
-static int listitem_multi_key(GtkWidget *item, GdkEventKey *event,
- gpointer data);
-static int listitem_button_press(GtkWidget *item, GdkEventButton *event,
- gpointer data);
-static int listitem_button_release(GtkWidget *item, GdkEventButton *event,
- gpointer data);
+#if !GTK_CHECK_VERSION(2,0,0)
+static gboolean listitem_single_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data);
+static gboolean listitem_multi_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data);
+static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
+ gpointer data);
+static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
+ gpointer data);
+#endif
+#if !GTK_CHECK_VERSION(2,4,0)
static void menuitem_activate(GtkMenuItem *item, gpointer data);
+#endif
static void coloursel_ok(GtkButton *button, gpointer data);
static void coloursel_cancel(GtkButton *button, gpointer data);
static void window_destroy(GtkWidget *widget, gpointer data);
+int get_listitemheight(GtkWidget *widget);
static int uctrl_cmp_byctrl(void *av, void *bv)
{
dp->byctrl = newtree234(uctrl_cmp_byctrl);
dp->bywidget = newtree234(uctrl_cmp_bywidget);
dp->coloursel_result.ok = FALSE;
+ dp->window = dp->cancelbutton = NULL;
+#if !GTK_CHECK_VERSION(2,0,0)
dp->treeitems = NULL;
- dp->window = dp->cancelbutton = dp->currtreeitem = NULL;
+ dp->currtreeitem = NULL;
+#endif
dp->flags = 0;
dp->currfocus = NULL;
}
}
freetree234(dp->bywidget);
dp->bywidget = NULL;
+#if !GTK_CHECK_VERSION(2,0,0)
sfree(dp->treeitems);
+#endif
}
static void dlg_add_uctrl(struct dlgparam *dp, struct uctrl *uc)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
+ GtkWidget *entry;
+ char *tmpstring;
assert(uc->ctrl->generic.type == CTRL_EDITBOX);
- assert(uc->entry != NULL);
- gtk_entry_set_text(GTK_ENTRY(uc->entry), text);
+
+#if GTK_CHECK_VERSION(2,4,0)
+ if (uc->combo)
+ entry = gtk_bin_get_child(GTK_BIN(uc->combo));
+ else
+#endif
+ entry = uc->entry;
+
+ assert(entry != NULL);
+
+ /*
+ * GTK 2 implements gtk_entry_set_text by means of two separate
+ * operations: first delete the previous text leaving the empty
+ * string, then insert the new text. This causes two calls to
+ * the "changed" signal.
+ *
+ * The first call to "changed", if allowed to proceed normally,
+ * will cause an EVENT_VALCHANGE event on the edit box, causing
+ * a call to dlg_editbox_get() which will read the empty string
+ * out of the GtkEntry - and promptly write it straight into
+ * the Config structure, which is precisely where our `text'
+ * pointer is probably pointing, so the second editing
+ * operation will insert that instead of the string we
+ * originally asked for.
+ *
+ * Hence, we must take our own copy of the text before we do
+ * this.
+ */
+ tmpstring = dupstr(text);
+ gtk_entry_set_text(GTK_ENTRY(entry), tmpstring);
+ sfree(tmpstring);
}
void dlg_editbox_get(union control *ctrl, void *dlg, char *buffer, int length)
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX);
- assert(uc->entry != NULL);
- strncpy(buffer, gtk_entry_get_text(GTK_ENTRY(uc->entry)),
- length);
- buffer[length-1] = '\0';
+
+#if GTK_CHECK_VERSION(2,4,0)
+ if (uc->combo) {
+#if GTK_CHECK_VERSION(2,6,0)
+ strncpy(buffer,
+ gtk_combo_box_get_active_text(GTK_COMBO_BOX(uc->combo)),
+ length);
+#else
+ strncpy(buffer,
+ gtk_entry_get_text
+ (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo)))),
+ length);
+#endif
+ buffer[length-1] = '\0';
+ return;
+ }
+#endif
+
+ if (uc->entry) {
+ strncpy(buffer, gtk_entry_get_text(GTK_ENTRY(uc->entry)),
+ length);
+ buffer[length-1] = '\0';
+ return;
+ }
+
+ assert(!"We shouldn't get here");
}
+#if !GTK_CHECK_VERSION(2,4,0)
static void container_remove_and_destroy(GtkWidget *w, gpointer data)
{
GtkContainer *cont = GTK_CONTAINER(data);
/* gtk_container_remove will unref the widget for us; we need not. */
gtk_container_remove(cont, w);
}
+#endif
/* The `listbox' functions can also apply to combo boxes. */
void dlg_listbox_clear(union control *ctrl, void *dlg)
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->menu != NULL || uc->list != NULL);
+#if !GTK_CHECK_VERSION(2,4,0)
if (uc->menu) {
gtk_container_foreach(GTK_CONTAINER(uc->menu),
container_remove_and_destroy,
GTK_CONTAINER(uc->menu));
- } else {
+ return;
+ }
+ if (uc->list) {
gtk_list_clear_items(GTK_LIST(uc->list), 0, -1);
+ return;
+ }
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ if (uc->listmodel) {
+ gtk_list_store_clear(uc->listmodel);
+ return;
}
+#endif
+ assert(!"We shouldn't get here");
}
void dlg_listbox_del(union control *ctrl, void *dlg, int index)
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->menu != NULL || uc->list != NULL);
+#if !GTK_CHECK_VERSION(2,4,0)
if (uc->menu) {
gtk_container_remove
(GTK_CONTAINER(uc->menu),
g_list_nth_data(GTK_MENU_SHELL(uc->menu)->children, index));
- } else {
+ return;
+ }
+ if (uc->list) {
gtk_list_clear_items(GTK_LIST(uc->list), index, index+1);
+ return;
}
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ if (uc->listmodel) {
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ assert(uc->listmodel != NULL);
+ path = gtk_tree_path_new_from_indices(index, -1);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(uc->listmodel), &iter, path);
+ gtk_list_store_remove(uc->listmodel, &iter);
+ gtk_tree_path_free(path);
+ return;
+ }
+#endif
+ assert(!"We shouldn't get here");
}
void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->menu != NULL || uc->list != NULL);
+ /*
+ * This routine is long and complicated in both GTK 1 and 2,
+ * and completely different. Sigh.
+ */
dp->flags |= FLAG_UPDATING_COMBO_LIST;
+#if !GTK_CHECK_VERSION(2,4,0)
if (uc->menu) {
/*
* List item in a drop-down (but non-combo) list. Tabs are
GINT_TO_POINTER(id));
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(menuitem_activate), dp);
- } else if (!uc->entry) {
+ goto done;
+ }
+ if (uc->list && uc->entry) {
+ /*
+ * List item in a combo-box list, which means the sensible
+ * thing to do is make it a perfectly normal label. Hence
+ * tabs are disregarded.
+ */
+ GtkWidget *listitem = gtk_list_item_new_with_label(text);
+
+ gtk_container_add(GTK_CONTAINER(uc->list), listitem);
+ gtk_widget_show(listitem);
+
+ gtk_object_set_data(GTK_OBJECT(listitem), "user-data",
+ GINT_TO_POINTER(id));
+ goto done;
+ }
+#endif
+#if !GTK_CHECK_VERSION(2,0,0)
+ if (uc->list) {
/*
* List item in a non-combo-box list box. We make all of
* these Columns containing GtkLabels. This allows us to do
GTK_SIGNAL_FUNC(listitem_button_release), dp);
gtk_object_set_data(GTK_OBJECT(listitem), "user-data",
GINT_TO_POINTER(id));
- } else {
- /*
- * List item in a combo-box list, which means the sensible
- * thing to do is make it a perfectly normal label. Hence
- * tabs are disregarded.
- */
- GtkWidget *listitem = gtk_list_item_new_with_label(text);
+ goto done;
+ }
+#else
+ if (uc->listmodel) {
+ GtkTreeIter iter;
+ int i, cols;
- gtk_container_add(GTK_CONTAINER(uc->list), listitem);
- gtk_widget_show(listitem);
+ dp->flags |= FLAG_UPDATING_LISTBOX;/* inhibit drag-list update */
+ gtk_list_store_append(uc->listmodel, &iter);
+ dp->flags &= ~FLAG_UPDATING_LISTBOX;
+ gtk_list_store_set(uc->listmodel, &iter, 0, id, -1);
- gtk_object_set_data(GTK_OBJECT(listitem), "user-data",
- GINT_TO_POINTER(id));
+ /*
+ * Now go through text and divide it into columns at the tabs,
+ * as necessary.
+ */
+ cols = (uc->ctrl->generic.type == CTRL_LISTBOX ? ctrl->listbox.ncols : 1);
+ cols = cols ? cols : 1;
+ for (i = 0; i < cols; i++) {
+ int collen = strcspn(text, "\t");
+ char *tmpstr = snewn(collen+1, char);
+ memcpy(tmpstr, text, collen);
+ tmpstr[collen] = '\0';
+ gtk_list_store_set(uc->listmodel, &iter, i+1, tmpstr, -1);
+ sfree(tmpstr);
+ text += collen;
+ if (*text) text++;
+ }
+ goto done;
}
-
+#endif
+ assert(!"We shouldn't get here");
+ done:
dp->flags &= ~FLAG_UPDATING_COMBO_LIST;
}
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
- GList *children;
- GtkObject *item;
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->menu != NULL || uc->list != NULL);
- children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
- uc->list));
- item = GTK_OBJECT(g_list_nth_data(children, index));
- g_list_free(children);
+#if !GTK_CHECK_VERSION(2,4,0)
+ if (uc->menu || uc->list) {
+ GList *children;
+ GtkObject *item;
- return GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), "user-data"));
+ children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
+ uc->list));
+ item = GTK_OBJECT(g_list_nth_data(children, index));
+ g_list_free(children);
+
+ return GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item),
+ "user-data"));
+ }
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ if (uc->listmodel) {
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ int ret;
+
+ path = gtk_tree_path_new_from_indices(index, -1);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(uc->listmodel), &iter, path);
+ gtk_tree_model_get(GTK_TREE_MODEL(uc->listmodel), &iter, 0, &ret, -1);
+ gtk_tree_path_free(path);
+
+ return ret;
+ }
+#endif
+ assert(!"We shouldn't get here");
+ return -1; /* placate dataflow analysis */
}
/* dlg_listbox_index returns <0 if no single element is selected. */
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
- GList *children;
- GtkWidget *item, *activeitem;
- int i;
- int selected = -1;
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->menu != NULL || uc->list != NULL);
- if (uc->menu)
- activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
- else
- activeitem = NULL; /* unnecessarily placate gcc */
-
- children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
- uc->list));
- for (i = 0; children!=NULL && (item = GTK_WIDGET(children->data))!=NULL;
- i++, children = children->next) {
- if (uc->menu ? activeitem == item :
- GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED) {
- if (selected == -1)
- selected = i;
- else
- selected = -2;
+#if !GTK_CHECK_VERSION(2,4,0)
+ if (uc->menu || uc->list) {
+ GList *children;
+ GtkWidget *item, *activeitem;
+ int i;
+ int selected = -1;
+
+ if (uc->menu)
+ activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
+ else
+ activeitem = NULL; /* unnecessarily placate gcc */
+
+ children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
+ uc->list));
+ for (i = 0; children!=NULL && (item = GTK_WIDGET(children->data))!=NULL;
+ i++, children = children->next) {
+ if (uc->menu ? activeitem == item :
+ GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED) {
+ if (selected == -1)
+ selected = i;
+ else
+ selected = -2;
+ }
}
+ g_list_free(children);
+ return selected < 0 ? -1 : selected;
}
- g_list_free(children);
- return selected < 0 ? -1 : selected;
+#else
+ if (uc->combo) {
+ /*
+ * This API function already does the right thing in the
+ * case of no current selection.
+ */
+ return gtk_combo_box_get_active(GTK_COMBO_BOX(uc->combo));
+ }
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ if (uc->treeview) {
+ GtkTreeSelection *treesel;
+ GtkTreePath *path;
+ GList *sellist;
+ gint *indices;
+ int ret;
+
+ assert(uc->treeview != NULL);
+ treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview));
+
+ if (gtk_tree_selection_count_selected_rows(treesel) != 1)
+ return -1;
+
+ sellist = gtk_tree_selection_get_selected_rows(treesel, NULL);
+
+ assert(sellist && sellist->data);
+ path = sellist->data;
+
+ if (gtk_tree_path_get_depth(path) != 1) {
+ ret = -1;
+ } else {
+ indices = gtk_tree_path_get_indices(path);
+ if (!indices) {
+ ret = -1;
+ } else {
+ ret = indices[0];
+ }
+ }
+
+ g_list_foreach(sellist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free(sellist);
+
+ return ret;
+ }
+#endif
+ assert(!"We shouldn't get here");
+ return -1; /* placate dataflow analysis */
}
int dlg_listbox_issel(union control *ctrl, void *dlg, int index)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
- GList *children;
- GtkWidget *item, *activeitem;
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->menu != NULL || uc->list != NULL);
- children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
- uc->list));
- item = GTK_WIDGET(g_list_nth_data(children, index));
- g_list_free(children);
+#if !GTK_CHECK_VERSION(2,4,0)
+ if (uc->menu || uc->list) {
+ GList *children;
+ GtkWidget *item, *activeitem;
- if (uc->menu) {
- activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
- return item == activeitem;
- } else {
- return GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED;
+ assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
+ uc->ctrl->generic.type == CTRL_LISTBOX);
+ assert(uc->menu != NULL || uc->list != NULL);
+
+ children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
+ uc->list));
+ item = GTK_WIDGET(g_list_nth_data(children, index));
+ g_list_free(children);
+
+ if (uc->menu) {
+ activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
+ return item == activeitem;
+ } else {
+ return GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED;
+ }
+ }
+#else
+ if (uc->combo) {
+ /*
+ * This API function already does the right thing in the
+ * case of no current selection.
+ */
+ return gtk_combo_box_get_active(GTK_COMBO_BOX(uc->combo)) == index;
+ }
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ if (uc->treeview) {
+ GtkTreeSelection *treesel;
+ GtkTreePath *path;
+ int ret;
+
+ assert(uc->treeview != NULL);
+ treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview));
+
+ path = gtk_tree_path_new_from_indices(index, -1);
+ ret = gtk_tree_selection_path_is_selected(treesel, path);
+ gtk_tree_path_free(path);
+
+ return ret;
}
+#endif
+ assert(!"We shouldn't get here");
+ return -1; /* placate dataflow analysis */
}
void dlg_listbox_select(union control *ctrl, void *dlg, int index)
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
- assert(uc->optmenu != NULL || uc->list != NULL);
+#if !GTK_CHECK_VERSION(2,4,0)
if (uc->optmenu) {
gtk_option_menu_set_history(GTK_OPTION_MENU(uc->optmenu), index);
- } else {
+ return;
+ }
+ if (uc->list) {
int nitems;
GList *items;
gdouble newtop, newbot;
if (modified)
gtk_adjustment_value_changed(uc->adj);
}
+ return;
+ }
+#else
+ if (uc->combo) {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(uc->combo), index);
+ return;
}
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ if (uc->treeview) {
+ GtkTreeSelection *treesel;
+ GtkTreePath *path;
+
+ treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview));
+
+ path = gtk_tree_path_new_from_indices(index, -1);
+ gtk_tree_selection_select_path(treesel, path);
+ gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(uc->treeview),
+ path, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_path_free(path);
+ return;
+ }
+#endif
+ assert(!"We shouldn't get here");
}
void dlg_text_set(union control *ctrl, void *dlg, char const *text)
case CTRL_FILESELECT:
case CTRL_FONTSELECT:
case CTRL_EDITBOX:
- /* Anything containing an edit box gets that focused. */
- gtk_widget_grab_focus(uc->entry);
+ if (uc->entry) {
+ /* Anything containing an edit box gets that focused. */
+ gtk_widget_grab_focus(uc->entry);
+ }
+#if GTK_CHECK_VERSION(2,4,0)
+ else if (uc->combo) {
+ /* Failing that, there'll be a combo box. */
+ gtk_widget_grab_focus(uc->combo);
+ }
+#endif
break;
case CTRL_RADIO:
/*
}
break;
case CTRL_LISTBOX:
- /*
- * If the list is really an option menu, we focus it.
- * Otherwise we tell it to focus one of its children, which
- * appears to do the Right Thing.
- */
+#if !GTK_CHECK_VERSION(2,4,0)
if (uc->optmenu) {
gtk_widget_grab_focus(uc->optmenu);
- } else {
- assert(uc->list != NULL);
- gtk_container_focus(GTK_CONTAINER(uc->list), GTK_DIR_TAB_FORWARD);
+ break;
}
+#else
+ if (uc->combo) {
+ gtk_widget_grab_focus(uc->combo);
+ break;
+ }
+#endif
+#if !GTK_CHECK_VERSION(2,0,0)
+ if (uc->list) {
+ /*
+ * For GTK-1 style list boxes, we tell it to focus one
+ * of its children, which appears to do the Right
+ * Thing.
+ */
+ gtk_container_focus(GTK_CONTAINER(uc->list), GTK_DIR_TAB_FORWARD);
+ break;
+ }
+#else
+ if (uc->treeview) {
+ gtk_widget_grab_focus(uc->treeview);
+ break;
+ }
+#endif
+ assert(!"We shouldn't get here");
break;
}
}
dp->coloursel_result.ok = FALSE;
gtk_window_set_modal(GTK_WINDOW(coloursel), TRUE);
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_color_selection_set_has_opacity_control(GTK_COLOR_SELECTION(ccs->colorsel), FALSE);
+#else
gtk_color_selection_set_opacity(GTK_COLOR_SELECTION(ccs->colorsel), FALSE);
+#endif
cvals[0] = r / 255.0;
cvals[1] = g / 255.0;
cvals[2] = b / 255.0;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_VALCHANGE);
}
-static int editbox_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean editbox_key(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
/*
* GtkEntry has a nasty habit of eating the Return key, which
* in the dialog just like it will everywhere else.
*/
if (event->keyval == GDK_Return && widget->parent != NULL) {
- gint return_val;
+ gboolean return_val;
gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
gtk_signal_emit_by_name(GTK_OBJECT(widget->parent), "key_press_event",
event, &return_val);
}
}
-static void editbox_lostfocus(GtkWidget *ed, GdkEventFocus *event,
- gpointer data)
+static gboolean editbox_lostfocus(GtkWidget *ed, GdkEventFocus *event,
+ gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(ed));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_REFRESH);
+ return FALSE;
}
-static int listitem_key(GtkWidget *item, GdkEventKey *event, gpointer data,
- int multiple)
+#if !GTK_CHECK_VERSION(2,0,0)
+
+/*
+ * GTK 1 list box event handlers.
+ */
+
+static gboolean listitem_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data, int multiple)
{
GtkAdjustment *adj = GTK_ADJUSTMENT(data);
return FALSE;
}
-static int listitem_single_key(GtkWidget *item, GdkEventKey *event,
- gpointer data)
+static gboolean listitem_single_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data)
{
return listitem_key(item, event, data, FALSE);
}
-static int listitem_multi_key(GtkWidget *item, GdkEventKey *event,
- gpointer data)
+static gboolean listitem_multi_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data)
{
return listitem_key(item, event, data, TRUE);
}
-static int listitem_button_press(GtkWidget *item, GdkEventButton *event,
- gpointer data)
+static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
+ gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
return FALSE;
}
-static int listitem_button_release(GtkWidget *item, GdkEventButton *event,
- gpointer data)
+static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
+ gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
}
-static void menuitem_activate(GtkMenuItem *item, gpointer data)
-{
- struct dlgparam *dp = (struct dlgparam *)data;
- GtkWidget *menushell = GTK_WIDGET(item)->parent;
- gpointer optmenu = gtk_object_get_data(GTK_OBJECT(menushell), "user-data");
- struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(optmenu));
- uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
-}
-
static void draglist_move(struct dlgparam *dp, struct uctrl *uc, int direction)
{
int index = dlg_listbox_index(uc->ctrl, dp);
draglist_move(dp, uc, +1);
}
+#else /* !GTK_CHECK_VERSION(2,0,0) */
+
+/*
+ * GTK 2 list box event handlers.
+ */
+
+static void listbox_doubleclick(GtkTreeView *treeview, GtkTreePath *path,
+ GtkTreeViewColumn *column, gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(treeview));
+ if (uc)
+ uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
+}
+
+static void listbox_selchange(GtkTreeSelection *treeselection,
+ gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ GtkTreeView *tree = gtk_tree_selection_get_tree_view(treeselection);
+ struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(tree));
+ if (uc)
+ uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
+}
+
+struct draglist_valchange_ctx {
+ struct uctrl *uc;
+ struct dlgparam *dp;
+};
+
+static gboolean draglist_valchange(gpointer data)
+{
+ struct draglist_valchange_ctx *ctx =
+ (struct draglist_valchange_ctx *)data;
+
+ ctx->uc->ctrl->generic.handler(ctx->uc->ctrl, ctx->dp,
+ ctx->dp->data, EVENT_VALCHANGE);
+
+ sfree(ctx);
+
+ return FALSE;
+}
+
+static void listbox_reorder(GtkTreeModel *treemodel, GtkTreePath *path,
+ GtkTreeIter *iter, gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ gpointer tree;
+ struct uctrl *uc;
+
+ if (dp->flags & FLAG_UPDATING_LISTBOX)
+ return; /* not a user drag operation */
+
+ tree = g_object_get_data(G_OBJECT(treemodel), "user-data");
+ uc = dlg_find_bywidget(dp, GTK_WIDGET(tree));
+ if (uc) {
+ /*
+ * We should cause EVENT_VALCHANGE on the list box, now
+ * that its rows have been reordered. However, the GTK 2
+ * docs say that at the point this signal is received the
+ * new row might not have actually been filled in yet.
+ *
+ * (So what smegging use is it then, eh? Don't suppose it
+ * occurred to you at any point that letting the
+ * application know _after_ the reordering was compelete
+ * might be helpful to someone?)
+ *
+ * To get round this, I schedule an idle function, which I
+ * hope won't be called until the main event loop is
+ * re-entered after the drag-and-drop handler has finished
+ * furtling with the list store.
+ */
+ struct draglist_valchange_ctx *ctx =
+ snew(struct draglist_valchange_ctx);
+ ctx->uc = uc;
+ ctx->dp = dp;
+ g_idle_add(draglist_valchange, ctx);
+ }
+}
+
+#endif /* !GTK_CHECK_VERSION(2,0,0) */
+
+#if !GTK_CHECK_VERSION(2,4,0)
+
+static void menuitem_activate(GtkMenuItem *item, gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ GtkWidget *menushell = GTK_WIDGET(item)->parent;
+ gpointer optmenu = gtk_object_get_data(GTK_OBJECT(menushell), "user-data");
+ struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(optmenu));
+ uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
+}
+
+#else
+
+static void droplist_selchange(GtkComboBox *combo, gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(combo));
+ if (uc)
+ uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
+}
+
+#endif /* !GTK_CHECK_VERSION(2,4,0) */
+
static void filesel_ok(GtkButton *button, gpointer data)
{
/* struct dlgparam *dp = (struct dlgparam *)data; */
gpointer filesel = gtk_object_get_data(GTK_OBJECT(button), "user-data");
struct uctrl *uc = gtk_object_get_data(GTK_OBJECT(filesel), "user-data");
- char *name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel));
+ const char *name = gtk_file_selection_get_filename
+ (GTK_FILE_SELECTION(filesel));
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
}
static void fontsel_ok(GtkButton *button, gpointer data)
{
/* struct dlgparam *dp = (struct dlgparam *)data; */
+
+#if !GTK_CHECK_VERSION(2,0,0)
+
gpointer fontsel = gtk_object_get_data(GTK_OBJECT(button), "user-data");
struct uctrl *uc = gtk_object_get_data(GTK_OBJECT(fontsel), "user-data");
- char *name = gtk_font_selection_dialog_get_font_name
+ const char *name = gtk_font_selection_dialog_get_font_name
(GTK_FONT_SELECTION_DIALOG(fontsel));
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
+
+#else
+
+ unifontsel *fontsel = (unifontsel *)gtk_object_get_data
+ (GTK_OBJECT(button), "user-data");
+ struct uctrl *uc = (struct uctrl *)fontsel->user_data;
+ char *name = unifontsel_get_name(fontsel);
+ assert(name); /* should always be ok after OK pressed */
+ gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
+ sfree(name);
+
+#endif
}
static void coloursel_ok(GtkButton *button, gpointer data)
}
if (uc->ctrl->generic.type == CTRL_FONTSELECT) {
+ const gchar *fontname = gtk_entry_get_text(GTK_ENTRY(uc->entry));
+
+#if !GTK_CHECK_VERSION(2,0,0)
+
+ /*
+ * Use the GTK 1 standard font selector.
+ */
+
gchar *spacings[] = { "c", "m", NULL };
- gchar *fontname = gtk_entry_get_text(GTK_ENTRY(uc->entry));
GtkWidget *fontsel =
gtk_font_selection_dialog_new("Select a font");
gtk_window_set_modal(GTK_WINDOW(fontsel), TRUE);
Display *disp = GDK_FONT_XDISPLAY(font);
Atom fontprop = XInternAtom(disp, "FONT", False);
unsigned long ret;
+ gdk_font_ref(font);
if (XGetFontProperty(xfs, fontprop, &ret)) {
char *name = XGetAtomName(disp, (Atom)ret);
if (name)
"clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)fontsel);
gtk_widget_show(fontsel);
+
+#else /* !GTK_CHECK_VERSION(2,0,0) */
+
+ /*
+ * Use the unifontsel code provided in gtkfont.c.
+ */
+
+ unifontsel *fontsel = unifontsel_new("Select a font");
+
+ gtk_window_set_modal(fontsel->window, TRUE);
+ unifontsel_set_name(fontsel, fontname);
+
+ gtk_object_set_data(GTK_OBJECT(fontsel->ok_button),
+ "user-data", (gpointer)fontsel);
+ fontsel->user_data = uc;
+ gtk_signal_connect(GTK_OBJECT(fontsel->ok_button), "clicked",
+ GTK_SIGNAL_FUNC(fontsel_ok), (gpointer)dp);
+ gtk_signal_connect_object(GTK_OBJECT(fontsel->ok_button), "clicked",
+ GTK_SIGNAL_FUNC(unifontsel_destroy),
+ (gpointer)fontsel);
+ gtk_signal_connect_object(GTK_OBJECT(fontsel->cancel_button),"clicked",
+ GTK_SIGNAL_FUNC(unifontsel_destroy),
+ (gpointer)fontsel);
+
+ gtk_widget_show(GTK_WIDGET(fontsel->window));
+
+#endif /* !GTK_CHECK_VERSION(2,0,0) */
+
}
}
* definitely a GtkWidget and should probably be added to a
* GtkVbox.)
*
- * `listitemheight' is used to calculate a usize for list boxes: it
- * should be the height from the size request of a GtkListItem.
- *
* `win' is required for setting the default button. If it is
* non-NULL, all buttons created will be default-capable (so they
* have extra space round them for the default highlight).
*/
GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
- struct controlset *s, int listitemheight,
- GtkWindow *win)
+ struct controlset *s, GtkWindow *win)
{
Columns *cols;
GtkWidget *ret;
uc->privdata = NULL;
uc->privdata_needs_free = FALSE;
uc->buttons = NULL;
- uc->entry = uc->list = uc->menu = NULL;
- uc->button = uc->optmenu = uc->text = NULL;
+ uc->entry = NULL;
+#if !GTK_CHECK_VERSION(2,4,0)
+ uc->list = uc->menu = uc->optmenu = NULL;
+#else
+ uc->combo = NULL;
+#endif
+#if GTK_CHECK_VERSION(2,0,0)
+ uc->treeview = NULL;
+ uc->listmodel = NULL;
+#endif
+ uc->button = uc->text = NULL;
uc->label = NULL;
uc->nclicks = 0;
case CTRL_EDITBOX:
{
GtkRequisition req;
+ GtkWidget *signalobject;
if (ctrl->editbox.has_list) {
+#if !GTK_CHECK_VERSION(2,4,0)
+ /*
+ * GTK 1 combo box.
+ */
w = gtk_combo_new();
gtk_combo_set_value_in_list(GTK_COMBO(w), FALSE, TRUE);
uc->entry = GTK_COMBO(w)->entry;
uc->list = GTK_COMBO(w)->list;
+ signalobject = uc->entry;
+#else
+ /*
+ * GTK 2 combo box.
+ */
+ uc->listmodel = gtk_list_store_new(2, G_TYPE_INT,
+ G_TYPE_STRING);
+ w = gtk_combo_box_entry_new_with_model
+ (GTK_TREE_MODEL(uc->listmodel), 1);
+ /* We cannot support password combo boxes. */
+ assert(!ctrl->editbox.password);
+ uc->combo = w;
+ signalobject = uc->combo;
+#endif
} else {
w = gtk_entry_new();
if (ctrl->editbox.password)
gtk_entry_set_visibility(GTK_ENTRY(w), FALSE);
uc->entry = w;
+ signalobject = w;
}
- gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
- GTK_SIGNAL_FUNC(editbox_changed), dp);
- gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event",
+ uc->entrysig =
+ gtk_signal_connect(GTK_OBJECT(signalobject), "changed",
+ GTK_SIGNAL_FUNC(editbox_changed), dp);
+ gtk_signal_connect(GTK_OBJECT(signalobject), "key_press_event",
GTK_SIGNAL_FUNC(editbox_key), dp);
- gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_in_event",
+ gtk_signal_connect(GTK_OBJECT(signalobject), "focus_in_event",
GTK_SIGNAL_FUNC(widget_focus), dp);
+ gtk_signal_connect(GTK_OBJECT(signalobject), "focus_out_event",
+ GTK_SIGNAL_FUNC(editbox_lostfocus), dp);
+ gtk_signal_connect(GTK_OBJECT(signalobject), "focus_out_event",
+ GTK_SIGNAL_FUNC(editbox_lostfocus), dp);
/*
* Edit boxes, for some strange reason, have a minimum
* width of 150 in GTK 1.2. We don't want this - we'd
w = container;
uc->label = label;
}
- gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_out_event",
- GTK_SIGNAL_FUNC(editbox_lostfocus), dp);
}
break;
case CTRL_FILESELECT:
gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event",
GTK_SIGNAL_FUNC(editbox_key), dp);
- gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
- GTK_SIGNAL_FUNC(editbox_changed), dp);
+ uc->entrysig =
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
+ GTK_SIGNAL_FUNC(editbox_changed), dp);
gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_in_event",
GTK_SIGNAL_FUNC(widget_focus), dp);
gtk_signal_connect(GTK_OBJECT(uc->button), "focus_in_event",
}
break;
case CTRL_LISTBOX:
- if (ctrl->listbox.height == 0) {
+
+#if GTK_CHECK_VERSION(2,0,0)
+ /*
+ * First construct the list data store, with the right
+ * number of columns.
+ */
+# if !GTK_CHECK_VERSION(2,4,0)
+ /* (For GTK 2.0 to 2.3, we do this for full listboxes only,
+ * because combo boxes are still done the old GTK1 way.) */
+ if (ctrl->listbox.height > 0)
+# endif
+ {
+ GType *types;
+ int i;
+ int cols;
+
+ cols = ctrl->listbox.ncols;
+ cols = cols ? cols : 1;
+ types = snewn(1 + cols, GType);
+
+ types[0] = G_TYPE_INT;
+ for (i = 0; i < cols; i++)
+ types[i+1] = G_TYPE_STRING;
+
+ uc->listmodel = gtk_list_store_newv(1 + cols, types);
+
+ sfree(types);
+ }
+#endif
+
+ /*
+ * See if it's a drop-down list (non-editable combo
+ * box).
+ */
+ if (ctrl->listbox.height == 0) {
+#if !GTK_CHECK_VERSION(2,4,0)
+ /*
+ * GTK1 and early-GTK2 option-menu style of
+ * drop-down list.
+ */
uc->optmenu = w = gtk_option_menu_new();
uc->menu = gtk_menu_new();
gtk_option_menu_set_menu(GTK_OPTION_MENU(w), uc->menu);
(gpointer)uc->optmenu);
gtk_signal_connect(GTK_OBJECT(uc->optmenu), "focus_in_event",
GTK_SIGNAL_FUNC(widget_focus), dp);
+#else
+ /*
+ * Late-GTK2 style using a GtkComboBox.
+ */
+ GtkCellRenderer *cr;
+
+ /*
+ * Create a non-editable GtkComboBox (that is, not
+ * its subclass GtkComboBoxEntry).
+ */
+ w = gtk_combo_box_new_with_model
+ (GTK_TREE_MODEL(uc->listmodel));
+ uc->combo = w;
+
+ /*
+ * Tell it how to render a list item (i.e. which
+ * column to look at in the list model).
+ */
+ cr = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(w), cr, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(w), cr,
+ "text", 1, NULL);
+
+ /*
+ * And tell it to notify us when the selection
+ * changes.
+ */
+ g_signal_connect(G_OBJECT(w), "changed",
+ G_CALLBACK(droplist_selchange), dp);
+#endif
} else {
+#if !GTK_CHECK_VERSION(2,0,0)
+ /*
+ * GTK1-style full list box.
+ */
uc->list = gtk_list_new();
if (ctrl->listbox.multisel == 2) {
gtk_list_set_selection_mode(GTK_LIST(uc->list),
* upgrades, I'd be grateful.
*/
{
- int edge = GTK_WIDGET(uc->list)->style->klass->ythickness;
+ int edge;
+ edge = GTK_WIDGET(uc->list)->style->klass->ythickness;
gtk_widget_set_usize(w, 10,
2*edge + (ctrl->listbox.height *
- listitemheight));
+ get_listitemheight(w)));
}
if (ctrl->listbox.draglist) {
w = cols;
}
+#else
+ /*
+ * GTK2 treeview-based full list box.
+ */
+ GtkTreeSelection *sel;
+
+ /*
+ * Create the list box itself, its columns, and
+ * its containing scrolled window.
+ */
+ w = gtk_tree_view_new_with_model
+ (GTK_TREE_MODEL(uc->listmodel));
+ g_object_set_data(G_OBJECT(uc->listmodel), "user-data",
+ (gpointer)w);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(w));
+ gtk_tree_selection_set_mode
+ (sel, ctrl->listbox.multisel ? GTK_SELECTION_MULTIPLE :
+ GTK_SELECTION_SINGLE);
+ uc->treeview = w;
+ gtk_signal_connect(GTK_OBJECT(w), "row-activated",
+ GTK_SIGNAL_FUNC(listbox_doubleclick), dp);
+ g_signal_connect(G_OBJECT(sel), "changed",
+ G_CALLBACK(listbox_selchange), dp);
+
+ if (ctrl->listbox.draglist) {
+ gtk_tree_view_set_reorderable(GTK_TREE_VIEW(w), TRUE);
+ g_signal_connect(G_OBJECT(uc->listmodel), "row-inserted",
+ G_CALLBACK(listbox_reorder), dp);
+ }
+
+ {
+ int i;
+ int cols;
+
+ cols = ctrl->listbox.ncols;
+ cols = cols ? cols : 1;
+ for (i = 0; i < cols; i++) {
+ GtkTreeViewColumn *column;
+ /*
+ * It appears that GTK 2 doesn't leave us any
+ * particularly sensible way to honour the
+ * "percentages" specification in the ctrl
+ * structure.
+ */
+ column = gtk_tree_view_column_new_with_attributes
+ ("heading", gtk_cell_renderer_text_new(),
+ "text", i+1, (char *)NULL);
+ gtk_tree_view_column_set_sizing
+ (column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
+ }
+ }
+
+ {
+ GtkWidget *scroll;
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type
+ (GTK_SCROLLED_WINDOW(scroll), GTK_SHADOW_IN);
+ gtk_widget_show(w);
+ gtk_container_add(GTK_CONTAINER(scroll), w);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
+ gtk_widget_set_size_request
+ (scroll, -1,
+ ctrl->listbox.height * get_listitemheight(w));
+
+ w = scroll;
+ }
+#endif
}
- if (ctrl->generic.label) {
- GtkWidget *label, *container;
- label = gtk_label_new(ctrl->generic.label);
+ if (ctrl->generic.label) {
+ GtkWidget *label, *container;
+ GtkRequisition req;
+
+ label = gtk_label_new(ctrl->generic.label);
+
+ shortcut_add(scs, label, ctrl->listbox.shortcut,
+ SHORTCUT_FOCUS, w);
container = columns_new(4);
- if (ctrl->listbox.percentwidth == 100) {
- columns_add(COLUMNS(container), label, 0, 1);
+ if (ctrl->listbox.percentwidth == 100) {
+ columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label);
- columns_add(COLUMNS(container), w, 0, 1);
- } else {
- gint percentages[2];
- percentages[1] = ctrl->listbox.percentwidth;
- percentages[0] = 100 - ctrl->listbox.percentwidth;
- columns_set_cols(COLUMNS(container), 2, percentages);
- columns_add(COLUMNS(container), label, 0, 1);
+ columns_add(COLUMNS(container), w, 0, 1);
+ } else {
+ gint percentages[2];
+ percentages[1] = ctrl->listbox.percentwidth;
+ percentages[0] = 100 - ctrl->listbox.percentwidth;
+ columns_set_cols(COLUMNS(container), 2, percentages);
+ columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label);
- columns_add(COLUMNS(container), w, 1, 1);
- }
- gtk_widget_show(label);
- gtk_widget_show(w);
- shortcut_add(scs, label, ctrl->listbox.shortcut,
- SHORTCUT_UCTRL, uc);
- w = container;
+ columns_add(COLUMNS(container), w, 1, 1);
+ /* Centre the label vertically. */
+ gtk_widget_size_request(w, &req);
+ gtk_widget_set_usize(label, -1, req.height);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ }
+ gtk_widget_show(label);
+ gtk_widget_show(w);
+
+ w = container;
uc->label = label;
- }
- break;
+ }
+
+ break;
case CTRL_TEXT:
/*
* Wrapping text widgets don't sit well with the GTK
struct selparam {
struct dlgparam *dp;
GtkNotebook *panels;
- GtkWidget *panel, *treeitem;
+ GtkWidget *panel;
+#if !GTK_CHECK_VERSION(2,0,0)
+ GtkWidget *treeitem;
+#else
+ int depth;
+ GtkTreePath *treepath;
+#endif
struct Shortcuts shortcuts;
};
+#if GTK_CHECK_VERSION(2,0,0)
+static void treeselection_changed(GtkTreeSelection *treeselection,
+ gpointer data)
+{
+ struct selparam *sps = (struct selparam *)data, *sp;
+ GtkTreeModel *treemodel;
+ GtkTreeIter treeiter;
+ gint spindex;
+ gint page_num;
+
+ if (!gtk_tree_selection_get_selected(treeselection, &treemodel, &treeiter))
+ return;
+
+ gtk_tree_model_get(treemodel, &treeiter, TREESTORE_PARAMS, &spindex, -1);
+ sp = &sps[spindex];
+
+ page_num = gtk_notebook_page_num(sp->panels, sp->panel);
+ gtk_notebook_set_page(sp->panels, page_num);
+
+ dlg_refresh(NULL, sp->dp);
+
+ sp->dp->shortcuts = &sp->shortcuts;
+}
+#else
static void treeitem_sel(GtkItem *item, gpointer data)
{
struct selparam *sp = (struct selparam *)data;
sp->dp->shortcuts = &sp->shortcuts;
sp->dp->currtreeitem = sp->treeitem;
}
+#endif
static void window_destroy(GtkWidget *widget, gpointer data)
{
gtk_main_quit();
}
+#if !GTK_CHECK_VERSION(2,0,0)
static int tree_grab_focus(struct dlgparam *dp)
{
int i, f;
*/
return tree_grab_focus(dp);
}
+#endif
int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
switch (sc->action) {
case SHORTCUT_TREE:
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_widget_grab_focus(sc->widget);
+#else
tree_grab_focus(dp);
+#endif
break;
case SHORTCUT_FOCUS:
gtk_widget_grab_focus(sc->widget);
}
break;
case CTRL_LISTBOX:
- /*
- * If the list is really an option menu, we focus
- * and click it. Otherwise we tell it to focus one
- * of its children, which appears to do the Right
- * Thing.
- */
+
+#if !GTK_CHECK_VERSION(2,4,0)
if (sc->uc->optmenu) {
GdkEventButton bev;
gint returnval;
gtk_signal_emit_by_name(GTK_OBJECT(sc->uc->optmenu),
"button_press_event",
&bev, &returnval);
- } else {
- assert(sc->uc->list != NULL);
-
+ break;
+ }
+#else
+ if (sc->uc->combo) {
+ gtk_widget_grab_focus(sc->uc->combo);
+ gtk_combo_box_popup(GTK_COMBO_BOX(sc->uc->combo));
+ break;
+ }
+#endif
+#if !GTK_CHECK_VERSION(2,0,0)
+ if (sc->uc->list) {
+ /*
+ * For GTK-1 style list boxes, we tell it to
+ * focus one of its children, which appears to
+ * do the Right Thing.
+ */
gtk_container_focus(GTK_CONTAINER(sc->uc->list),
GTK_DIR_TAB_FORWARD);
+ break;
+ }
+#else
+ if (sc->uc->treeview) {
+ gtk_widget_grab_focus(sc->uc->treeview);
+ break;
}
+#endif
+ assert(!"We shouldn't get here");
break;
}
break;
return FALSE;
}
+#if !GTK_CHECK_VERSION(2,0,0)
int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
return FALSE;
}
+#endif
static void shortcut_highlight(GtkWidget *labelw, int chr)
{
shortcut_highlight(labelw, chr);
}
-int get_listitemheight(void)
+int get_listitemheight(GtkWidget *w)
{
+#if !GTK_CHECK_VERSION(2,0,0)
GtkWidget *listitem = gtk_list_item_new_with_label("foo");
GtkRequisition req;
gtk_widget_size_request(listitem, &req);
- gtk_widget_unref(listitem);
+ gtk_object_sink(GTK_OBJECT(listitem));
return req.height;
+#else
+ int height;
+ GtkCellRenderer *cr = gtk_cell_renderer_text_new();
+ gtk_cell_renderer_get_size(cr, w, NULL, NULL, NULL, NULL, &height);
+ g_object_ref(G_OBJECT(cr));
+ gtk_object_sink(GTK_OBJECT(cr));
+ g_object_unref(G_OBJECT(cr));
+ return height;
+#endif
+}
+
+void set_dialog_action_area(GtkDialog *dlg, GtkWidget *w)
+{
+#if !GTK_CHECK_VERSION(2,0,0)
+
+ /*
+ * In GTK 1, laying out the buttons at the bottom of the
+ * configuration box is nice and easy, because a GtkDialog's
+ * action_area is a GtkHBox which stretches to cover the full
+ * width of the dialog. So we just put our Columns widget
+ * straight into that hbox, and it ends up just where we want
+ * it.
+ */
+ gtk_box_pack_start(GTK_BOX(dlg->action_area), w, TRUE, TRUE, 0);
+
+#else
+ /*
+ * In GTK 2, the action area is now a GtkHButtonBox and its
+ * layout behaviour seems to be different: it doesn't stretch
+ * to cover the full width of the window, but instead finds its
+ * own preferred width and right-aligns that within the window.
+ * This isn't what we want, because we have both left-aligned
+ * and right-aligned buttons coming out of the above call to
+ * layout_ctrls(), and right-aligning the whole thing will
+ * result in the former being centred and looking weird.
+ *
+ * So instead we abandon the dialog's action area completely:
+ * we gtk_widget_hide() it in the below code, and we also call
+ * gtk_dialog_set_has_separator() to remove the separator above
+ * it. We then insert our own action area into the end of the
+ * dialog's main vbox, and add our own separator above that.
+ *
+ * (Ideally, if we were a native GTK app, we would use the
+ * GtkHButtonBox's _own_ innate ability to support one set of
+ * buttons being right-aligned and one left-aligned. But to do
+ * that here, we would have to either (a) pick apart our cross-
+ * platform layout structures and treat them specially for this
+ * particular set of controls, which would be painful, or else
+ * (b) develop a special and simpler cross-platform
+ * representation for these particular controls, and introduce
+ * special-case code into all the _other_ platforms to handle
+ * it. Neither appeals. Therefore, I regretfully discard the
+ * GTKHButtonBox and go it alone.)
+ */
+
+ GtkWidget *align;
+ align = gtk_alignment_new(0, 0, 1, 1);
+ gtk_container_add(GTK_CONTAINER(align), w);
+ /*
+ * The purpose of this GtkAlignment is to provide padding
+ * around the buttons. The padding we use is twice the padding
+ * used in our GtkColumns, because we nest two GtkColumns most
+ * of the time (one separating the tree view from the main
+ * controls, and another for the main controls themselves).
+ */
+#if GTK_CHECK_VERSION(2,4,0)
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align), 8, 8, 8, 8);
+#endif
+ gtk_widget_show(align);
+ gtk_box_pack_end(GTK_BOX(dlg->vbox), align, FALSE, TRUE, 0);
+ w = gtk_hseparator_new();
+ gtk_box_pack_end(GTK_BOX(dlg->vbox), w, FALSE, TRUE, 0);
+ gtk_widget_show(w);
+ gtk_widget_hide(dlg->action_area);
+ gtk_dialog_set_has_separator(dlg, FALSE);
+#endif
}
int do_config_box(const char *title, Config *cfg, int midsession,
{
GtkWidget *window, *hbox, *vbox, *cols, *label,
*tree, *treescroll, *panels, *panelvbox;
- int index, level, listitemheight;
+ int index, level;
struct controlbox *ctrlbox;
char *path;
+#if GTK_CHECK_VERSION(2,0,0)
+ GtkTreeStore *treestore;
+ GtkCellRenderer *treerenderer;
+ GtkTreeViewColumn *treecolumn;
+ GtkTreeSelection *treeselection;
+ GtkTreeIter treeiterlevels[8];
+#else
GtkTreeItem *treeitemlevels[8];
GtkTree *treelevels[8];
+#endif
struct dlgparam dp;
struct Shortcuts scs;
dlg_init(&dp);
- listitemheight = get_listitemheight();
-
for (index = 0; index < lenof(scs.sc); index++) {
scs.sc[index].action = SHORTCUT_EMPTY;
}
columns_force_left_align(COLUMNS(cols), label);
gtk_widget_show(label);
treescroll = gtk_scrolled_window_new(NULL, NULL);
+#if GTK_CHECK_VERSION(2,0,0)
+ treestore = gtk_tree_store_new
+ (TREESTORE_NUM, G_TYPE_STRING, G_TYPE_INT);
+ tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(treestore));
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
+ treerenderer = gtk_cell_renderer_text_new();
+ treecolumn = gtk_tree_view_column_new_with_attributes
+ ("Label", treerenderer, "text", 0, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(tree), treecolumn);
+ treeselection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
+ gtk_tree_selection_set_mode(treeselection, GTK_SELECTION_BROWSE);
+ gtk_container_add(GTK_CONTAINER(treescroll), tree);
+#else
tree = gtk_tree_new();
- gtk_signal_connect(GTK_OBJECT(tree), "focus_in_event",
- GTK_SIGNAL_FUNC(widget_focus), &dp);
- shortcut_add(&scs, label, 'g', SHORTCUT_TREE, tree);
gtk_tree_set_view_mode(GTK_TREE(tree), GTK_TREE_VIEW_ITEM);
gtk_tree_set_selection_mode(GTK_TREE(tree), GTK_SELECTION_BROWSE);
gtk_signal_connect(GTK_OBJECT(tree), "focus",
GTK_SIGNAL_FUNC(tree_focus), &dp);
+#endif
+ gtk_signal_connect(GTK_OBJECT(tree), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), &dp);
+ shortcut_add(&scs, label, 'g', SHORTCUT_TREE, tree);
gtk_widget_show(treescroll);
gtk_box_pack_start(GTK_BOX(vbox), treescroll, TRUE, TRUE, 0);
panels = gtk_notebook_new();
GtkWidget *w;
if (!*s->pathname) {
- w = layout_ctrls(&dp, &scs, s, listitemheight, GTK_WINDOW(window));
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->action_area),
- w, TRUE, TRUE, 0);
+ w = layout_ctrls(&dp, &scs, s, GTK_WINDOW(window));
+
+ set_dialog_action_area(GTK_DIALOG(window), w);
} else {
int j = path ? ctrl_path_compare(s->pathname, path) : 0;
if (j != INT_MAX) { /* add to treeview, start new panel */
char *c;
+#if GTK_CHECK_VERSION(2,0,0)
+ GtkTreeIter treeiter;
+#else
GtkWidget *treeitem;
+#endif
int first;
/*
else
c++;
- treeitem = gtk_tree_item_new_with_label(c);
+ path = s->pathname;
+
+ first = (panelvbox == NULL);
+
+ panelvbox = gtk_vbox_new(FALSE, 4);
+ gtk_widget_show(panelvbox);
+ gtk_notebook_append_page(GTK_NOTEBOOK(panels), panelvbox,
+ NULL);
+ if (first) {
+ gint page_num;
+
+ page_num = gtk_notebook_page_num(GTK_NOTEBOOK(panels),
+ panelvbox);
+ gtk_notebook_set_page(GTK_NOTEBOOK(panels), page_num);
+ }
+
+ if (nselparams >= selparamsize) {
+ selparamsize += 16;
+ selparams = sresize(selparams, selparamsize,
+ struct selparam);
+ }
+ selparams[nselparams].dp = &dp;
+ selparams[nselparams].panels = GTK_NOTEBOOK(panels);
+ selparams[nselparams].panel = panelvbox;
+ selparams[nselparams].shortcuts = scs; /* structure copy */
+
assert(j-1 < level);
+
+#if GTK_CHECK_VERSION(2,0,0)
+ if (j > 0)
+ /* treeiterlevels[j-1] will always be valid because we
+ * don't allow implicit path components; see above.
+ */
+ gtk_tree_store_append(treestore, &treeiter,
+ &treeiterlevels[j-1]);
+ else
+ gtk_tree_store_append(treestore, &treeiter, NULL);
+ gtk_tree_store_set(treestore, &treeiter,
+ TREESTORE_PATH, c,
+ TREESTORE_PARAMS, nselparams,
+ -1);
+ treeiterlevels[j] = treeiter;
+
+ selparams[nselparams].depth = j;
+ if (j > 0) {
+ selparams[nselparams].treepath =
+ gtk_tree_model_get_path(GTK_TREE_MODEL(treestore),
+ &treeiterlevels[j-1]);
+ /*
+ * We are going to collapse all tree branches
+ * at depth greater than 2, but not _yet_; see
+ * the comment at the call to
+ * gtk_tree_view_collapse_row below.
+ */
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(tree),
+ selparams[nselparams].treepath,
+ FALSE);
+ } else {
+ selparams[nselparams].treepath = NULL;
+ }
+#else
+ treeitem = gtk_tree_item_new_with_label(c);
if (j > 0) {
if (!treelevels[j-1]) {
treelevels[j-1] = GTK_TREE(gtk_tree_new());
}
treeitemlevels[j] = GTK_TREE_ITEM(treeitem);
treelevels[j] = NULL;
- level = j+1;
gtk_signal_connect(GTK_OBJECT(treeitem), "key_press_event",
GTK_SIGNAL_FUNC(tree_key_press), &dp);
gtk_widget_show(treeitem);
- path = s->pathname;
-
- first = (panelvbox == NULL);
-
- panelvbox = gtk_vbox_new(FALSE, 4);
- gtk_widget_show(panelvbox);
- gtk_notebook_append_page(GTK_NOTEBOOK(panels), panelvbox,
- NULL);
- if (first) {
- gint page_num;
-
- page_num = gtk_notebook_page_num(GTK_NOTEBOOK(panels),
- panelvbox);
- gtk_notebook_set_page(GTK_NOTEBOOK(panels), page_num);
+ if (first)
gtk_tree_select_child(GTK_TREE(tree), treeitem);
- }
-
- if (nselparams >= selparamsize) {
- selparamsize += 16;
- selparams = sresize(selparams, selparamsize,
- struct selparam);
- }
- selparams[nselparams].dp = &dp;
- selparams[nselparams].panels = GTK_NOTEBOOK(panels);
- selparams[nselparams].panel = panelvbox;
- selparams[nselparams].shortcuts = scs; /* structure copy */
selparams[nselparams].treeitem = treeitem;
- nselparams++;
+#endif
+ level = j+1;
+ nselparams++;
}
- w = layout_ctrls(&dp,
- &selparams[nselparams-1].shortcuts,
- s, listitemheight, NULL);
+ w = layout_ctrls(&dp, &selparams[nselparams-1].shortcuts, s, NULL);
gtk_box_pack_start(GTK_BOX(panelvbox), w, FALSE, FALSE, 0);
gtk_widget_show(w);
}
}
+#if GTK_CHECK_VERSION(2,0,0)
+ {
+ GtkRequisition req;
+ int i;
+
+ /*
+ * We want our tree view to come up with all branches at
+ * depth 2 or more collapsed. However, if we start off
+ * with those branches collapsed, then the tree view's
+ * size request will be calculated based on the width of
+ * the collapsed tree. So instead we start with them all
+ * expanded; then we ask for the current size request,
+ * collapse the relevant rows, and force the width to the
+ * value we just computed. This arranges that the tree
+ * view is wide enough to have all branches expanded
+ * safely.
+ */
+
+ gtk_widget_size_request(tree, &req);
+
+ for (i = 0; i < nselparams; i++)
+ if (selparams[i].depth >= 2)
+ gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree),
+ selparams[i].treepath);
+
+ gtk_widget_set_size_request(tree, req.width, -1);
+ }
+#endif
+
+#if GTK_CHECK_VERSION(2,0,0)
+ g_signal_connect(G_OBJECT(treeselection), "changed",
+ G_CALLBACK(treeselection_changed), selparams);
+#else
dp.ntreeitems = nselparams;
dp.treeitems = snewn(dp.ntreeitems, GtkWidget *);
&selparams[index]);
dp.treeitems[index] = selparams[index].treeitem;
}
+#endif
dp.data = cfg;
dlg_refresh(NULL, &dp);
dp.shortcuts = &selparams[0].shortcuts;
+#if !GTK_CHECK_VERSION(2,0,0)
dp.currtreeitem = dp.treeitems[0];
+#endif
dp.lastfocus = NULL;
dp.retval = 0;
dp.window = window;
set_window_icon(window, cfg_icon, n_cfg_icon);
}
+#if !GTK_CHECK_VERSION(2,0,0)
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(treescroll),
tree);
+#endif
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(treescroll),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
window = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(window), title);
- w0 = layout_ctrls(&dp, &scs, s0, 0, GTK_WINDOW(window));
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->action_area),
- w0, TRUE, TRUE, 0);
+ w0 = layout_ctrls(&dp, &scs, s0, GTK_WINDOW(window));
+ set_dialog_action_area(GTK_DIALOG(window), w0);
gtk_widget_show(w0);
- w1 = layout_ctrls(&dp, &scs, s1, 0, GTK_WINDOW(window));
+ w1 = layout_ctrls(&dp, &scs, s1, GTK_WINDOW(window));
gtk_container_set_border_width(GTK_CONTAINER(w1), 10);
gtk_widget_set_usize(w1, minwid+20, -1);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
GtkWidget *label = gtk_label_new(text);
GtkRequisition req;
gtk_widget_size_request(label, &req);
- gtk_widget_unref(label);
+ gtk_object_sink(GTK_OBJECT(label));
return req.width;
}
"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
"Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, "
- "Markus Kuhn, and CORE SDI S.A.\n\n"
+ "Markus Kuhn, Colin Watson, and CORE SDI S.A.\n\n"
"Permission is hereby granted, free of charge, to any person "
"obtaining a copy of this software and associated documentation "
*/
uc = dlg_find_byctrl(&es->dp, es->listctrl);
es->ignore_selchange = 1;
+#if !GTK_CHECK_VERSION(2,0,0)
+ assert(uc->list);
gtk_list_unselect_all(GTK_LIST(uc->list));
+#else
+ assert(uc->treeview);
+ gtk_tree_selection_unselect_all
+ (gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview)));
+#endif
es->ignore_selchange = 0;
sfree(es->seldata);
GtkWidget *parent = GTK_WIDGET(parentwin);
struct controlset *s0, *s1;
union control *c;
- int listitemheight, index;
+ int index;
char *title;
if (es->window) {
c->listbox.percentages[1] = 10;
c->listbox.percentages[2] = 65;
- listitemheight = get_listitemheight();
-
es->window = window = gtk_dialog_new();
title = dupcat(appname, " Event Log", NULL);
gtk_window_set_title(GTK_WINDOW(window), title);
sfree(title);
- w0 = layout_ctrls(&es->dp, &es->scs, s0,
- listitemheight, GTK_WINDOW(window));
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->action_area),
- w0, TRUE, TRUE, 0);
+ w0 = layout_ctrls(&es->dp, &es->scs, s0, GTK_WINDOW(window));
+ set_dialog_action_area(GTK_DIALOG(window), w0);
gtk_widget_show(w0);
- w1 = layout_ctrls(&es->dp, &es->scs, s1,
- listitemheight, GTK_WINDOW(window));
+ w1 = layout_ctrls(&es->dp, &es->scs, s1, GTK_WINDOW(window));
gtk_container_set_border_width(GTK_CONTAINER(w1), 10);
gtk_widget_set_usize(w1, 20 +
string_width("LINE OF TEXT GIVING WIDTH OF EVENT LOG"
--- /dev/null
+/*
+ * Unified font management for GTK.
+ *
+ * PuTTY is willing to use both old-style X server-side bitmap
+ * fonts _and_ GTK2/Pango client-side fonts. This requires us to
+ * do a bit of work to wrap the two wildly different APIs into
+ * forms the rest of the code can switch between seamlessly, and
+ * also requires a custom font selector capable of handling both
+ * types of font.
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+
+#include "putty.h"
+#include "gtkfont.h"
+#include "tree234.h"
+
+/*
+ * Future work:
+ *
+ * - it would be nice to have a display of the current font name,
+ * and in particular whether it's client- or server-side,
+ * during the progress of the font selector.
+ *
+ * - all the GDK font functions used in the x11font subclass are
+ * deprecated, so one day they may go away. When this happens -
+ * or before, if I'm feeling proactive - it oughtn't to be too
+ * difficult in principle to convert the whole thing to use
+ * actual Xlib font calls.
+ *
+ * - it would be nice if we could move the processing of
+ * underline and VT100 double width into this module, so that
+ * instead of using the ghastly pixmap-stretching technique
+ * everywhere we could tell the Pango backend to scale its
+ * fonts to double size properly and at full resolution.
+ * However, this requires me to learn how to make Pango stretch
+ * text to an arbitrary aspect ratio (for double-width only
+ * text, which perversely is harder than DW+DH), and right now
+ * I haven't the energy.
+ */
+
+/*
+ * Ad-hoc vtable mechanism to allow font structures to be
+ * polymorphic.
+ *
+ * Any instance of `unifont' used in the vtable functions will
+ * actually be the first element of a larger structure containing
+ * data specific to the subtype. This is permitted by the ISO C
+ * provision that one may safely cast between a pointer to a
+ * structure and a pointer to its first element.
+ */
+
+#define FONTFLAG_CLIENTSIDE 0x0001
+#define FONTFLAG_SERVERSIDE 0x0002
+#define FONTFLAG_SERVERALIAS 0x0004
+#define FONTFLAG_NONMONOSPACED 0x0008
+
+#define FONTFLAG_SORT_MASK 0x0007 /* used to disambiguate font families */
+
+typedef void (*fontsel_add_entry)(void *ctx, const char *realfontname,
+ const char *family, const char *charset,
+ const char *style, const char *stylekey,
+ int size, int flags,
+ const struct unifont_vtable *fontclass);
+
+struct unifont_vtable {
+ /*
+ * `Methods' of the `class'.
+ */
+ unifont *(*create)(GtkWidget *widget, const char *name, int wide, int bold,
+ int shadowoffset, int shadowalways);
+ void (*destroy)(unifont *font);
+ void (*draw_text)(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len, int wide,
+ int bold, int cellwidth);
+ void (*enum_fonts)(GtkWidget *widget,
+ fontsel_add_entry callback, void *callback_ctx);
+ char *(*canonify_fontname)(GtkWidget *widget, const char *name, int *size,
+ int *flags, int resolve_aliases);
+ char *(*scale_fontname)(GtkWidget *widget, const char *name, int size);
+
+ /*
+ * `Static data members' of the `class'.
+ */
+ const char *prefix;
+};
+
+/* ----------------------------------------------------------------------
+ * GDK-based X11 font implementation.
+ */
+
+static void x11font_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len,
+ int wide, int bold, int cellwidth);
+static unifont *x11font_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways);
+static void x11font_destroy(unifont *font);
+static void x11font_enum_fonts(GtkWidget *widget,
+ fontsel_add_entry callback, void *callback_ctx);
+static char *x11font_canonify_fontname(GtkWidget *widget, const char *name,
+ int *size, int *flags,
+ int resolve_aliases);
+static char *x11font_scale_fontname(GtkWidget *widget, const char *name,
+ int size);
+
+struct x11font {
+ struct unifont u;
+ /*
+ * Actual font objects. We store a number of these, for
+ * automatically guessed bold and wide variants.
+ *
+ * The parallel array `allocated' indicates whether we've
+ * tried to fetch a subfont already (thus distinguishing NULL
+ * because we haven't tried yet from NULL because we tried and
+ * failed, so that we don't keep trying and failing
+ * subsequently).
+ */
+ GdkFont *fonts[4];
+ int allocated[4];
+ /*
+ * `sixteen_bit' is true iff the font object is indexed by
+ * values larger than a byte. That is, this flag tells us
+ * whether we use gdk_draw_text_wc() or gdk_draw_text().
+ */
+ int sixteen_bit;
+ /*
+ * `variable' is true iff the font is non-fixed-pitch. This
+ * enables some code which takes greater care over character
+ * positioning during text drawing.
+ */
+ int variable;
+ /*
+ * Data passed in to unifont_create().
+ */
+ int wide, bold, shadowoffset, shadowalways;
+};
+
+static const struct unifont_vtable x11font_vtable = {
+ x11font_create,
+ x11font_destroy,
+ x11font_draw_text,
+ x11font_enum_fonts,
+ x11font_canonify_fontname,
+ x11font_scale_fontname,
+ "server",
+};
+
+char *x11_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;
+}
+
+static int x11_font_width(GdkFont *font, int sixteen_bit)
+{
+ if (sixteen_bit) {
+ XChar2b space;
+ space.byte1 = 0;
+ space.byte2 = '0';
+ return gdk_text_width(font, (const gchar *)&space, 2);
+ } else {
+ return gdk_char_width(font, '0');
+ }
+}
+
+static unifont *x11font_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways)
+{
+ struct x11font *xfont;
+ GdkFont *font;
+ XFontStruct *xfs;
+ Display *disp;
+ Atom charset_registry, charset_encoding, spacing;
+ unsigned long registry_ret, encoding_ret, spacing_ret;
+ int pubcs, realcs, sixteen_bit, variable;
+ int i;
+
+ font = gdk_font_load(name);
+ if (!font)
+ return NULL;
+
+ xfs = GDK_FONT_XFONT(font);
+ disp = GDK_FONT_XDISPLAY(font);
+
+ charset_registry = XInternAtom(disp, "CHARSET_REGISTRY", False);
+ charset_encoding = XInternAtom(disp, "CHARSET_ENCODING", False);
+
+ pubcs = realcs = CS_NONE;
+ sixteen_bit = FALSE;
+ variable = TRUE;
+
+ if (XGetFontProperty(xfs, charset_registry, ®istry_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);
+ pubcs = realcs = charset_from_xenc(encoding);
+
+ /*
+ * iso10646-1 is the only wide font encoding we
+ * support. In this case, we expect clients to give us
+ * UTF-8, which this module must internally convert
+ * into 16-bit Unicode.
+ */
+ if (!strcasecmp(encoding, "iso10646-1")) {
+ sixteen_bit = TRUE;
+ pubcs = realcs = CS_UTF8;
+ }
+
+ /*
+ * Hack for X line-drawing characters: if the primary
+ * font is encoded as ISO-8859-1, 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 (pubcs == CS_ISO8859_1) {
+ int lb, rb, wid, asc, desc;
+ gchar text[2];
+
+ text[1] = '\0';
+ text[0] = '\x12';
+ gdk_string_extents(font, text, &lb, &rb, &wid, &asc, &desc);
+ if (asc != desc)
+ realcs = CS_ISO8859_1_X11;
+ }
+
+ sfree(encoding);
+ }
+ }
+
+ spacing = XInternAtom(disp, "SPACING", False);
+ if (XGetFontProperty(xfs, spacing, &spacing_ret)) {
+ char *spc;
+ spc = XGetAtomName(disp, (Atom)spacing_ret);
+
+ if (spc && strchr("CcMm", spc[0]))
+ variable = FALSE;
+ }
+
+ xfont = snew(struct x11font);
+ xfont->u.vt = &x11font_vtable;
+ xfont->u.width = x11_font_width(font, sixteen_bit);
+ xfont->u.ascent = font->ascent;
+ xfont->u.descent = font->descent;
+ xfont->u.height = xfont->u.ascent + xfont->u.descent;
+ xfont->u.public_charset = pubcs;
+ xfont->u.real_charset = realcs;
+ xfont->fonts[0] = font;
+ xfont->allocated[0] = TRUE;
+ xfont->sixteen_bit = sixteen_bit;
+ xfont->variable = variable;
+ xfont->wide = wide;
+ xfont->bold = bold;
+ xfont->shadowoffset = shadowoffset;
+ xfont->shadowalways = shadowalways;
+
+ for (i = 1; i < lenof(xfont->fonts); i++) {
+ xfont->fonts[i] = NULL;
+ xfont->allocated[i] = FALSE;
+ }
+
+ return (unifont *)xfont;
+}
+
+static void x11font_destroy(unifont *font)
+{
+ struct x11font *xfont = (struct x11font *)font;
+ int i;
+
+ for (i = 0; i < lenof(xfont->fonts); i++)
+ if (xfont->fonts[i])
+ gdk_font_unref(xfont->fonts[i]);
+ sfree(font);
+}
+
+static void x11_alloc_subfont(struct x11font *xfont, int sfid)
+{
+ char *derived_name = x11_guess_derived_font_name
+ (xfont->fonts[0], sfid & 1, !!(sfid & 2));
+ xfont->fonts[sfid] = gdk_font_load(derived_name); /* may be NULL */
+ xfont->allocated[sfid] = TRUE;
+ sfree(derived_name);
+}
+
+static void x11font_really_draw_text(GdkDrawable *target, GdkFont *font,
+ GdkGC *gc, int x, int y,
+ const gchar *string, int clen, int nchars,
+ int shadowbold, int shadowoffset,
+ int fontvariable, int cellwidth)
+{
+ int step = clen * nchars, nsteps = 1, centre = FALSE;
+
+ if (fontvariable) {
+ /*
+ * In a variable-pitch font, we draw one character at a
+ * time, and centre it in the character cell.
+ */
+ step = clen;
+ nsteps = nchars;
+ centre = TRUE;
+ }
+
+ while (nsteps-- > 0) {
+ int X = x;
+ if (centre)
+ X += (cellwidth - gdk_text_width(font, string, step)) / 2;
+
+ gdk_draw_text(target, font, gc, X, y, string, step);
+ if (shadowbold)
+ gdk_draw_text(target, font, gc, X + shadowoffset, y, string, step);
+
+ x += cellwidth;
+ string += step;
+ }
+}
+
+static void x11font_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len,
+ int wide, int bold, int cellwidth)
+{
+ struct x11font *xfont = (struct x11font *)font;
+ int sfid;
+ int shadowbold = FALSE;
+ int mult = (wide ? 2 : 1);
+
+ wide -= xfont->wide;
+ bold -= xfont->bold;
+
+ /*
+ * Decide which subfont we're using, and whether we have to
+ * use shadow bold.
+ */
+ if (xfont->shadowalways && bold) {
+ shadowbold = TRUE;
+ bold = 0;
+ }
+ sfid = 2 * wide + bold;
+ if (!xfont->allocated[sfid])
+ x11_alloc_subfont(xfont, sfid);
+ if (bold && !xfont->fonts[sfid]) {
+ bold = 0;
+ shadowbold = TRUE;
+ sfid = 2 * wide + bold;
+ if (!xfont->allocated[sfid])
+ x11_alloc_subfont(xfont, sfid);
+ }
+
+ if (!xfont->fonts[sfid])
+ return; /* we've tried our best, but no luck */
+
+ if (xfont->sixteen_bit) {
+ /*
+ * This X font has 16-bit character indices, which means
+ * we expect our string to have been passed in UTF-8.
+ */
+ XChar2b *xcs;
+ wchar_t *wcs;
+ int nchars, maxchars, i;
+
+ /*
+ * Convert the input string to wide-character Unicode.
+ */
+ maxchars = 0;
+ for (i = 0; i < len; i++)
+ if ((unsigned char)string[i] <= 0x7F ||
+ (unsigned char)string[i] >= 0xC0)
+ maxchars++;
+ wcs = snewn(maxchars+1, wchar_t);
+ nchars = charset_to_unicode((char **)&string, &len, wcs, maxchars,
+ CS_UTF8, NULL, NULL, 0);
+ assert(nchars <= maxchars);
+ wcs[nchars] = L'\0';
+
+ xcs = snewn(nchars, XChar2b);
+ for (i = 0; i < nchars; i++) {
+ xcs[i].byte1 = wcs[i] >> 8;
+ xcs[i].byte2 = wcs[i];
+ }
+
+ x11font_really_draw_text(target, xfont->fonts[sfid], gc, x, y,
+ (gchar *)xcs, 2, nchars,
+ shadowbold, xfont->shadowoffset,
+ xfont->variable, cellwidth * mult);
+ sfree(xcs);
+ sfree(wcs);
+ } else {
+ x11font_really_draw_text(target, xfont->fonts[sfid], gc, x, y,
+ string, 1, len,
+ shadowbold, xfont->shadowoffset,
+ xfont->variable, cellwidth * mult);
+ }
+}
+
+static void x11font_enum_fonts(GtkWidget *widget,
+ fontsel_add_entry callback, void *callback_ctx)
+{
+ char **fontnames;
+ char *tmp = NULL;
+ int nnames, i, max, tmpsize;
+
+ max = 32768;
+ while (1) {
+ fontnames = XListFonts(GDK_DISPLAY(), "*", max, &nnames);
+ if (nnames >= max) {
+ XFreeFontNames(fontnames);
+ max *= 2;
+ } else
+ break;
+ }
+
+ tmpsize = 0;
+
+ for (i = 0; i < nnames; i++) {
+ if (fontnames[i][0] == '-') {
+ /*
+ * Dismember an XLFD and convert it into the format
+ * we'll be using in the font selector.
+ */
+ char *components[14];
+ char *p, *font, *style, *stylekey, *charset;
+ int j, weightkey, slantkey, setwidthkey;
+ int thistmpsize, fontsize, flags;
+
+ thistmpsize = 4 * strlen(fontnames[i]) + 256;
+ if (tmpsize < thistmpsize) {
+ tmpsize = thistmpsize;
+ tmp = sresize(tmp, tmpsize, char);
+ }
+ strcpy(tmp, fontnames[i]);
+
+ p = tmp;
+ for (j = 0; j < 14; j++) {
+ if (*p)
+ *p++ = '\0';
+ components[j] = p;
+ while (*p && *p != '-')
+ p++;
+ }
+ *p++ = '\0';
+
+ /*
+ * Font name is made up of fields 0 and 1, in reverse
+ * order with parentheses. (This is what the GTK 1.2 X
+ * font selector does, and it seems to come out
+ * looking reasonably sensible.)
+ */
+ font = p;
+ p += 1 + sprintf(p, "%s (%s)", components[1], components[0]);
+
+ /*
+ * Charset is made up of fields 12 and 13.
+ */
+ charset = p;
+ p += 1 + sprintf(p, "%s-%s", components[12], components[13]);
+
+ /*
+ * Style is a mixture of quite a lot of the fields,
+ * with some strange formatting.
+ */
+ style = p;
+ p += sprintf(p, "%s", components[2][0] ? components[2] :
+ "regular");
+ if (!g_strcasecmp(components[3], "i"))
+ p += sprintf(p, " italic");
+ else if (!g_strcasecmp(components[3], "o"))
+ p += sprintf(p, " oblique");
+ else if (!g_strcasecmp(components[3], "ri"))
+ p += sprintf(p, " reverse italic");
+ else if (!g_strcasecmp(components[3], "ro"))
+ p += sprintf(p, " reverse oblique");
+ else if (!g_strcasecmp(components[3], "ot"))
+ p += sprintf(p, " other-slant");
+ if (components[4][0] && g_strcasecmp(components[4], "normal"))
+ p += sprintf(p, " %s", components[4]);
+ if (!g_strcasecmp(components[10], "m"))
+ p += sprintf(p, " [M]");
+ if (!g_strcasecmp(components[10], "c"))
+ p += sprintf(p, " [C]");
+ if (components[5][0])
+ p += sprintf(p, " %s", components[5]);
+
+ /*
+ * Style key is the same stuff as above, but with a
+ * couple of transformations done on it to make it
+ * sort more sensibly.
+ */
+ p++;
+ stylekey = p;
+ if (!g_strcasecmp(components[2], "medium") ||
+ !g_strcasecmp(components[2], "regular") ||
+ !g_strcasecmp(components[2], "normal") ||
+ !g_strcasecmp(components[2], "book"))
+ weightkey = 0;
+ else if (!g_strncasecmp(components[2], "demi", 4) ||
+ !g_strncasecmp(components[2], "semi", 4))
+ weightkey = 1;
+ else
+ weightkey = 2;
+ if (!g_strcasecmp(components[3], "r"))
+ slantkey = 0;
+ else if (!g_strncasecmp(components[3], "r", 1))
+ slantkey = 2;
+ else
+ slantkey = 1;
+ if (!g_strcasecmp(components[4], "normal"))
+ setwidthkey = 0;
+ else
+ setwidthkey = 1;
+
+ p += sprintf(p, "%04d%04d%s%04d%04d%s%04d%04d%s%04d%s%04d%s",
+ weightkey,
+ (int)strlen(components[2]), components[2],
+ slantkey,
+ (int)strlen(components[3]), components[3],
+ setwidthkey,
+ (int)strlen(components[4]), components[4],
+ (int)strlen(components[10]), components[10],
+ (int)strlen(components[5]), components[5]);
+
+ assert(p - tmp < thistmpsize);
+
+ /*
+ * Size is in pixels, for our application, so we
+ * derive it directly from the pixel size field,
+ * number 6.
+ */
+ fontsize = atoi(components[6]);
+
+ /*
+ * Flags: we need to know whether this is a monospaced
+ * font, which we do by examining the spacing field
+ * again.
+ */
+ flags = FONTFLAG_SERVERSIDE;
+ if (!strchr("CcMm", components[10][0]))
+ flags |= FONTFLAG_NONMONOSPACED;
+
+ /*
+ * Not sure why, but sometimes the X server will
+ * deliver dummy font types in which fontsize comes
+ * out as zero. Filter those out.
+ */
+ if (fontsize)
+ callback(callback_ctx, fontnames[i], font, charset,
+ style, stylekey, fontsize, flags, &x11font_vtable);
+ } else {
+ /*
+ * This isn't an XLFD, so it must be an alias.
+ * Transmit it with mostly null data.
+ *
+ * It would be nice to work out if it's monospaced
+ * here, but at the moment I can't see that being
+ * anything but computationally hideous. Ah well.
+ */
+ callback(callback_ctx, fontnames[i], fontnames[i], NULL,
+ NULL, NULL, 0, FONTFLAG_SERVERALIAS, &x11font_vtable);
+ }
+ }
+ XFreeFontNames(fontnames);
+}
+
+static char *x11font_canonify_fontname(GtkWidget *widget, const char *name,
+ int *size, int *flags,
+ int resolve_aliases)
+{
+ /*
+ * When given an X11 font name to try to make sense of for a
+ * font selector, we must attempt to load it (to see if it
+ * exists), and then canonify it by extracting its FONT
+ * property, which should give its full XLFD even if what we
+ * originally had was a wildcard.
+ *
+ * However, we must carefully avoid canonifying font
+ * _aliases_, unless specifically asked to, because the font
+ * selector treats them as worthwhile in their own right.
+ */
+ GdkFont *font = gdk_font_load(name);
+ XFontStruct *xfs;
+ Display *disp;
+ Atom fontprop, fontprop2;
+ unsigned long ret;
+
+ if (!font)
+ return NULL; /* didn't make sense to us, sorry */
+
+ gdk_font_ref(font);
+
+ xfs = GDK_FONT_XFONT(font);
+ disp = GDK_FONT_XDISPLAY(font);
+ fontprop = XInternAtom(disp, "FONT", False);
+
+ if (XGetFontProperty(xfs, fontprop, &ret)) {
+ char *newname = XGetAtomName(disp, (Atom)ret);
+ if (newname) {
+ unsigned long fsize = 12;
+
+ fontprop2 = XInternAtom(disp, "PIXEL_SIZE", False);
+ if (XGetFontProperty(xfs, fontprop2, &fsize) && fsize > 0) {
+ *size = fsize;
+ gdk_font_unref(font);
+ if (flags) {
+ if (name[0] == '-' || resolve_aliases)
+ *flags = FONTFLAG_SERVERSIDE;
+ else
+ *flags = FONTFLAG_SERVERALIAS;
+ }
+ return dupstr(name[0] == '-' || resolve_aliases ?
+ newname : name);
+ }
+ }
+ }
+
+ gdk_font_unref(font);
+ return NULL; /* something went wrong */
+}
+
+static char *x11font_scale_fontname(GtkWidget *widget, const char *name,
+ int size)
+{
+ return NULL; /* shan't */
+}
+
+#if GTK_CHECK_VERSION(2,0,0)
+
+/* ----------------------------------------------------------------------
+ * Pango font implementation (for GTK 2 only).
+ */
+
+#if defined PANGO_PRE_1POINT4 && !defined PANGO_PRE_1POINT6
+#define PANGO_PRE_1POINT6 /* make life easier for pre-1.4 folk */
+#endif
+
+static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len,
+ int wide, int bold, int cellwidth);
+static unifont *pangofont_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways);
+static void pangofont_destroy(unifont *font);
+static void pangofont_enum_fonts(GtkWidget *widget, fontsel_add_entry callback,
+ void *callback_ctx);
+static char *pangofont_canonify_fontname(GtkWidget *widget, const char *name,
+ int *size, int *flags,
+ int resolve_aliases);
+static char *pangofont_scale_fontname(GtkWidget *widget, const char *name,
+ int size);
+
+struct pangofont {
+ struct unifont u;
+ /*
+ * Pango objects.
+ */
+ PangoFontDescription *desc;
+ PangoFontset *fset;
+ /*
+ * The containing widget.
+ */
+ GtkWidget *widget;
+ /*
+ * Data passed in to unifont_create().
+ */
+ int bold, shadowoffset, shadowalways;
+};
+
+static const struct unifont_vtable pangofont_vtable = {
+ pangofont_create,
+ pangofont_destroy,
+ pangofont_draw_text,
+ pangofont_enum_fonts,
+ pangofont_canonify_fontname,
+ pangofont_scale_fontname,
+ "client",
+};
+
+/*
+ * This function is used to rigorously validate a
+ * PangoFontDescription. Later versions of Pango have a nasty
+ * habit of accepting _any_ old string as input to
+ * pango_font_description_from_string and returning a font
+ * description which can actually be used to display text, even if
+ * they have to do it by falling back to their most default font.
+ * This is doubtless helpful in some situations, but not here,
+ * because we need to know if a Pango font string actually _makes
+ * sense_ in order to fall back to treating it as an X font name
+ * if it doesn't. So we check that the font family is actually one
+ * supported by Pango.
+ */
+static int pangofont_check_desc_makes_sense(PangoContext *ctx,
+ PangoFontDescription *desc)
+{
+#ifndef PANGO_PRE_1POINT6
+ PangoFontMap *map;
+#endif
+ PangoFontFamily **families;
+ int i, nfamilies, matched;
+
+ /*
+ * Ask Pango for a list of font families, and iterate through
+ * them to see if one of them matches the family in the
+ * PangoFontDescription.
+ */
+#ifndef PANGO_PRE_1POINT6
+ map = pango_context_get_font_map(ctx);
+ if (!map)
+ return FALSE;
+ pango_font_map_list_families(map, &families, &nfamilies);
+#else
+ pango_context_list_families(ctx, &families, &nfamilies);
+#endif
+
+ matched = FALSE;
+ for (i = 0; i < nfamilies; i++) {
+ if (!g_strcasecmp(pango_font_family_get_name(families[i]),
+ pango_font_description_get_family(desc))) {
+ matched = TRUE;
+ break;
+ }
+ }
+ g_free(families);
+
+ return matched;
+}
+
+static unifont *pangofont_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways)
+{
+ struct pangofont *pfont;
+ PangoContext *ctx;
+#ifndef PANGO_PRE_1POINT6
+ PangoFontMap *map;
+#endif
+ PangoFontDescription *desc;
+ PangoFontset *fset;
+ PangoFontMetrics *metrics;
+
+ desc = pango_font_description_from_string(name);
+ if (!desc)
+ return NULL;
+ ctx = gtk_widget_get_pango_context(widget);
+ if (!ctx) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ if (!pangofont_check_desc_makes_sense(ctx, desc)) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+#ifndef PANGO_PRE_1POINT6
+ map = pango_context_get_font_map(ctx);
+ if (!map) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ fset = pango_font_map_load_fontset(map, ctx, desc,
+ pango_context_get_language(ctx));
+#else
+ fset = pango_context_load_fontset(ctx, desc,
+ pango_context_get_language(ctx));
+#endif
+ if (!fset) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ metrics = pango_fontset_get_metrics(fset);
+ if (!metrics ||
+ pango_font_metrics_get_approximate_digit_width(metrics) == 0) {
+ pango_font_description_free(desc);
+ g_object_unref(fset);
+ return NULL;
+ }
+
+ pfont = snew(struct pangofont);
+ pfont->u.vt = &pangofont_vtable;
+ pfont->u.width =
+ PANGO_PIXELS(pango_font_metrics_get_approximate_digit_width(metrics));
+ pfont->u.ascent = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics));
+ pfont->u.descent = PANGO_PIXELS(pango_font_metrics_get_descent(metrics));
+ pfont->u.height = pfont->u.ascent + pfont->u.descent;
+ /* The Pango API is hardwired to UTF-8 */
+ pfont->u.public_charset = CS_UTF8;
+ pfont->u.real_charset = CS_UTF8;
+ pfont->desc = desc;
+ pfont->fset = fset;
+ pfont->widget = widget;
+ pfont->bold = bold;
+ pfont->shadowoffset = shadowoffset;
+ pfont->shadowalways = shadowalways;
+
+ pango_font_metrics_unref(metrics);
+
+ return (unifont *)pfont;
+}
+
+static void pangofont_destroy(unifont *font)
+{
+ struct pangofont *pfont = (struct pangofont *)font;
+ pango_font_description_free(pfont->desc);
+ g_object_unref(pfont->fset);
+ sfree(font);
+}
+
+static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len,
+ int wide, int bold, int cellwidth)
+{
+ struct pangofont *pfont = (struct pangofont *)font;
+ PangoLayout *layout;
+ PangoRectangle rect;
+ int shadowbold = FALSE;
+
+ if (wide)
+ cellwidth *= 2;
+
+ y -= pfont->u.ascent;
+
+ layout = pango_layout_new(gtk_widget_get_pango_context(pfont->widget));
+ pango_layout_set_font_description(layout, pfont->desc);
+ if (bold > pfont->bold) {
+ if (pfont->shadowalways)
+ shadowbold = TRUE;
+ else {
+ PangoFontDescription *desc2 =
+ pango_font_description_copy_static(pfont->desc);
+ pango_font_description_set_weight(desc2, PANGO_WEIGHT_BOLD);
+ pango_layout_set_font_description(layout, desc2);
+ }
+ }
+
+ while (len > 0) {
+ int clen;
+
+ /*
+ * Extract a single UTF-8 character from the string.
+ */
+ clen = 1;
+ while (clen < len &&
+ (unsigned char)string[clen] >= 0x80 &&
+ (unsigned char)string[clen] < 0xC0)
+ clen++;
+
+ pango_layout_set_text(layout, string, clen);
+ pango_layout_get_pixel_extents(layout, NULL, &rect);
+ gdk_draw_layout(target, gc, x + (cellwidth - rect.width)/2,
+ y + (pfont->u.height - rect.height)/2, layout);
+ if (shadowbold)
+ gdk_draw_layout(target, gc, x + (cellwidth - rect.width)/2 + pfont->shadowoffset,
+ y + (pfont->u.height - rect.height)/2, layout);
+
+ len -= clen;
+ string += clen;
+ x += cellwidth;
+ }
+
+ g_object_unref(layout);
+}
+
+/*
+ * Dummy size value to be used when converting a
+ * PangoFontDescription of a scalable font to a string for
+ * internal use.
+ */
+#define PANGO_DUMMY_SIZE 12
+
+static void pangofont_enum_fonts(GtkWidget *widget, fontsel_add_entry callback,
+ void *callback_ctx)
+{
+ PangoContext *ctx;
+#ifndef PANGO_PRE_1POINT6
+ PangoFontMap *map;
+#endif
+ PangoFontFamily **families;
+ int i, nfamilies;
+
+ ctx = gtk_widget_get_pango_context(widget);
+ if (!ctx)
+ return;
+
+ /*
+ * Ask Pango for a list of font families, and iterate through
+ * them.
+ */
+#ifndef PANGO_PRE_1POINT6
+ map = pango_context_get_font_map(ctx);
+ if (!map)
+ return;
+ pango_font_map_list_families(map, &families, &nfamilies);
+#else
+ pango_context_list_families(ctx, &families, &nfamilies);
+#endif
+ for (i = 0; i < nfamilies; i++) {
+ PangoFontFamily *family = families[i];
+ const char *familyname;
+ int flags;
+ PangoFontFace **faces;
+ int j, nfaces;
+
+ /*
+ * Set up our flags for this font family, and get the name
+ * string.
+ */
+ flags = FONTFLAG_CLIENTSIDE;
+#ifndef PANGO_PRE_1POINT4
+ /*
+ * In very early versions of Pango, we can't tell
+ * monospaced fonts from non-monospaced.
+ */
+ if (!pango_font_family_is_monospace(family))
+ flags |= FONTFLAG_NONMONOSPACED;
+#endif
+ familyname = pango_font_family_get_name(family);
+
+ /*
+ * Go through the available font faces in this family.
+ */
+ pango_font_family_list_faces(family, &faces, &nfaces);
+ for (j = 0; j < nfaces; j++) {
+ PangoFontFace *face = faces[j];
+ PangoFontDescription *desc;
+ const char *facename;
+ int *sizes;
+ int k, nsizes, dummysize;
+
+ /*
+ * Get the face name string.
+ */
+ facename = pango_font_face_get_face_name(face);
+
+ /*
+ * Set up a font description with what we've got so
+ * far. We'll fill in the size field manually and then
+ * call pango_font_description_to_string() to give the
+ * full real name of the specific font.
+ */
+ desc = pango_font_face_describe(face);
+
+ /*
+ * See if this font has a list of specific sizes.
+ */
+#ifndef PANGO_PRE_1POINT4
+ pango_font_face_list_sizes(face, &sizes, &nsizes);
+#else
+ /*
+ * In early versions of Pango, that call wasn't
+ * supported; we just have to assume everything is
+ * scalable.
+ */
+ sizes = NULL;
+#endif
+ if (!sizes) {
+ /*
+ * Write a single entry with a dummy size.
+ */
+ dummysize = PANGO_DUMMY_SIZE * PANGO_SCALE;
+ sizes = &dummysize;
+ nsizes = 1;
+ }
+
+ /*
+ * If so, go through them one by one.
+ */
+ for (k = 0; k < nsizes; k++) {
+ char *fullname;
+ char stylekey[128];
+
+ pango_font_description_set_size(desc, sizes[k]);
+
+ fullname = pango_font_description_to_string(desc);
+
+ /*
+ * Construct the sorting key for font styles.
+ */
+ {
+ char *p = stylekey;
+ int n;
+
+ n = pango_font_description_get_weight(desc);
+ /* Weight: normal, then lighter, then bolder */
+ if (n <= PANGO_WEIGHT_NORMAL)
+ n = PANGO_WEIGHT_NORMAL - n;
+ p += sprintf(p, "%4d", n);
+
+ n = pango_font_description_get_style(desc);
+ p += sprintf(p, " %2d", n);
+
+ n = pango_font_description_get_stretch(desc);
+ /* Stretch: closer to normal sorts earlier */
+ n = 2 * abs(PANGO_STRETCH_NORMAL - n) +
+ (n < PANGO_STRETCH_NORMAL);
+ p += sprintf(p, " %2d", n);
+
+ n = pango_font_description_get_variant(desc);
+ p += sprintf(p, " %2d", n);
+
+ }
+
+ /*
+ * Got everything. Hand off to the callback.
+ * (The charset string is NULL, because only
+ * server-side X fonts use it.)
+ */
+ callback(callback_ctx, fullname, familyname, NULL, facename,
+ stylekey,
+ (sizes == &dummysize ? 0 : PANGO_PIXELS(sizes[k])),
+ flags, &pangofont_vtable);
+
+ g_free(fullname);
+ }
+ if (sizes != &dummysize)
+ g_free(sizes);
+
+ pango_font_description_free(desc);
+ }
+ g_free(faces);
+ }
+ g_free(families);
+}
+
+static char *pangofont_canonify_fontname(GtkWidget *widget, const char *name,
+ int *size, int *flags,
+ int resolve_aliases)
+{
+ /*
+ * When given a Pango font name to try to make sense of for a
+ * font selector, we must normalise it to PANGO_DUMMY_SIZE and
+ * extract its original size (in pixels) into the `size' field.
+ */
+ PangoContext *ctx;
+#ifndef PANGO_PRE_1POINT6
+ PangoFontMap *map;
+#endif
+ PangoFontDescription *desc;
+ PangoFontset *fset;
+ PangoFontMetrics *metrics;
+ char *newname, *retname;
+
+ desc = pango_font_description_from_string(name);
+ if (!desc)
+ return NULL;
+ ctx = gtk_widget_get_pango_context(widget);
+ if (!ctx) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ if (!pangofont_check_desc_makes_sense(ctx, desc)) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+#ifndef PANGO_PRE_1POINT6
+ map = pango_context_get_font_map(ctx);
+ if (!map) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ fset = pango_font_map_load_fontset(map, ctx, desc,
+ pango_context_get_language(ctx));
+#else
+ fset = pango_context_load_fontset(ctx, desc,
+ pango_context_get_language(ctx));
+#endif
+ if (!fset) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ metrics = pango_fontset_get_metrics(fset);
+ if (!metrics ||
+ pango_font_metrics_get_approximate_digit_width(metrics) == 0) {
+ pango_font_description_free(desc);
+ g_object_unref(fset);
+ return NULL;
+ }
+
+ *size = PANGO_PIXELS(pango_font_description_get_size(desc));
+ *flags = FONTFLAG_CLIENTSIDE;
+ pango_font_description_set_size(desc, PANGO_DUMMY_SIZE * PANGO_SCALE);
+ newname = pango_font_description_to_string(desc);
+ retname = dupstr(newname);
+ g_free(newname);
+
+ pango_font_metrics_unref(metrics);
+ pango_font_description_free(desc);
+ g_object_unref(fset);
+
+ return retname;
+}
+
+static char *pangofont_scale_fontname(GtkWidget *widget, const char *name,
+ int size)
+{
+ PangoFontDescription *desc;
+ char *newname, *retname;
+
+ desc = pango_font_description_from_string(name);
+ if (!desc)
+ return NULL;
+ pango_font_description_set_size(desc, size * PANGO_SCALE);
+ newname = pango_font_description_to_string(desc);
+ retname = dupstr(newname);
+ g_free(newname);
+ pango_font_description_free(desc);
+
+ return retname;
+}
+
+#endif /* GTK_CHECK_VERSION(2,0,0) */
+
+/* ----------------------------------------------------------------------
+ * Outermost functions which do the vtable dispatch.
+ */
+
+/*
+ * Complete list of font-type subclasses. Listed in preference
+ * order for unifont_create(). (That is, in the extremely unlikely
+ * event that the same font name is valid as both a Pango and an
+ * X11 font, it will be interpreted as the former in the absence
+ * of an explicit type-disambiguating prefix.)
+ */
+static const struct unifont_vtable *unifont_types[] = {
+#if GTK_CHECK_VERSION(2,0,0)
+ &pangofont_vtable,
+#endif
+ &x11font_vtable,
+};
+
+/*
+ * Function which takes a font name and processes the optional
+ * scheme prefix. Returns the tail of the font name suitable for
+ * passing to individual font scheme functions, and also provides
+ * a subrange of the unifont_types[] array above.
+ *
+ * The return values `start' and `end' denote a half-open interval
+ * in unifont_types[]; that is, the correct way to iterate over
+ * them is
+ *
+ * for (i = start; i < end; i++) {...}
+ */
+static const char *unifont_do_prefix(const char *name, int *start, int *end)
+{
+ int colonpos = strcspn(name, ":");
+ int i;
+
+ if (name[colonpos]) {
+ /*
+ * There's a colon prefix on the font name. Use it to work
+ * out which subclass to use.
+ */
+ for (i = 0; i < lenof(unifont_types); i++) {
+ if (strlen(unifont_types[i]->prefix) == colonpos &&
+ !strncmp(unifont_types[i]->prefix, name, colonpos)) {
+ *start = i;
+ *end = i+1;
+ return name + colonpos + 1;
+ }
+ }
+ /*
+ * None matched, so return an empty scheme list to prevent
+ * any scheme from being called at all.
+ */
+ *start = *end = 0;
+ return name + colonpos + 1;
+ } else {
+ /*
+ * No colon prefix, so just use all the subclasses.
+ */
+ *start = 0;
+ *end = lenof(unifont_types);
+ return name;
+ }
+}
+
+unifont *unifont_create(GtkWidget *widget, const char *name, int wide,
+ int bold, int shadowoffset, int shadowalways)
+{
+ int i, start, end;
+
+ name = unifont_do_prefix(name, &start, &end);
+
+ for (i = start; i < end; i++) {
+ unifont *ret = unifont_types[i]->create(widget, name, wide, bold,
+ shadowoffset, shadowalways);
+ if (ret)
+ return ret;
+ }
+ return NULL; /* font not found in any scheme */
+}
+
+void unifont_destroy(unifont *font)
+{
+ font->vt->destroy(font);
+}
+
+void unifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len,
+ int wide, int bold, int cellwidth)
+{
+ font->vt->draw_text(target, gc, font, x, y, string, len,
+ wide, bold, cellwidth);
+}
+
+#if GTK_CHECK_VERSION(2,0,0)
+
+/* ----------------------------------------------------------------------
+ * Implementation of a unified font selector. Used on GTK 2 only;
+ * for GTK 1 we still use the standard font selector.
+ */
+
+typedef struct fontinfo fontinfo;
+
+typedef struct unifontsel_internal {
+ /* This must be the structure's first element, for cross-casting */
+ unifontsel u;
+ GtkListStore *family_model, *style_model, *size_model;
+ GtkWidget *family_list, *style_list, *size_entry, *size_list;
+ GtkWidget *filter_buttons[4];
+ GtkWidget *preview_area;
+ GdkPixmap *preview_pixmap;
+ int preview_width, preview_height;
+ GdkColor preview_fg, preview_bg;
+ int filter_flags;
+ tree234 *fonts_by_realname, *fonts_by_selorder;
+ fontinfo *selected;
+ int selsize, intendedsize;
+ int inhibit_response; /* inhibit callbacks when we change GUI controls */
+} unifontsel_internal;
+
+/*
+ * The structure held in the tree234s. All the string members are
+ * part of the same allocated area, so don't need freeing
+ * separately.
+ */
+struct fontinfo {
+ char *realname;
+ char *family, *charset, *style, *stylekey;
+ int size, flags;
+ /*
+ * Fallback sorting key, to permit multiple identical entries
+ * to exist in the selorder tree.
+ */
+ int index;
+ /*
+ * Indices mapping fontinfo structures to indices in the list
+ * boxes. sizeindex is irrelevant if the font is scalable
+ * (size==0).
+ */
+ int familyindex, styleindex, sizeindex;
+ /*
+ * The class of font.
+ */
+ const struct unifont_vtable *fontclass;
+};
+
+struct fontinfo_realname_find {
+ const char *realname;
+ int flags;
+};
+
+static int strnullcasecmp(const char *a, const char *b)
+{
+ int i;
+
+ /*
+ * If exactly one of the inputs is NULL, it compares before
+ * the other one.
+ */
+ if ((i = (!b) - (!a)) != 0)
+ return i;
+
+ /*
+ * NULL compares equal.
+ */
+ if (!a)
+ return 0;
+
+ /*
+ * Otherwise, ordinary strcasecmp.
+ */
+ return g_strcasecmp(a, b);
+}
+
+static int fontinfo_realname_compare(void *av, void *bv)
+{
+ fontinfo *a = (fontinfo *)av;
+ fontinfo *b = (fontinfo *)bv;
+ int i;
+
+ if ((i = strnullcasecmp(a->realname, b->realname)) != 0)
+ return i;
+ if ((a->flags & FONTFLAG_SORT_MASK) != (b->flags & FONTFLAG_SORT_MASK))
+ return ((a->flags & FONTFLAG_SORT_MASK) <
+ (b->flags & FONTFLAG_SORT_MASK) ? -1 : +1);
+ return 0;
+}
+
+static int fontinfo_realname_find(void *av, void *bv)
+{
+ struct fontinfo_realname_find *a = (struct fontinfo_realname_find *)av;
+ fontinfo *b = (fontinfo *)bv;
+ int i;
+
+ if ((i = strnullcasecmp(a->realname, b->realname)) != 0)
+ return i;
+ if ((a->flags & FONTFLAG_SORT_MASK) != (b->flags & FONTFLAG_SORT_MASK))
+ return ((a->flags & FONTFLAG_SORT_MASK) <
+ (b->flags & FONTFLAG_SORT_MASK) ? -1 : +1);
+ return 0;
+}
+
+static int fontinfo_selorder_compare(void *av, void *bv)
+{
+ fontinfo *a = (fontinfo *)av;
+ fontinfo *b = (fontinfo *)bv;
+ int i;
+ if ((i = strnullcasecmp(a->family, b->family)) != 0)
+ return i;
+ /*
+ * Font class comes immediately after family, so that fonts
+ * from different classes with the same family
+ */
+ if ((a->flags & FONTFLAG_SORT_MASK) != (b->flags & FONTFLAG_SORT_MASK))
+ return ((a->flags & FONTFLAG_SORT_MASK) <
+ (b->flags & FONTFLAG_SORT_MASK) ? -1 : +1);
+ if ((i = strnullcasecmp(a->charset, b->charset)) != 0)
+ return i;
+ if ((i = strnullcasecmp(a->stylekey, b->stylekey)) != 0)
+ return i;
+ if ((i = strnullcasecmp(a->style, b->style)) != 0)
+ return i;
+ if (a->size != b->size)
+ return (a->size < b->size ? -1 : +1);
+ if (a->index != b->index)
+ return (a->index < b->index ? -1 : +1);
+ return 0;
+}
+
+static void unifontsel_deselect(unifontsel_internal *fs)
+{
+ fs->selected = NULL;
+ gtk_list_store_clear(fs->style_model);
+ gtk_list_store_clear(fs->size_model);
+ gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
+ gtk_widget_set_sensitive(fs->size_entry, FALSE);
+}
+
+static void unifontsel_setup_familylist(unifontsel_internal *fs)
+{
+ GtkTreeIter iter;
+ int i, listindex, minpos = -1, maxpos = -1;
+ char *currfamily = NULL;
+ int currflags = -1;
+ fontinfo *info;
+
+ gtk_list_store_clear(fs->family_model);
+ listindex = 0;
+
+ /*
+ * Search through the font tree for anything matching our
+ * current filter criteria. When we find one, add its font
+ * name to the list box.
+ */
+ for (i = 0 ;; i++) {
+ info = (fontinfo *)index234(fs->fonts_by_selorder, i);
+ /*
+ * info may be NULL if we've just run off the end of the
+ * tree. We must still do a processing pass in that
+ * situation, in case we had an unfinished font record in
+ * progress.
+ */
+ if (info && (info->flags &~ fs->filter_flags)) {
+ info->familyindex = -1;
+ continue; /* we're filtering out this font */
+ }
+ if (!info || strnullcasecmp(currfamily, info->family) ||
+ currflags != (info->flags & FONTFLAG_SORT_MASK)) {
+ /*
+ * We've either finished a family, or started a new
+ * one, or both.
+ */
+ if (currfamily) {
+ gtk_list_store_append(fs->family_model, &iter);
+ gtk_list_store_set(fs->family_model, &iter,
+ 0, currfamily, 1, minpos, 2, maxpos+1, -1);
+ listindex++;
+ }
+ if (info) {
+ minpos = i;
+ currfamily = info->family;
+ currflags = info->flags & FONTFLAG_SORT_MASK;
+ }
+ }
+ if (!info)
+ break; /* now we're done */
+ info->familyindex = listindex;
+ maxpos = i;
+ }
+
+ /*
+ * If we've just filtered out the previously selected font,
+ * deselect it thoroughly.
+ */
+ if (fs->selected && fs->selected->familyindex < 0)
+ unifontsel_deselect(fs);
+}
+
+static void unifontsel_setup_stylelist(unifontsel_internal *fs,
+ int start, int end)
+{
+ GtkTreeIter iter;
+ int i, listindex, minpos = -1, maxpos = -1, started = FALSE;
+ char *currcs = NULL, *currstyle = NULL;
+ fontinfo *info;
+
+ gtk_list_store_clear(fs->style_model);
+ listindex = 0;
+ started = FALSE;
+
+ /*
+ * Search through the font tree for anything matching our
+ * current filter criteria. When we find one, add its charset
+ * and/or style name to the list box.
+ */
+ for (i = start; i <= end; i++) {
+ if (i == end)
+ info = NULL;
+ else
+ info = (fontinfo *)index234(fs->fonts_by_selorder, i);
+ /*
+ * info may be NULL if we've just run off the end of the
+ * relevant data. We must still do a processing pass in
+ * that situation, in case we had an unfinished font
+ * record in progress.
+ */
+ if (info && (info->flags &~ fs->filter_flags)) {
+ info->styleindex = -1;
+ continue; /* we're filtering out this font */
+ }
+ if (!info || !started || strnullcasecmp(currcs, info->charset) ||
+ strnullcasecmp(currstyle, info->style)) {
+ /*
+ * We've either finished a style/charset, or started a
+ * new one, or both.
+ */
+ started = TRUE;
+ if (currstyle) {
+ gtk_list_store_append(fs->style_model, &iter);
+ gtk_list_store_set(fs->style_model, &iter,
+ 0, currstyle, 1, minpos, 2, maxpos+1,
+ 3, TRUE, -1);
+ listindex++;
+ }
+ if (info) {
+ minpos = i;
+ if (info->charset && strnullcasecmp(currcs, info->charset)) {
+ gtk_list_store_append(fs->style_model, &iter);
+ gtk_list_store_set(fs->style_model, &iter,
+ 0, info->charset, 1, -1, 2, -1,
+ 3, FALSE, -1);
+ listindex++;
+ }
+ currcs = info->charset;
+ currstyle = info->style;
+ }
+ }
+ if (!info)
+ break; /* now we're done */
+ info->styleindex = listindex;
+ maxpos = i;
+ }
+}
+
+static const int unifontsel_default_sizes[] = { 10, 12, 14, 16, 20, 24, 32 };
+
+static void unifontsel_setup_sizelist(unifontsel_internal *fs,
+ int start, int end)
+{
+ GtkTreeIter iter;
+ int i, listindex;
+ char sizetext[40];
+ fontinfo *info;
+
+ gtk_list_store_clear(fs->size_model);
+ listindex = 0;
+
+ /*
+ * Search through the font tree for anything matching our
+ * current filter criteria. When we find one, add its font
+ * name to the list box.
+ */
+ for (i = start; i < end; i++) {
+ info = (fontinfo *)index234(fs->fonts_by_selorder, i);
+ if (info->flags &~ fs->filter_flags) {
+ info->sizeindex = -1;
+ continue; /* we're filtering out this font */
+ }
+ if (info->size) {
+ sprintf(sizetext, "%d", info->size);
+ info->sizeindex = listindex;
+ gtk_list_store_append(fs->size_model, &iter);
+ gtk_list_store_set(fs->size_model, &iter,
+ 0, sizetext, 1, i, 2, info->size, -1);
+ listindex++;
+ } else {
+ int j;
+
+ assert(i == start);
+ assert(i+1 == end);
+
+ for (j = 0; j < lenof(unifontsel_default_sizes); j++) {
+ sprintf(sizetext, "%d", unifontsel_default_sizes[j]);
+ gtk_list_store_append(fs->size_model, &iter);
+ gtk_list_store_set(fs->size_model, &iter, 0, sizetext, 1, i,
+ 2, unifontsel_default_sizes[j], -1);
+ listindex++;
+ }
+ }
+ }
+}
+
+static void unifontsel_set_filter_buttons(unifontsel_internal *fs)
+{
+ int i;
+
+ for (i = 0; i < lenof(fs->filter_buttons); i++) {
+ int flagbit = GPOINTER_TO_INT(gtk_object_get_data
+ (GTK_OBJECT(fs->filter_buttons[i]),
+ "user-data"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fs->filter_buttons[i]),
+ !!(fs->filter_flags & flagbit));
+ }
+}
+
+static void unifontsel_draw_preview_text(unifontsel_internal *fs)
+{
+ unifont *font;
+ char *sizename = NULL;
+ fontinfo *info = fs->selected;
+
+ if (info) {
+ sizename = info->fontclass->scale_fontname
+ (GTK_WIDGET(fs->u.window), info->realname, fs->selsize);
+ font = info->fontclass->create(GTK_WIDGET(fs->u.window),
+ sizename ? sizename : info->realname,
+ FALSE, FALSE, 0, 0);
+ } else
+ font = NULL;
+
+ if (fs->preview_pixmap) {
+ GdkGC *gc = gdk_gc_new(fs->preview_pixmap);
+ gdk_gc_set_foreground(gc, &fs->preview_bg);
+ gdk_draw_rectangle(fs->preview_pixmap, gc, 1, 0, 0,
+ fs->preview_width, fs->preview_height);
+ gdk_gc_set_foreground(gc, &fs->preview_fg);
+ if (font) {
+ /*
+ * The pangram used here is rather carefully
+ * constructed: it contains a sequence of very narrow
+ * letters (`jil') and a pair of adjacent very wide
+ * letters (`wm').
+ *
+ * If the user selects a proportional font, it will be
+ * coerced into fixed-width character cells when used
+ * in the actual terminal window. We therefore display
+ * it the same way in the preview pane, so as to show
+ * it the way it will actually be displayed - and we
+ * deliberately pick a pangram which will show the
+ * resulting miskerning at its worst.
+ *
+ * We aren't trying to sell people these fonts; we're
+ * trying to let them make an informed choice. Better
+ * that they find out the problems with using
+ * proportional fonts in terminal windows here than
+ * that they go to the effort of selecting their font
+ * and _then_ realise it was a mistake.
+ */
+ info->fontclass->draw_text(fs->preview_pixmap, gc, font,
+ 0, font->ascent,
+ "bankrupt jilted showmen quiz convex fogey",
+ 41, FALSE, FALSE, font->width);
+ info->fontclass->draw_text(fs->preview_pixmap, gc, font,
+ 0, font->ascent + font->height,
+ "BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY",
+ 41, FALSE, FALSE, font->width);
+ /*
+ * The ordering of punctuation here is also selected
+ * with some specific aims in mind. I put ` and '
+ * together because some software (and people) still
+ * use them as matched quotes no matter what Unicode
+ * might say on the matter, so people can quickly
+ * check whether they look silly in a candidate font.
+ * The sequence #_@ is there to let people judge the
+ * suitability of the underscore as an effectively
+ * alphabetic character (since that's how it's often
+ * used in practice, at least by programmers).
+ */
+ info->fontclass->draw_text(fs->preview_pixmap, gc, font,
+ 0, font->ascent + font->height * 2,
+ "0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$",
+ 42, FALSE, FALSE, font->width);
+ }
+ gdk_gc_unref(gc);
+ gdk_window_invalidate_rect(fs->preview_area->window, NULL, FALSE);
+ }
+ if (font)
+ info->fontclass->destroy(font);
+
+ sfree(sizename);
+}
+
+static void unifontsel_select_font(unifontsel_internal *fs,
+ fontinfo *info, int size, int leftlist,
+ int size_is_explicit)
+{
+ int index;
+ int minval, maxval;
+ GtkTreePath *treepath;
+ GtkTreeIter iter;
+
+ fs->inhibit_response = TRUE;
+
+ fs->selected = info;
+ fs->selsize = size;
+ if (size_is_explicit)
+ fs->intendedsize = size;
+
+ gtk_widget_set_sensitive(fs->u.ok_button, TRUE);
+
+ /*
+ * Find the index of this fontinfo in the selorder list.
+ */
+ index = -1;
+ findpos234(fs->fonts_by_selorder, info, NULL, &index);
+ assert(index >= 0);
+
+ /*
+ * Adjust the font selector flags and redo the font family
+ * list box, if necessary.
+ */
+ if (leftlist <= 0 &&
+ (fs->filter_flags | info->flags) != fs->filter_flags) {
+ fs->filter_flags |= info->flags;
+ unifontsel_set_filter_buttons(fs);
+ unifontsel_setup_familylist(fs);
+ }
+
+ /*
+ * Find the appropriate family name and select it in the list.
+ */
+ assert(info->familyindex >= 0);
+ treepath = gtk_tree_path_new_from_indices(info->familyindex, -1);
+ gtk_tree_selection_select_path
+ (gtk_tree_view_get_selection(GTK_TREE_VIEW(fs->family_list)),
+ treepath);
+ gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->family_list),
+ treepath, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(fs->family_model), &iter, treepath);
+ gtk_tree_path_free(treepath);
+
+ /*
+ * Now set up the font style list.
+ */
+ gtk_tree_model_get(GTK_TREE_MODEL(fs->family_model), &iter,
+ 1, &minval, 2, &maxval, -1);
+ if (leftlist <= 1)
+ unifontsel_setup_stylelist(fs, minval, maxval);
+
+ /*
+ * Find the appropriate style name and select it in the list.
+ */
+ if (info->style) {
+ assert(info->styleindex >= 0);
+ treepath = gtk_tree_path_new_from_indices(info->styleindex, -1);
+ gtk_tree_selection_select_path
+ (gtk_tree_view_get_selection(GTK_TREE_VIEW(fs->style_list)),
+ treepath);
+ gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->style_list),
+ treepath, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(fs->style_model),
+ &iter, treepath);
+ gtk_tree_path_free(treepath);
+
+ /*
+ * And set up the size list.
+ */
+ gtk_tree_model_get(GTK_TREE_MODEL(fs->style_model), &iter,
+ 1, &minval, 2, &maxval, -1);
+ if (leftlist <= 2)
+ unifontsel_setup_sizelist(fs, minval, maxval);
+
+ /*
+ * Find the appropriate size, and select it in the list.
+ */
+ if (info->size) {
+ assert(info->sizeindex >= 0);
+ treepath = gtk_tree_path_new_from_indices(info->sizeindex, -1);
+ gtk_tree_selection_select_path
+ (gtk_tree_view_get_selection(GTK_TREE_VIEW(fs->size_list)),
+ treepath);
+ gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->size_list),
+ treepath, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_path_free(treepath);
+ size = info->size;
+ } else {
+ int j;
+ for (j = 0; j < lenof(unifontsel_default_sizes); j++)
+ if (unifontsel_default_sizes[j] == size) {
+ treepath = gtk_tree_path_new_from_indices(j, -1);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(fs->size_list),
+ treepath, NULL, FALSE);
+ gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->size_list),
+ treepath, NULL, FALSE, 0.0,
+ 0.0);
+ gtk_tree_path_free(treepath);
+ }
+ }
+
+ /*
+ * And set up the font size text entry box.
+ */
+ {
+ char sizetext[40];
+ sprintf(sizetext, "%d", size);
+ gtk_entry_set_text(GTK_ENTRY(fs->size_entry), sizetext);
+ }
+ } else {
+ if (leftlist <= 2)
+ unifontsel_setup_sizelist(fs, 0, 0);
+ gtk_entry_set_text(GTK_ENTRY(fs->size_entry), "");
+ }
+
+ /*
+ * Grey out the font size edit box if we're not using a
+ * scalable font.
+ */
+ gtk_entry_set_editable(GTK_ENTRY(fs->size_entry), fs->selected->size == 0);
+ gtk_widget_set_sensitive(fs->size_entry, fs->selected->size == 0);
+
+ unifontsel_draw_preview_text(fs);
+
+ fs->inhibit_response = FALSE;
+}
+
+static void unifontsel_button_toggled(GtkToggleButton *tb, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ int newstate = gtk_toggle_button_get_active(tb);
+ int newflags;
+ int flagbit = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(tb),
+ "user-data"));
+
+ if (newstate)
+ newflags = fs->filter_flags | flagbit;
+ else
+ newflags = fs->filter_flags & ~flagbit;
+
+ if (fs->filter_flags != newflags) {
+ fs->filter_flags = newflags;
+ unifontsel_setup_familylist(fs);
+ }
+}
+
+static void unifontsel_add_entry(void *ctx, const char *realfontname,
+ const char *family, const char *charset,
+ const char *style, const char *stylekey,
+ int size, int flags,
+ const struct unifont_vtable *fontclass)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)ctx;
+ fontinfo *info;
+ int totalsize;
+ char *p;
+
+ totalsize = sizeof(fontinfo) + strlen(realfontname) +
+ (family ? strlen(family) : 0) + (charset ? strlen(charset) : 0) +
+ (style ? strlen(style) : 0) + (stylekey ? strlen(stylekey) : 0) + 10;
+ info = (fontinfo *)smalloc(totalsize);
+ info->fontclass = fontclass;
+ p = (char *)info + sizeof(fontinfo);
+ info->realname = p;
+ strcpy(p, realfontname);
+ p += 1+strlen(p);
+ if (family) {
+ info->family = p;
+ strcpy(p, family);
+ p += 1+strlen(p);
+ } else
+ info->family = NULL;
+ if (charset) {
+ info->charset = p;
+ strcpy(p, charset);
+ p += 1+strlen(p);
+ } else
+ info->charset = NULL;
+ if (style) {
+ info->style = p;
+ strcpy(p, style);
+ p += 1+strlen(p);
+ } else
+ info->style = NULL;
+ if (stylekey) {
+ info->stylekey = p;
+ strcpy(p, stylekey);
+ p += 1+strlen(p);
+ } else
+ info->stylekey = NULL;
+ assert(p - (char *)info <= totalsize);
+ info->size = size;
+ info->flags = flags;
+ info->index = count234(fs->fonts_by_selorder);
+
+ /*
+ * It's just conceivable that a misbehaving font enumerator
+ * might tell us about the same font real name more than once,
+ * in which case we should silently drop the new one.
+ */
+ if (add234(fs->fonts_by_realname, info) != info) {
+ sfree(info);
+ return;
+ }
+ /*
+ * However, we should never get a duplicate key in the
+ * selorder tree, because the index field carefully
+ * disambiguates otherwise identical records.
+ */
+ add234(fs->fonts_by_selorder, info);
+}
+
+static fontinfo *update_for_intended_size(unifontsel_internal *fs,
+ fontinfo *info)
+{
+ fontinfo info2, *below, *above;
+ int pos;
+
+ /*
+ * Copy the info structure. This doesn't copy its dynamic
+ * string fields, but that's unimportant because all we're
+ * going to do is to adjust the size field and use it in one
+ * tree search.
+ */
+ info2 = *info;
+ info2.size = fs->intendedsize;
+
+ /*
+ * Search in the tree to find the fontinfo structure which
+ * best approximates the size the user last requested.
+ */
+ below = findrelpos234(fs->fonts_by_selorder, &info2, NULL,
+ REL234_LE, &pos);
+ above = index234(fs->fonts_by_selorder, pos+1);
+
+ /*
+ * See if we've found it exactly, which is an easy special
+ * case. If we have, it'll be in `below' and not `above',
+ * because we did a REL234_LE rather than REL234_LT search.
+ */
+ if (!fontinfo_selorder_compare(&info2, below))
+ return below;
+
+ /*
+ * Now we've either found two suitable fonts, one smaller and
+ * one larger, or we're at one or other extreme end of the
+ * scale. Find out which, by NULLing out either of below and
+ * above if it differs from this one in any respect but size
+ * (and the disambiguating index field). Bear in mind, also,
+ * that either one might _already_ be NULL if we're at the
+ * extreme ends of the font list.
+ */
+ if (below) {
+ info2.size = below->size;
+ info2.index = below->index;
+ if (fontinfo_selorder_compare(&info2, below))
+ below = NULL;
+ }
+ if (above) {
+ info2.size = above->size;
+ info2.index = above->index;
+ if (fontinfo_selorder_compare(&info2, above))
+ above = NULL;
+ }
+
+ /*
+ * Now return whichever of above and below is non-NULL, if
+ * that's unambiguous.
+ */
+ if (!above)
+ return below;
+ if (!below)
+ return above;
+
+ /*
+ * And now we really do have to make a choice about whether to
+ * round up or down. We'll do it by rounding to nearest,
+ * breaking ties by rounding up.
+ */
+ if (above->size - fs->intendedsize <= fs->intendedsize - below->size)
+ return above;
+ else
+ return below;
+}
+
+static void family_changed(GtkTreeSelection *treeselection, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ GtkTreeModel *treemodel;
+ GtkTreeIter treeiter;
+ int minval;
+ fontinfo *info;
+
+ if (fs->inhibit_response) /* we made this change ourselves */
+ return;
+
+ if (!gtk_tree_selection_get_selected(treeselection, &treemodel, &treeiter))
+ return;
+
+ gtk_tree_model_get(treemodel, &treeiter, 1, &minval, -1);
+ info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
+ info = update_for_intended_size(fs, info);
+ if (!info)
+ return; /* _shouldn't_ happen unless font list is completely funted */
+ if (!info->size)
+ fs->selsize = fs->intendedsize; /* font is scalable */
+ unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
+ 1, FALSE);
+}
+
+static void style_changed(GtkTreeSelection *treeselection, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ GtkTreeModel *treemodel;
+ GtkTreeIter treeiter;
+ int minval;
+ fontinfo *info;
+
+ if (fs->inhibit_response) /* we made this change ourselves */
+ return;
+
+ if (!gtk_tree_selection_get_selected(treeselection, &treemodel, &treeiter))
+ return;
+
+ gtk_tree_model_get(treemodel, &treeiter, 1, &minval, -1);
+ if (minval < 0)
+ return; /* somehow a charset heading got clicked */
+ info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
+ info = update_for_intended_size(fs, info);
+ if (!info)
+ return; /* _shouldn't_ happen unless font list is completely funted */
+ if (!info->size)
+ fs->selsize = fs->intendedsize; /* font is scalable */
+ unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
+ 2, FALSE);
+}
+
+static void size_changed(GtkTreeSelection *treeselection, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ GtkTreeModel *treemodel;
+ GtkTreeIter treeiter;
+ int minval, size;
+ fontinfo *info;
+
+ if (fs->inhibit_response) /* we made this change ourselves */
+ return;
+
+ if (!gtk_tree_selection_get_selected(treeselection, &treemodel, &treeiter))
+ return;
+
+ gtk_tree_model_get(treemodel, &treeiter, 1, &minval, 2, &size, -1);
+ info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
+ unifontsel_select_font(fs, info, info->size ? info->size : size, 3, TRUE);
+}
+
+static void size_entry_changed(GtkEditable *ed, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ const char *text;
+ int size;
+
+ if (fs->inhibit_response) /* we made this change ourselves */
+ return;
+
+ text = gtk_entry_get_text(GTK_ENTRY(ed));
+ size = atoi(text);
+
+ if (size > 0) {
+ assert(fs->selected->size == 0);
+ unifontsel_select_font(fs, fs->selected, size, 3, TRUE);
+ }
+}
+
+static void alias_resolve(GtkTreeView *treeview, GtkTreePath *path,
+ GtkTreeViewColumn *column, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ GtkTreeIter iter;
+ int minval, newsize;
+ fontinfo *info, *newinfo;
+ char *newname;
+
+ if (fs->inhibit_response) /* we made this change ourselves */
+ return;
+
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(fs->family_model), &iter, path);
+ gtk_tree_model_get(GTK_TREE_MODEL(fs->family_model), &iter, 1,&minval, -1);
+ info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
+ if (info) {
+ int flags;
+ struct fontinfo_realname_find f;
+
+ newname = info->fontclass->canonify_fontname
+ (GTK_WIDGET(fs->u.window), info->realname, &newsize, &flags, TRUE);
+
+ f.realname = newname;
+ f.flags = flags;
+ newinfo = find234(fs->fonts_by_realname, &f, fontinfo_realname_find);
+
+ sfree(newname);
+ if (!newinfo)
+ return; /* font name not in our index */
+ if (newinfo == info)
+ return; /* didn't change under canonification => not an alias */
+ unifontsel_select_font(fs, newinfo,
+ newinfo->size ? newinfo->size : newsize,
+ 1, TRUE);
+ }
+}
+
+static gint unifontsel_expose_area(GtkWidget *widget, GdkEventExpose *event,
+ gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+
+ if (fs->preview_pixmap) {
+ gdk_draw_pixmap(widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+ fs->preview_pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
+ }
+ return TRUE;
+}
+
+static gint unifontsel_configure_area(GtkWidget *widget,
+ GdkEventConfigure *event, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ int ox, oy, nx, ny, x, y;
+
+ /*
+ * Enlarge the pixmap, but never shrink it.
+ */
+ ox = fs->preview_width;
+ oy = fs->preview_height;
+ x = event->width;
+ y = event->height;
+ if (x > ox || y > oy) {
+ if (fs->preview_pixmap)
+ gdk_pixmap_unref(fs->preview_pixmap);
+
+ nx = (x > ox ? x : ox);
+ ny = (y > oy ? y : oy);
+ fs->preview_pixmap = gdk_pixmap_new(widget->window, nx, ny, -1);
+ fs->preview_width = nx;
+ fs->preview_height = ny;
+
+ unifontsel_draw_preview_text(fs);
+ }
+
+ gdk_window_invalidate_rect(widget->window, NULL, FALSE);
+
+ return TRUE;
+}
+
+unifontsel *unifontsel_new(const char *wintitle)
+{
+ unifontsel_internal *fs = snew(unifontsel_internal);
+ GtkWidget *table, *label, *w, *ww, *scroll;
+ GtkListStore *model;
+ GtkTreeViewColumn *column;
+ int lists_height, preview_height, font_width, style_width, size_width;
+ int i;
+
+ fs->inhibit_response = FALSE;
+ fs->selected = NULL;
+
+ {
+ /*
+ * Invent some magic size constants.
+ */
+ GtkRequisition req;
+ label = gtk_label_new("Quite Long Font Name (Foundry)");
+ gtk_widget_size_request(label, &req);
+ font_width = req.width;
+ lists_height = 14 * req.height;
+ preview_height = 5 * req.height;
+ gtk_label_set_text(GTK_LABEL(label), "Italic Extra Condensed");
+ gtk_widget_size_request(label, &req);
+ style_width = req.width;
+ gtk_label_set_text(GTK_LABEL(label), "48000");
+ gtk_widget_size_request(label, &req);
+ size_width = req.width;
+#if GTK_CHECK_VERSION(2,10,0)
+ g_object_ref_sink(label);
+ g_object_unref(label);
+#else
+ gtk_object_sink(GTK_OBJECT(label));
+#endif
+ }
+
+ /*
+ * Create the dialog box and initialise the user-visible
+ * fields in the returned structure.
+ */
+ fs->u.user_data = NULL;
+ fs->u.window = GTK_WINDOW(gtk_dialog_new());
+ gtk_window_set_title(fs->u.window, wintitle);
+ fs->u.cancel_button = gtk_dialog_add_button
+ (GTK_DIALOG(fs->u.window), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ fs->u.ok_button = gtk_dialog_add_button
+ (GTK_DIALOG(fs->u.window), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_widget_grab_default(fs->u.ok_button);
+
+ /*
+ * Now set up the internal fields, including in particular all
+ * the controls that actually allow the user to select fonts.
+ */
+ table = gtk_table_new(8, 3, FALSE);
+ gtk_widget_show(table);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+#if GTK_CHECK_VERSION(2,4,0)
+ /* GtkAlignment seems to be the simplest way to put padding round things */
+ w = gtk_alignment_new(0, 0, 1, 1);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(w), 8, 8, 8, 8);
+ gtk_container_add(GTK_CONTAINER(w), table);
+ gtk_widget_show(w);
+#else
+ w = table;
+#endif
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fs->u.window)->vbox),
+ w, TRUE, TRUE, 0);
+
+ label = gtk_label_new_with_mnemonic("_Font:");
+ gtk_widget_show(label);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+
+ /*
+ * The Font list box displays only a string, but additionally
+ * stores two integers which give the limits within the
+ * tree234 of the font entries covered by this list entry.
+ */
+ model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+ w = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), w);
+ gtk_widget_show(w);
+ column = gtk_tree_view_column_new_with_attributes
+ ("Font", gtk_cell_renderer_text_new(),
+ "text", 0, (char *)NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
+ g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(w))),
+ "changed", G_CALLBACK(family_changed), fs);
+ g_signal_connect(G_OBJECT(w), "row-activated",
+ G_CALLBACK(alias_resolve), fs);
+
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
+ gtk_container_add(GTK_CONTAINER(scroll), w);
+ gtk_widget_show(scroll);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ gtk_widget_set_size_request(scroll, font_width, lists_height);
+ gtk_table_attach(GTK_TABLE(table), scroll, 0, 1, 1, 3, GTK_FILL,
+ GTK_EXPAND | GTK_FILL, 0, 0);
+ fs->family_model = model;
+ fs->family_list = w;
+
+ label = gtk_label_new_with_mnemonic("_Style:");
+ gtk_widget_show(label);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+ gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
+
+ /*
+ * The Style list box can contain insensitive elements
+ * (character set headings for server-side fonts), so we add
+ * an extra column to the list store to hold that information.
+ */
+ model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT,
+ G_TYPE_BOOLEAN);
+ w = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), w);
+ gtk_widget_show(w);
+ column = gtk_tree_view_column_new_with_attributes
+ ("Style", gtk_cell_renderer_text_new(),
+ "text", 0, "sensitive", 3, (char *)NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
+ g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(w))),
+ "changed", G_CALLBACK(style_changed), fs);
+
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
+ gtk_container_add(GTK_CONTAINER(scroll), w);
+ gtk_widget_show(scroll);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ gtk_widget_set_size_request(scroll, style_width, lists_height);
+ gtk_table_attach(GTK_TABLE(table), scroll, 1, 2, 1, 3, GTK_FILL,
+ GTK_EXPAND | GTK_FILL, 0, 0);
+ fs->style_model = model;
+ fs->style_list = w;
+
+ label = gtk_label_new_with_mnemonic("Si_ze:");
+ gtk_widget_show(label);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
+ gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
+
+ /*
+ * The Size label attaches primarily to a text input box so
+ * that the user can select a size of their choice. The list
+ * of available sizes is secondary.
+ */
+ fs->size_entry = w = gtk_entry_new();
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), w);
+ gtk_widget_set_size_request(w, size_width, -1);
+ gtk_widget_show(w);
+ gtk_table_attach(GTK_TABLE(table), w, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
+ g_signal_connect(G_OBJECT(w), "changed", G_CALLBACK(size_entry_changed),
+ fs);
+
+ model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+ w = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
+ gtk_widget_show(w);
+ column = gtk_tree_view_column_new_with_attributes
+ ("Size", gtk_cell_renderer_text_new(),
+ "text", 0, (char *)NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
+ g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(w))),
+ "changed", G_CALLBACK(size_changed), fs);
+
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
+ gtk_container_add(GTK_CONTAINER(scroll), w);
+ gtk_widget_show(scroll);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ gtk_table_attach(GTK_TABLE(table), scroll, 2, 3, 2, 3, GTK_FILL,
+ GTK_EXPAND | GTK_FILL, 0, 0);
+ fs->size_model = model;
+ fs->size_list = w;
+
+ /*
+ * Preview widget.
+ */
+ fs->preview_area = gtk_drawing_area_new();
+ fs->preview_pixmap = NULL;
+ fs->preview_width = 0;
+ fs->preview_height = 0;
+ fs->preview_fg.pixel = fs->preview_bg.pixel = 0;
+ fs->preview_fg.red = fs->preview_fg.green = fs->preview_fg.blue = 0x0000;
+ fs->preview_bg.red = fs->preview_bg.green = fs->preview_bg.blue = 0xFFFF;
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &fs->preview_fg,
+ FALSE, FALSE);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &fs->preview_bg,
+ FALSE, FALSE);
+ gtk_signal_connect(GTK_OBJECT(fs->preview_area), "expose_event",
+ GTK_SIGNAL_FUNC(unifontsel_expose_area), fs);
+ gtk_signal_connect(GTK_OBJECT(fs->preview_area), "configure_event",
+ GTK_SIGNAL_FUNC(unifontsel_configure_area), fs);
+ gtk_widget_set_size_request(fs->preview_area, 1, preview_height);
+ gtk_widget_show(fs->preview_area);
+ ww = fs->preview_area;
+ w = gtk_frame_new(NULL);
+ gtk_container_add(GTK_CONTAINER(w), ww);
+ gtk_widget_show(w);
+#if GTK_CHECK_VERSION(2,4,0)
+ ww = w;
+ /* GtkAlignment seems to be the simplest way to put padding round things */
+ w = gtk_alignment_new(0, 0, 1, 1);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(w), 8, 8, 8, 8);
+ gtk_container_add(GTK_CONTAINER(w), ww);
+ gtk_widget_show(w);
+#endif
+ ww = w;
+ w = gtk_frame_new("Preview of font");
+ gtk_container_add(GTK_CONTAINER(w), ww);
+ gtk_widget_show(w);
+ gtk_table_attach(GTK_TABLE(table), w, 0, 3, 3, 4,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 8);
+
+ i = 0;
+ w = gtk_check_button_new_with_label("Show client-side fonts");
+ gtk_object_set_data(GTK_OBJECT(w), "user-data",
+ GINT_TO_POINTER(FONTFLAG_CLIENTSIDE));
+ gtk_signal_connect(GTK_OBJECT(w), "toggled",
+ GTK_SIGNAL_FUNC(unifontsel_button_toggled), fs);
+ gtk_widget_show(w);
+ fs->filter_buttons[i++] = w;
+ gtk_table_attach(GTK_TABLE(table), w, 0, 3, 4, 5, GTK_FILL, 0, 0, 0);
+ w = gtk_check_button_new_with_label("Show server-side fonts");
+ gtk_object_set_data(GTK_OBJECT(w), "user-data",
+ GINT_TO_POINTER(FONTFLAG_SERVERSIDE));
+ gtk_signal_connect(GTK_OBJECT(w), "toggled",
+ GTK_SIGNAL_FUNC(unifontsel_button_toggled), fs);
+ gtk_widget_show(w);
+ fs->filter_buttons[i++] = w;
+ gtk_table_attach(GTK_TABLE(table), w, 0, 3, 5, 6, GTK_FILL, 0, 0, 0);
+ w = gtk_check_button_new_with_label("Show server-side font aliases");
+ gtk_object_set_data(GTK_OBJECT(w), "user-data",
+ GINT_TO_POINTER(FONTFLAG_SERVERALIAS));
+ gtk_signal_connect(GTK_OBJECT(w), "toggled",
+ GTK_SIGNAL_FUNC(unifontsel_button_toggled), fs);
+ gtk_widget_show(w);
+ fs->filter_buttons[i++] = w;
+ gtk_table_attach(GTK_TABLE(table), w, 0, 3, 6, 7, GTK_FILL, 0, 0, 0);
+ w = gtk_check_button_new_with_label("Show non-monospaced fonts");
+ gtk_object_set_data(GTK_OBJECT(w), "user-data",
+ GINT_TO_POINTER(FONTFLAG_NONMONOSPACED));
+ gtk_signal_connect(GTK_OBJECT(w), "toggled",
+ GTK_SIGNAL_FUNC(unifontsel_button_toggled), fs);
+ gtk_widget_show(w);
+ fs->filter_buttons[i++] = w;
+ 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 |
+ FONTFLAG_SERVERALIAS;
+ unifontsel_set_filter_buttons(fs);
+
+ /*
+ * Go and find all the font names, and set up our master font
+ * list.
+ */
+ fs->fonts_by_realname = newtree234(fontinfo_realname_compare);
+ fs->fonts_by_selorder = newtree234(fontinfo_selorder_compare);
+ for (i = 0; i < lenof(unifont_types); i++)
+ unifont_types[i]->enum_fonts(GTK_WIDGET(fs->u.window),
+ unifontsel_add_entry, fs);
+
+ /*
+ * And set up the initial font names list.
+ */
+ unifontsel_setup_familylist(fs);
+
+ fs->selsize = fs->intendedsize = 13; /* random default */
+ gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
+
+ return (unifontsel *)fs;
+}
+
+void unifontsel_destroy(unifontsel *fontsel)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)fontsel;
+ fontinfo *info;
+
+ if (fs->preview_pixmap)
+ gdk_pixmap_unref(fs->preview_pixmap);
+
+ freetree234(fs->fonts_by_selorder);
+ while ((info = delpos234(fs->fonts_by_realname, 0)) != NULL)
+ sfree(info);
+ freetree234(fs->fonts_by_realname);
+
+ gtk_widget_destroy(GTK_WIDGET(fs->u.window));
+ sfree(fs);
+}
+
+void unifontsel_set_name(unifontsel *fontsel, const char *fontname)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)fontsel;
+ int i, start, end, size, flags;
+ const char *fontname2 = NULL;
+ fontinfo *info;
+
+ /*
+ * Provide a default if given an empty or null font name.
+ */
+ if (!fontname || !*fontname)
+ fontname = "server:fixed";
+
+ /*
+ * Call the canonify_fontname function.
+ */
+ fontname = unifont_do_prefix(fontname, &start, &end);
+ for (i = start; i < end; i++) {
+ fontname2 = unifont_types[i]->canonify_fontname
+ (GTK_WIDGET(fs->u.window), fontname, &size, &flags, FALSE);
+ if (fontname2)
+ break;
+ }
+ if (i == end)
+ return; /* font name not recognised */
+
+ /*
+ * Now look up the canonified font name in our index.
+ */
+ {
+ struct fontinfo_realname_find f;
+ f.realname = fontname2;
+ f.flags = flags;
+ info = find234(fs->fonts_by_realname, &f, fontinfo_realname_find);
+ }
+
+ /*
+ * If we've found the font, and its size field is either
+ * correct or zero (the latter indicating a scalable font),
+ * then we're done. Otherwise, try looking up the original
+ * font name instead.
+ */
+ if (!info || (info->size != size && info->size != 0)) {
+ struct fontinfo_realname_find f;
+ f.realname = fontname;
+ f.flags = flags;
+
+ info = find234(fs->fonts_by_realname, &f, fontinfo_realname_find);
+ if (!info || info->size != size)
+ return; /* font name not in our index */
+ }
+
+ /*
+ * Now we've got a fontinfo structure and a font size, so we
+ * know everything we need to fill in all the fields in the
+ * dialog.
+ */
+ unifontsel_select_font(fs, info, size, 0, TRUE);
+}
+
+char *unifontsel_get_name(unifontsel *fontsel)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)fontsel;
+ char *name;
+
+ if (!fs->selected)
+ return NULL;
+
+ if (fs->selected->size == 0) {
+ name = fs->selected->fontclass->scale_fontname
+ (GTK_WIDGET(fs->u.window), fs->selected->realname, fs->selsize);
+ if (name) {
+ char *ret = dupcat(fs->selected->fontclass->prefix, ":",
+ name, NULL);
+ sfree(name);
+ return ret;
+ }
+ }
+
+ return dupcat(fs->selected->fontclass->prefix, ":",
+ fs->selected->realname, NULL);
+}
+
+#endif /* GTK_CHECK_VERSION(2,0,0) */
--- /dev/null
+/*
+ * Header file for gtkfont.c. Has to be separate from unix.h
+ * because it depends on GTK data types, hence can't be included
+ * from cross-platform code (which doesn't go near GTK).
+ */
+
+#ifndef PUTTY_GTKFONT_H
+#define PUTTY_GTKFONT_H
+
+/*
+ * Exports from gtkfont.c.
+ */
+struct unifont_vtable; /* contents internal to gtkfont.c */
+typedef struct unifont {
+ const struct unifont_vtable *vt;
+ /*
+ * `Non-static data members' of the `class', accessible to
+ * external code.
+ */
+
+ /*
+ * public_charset is the charset used when the user asks for
+ * `Use font encoding'.
+ *
+ * real_charset is the charset used when translating text into
+ * a form suitable for sending to unifont_draw_text().
+ *
+ * They can differ. For example, public_charset might be
+ * CS_ISO8859_1 while real_charset is CS_ISO8859_1_X11.
+ */
+ int public_charset, real_charset;
+
+ /*
+ * Font dimensions needed by clients.
+ */
+ int width, height, ascent, descent;
+} unifont;
+
+unifont *unifont_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways);
+void unifont_destroy(unifont *font);
+void unifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const char *string, int len,
+ int wide, int bold, int cellwidth);
+
+/*
+ * Unified font selector dialog. I can't be bothered to do a
+ * proper GTK subclassing today, so this will just be an ordinary
+ * data structure with some useful members.
+ *
+ * (Of course, these aren't the only members; this structure is
+ * contained within a bigger one which holds data visible only to
+ * the implementation.)
+ */
+typedef struct unifontsel {
+ void *user_data; /* settable by the user */
+ GtkWindow *window;
+ GtkWidget *ok_button, *cancel_button;
+} unifontsel;
+
+unifontsel *unifontsel_new(const char *wintitle);
+void unifontsel_destroy(unifontsel *fontsel);
+void unifontsel_set_name(unifontsel *fontsel, const char *fontname);
+char *unifontsel_get_name(unifontsel *fontsel);
+
+#endif /* PUTTY_GTKFONT_H */
#include "putty.h"
#include "terminal.h"
+#include "gtkfont.h"
#define CAT2(x,y) x ## y
#define CAT(x,y) CAT2(x,y)
*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];
{
FontSpec ret;
if (!strcmp(name, "Font"))
- strcpy(ret.name, "fixed");
+ strcpy(ret.name, "server:fixed");
else
*ret.name = '\0';
return ret;
*/
#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));
*/
#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
/* 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);
}
* 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;
}
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) {
}
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) {
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) {
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
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, ®istry_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);
}
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);
}
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();
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);
void uxsel_set(int fd, int rwx, uxsel_callback_fn callback)
{
- struct fd *newfd = snew(struct fd);
- struct fd *oldfd;
+ struct fd *newfd;
- newfd->fd = fd;
- newfd->rwx = rwx;
- newfd->callback = callback;
+ uxsel_del(fd);
- oldfd = find234(fds, newfd, NULL);
- if (oldfd) {
- uxsel_input_remove(oldfd->id);
- del234(fds, oldfd);
- sfree(oldfd);
+ if (rwx) {
+ newfd = snew(struct fd);
+ newfd->fd = fd;
+ newfd->rwx = rwx;
+ newfd->callback = callback;
+ newfd->id = uxsel_input_add(fd, rwx);
+ add234(fds, newfd);
}
-
- add234(fds, newfd);
- newfd->id = uxsel_input_add(fd, rwx);
}
void uxsel_del(int fd)
int read_setting_fontspec(void *handle, const char *name, FontSpec *result)
{
- return !!read_setting_s(handle, name, result->name, sizeof(result->name));
+ /*
+ * In GTK1-only PuTTY, we used to store font names simply as a
+ * valid X font description string (logical or alias), under a
+ * bare key such as "Font".
+ *
+ * In GTK2 PuTTY, we have a prefix system where "client:"
+ * indicates a Pango font and "server:" an X one; existing
+ * configuration needs to be reinterpreted as having the
+ * "server:" prefix, so we change the storage key from the
+ * provided name string (e.g. "Font") to a suffixed one
+ * ("FontName").
+ */
+ char *suffname = dupcat(name, "Name", NULL);
+ if (read_setting_s(handle, suffname, result->name, sizeof(result->name))) {
+ sfree(suffname);
+ return TRUE; /* got new-style name */
+ }
+ sfree(suffname);
+
+ /* Fall back to old-style name. */
+ memcpy(result->name, "server:", 7);
+ if (!read_setting_s(handle, name,
+ result->name + 7, sizeof(result->name) - 7) ||
+ !result->name[7]) {
+ result->name[0] = '\0';
+ return FALSE;
+ } else {
+ return TRUE;
+ }
}
int read_setting_filename(void *handle, const char *name, Filename *result)
{
void write_setting_fontspec(void *handle, const char *name, FontSpec result)
{
- write_setting_s(handle, name, result.name);
+ /*
+ * read_setting_fontspec had to handle two cases, but when
+ * writing our settings back out we simply always generate the
+ * new-style name.
+ */
+ char *suffname = dupcat(name, "Name", NULL);
+ write_setting_s(handle, suffname, result.name);
+ sfree(suffname);
}
void write_setting_filename(void *handle, const char *name, Filename result)
{
LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
- LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
+ LTEXT "Markus Kuhn, Colin Watson, and CORE SDI S.A.", 1004, 10, 50, 206, 8
LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8
LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
- LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
+ LTEXT "Markus Kuhn, Colin Watson, and CORE SDI S.A.", 1004, 10, 50, 206, 8
LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8
LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
- LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
+ LTEXT "Markus Kuhn, Colin Watson, and CORE SDI S.A.", 1004, 10, 50, 206, 8
LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8
projects / PuTTY.git / commitdiff