#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;
};
struct dlgparam {
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 */
static void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
int chr, int action, void *ptr);
static void shortcut_highlight(GtkWidget *label, int chr);
+#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(GtkWidget *item, GdkEventButton *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)
{
{
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);
+
+#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 block our "changed" signal handler for the
- * duration of this call to gtk_entry_set_text.
+ * out of the GtkEntry - and promptly write it straight into the
+ * Conf 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.
*/
- g_signal_handler_block(uc->entry, uc->entrysig);
- gtk_entry_set_text(GTK_ENTRY(uc->entry), text);
- g_signal_handler_unblock(uc->entry, uc->entrysig);
+ 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)
+char *dlg_editbox_get(union control *ctrl, void *dlg)
{
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)
+ return dupstr(gtk_combo_box_get_active_text(GTK_COMBO_BOX(uc->combo)));
+#else
+ return dupstr(gtk_entry_get_text
+ (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo)))));
+#endif
+ }
+#endif
+
+ if (uc->entry) {
+ return dupstr(gtk_entry_get_text(GTK_ENTRY(uc->entry)));
+ }
+
+ 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_connect(GTK_OBJECT(listitem), "focus_in_event",
GTK_SIGNAL_FUNC(widget_focus), dp);
gtk_signal_connect(GTK_OBJECT(listitem), "button_press_event",
- GTK_SIGNAL_FUNC(listitem_button), dp);
+ GTK_SIGNAL_FUNC(listitem_button_press), dp);
+ gtk_signal_connect(GTK_OBJECT(listitem), "button_release_event",
+ 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;
+
+ 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"));
+ 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;
+ GtkTreeModel *model;
+ 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, &model);
+
+ 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)
}
}
-void dlg_filesel_set(union control *ctrl, void *dlg, Filename fn)
+void dlg_filesel_set(union control *ctrl, void *dlg, Filename *fn)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
+ /* We must copy fn->path before passing it to gtk_entry_set_text.
+ * See comment in dlg_editbox_set() for the reasons. */
+ char *duppath = dupstr(fn->path);
assert(uc->ctrl->generic.type == CTRL_FILESELECT);
assert(uc->entry != NULL);
- gtk_entry_set_text(GTK_ENTRY(uc->entry), fn.path);
+ gtk_entry_set_text(GTK_ENTRY(uc->entry), duppath);
+ sfree(duppath);
}
-void dlg_filesel_get(union control *ctrl, void *dlg, Filename *fn)
+Filename *dlg_filesel_get(union control *ctrl, void *dlg)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_FILESELECT);
assert(uc->entry != NULL);
- strncpy(fn->path, gtk_entry_get_text(GTK_ENTRY(uc->entry)),
- lenof(fn->path));
- fn->path[lenof(fn->path)-1] = '\0';
+ return filename_from_str(gtk_entry_get_text(GTK_ENTRY(uc->entry)));
}
-void dlg_fontsel_set(union control *ctrl, void *dlg, FontSpec fs)
+void dlg_fontsel_set(union control *ctrl, void *dlg, FontSpec *fs)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
+ /* We must copy fs->name before passing it to gtk_entry_set_text.
+ * See comment in dlg_editbox_set() for the reasons. */
+ char *dupname = dupstr(fs->name);
assert(uc->ctrl->generic.type == CTRL_FONTSELECT);
assert(uc->entry != NULL);
- gtk_entry_set_text(GTK_ENTRY(uc->entry), fs.name);
+ gtk_entry_set_text(GTK_ENTRY(uc->entry), dupname);
+ sfree(dupname);
}
-void dlg_fontsel_get(union control *ctrl, void *dlg, FontSpec *fs)
+FontSpec *dlg_fontsel_get(union control *ctrl, void *dlg)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_FONTSELECT);
assert(uc->entry != NULL);
- strncpy(fs->name, gtk_entry_get_text(GTK_ENTRY(uc->entry)),
- lenof(fs->name));
- fs->name[lenof(fs->name)-1] = '\0';
+ return fontspec_new(gtk_entry_get_text(GTK_ENTRY(uc->entry)));
}
/*
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);
-#if GTK_CHECK_VERSION(2,0,0)
- gtk_widget_grab_focus(uc->list);
+ 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;
}
}
return FALSE;
}
+#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)
{
return listitem_key(item, event, data, TRUE);
}
-static gboolean listitem_button(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));
+ switch (event->type) {
+ default:
+ case GDK_BUTTON_PRESS: uc->nclicks = 1; break;
+ case GDK_2BUTTON_PRESS: uc->nclicks = 2; break;
+ case GDK_3BUTTON_PRESS: uc->nclicks = 3; break;
+ }
+ return FALSE;
+}
+
+static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
+ gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
- if (event->type == GDK_2BUTTON_PRESS ||
- event->type == GDK_3BUTTON_PRESS) {
- struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
+ struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
+ if (uc->nclicks>1) {
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
return TRUE;
}
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; */
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");
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 };
-#endif
- const gchar *fontname = gtk_entry_get_text(GTK_ENTRY(uc->entry));
- /* TODO: In GTK 2, this only seems to offer client-side fonts. */
GtkWidget *fontsel =
gtk_font_selection_dialog_new("Select a font");
gtk_window_set_modal(GTK_WINDOW(fontsel), TRUE);
-#if !GTK_CHECK_VERSION(2,0,0)
gtk_font_selection_dialog_set_filter
(GTK_FONT_SELECTION_DIALOG(fontsel),
GTK_FONT_FILTER_BASE, GTK_FONT_ALL,
NULL, NULL, NULL, NULL, spacings, NULL);
-#endif
if (!gtk_font_selection_dialog_set_font_name
(GTK_FONT_SELECTION_DIALOG(fontsel), fontname)) {
/*
"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;
switch (ctrl->generic.type) {
case CTRL_BUTTON:
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;
}
uc->entrysig =
- gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
+ gtk_signal_connect(GTK_OBJECT(signalobject), "changed",
GTK_SIGNAL_FUNC(editbox_changed), dp);
- gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event",
+ 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:
}
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),
*/
{
int edge;
-#if GTK_CHECK_VERSION(2,0,0)
- edge = GTK_WIDGET(uc->list)->style->ythickness;
-#else
edge = GTK_WIDGET(uc->list)->style->klass->ythickness;
-#endif
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;
+ GtkCellRenderer *cellrend;
+ /*
+ * It appears that GTK 2 doesn't leave us any
+ * particularly sensible way to honour the
+ * "percentages" specification in the ctrl
+ * structure.
+ */
+ cellrend = gtk_cell_renderer_text_new();
+ if (!ctrl->listbox.hscroll) {
+ gtk_object_set(GTK_OBJECT(cellrend),
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ "ellipsize-set", TRUE,
+ NULL);
+ }
+ column = gtk_tree_view_column_new_with_attributes
+ ("heading", cellrend, "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
GtkWidget *panel;
#if !GTK_CHECK_VERSION(2,0,0)
GtkWidget *treeitem;
+#else
+ int depth;
+ GtkTreePath *treepath;
#endif
struct Shortcuts shortcuts;
};
}
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);
-
-#if GTK_CHECK_VERSION(2,0,0)
- gtk_widget_grab_focus(sc->uc->list);
+ 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);
-#endif
+ break;
+ }
+#else
+ if (sc->uc->treeview) {
+ gtk_widget_grab_focus(sc->uc->treeview);
+ break;
}
+#endif
+ assert(!"We shouldn't get here");
break;
}
break;
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_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)
* straight into that hbox, and it ends up just where we want
* it.
*/
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->action_area),
- w, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(dlg->action_area), w, TRUE, TRUE, 0);
#else
/*
* 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();
#endif
}
-int do_config_box(const char *title, Config *cfg, int midsession,
+int do_config_box(const char *title, Conf *conf, int midsession,
int protcfginfo)
{
GtkWidget *window, *hbox, *vbox, *cols, *label,
*tree, *treescroll, *panels, *panelvbox;
- int index, level, listitemheight;
+ int index, level, protocol;
struct controlbox *ctrlbox;
char *path;
#if GTK_CHECK_VERSION(2,0,0)
dlg_init(&dp);
- listitemheight = get_listitemheight();
-
for (index = 0; index < lenof(scs.sc); index++) {
scs.sc[index].action = SHORTCUT_EMPTY;
}
window = gtk_dialog_new();
ctrlbox = ctrl_new_box();
- setup_config_box(ctrlbox, midsession, cfg->protocol, protcfginfo);
- unix_setup_config_box(ctrlbox, midsession, cfg->protocol);
+ protocol = conf_get_int(conf, CONF_protocol);
+ setup_config_box(ctrlbox, midsession, protocol, protcfginfo);
+ unix_setup_config_box(ctrlbox, midsession, protocol);
gtk_setup_config_box(ctrlbox, midsession, window);
gtk_window_set_title(GTK_WINDOW(window), title);
GtkWidget *w;
if (!*s->pathname) {
- w = layout_ctrls(&dp, &scs, s, listitemheight, GTK_WINDOW(window));
+ w = layout_ctrls(&dp, &scs, s, GTK_WINDOW(window));
set_dialog_action_area(GTK_DIALOG(window), w);
} else {
-1);
treeiterlevels[j] = treeiter;
+ selparams[nselparams].depth = j;
if (j > 0) {
- GtkTreePath *path;
-
- path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore),
- &treeiterlevels[j-1]);
- if (j < 2)
- gtk_tree_view_expand_row(GTK_TREE_VIEW(tree), path,
- FALSE);
- else
- gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree), path);
- gtk_tree_path_free(path);
+ 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);
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);
}
#endif
- dp.data = cfg;
+ dp.data = conf;
dlg_refresh(NULL, &dp);
dp.shortcuts = &selparams[0].shortcuts;
window = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(window), title);
- w0 = layout_ctrls(&dp, &scs, s0, 0, GTK_WINDOW(window));
+ 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),
return dp.retval;
}
-static int string_width(char *text)
+int string_width(char *text)
{
GtkWidget *label = gtk_label_new(text);
GtkRequisition req;
"OK", 'o', 1, 1, NULL);
}
+void nonfatal_message_box(void *window, char *msg)
+{
+ messagebox(window, "PuTTY Error", msg,
+ string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
+ "OK", 'o', 1, 1, NULL);
+}
+
void fatalbox(char *p, ...)
{
va_list ap;
cleanup_exit(1);
}
+void nonfatal(char *p, ...)
+{
+ va_list ap;
+ char *msg;
+ va_start(ap, p);
+ msg = dupvprintf(p, ap);
+ va_end(ap);
+ nonfatal_message_box(NULL, msg);
+ sfree(msg);
+}
+
static GtkWidget *aboutbox = NULL;
static void about_close_clicked(GtkButton *button, gpointer data)
char *title;
char *licence =
- "Copyright 1997-2007 Simon Tatham.\n\n"
+ "Copyright 1997-2014 Simon Tatham.\n\n"
"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, Colin Watson, and CORE SDI S.A.\n\n"
+ "Markus Kuhn, Colin Watson, Christopher Staite, 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 "
w, FALSE, FALSE, 5);
gtk_widget_show(w);
- w = gtk_label_new("Copyright 1997-2007 Simon Tatham. All rights reserved");
+ w = gtk_label_new("Copyright 1997-2014 Simon Tatham. All rights reserved");
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
w, FALSE, FALSE, 5);
gtk_widget_show(w);
set_transient_window_pos(GTK_WIDGET(window), aboutbox);
+ gtk_window_set_transient_for(GTK_WINDOW(aboutbox),
+ GTK_WINDOW(window));
gtk_widget_show(aboutbox);
}
es->window = NULL;
sfree(es->seldata);
+ es->seldata = NULL;
dlg_cleanup(&es->dp);
ctrl_free_box(es->eventbox);
}
*/
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));
+ 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"
es->nevents++;
}
-int askappend(void *frontend, Filename filename,
+int askappend(void *frontend, Filename *filename,
void (*callback)(void *ctx, int result), void *ctx)
{
static const char msgtemplate[] =
char *mbtitle;
int mbret;
- message = dupprintf(msgtemplate, FILENAME_MAX, filename.path);
+ message = dupprintf(msgtemplate, FILENAME_MAX, filename->path);
mbtitle = dupprintf("%s Log to File", appname);
mbret = messagebox(get_window(frontend), mbtitle, message,
projects / PuTTY.git / blobdiff