X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkdlg.c;h=573111aeede967676f5f2d6c4a86c87c43226046;hb=5471539a6738484b48fb938c88dce547a3e4b299;hp=0c2487799e754f3601fc310cfcf8b87b0ff572ad;hpb=82a586792f5a5a95ba59aa4632760bcbc4597362;p=PuTTY.git diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c index 0c248779..573111ae 100644 --- a/unix/gtkdlg.c +++ b/unix/gtkdlg.c @@ -6,24 +6,39 @@ #include #include #include + #include +#if !GTK_CHECK_VERSION(3,0,0) #include -#include -#include -#include +#endif +#define MAY_REFER_TO_GTK_IN_HEADERS + +#include "putty.h" +#include "gtkcompat.h" #include "gtkcols.h" #include "gtkfont.h" +#include "gtkmisc.h" + +#ifndef NOT_X_WINDOWS +#include +#include +#include +#endif #ifdef TESTMODE #define PUTTY_DO_GLOBALS /* actually _define_ globals */ #endif -#include "putty.h" #include "storage.h" #include "dialog.h" #include "tree234.h" +#if GTK_CHECK_VERSION(2,0,0) +/* Decide which of GtkFileChooserDialog and GtkFileSelection to use */ +#define USE_GTK_FILE_CHOOSER_DIALOG +#endif + struct Shortcut { GtkWidget *widget; struct uctrl *uc; @@ -37,14 +52,20 @@ struct Shortcuts { struct uctrl { union control *ctrl; GtkWidget *toplevel; - 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 */ @@ -66,10 +87,14 @@ struct dlgparam { #if !GTK_CHECK_VERSION(2,0,0) GtkWidget *currtreeitem, **treeitems; int ntreeitems; +#else + int nselparams; + struct selparam *selparams; #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 */ @@ -96,6 +121,7 @@ static gboolean widget_focus(GtkWidget *widget, GdkEventFocus *event, 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, @@ -104,10 +130,19 @@ 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 +#if GTK_CHECK_VERSION(3,0,0) +static void colourchoose_response(GtkDialog *dialog, + gint response_id, gpointer data); +#else static void coloursel_ok(GtkButton *button, gpointer data); static void coloursel_cancel(GtkButton *button, gpointer data); +#endif static void window_destroy(GtkWidget *widget, gpointer data); +int get_listitemheight(GtkWidget *widget); static int uctrl_cmp_byctrl(void *av, void *bv) { @@ -175,8 +210,6 @@ static void dlg_cleanup(struct dlgparam *dp) dp->byctrl = NULL; while ( (uc = index234(dp->bywidget, 0)) != NULL) { del234(dp->bywidget, uc); - if (uc->privdata_needs_free) - sfree(uc->privdata); sfree(uc->buttons); sfree(uc); } @@ -209,39 +242,11 @@ static struct uctrl *dlg_find_bywidget(struct dlgparam *dp, GtkWidget *w) ret = find234(dp->bywidget, w, uctrl_cmp_bywidget_find); if (ret) return ret; - w = w->parent; + w = gtk_widget_get_parent(w); } while (w); return ret; } -void *dlg_get_privdata(union control *ctrl, void *dlg) -{ - struct dlgparam *dp = (struct dlgparam *)dlg; - struct uctrl *uc = dlg_find_byctrl(dp, ctrl); - return uc->privdata; -} - -void dlg_set_privdata(union control *ctrl, void *dlg, void *ptr) -{ - struct dlgparam *dp = (struct dlgparam *)dlg; - struct uctrl *uc = dlg_find_byctrl(dp, ctrl); - uc->privdata = ptr; - uc->privdata_needs_free = FALSE; -} - -void *dlg_alloc_privdata(union control *ctrl, void *dlg, size_t size) -{ - struct dlgparam *dp = (struct dlgparam *)dlg; - struct uctrl *uc = dlg_find_byctrl(dp, ctrl); - /* - * This is an internal allocation routine, so it's allowed to - * use smalloc directly. - */ - uc->privdata = smalloc(size); - uc->privdata_needs_free = FALSE; - return uc->privdata; -} - union control *dlg_last_focused(union control *ctrl, void *dlg) { struct dlgparam *dp = (struct dlgparam *)dlg; @@ -294,48 +299,69 @@ void dlg_editbox_set(union control *ctrl, void *dlg, char const *text) { 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) { + return dupstr(gtk_entry_get_text + (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo))))); + } +#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) @@ -345,15 +371,26 @@ 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) @@ -363,15 +400,32 @@ 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) @@ -394,10 +448,14 @@ void dlg_listbox_addwithid(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); + /* + * 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 @@ -409,11 +467,30 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg, gtk_container_add(GTK_CONTAINER(uc->menu), menuitem); gtk_widget_show(menuitem); - gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", - GINT_TO_POINTER(id)); - gtk_signal_connect(GTK_OBJECT(menuitem), "activate", - GTK_SIGNAL_FUNC(menuitem_activate), dp); - } else if (!uc->entry) { + g_object_set_data(G_OBJECT(menuitem), "user-data", + GINT_TO_POINTER(id)); + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(menuitem_activate), dp); + 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); + + g_object_set_data(G_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 @@ -462,35 +539,53 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg, gtk_widget_show(listitem); if (ctrl->listbox.multisel) { - gtk_signal_connect(GTK_OBJECT(listitem), "key_press_event", - GTK_SIGNAL_FUNC(listitem_multi_key), uc->adj); + g_signal_connect(G_OBJECT(listitem), "key_press_event", + G_CALLBACK(listitem_multi_key), uc->adj); } else { - gtk_signal_connect(GTK_OBJECT(listitem), "key_press_event", - GTK_SIGNAL_FUNC(listitem_single_key), uc->adj); + g_signal_connect(G_OBJECT(listitem), "key_press_event", + G_CALLBACK(listitem_single_key), uc->adj); } - 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_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); + g_signal_connect(G_OBJECT(listitem), "focus_in_event", + G_CALLBACK(widget_focus), dp); + g_signal_connect(G_OBJECT(listitem), "button_press_event", + G_CALLBACK(listitem_button_press), dp); + g_signal_connect(G_OBJECT(listitem), "button_release_event", + G_CALLBACK(listitem_button_release), dp); + g_object_set_data(G_OBJECT(listitem), "user-data", + GINT_TO_POINTER(id)); + 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; } @@ -498,19 +593,39 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index) { 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; + GObject *item; + + children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu : + uc->list)); + item = G_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(g_object_get_data(G_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. */ @@ -518,58 +633,143 @@ int dlg_listbox_index(union control *ctrl, void *dlg) { 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) @@ -579,11 +779,13 @@ 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; @@ -613,7 +815,30 @@ void dlg_listbox_select(union control *ctrl, void *dlg, int index) 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) @@ -667,44 +892,48 @@ void dlg_label_change(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))); } /* @@ -742,8 +971,16 @@ void dlg_set_focus(union control *ctrl, void *dlg) 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: /* @@ -760,21 +997,34 @@ void dlg_set_focus(union control *ctrl, void *dlg) } 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; } } @@ -789,20 +1039,23 @@ void dlg_beep(void *dlg) gdk_beep(); } +#if !GTK_CHECK_VERSION(3,0,0) static void errmsg_button_clicked(GtkButton *button, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); } +#endif static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child) { +#if !GTK_CHECK_VERSION(2,0,0) gint x, y, w, h, dx, dy; GtkRequisition req; gtk_window_set_position(GTK_WINDOW(child), GTK_WIN_POS_NONE); gtk_widget_size_request(GTK_WIDGET(child), &req); - gdk_window_get_origin(GTK_WIDGET(parent)->window, &x, &y); - gdk_window_get_size(GTK_WIDGET(parent)->window, &w, &h); + gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(parent)), &x, &y); + gdk_window_get_size(gtk_widget_get_window(GTK_WIDGET(parent)), &w, &h); /* * One corner of the transient will be offset inwards, by 1/4 @@ -821,39 +1074,55 @@ static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child) else dy = y + 3*h/4 - req.height; /* work from bottom edges */ gtk_widget_set_uposition(GTK_WIDGET(child), dx, dy); +#endif } -void dlg_error_msg(void *dlg, char *msg) +void dlg_error_msg(void *dlg, const char *msg) { struct dlgparam *dp = (struct dlgparam *)dlg; - GtkWidget *window, *hbox, *text, *ok; + GtkWidget *window; + +#if GTK_CHECK_VERSION(3,0,0) + window = gtk_message_dialog_new(GTK_WINDOW(dp->window), + (GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", msg); + gtk_dialog_run(GTK_DIALOG(window)); + gtk_widget_destroy(window); +#else + GtkWidget *hbox, *text, *ok; window = gtk_dialog_new(); text = gtk_label_new(msg); - gtk_misc_set_alignment(GTK_MISC(text), 0.0, 0.0); + align_label_left(GTK_LABEL(text)); hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 20); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox, FALSE, FALSE, 20); gtk_widget_show(text); gtk_widget_show(hbox); gtk_window_set_title(GTK_WINDOW(window), "Error"); gtk_label_set_line_wrap(GTK_LABEL(text), TRUE); ok = gtk_button_new_with_label("OK"); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area), + gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(window))), ok, FALSE, FALSE, 0); gtk_widget_show(ok); - GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(ok, TRUE); gtk_window_set_default(GTK_WINDOW(window), ok); - gtk_signal_connect(GTK_OBJECT(ok), "clicked", - GTK_SIGNAL_FUNC(errmsg_button_clicked), window); - gtk_signal_connect(GTK_OBJECT(window), "destroy", - GTK_SIGNAL_FUNC(window_destroy), NULL); + g_signal_connect(G_OBJECT(ok), "clicked", + G_CALLBACK(errmsg_button_clicked), window); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(window_destroy), NULL); gtk_window_set_modal(GTK_WINDOW(window), TRUE); gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(dp->window)); set_transient_window_pos(dp->window, window); gtk_widget_show(window); gtk_main(); +#endif + + post_main(); } /* @@ -892,41 +1161,85 @@ void dlg_coloursel_start(union control *ctrl, void *dlg, int r, int g, int b) { struct dlgparam *dp = (struct dlgparam *)dlg; struct uctrl *uc = dlg_find_byctrl(dp, ctrl); - gdouble cvals[4]; +#if GTK_CHECK_VERSION(3,0,0) + GtkWidget *coloursel = + gtk_color_chooser_dialog_new("Select a colour", + GTK_WINDOW(dp->window)); + gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(coloursel), FALSE); +#else + GtkWidget *okbutton, *cancelbutton; GtkWidget *coloursel = gtk_color_selection_dialog_new("Select a colour"); GtkColorSelectionDialog *ccs = GTK_COLOR_SELECTION_DIALOG(coloursel); + GtkColorSelection *cs = GTK_COLOR_SELECTION + (gtk_color_selection_dialog_get_color_selection(ccs)); + gtk_color_selection_set_has_opacity_control(cs, FALSE); +#endif 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); + +#if GTK_CHECK_VERSION(3,0,0) + { + GdkRGBA rgba; + rgba.red = r / 255.0; + rgba.green = g / 255.0; + rgba.blue = b / 255.0; + rgba.alpha = 1.0; /* fully opaque! */ + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(coloursel), &rgba); + } +#elif GTK_CHECK_VERSION(2,0,0) + { + GdkColor col; + col.red = r * 0x0101; + col.green = g * 0x0101; + col.blue = b * 0x0101; + gtk_color_selection_set_current_color(cs, &col); + } #else - gtk_color_selection_set_opacity(GTK_COLOR_SELECTION(ccs->colorsel), FALSE); + { + gdouble cvals[4]; + cvals[0] = r / 255.0; + cvals[1] = g / 255.0; + cvals[2] = b / 255.0; + cvals[3] = 1.0; /* fully opaque! */ + gtk_color_selection_set_color(cs, cvals); + } #endif - cvals[0] = r / 255.0; - cvals[1] = g / 255.0; - cvals[2] = b / 255.0; - cvals[3] = 1.0; /* fully opaque! */ - gtk_color_selection_set_color(GTK_COLOR_SELECTION(ccs->colorsel), cvals); - gtk_object_set_data(GTK_OBJECT(ccs->ok_button), "user-data", + g_object_set_data(G_OBJECT(coloursel), "user-data", (gpointer)uc); + +#if GTK_CHECK_VERSION(3,0,0) + g_signal_connect(G_OBJECT(coloursel), "response", + G_CALLBACK(colourchoose_response), (gpointer)dp); +#else + +#if GTK_CHECK_VERSION(2,0,0) + g_object_get(G_OBJECT(ccs), + "ok-button", &okbutton, + "cancel-button", &cancelbutton, + (const char *)NULL); +#else + okbutton = ccs->ok_button; + cancelbutton = ccs->cancel_button; +#endif + g_object_set_data(G_OBJECT(okbutton), "user-data", (gpointer)coloursel); - gtk_object_set_data(GTK_OBJECT(ccs->cancel_button), "user-data", + g_object_set_data(G_OBJECT(cancelbutton), "user-data", (gpointer)coloursel); - gtk_object_set_data(GTK_OBJECT(coloursel), "user-data", (gpointer)uc); - gtk_signal_connect(GTK_OBJECT(ccs->ok_button), "clicked", - GTK_SIGNAL_FUNC(coloursel_ok), (gpointer)dp); - gtk_signal_connect(GTK_OBJECT(ccs->cancel_button), "clicked", - GTK_SIGNAL_FUNC(coloursel_cancel), (gpointer)dp); - gtk_signal_connect_object(GTK_OBJECT(ccs->ok_button), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), - (gpointer)coloursel); - gtk_signal_connect_object(GTK_OBJECT(ccs->cancel_button), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), - (gpointer)coloursel); + g_signal_connect(G_OBJECT(okbutton), "clicked", + G_CALLBACK(coloursel_ok), (gpointer)dp); + g_signal_connect(G_OBJECT(cancelbutton), "clicked", + G_CALLBACK(coloursel_cancel), (gpointer)dp); + g_signal_connect_swapped(G_OBJECT(okbutton), "clicked", + G_CALLBACK(gtk_widget_destroy), + (gpointer)coloursel); + g_signal_connect_swapped(G_OBJECT(cancelbutton), "clicked", + G_CALLBACK(gtk_widget_destroy), + (gpointer)coloursel); +#endif gtk_widget_show(coloursel); } @@ -993,11 +1306,12 @@ static gboolean editbox_key(GtkWidget *widget, GdkEventKey *event, * Return in an edit box will now activate the default button * in the dialog just like it will everywhere else. */ - if (event->keyval == GDK_Return && widget->parent != NULL) { + GtkWidget *parent = gtk_widget_get_parent(widget); + if (event->keyval == GDK_KEY_Return && parent != NULL) { 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); + g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event"); + g_signal_emit_by_name(G_OBJECT(parent), "key_press_event", + event, &return_val); return return_val; } return FALSE; @@ -1021,6 +1335,12 @@ static gboolean editbox_lostfocus(GtkWidget *ed, GdkEventFocus *event, 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) { @@ -1049,7 +1369,7 @@ static gboolean listitem_key(GtkWidget *item, GdkEventKey *event, */ GtkWidget *list = item->parent; - gtk_signal_emit_stop_by_name(GTK_OBJECT(item), "key_press_event"); + g_signal_stop_emission_by_name(G_OBJECT(item), "key_press_event"); if (!multiple && GTK_WIDGET_STATE(item) != GTK_STATE_SELECTED) { @@ -1161,15 +1481,6 @@ static void list_selchange(GtkList *list, gpointer data) 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); @@ -1208,40 +1519,217 @@ static void draglist_down(GtkButton *button, gpointer data) struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button)); 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 = g_object_get_data(G_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) */ + +#ifdef USE_GTK_FILE_CHOOSER_DIALOG +static void filechoose_response(GtkDialog *dialog, gint response, + gpointer data) +{ + /* struct dlgparam *dp = (struct dlgparam *)data; */ + struct uctrl *uc = g_object_get_data(G_OBJECT(dialog), "user-data"); + if (response == GTK_RESPONSE_ACCEPT) { + gchar *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + gtk_entry_set_text(GTK_ENTRY(uc->entry), name); + g_free(name); + } + gtk_widget_destroy(GTK_WIDGET(dialog)); +} +#else 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"); + gpointer filesel = g_object_get_data(G_OBJECT(button), "user-data"); + struct uctrl *uc = g_object_get_data(G_OBJECT(filesel), "user-data"); const char *name = gtk_file_selection_get_filename (GTK_FILE_SELECTION(filesel)); gtk_entry_set_text(GTK_ENTRY(uc->entry), name); } +#endif static void fontsel_ok(GtkButton *button, gpointer data) { /* struct dlgparam *dp = (struct dlgparam *)data; */ - unifontsel *fontsel = (unifontsel *)gtk_object_get_data - (GTK_OBJECT(button), "user-data"); + +#if !GTK_CHECK_VERSION(2,0,0) + + gpointer fontsel = g_object_get_data(G_OBJECT(button), "user-data"); + struct uctrl *uc = g_object_get_data(G_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 *)g_object_get_data + (G_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 +} + +#if GTK_CHECK_VERSION(3,0,0) + +static void colourchoose_response(GtkDialog *dialog, + gint response_id, gpointer data) +{ + struct dlgparam *dp = (struct dlgparam *)data; + struct uctrl *uc = g_object_get_data(G_OBJECT(dialog), "user-data"); + + if (response_id == GTK_RESPONSE_OK) { + GdkRGBA rgba; + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dialog), &rgba); + dp->coloursel_result.r = (int) (255 * rgba.red); + dp->coloursel_result.g = (int) (255 * rgba.green); + dp->coloursel_result.b = (int) (255 * rgba.blue); + dp->coloursel_result.ok = TRUE; + } else { + dp->coloursel_result.ok = FALSE; + } + + uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK); + + gtk_widget_destroy(GTK_WIDGET(dialog)); } +#else /* GTK 1/2 coloursel response handlers */ + static void coloursel_ok(GtkButton *button, gpointer data) { struct dlgparam *dp = (struct dlgparam *)data; - gpointer coloursel = gtk_object_get_data(GTK_OBJECT(button), "user-data"); - struct uctrl *uc = gtk_object_get_data(GTK_OBJECT(coloursel), "user-data"); - gdouble cvals[4]; - gtk_color_selection_get_color - (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(coloursel)->colorsel), - cvals); - dp->coloursel_result.r = (int) (255 * cvals[0]); - dp->coloursel_result.g = (int) (255 * cvals[1]); - dp->coloursel_result.b = (int) (255 * cvals[2]); + gpointer coloursel = g_object_get_data(G_OBJECT(button), "user-data"); + struct uctrl *uc = g_object_get_data(G_OBJECT(coloursel), "user-data"); + +#if GTK_CHECK_VERSION(2,0,0) + { + GtkColorSelection *cs = GTK_COLOR_SELECTION + (gtk_color_selection_dialog_get_color_selection + (GTK_COLOR_SELECTION_DIALOG(coloursel))); + GdkColor col; + gtk_color_selection_get_current_color(cs, &col); + dp->coloursel_result.r = col.red / 0x0100; + dp->coloursel_result.g = col.green / 0x0100; + dp->coloursel_result.b = col.blue / 0x0100; + } +#else + { + GtkColorSelection *cs = GTK_COLOR_SELECTION + (gtk_color_selection_dialog_get_color_selection + (GTK_COLOR_SELECTION_DIALOG(coloursel))); + gdouble cvals[4]; + gtk_color_selection_get_color(cs, cvals); + dp->coloursel_result.r = (int) (255 * cvals[0]); + dp->coloursel_result.g = (int) (255 * cvals[1]); + dp->coloursel_result.b = (int) (255 * cvals[2]); + } +#endif dp->coloursel_result.ok = TRUE; uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK); } @@ -1249,70 +1737,155 @@ static void coloursel_ok(GtkButton *button, gpointer data) static void coloursel_cancel(GtkButton *button, gpointer data) { struct dlgparam *dp = (struct dlgparam *)data; - gpointer coloursel = gtk_object_get_data(GTK_OBJECT(button), "user-data"); - struct uctrl *uc = gtk_object_get_data(GTK_OBJECT(coloursel), "user-data"); + gpointer coloursel = g_object_get_data(G_OBJECT(button), "user-data"); + struct uctrl *uc = g_object_get_data(G_OBJECT(coloursel), "user-data"); dp->coloursel_result.ok = FALSE; uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK); } +#endif /* end of coloursel response handlers */ + static void filefont_clicked(GtkButton *button, gpointer data) { struct dlgparam *dp = (struct dlgparam *)data; struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button)); if (uc->ctrl->generic.type == CTRL_FILESELECT) { +#ifdef USE_GTK_FILE_CHOOSER_DIALOG + GtkWidget *filechoose = gtk_file_chooser_dialog_new + (uc->ctrl->fileselect.title, GTK_WINDOW(dp->window), + (uc->ctrl->fileselect.for_writing ? + GTK_FILE_CHOOSER_ACTION_SAVE : + GTK_FILE_CHOOSER_ACTION_OPEN), + STANDARD_CANCEL_LABEL, GTK_RESPONSE_CANCEL, + STANDARD_OPEN_LABEL, GTK_RESPONSE_ACCEPT, + (const gchar *)NULL); + gtk_window_set_modal(GTK_WINDOW(filechoose), TRUE); + g_object_set_data(G_OBJECT(filechoose), "user-data", (gpointer)uc); + g_signal_connect(G_OBJECT(filechoose), "response", + G_CALLBACK(filechoose_response), (gpointer)dp); + gtk_widget_show(filechoose); +#else GtkWidget *filesel = gtk_file_selection_new(uc->ctrl->fileselect.title); gtk_window_set_modal(GTK_WINDOW(filesel), TRUE); - gtk_object_set_data - (GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "user-data", + g_object_set_data + (G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "user-data", (gpointer)filesel); - gtk_object_set_data(GTK_OBJECT(filesel), "user-data", (gpointer)uc); - gtk_signal_connect - (GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", - GTK_SIGNAL_FUNC(filesel_ok), (gpointer)dp); - gtk_signal_connect_object - (GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)filesel); - gtk_signal_connect_object - (GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)filesel); + g_object_set_data(G_OBJECT(filesel), "user-data", (gpointer)uc); + g_signal_connect + (G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", + G_CALLBACK(filesel_ok), (gpointer)dp); + g_signal_connect_swapped + (G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", + G_CALLBACK(gtk_widget_destroy), (gpointer)filesel); + g_signal_connect_swapped + (G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked", + G_CALLBACK(gtk_widget_destroy), (gpointer)filesel); gtk_widget_show(filesel); +#endif } 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 }; + GtkWidget *fontsel = + gtk_font_selection_dialog_new("Select a font"); + gtk_window_set_modal(GTK_WINDOW(fontsel), TRUE); + gtk_font_selection_dialog_set_filter + (GTK_FONT_SELECTION_DIALOG(fontsel), + GTK_FONT_FILTER_BASE, GTK_FONT_ALL, + NULL, NULL, NULL, NULL, spacings, NULL); + if (!gtk_font_selection_dialog_set_font_name + (GTK_FONT_SELECTION_DIALOG(fontsel), fontname)) { + /* + * If the font name wasn't found as it was, try opening + * it and extracting its FONT property. This should + * have the effect of mapping short aliases into true + * XLFDs. + */ + GdkFont *font = gdk_font_load(fontname); + if (font) { + XFontStruct *xfs = GDK_FONT_XFONT(font); + 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) + gtk_font_selection_dialog_set_font_name + (GTK_FONT_SELECTION_DIALOG(fontsel), name); + } + gdk_font_unref(font); + } + } + g_object_set_data + (G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button), + "user-data", (gpointer)fontsel); + g_object_set_data(G_OBJECT(fontsel), "user-data", (gpointer)uc); + g_signal_connect + (G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button), + "clicked", G_CALLBACK(fontsel_ok), (gpointer)dp); + g_signal_connect_swapped + (G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button), + "clicked", G_CALLBACK(gtk_widget_destroy), + (gpointer)fontsel); + g_signal_connect_swapped + (G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->cancel_button), + "clicked", G_CALLBACK(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); + g_object_set_data(G_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); + g_signal_connect(G_OBJECT(fontsel->ok_button), "clicked", + G_CALLBACK(fontsel_ok), (gpointer)dp); + g_signal_connect_swapped(G_OBJECT(fontsel->ok_button), "clicked", + G_CALLBACK(unifontsel_destroy), + (gpointer)fontsel); + g_signal_connect_swapped(G_OBJECT(fontsel->cancel_button),"clicked", + G_CALLBACK(unifontsel_destroy), + (gpointer)fontsel); gtk_widget_show(GTK_WIDGET(fontsel->window)); + +#endif /* !GTK_CHECK_VERSION(2,0,0) */ + } } +#if !GTK_CHECK_VERSION(3,0,0) static void label_sizealloc(GtkWidget *widget, GtkAllocation *alloc, gpointer data) { struct dlgparam *dp = (struct dlgparam *)data; struct uctrl *uc = dlg_find_bywidget(dp, widget); - gtk_widget_set_usize(uc->text, alloc->width, -1); + gtk_widget_set_size_request(uc->text, alloc->width, -1); gtk_label_set_text(GTK_LABEL(uc->text), uc->ctrl->generic.label); - gtk_signal_disconnect(GTK_OBJECT(uc->text), uc->textsig); + g_signal_handler_disconnect(G_OBJECT(uc->text), uc->textsig); } +#endif /* ---------------------------------------------------------------------- * This function does the main layout work: it reads a controlset, @@ -1323,16 +1896,12 @@ static void label_sizealloc(GtkWidget *widget, GtkAllocation *alloc, * 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; @@ -1391,11 +1960,18 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, uc = snew(struct uctrl); uc->ctrl = ctrl; - 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; @@ -1403,27 +1979,27 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, case CTRL_BUTTON: w = gtk_button_new_with_label(ctrl->generic.label); if (win) { - GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(w, TRUE); if (ctrl->button.isdefault) gtk_window_set_default(win, w); if (ctrl->button.iscancel) dp->cancelbutton = w; } - gtk_signal_connect(GTK_OBJECT(w), "clicked", - GTK_SIGNAL_FUNC(button_clicked), dp); - gtk_signal_connect(GTK_OBJECT(w), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); - shortcut_add(scs, GTK_BIN(w)->child, ctrl->button.shortcut, - SHORTCUT_UCTRL, uc); + g_signal_connect(G_OBJECT(w), "clicked", + G_CALLBACK(button_clicked), dp); + g_signal_connect(G_OBJECT(w), "focus_in_event", + G_CALLBACK(widget_focus), dp); + shortcut_add(scs, gtk_bin_get_child(GTK_BIN(w)), + ctrl->button.shortcut, SHORTCUT_UCTRL, uc); break; case CTRL_CHECKBOX: w = gtk_check_button_new_with_label(ctrl->generic.label); - gtk_signal_connect(GTK_OBJECT(w), "toggled", - GTK_SIGNAL_FUNC(button_toggled), dp); - gtk_signal_connect(GTK_OBJECT(w), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); - shortcut_add(scs, GTK_BIN(w)->child, ctrl->checkbox.shortcut, - SHORTCUT_UCTRL, uc); + g_signal_connect(G_OBJECT(w), "toggled", + G_CALLBACK(button_toggled), dp); + g_signal_connect(G_OBJECT(w), "focus_in_event", + G_CALLBACK(widget_focus), dp); + shortcut_add(scs, gtk_bin_get_child(GTK_BIN(w)), + ctrl->checkbox.shortcut, SHORTCUT_UCTRL, uc); left = TRUE; break; case CTRL_RADIO: @@ -1466,19 +2042,19 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, b = (gtk_radio_button_new_with_label (group, ctrl->radio.buttons[i])); uc->buttons[i] = b; - group = gtk_radio_button_group(GTK_RADIO_BUTTON(b)); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(b)); colstart = i % ctrl->radio.ncolumns; columns_add(COLUMNS(w), b, colstart, (i == ctrl->radio.nbuttons-1 ? ctrl->radio.ncolumns - colstart : 1)); columns_force_left_align(COLUMNS(w), b); gtk_widget_show(b); - gtk_signal_connect(GTK_OBJECT(b), "toggled", - GTK_SIGNAL_FUNC(button_toggled), dp); - gtk_signal_connect(GTK_OBJECT(b), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); + g_signal_connect(G_OBJECT(b), "toggled", + G_CALLBACK(button_toggled), dp); + g_signal_connect(G_OBJECT(b), "focus_in_event", + G_CALLBACK(widget_focus), dp); if (ctrl->radio.shortcuts) { - shortcut_add(scs, GTK_BIN(b)->child, + shortcut_add(scs, gtk_bin_get_child(GTK_BIN(b)), ctrl->radio.shortcuts[i], SHORTCUT_UCTRL, uc); } @@ -1487,38 +2063,70 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, break; 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_new_with_model_and_entry + (GTK_TREE_MODEL(uc->listmodel)); + /* 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_FUNC(editbox_changed), dp); - gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event", - GTK_SIGNAL_FUNC(editbox_key), dp); - gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); + g_signal_connect(G_OBJECT(signalobject), "changed", + G_CALLBACK(editbox_changed), dp); + g_signal_connect(G_OBJECT(signalobject), "key_press_event", + G_CALLBACK(editbox_key), dp); + g_signal_connect(G_OBJECT(signalobject), "focus_in_event", + G_CALLBACK(widget_focus), dp); + g_signal_connect(G_OBJECT(signalobject), "focus_out_event", + G_CALLBACK(editbox_lostfocus), dp); + g_signal_connect(G_OBJECT(signalobject), "focus_out_event", + G_CALLBACK(editbox_lostfocus), dp); + +#if !GTK_CHECK_VERSION(3,0,0) /* * Edit boxes, for some strange reason, have a minimum * width of 150 in GTK 1.2. We don't want this - we'd * rather the edit boxes acquired their natural width * from the column layout of the rest of the box. - * - * Also, while we're here, we'll squirrel away the - * edit box height so we can use that to centre its - * label vertically beside it. */ - gtk_widget_size_request(w, &req); - gtk_widget_set_usize(w, 10, req.height); + { + GtkRequisition req; + gtk_widget_size_request(w, &req); + gtk_widget_set_size_request(w, 10, req.height); + } +#else + /* + * In GTK 3, this is still true, but there's a special + * method for GtkEntry in particular to fix it. + */ + if (GTK_IS_ENTRY(w)) + gtk_entry_set_width_chars(GTK_ENTRY(w), 1); +#endif if (ctrl->generic.label) { GtkWidget *label, *container; @@ -1541,9 +2149,8 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, columns_add(COLUMNS(container), label, 0, 1); columns_force_left_align(COLUMNS(container), label); columns_add(COLUMNS(container), w, 1, 1); - /* Centre the label vertically. */ - gtk_widget_set_usize(label, -1, req.height); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + columns_force_same_height(COLUMNS(container), + label, w); } gtk_widget_show(label); gtk_widget_show(w); @@ -1551,16 +2158,13 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, 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: case CTRL_FONTSELECT: { GtkWidget *ww; - GtkRequisition req; - char *browsebtn = + const char *browsebtn = (ctrl->generic.type == CTRL_FILESELECT ? "Browse..." : "Change..."); @@ -1582,8 +2186,15 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, } uc->entry = ww = gtk_entry_new(); - gtk_widget_size_request(ww, &req); - gtk_widget_set_usize(ww, 10, req.height); +#if !GTK_CHECK_VERSION(3,0,0) + { + GtkRequisition req; + gtk_widget_size_request(ww, &req); + gtk_widget_set_size_request(ww, 10, req.height); + } +#else + gtk_entry_set_width_chars(GTK_ENTRY(ww), 1); +#endif columns_add(COLUMNS(w), ww, 0, 1); gtk_widget_show(ww); @@ -1591,29 +2202,107 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, columns_add(COLUMNS(w), ww, 1, 1); gtk_widget_show(ww); - gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event", - GTK_SIGNAL_FUNC(editbox_key), dp); + columns_force_same_height(COLUMNS(w), uc->entry, uc->button); + + g_signal_connect(G_OBJECT(uc->entry), "key_press_event", + G_CALLBACK(editbox_key), 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", - GTK_SIGNAL_FUNC(widget_focus), dp); - gtk_signal_connect(GTK_OBJECT(ww), "clicked", - GTK_SIGNAL_FUNC(filefont_clicked), dp); + g_signal_connect(G_OBJECT(uc->entry), "changed", + G_CALLBACK(editbox_changed), dp); + g_signal_connect(G_OBJECT(uc->entry), "focus_in_event", + G_CALLBACK(widget_focus), dp); + g_signal_connect(G_OBJECT(uc->button), "focus_in_event", + G_CALLBACK(widget_focus), dp); + g_signal_connect(G_OBJECT(ww), "clicked", + G_CALLBACK(filefont_clicked), dp); } 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); - gtk_object_set_data(GTK_OBJECT(uc->menu), "user-data", - (gpointer)uc->optmenu); - gtk_signal_connect(GTK_OBJECT(uc->optmenu), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); + g_object_set_data(G_OBJECT(uc->menu), "user-data", + (gpointer)uc->optmenu); + g_signal_connect(G_OBJECT(uc->optmenu), "focus_in_event", + G_CALLBACK(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); + + g_signal_connect(G_OBJECT(w), "focus_in_event", + G_CALLBACK(widget_focus), 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), @@ -1635,10 +2324,10 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, (GTK_SCROLLED_WINDOW(w)); gtk_widget_show(uc->list); - gtk_signal_connect(GTK_OBJECT(uc->list), "selection-changed", - GTK_SIGNAL_FUNC(list_selchange), dp); - gtk_signal_connect(GTK_OBJECT(uc->list), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); + g_signal_connect(G_OBJECT(uc->list), "selection-changed", + G_CALLBACK(list_selchange), dp); + g_signal_connect(G_OBJECT(uc->list), "focus_in_event", + G_CALLBACK(widget_focus), dp); /* * Adjust the height of the scrolled window to the @@ -1654,14 +2343,10 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, */ { 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, + gtk_widget_set_size_request(w, 10, 2*edge + (ctrl->listbox.height * - listitemheight)); + get_listitemheight(w))); } if (ctrl->listbox.draglist) { @@ -1682,52 +2367,142 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, button = gtk_button_new_with_label("Up"); columns_add(COLUMNS(cols), button, 1, 1); gtk_widget_show(button); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(draglist_up), dp); - gtk_signal_connect(GTK_OBJECT(button), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(draglist_up), dp); + g_signal_connect(G_OBJECT(button), "focus_in_event", + G_CALLBACK(widget_focus), dp); button = gtk_button_new_with_label("Down"); columns_add(COLUMNS(cols), button, 1, 1); gtk_widget_show(button); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(draglist_down), dp); - gtk_signal_connect(GTK_OBJECT(button), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), dp); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(draglist_down), dp); + g_signal_connect(G_OBJECT(button), "focus_in_event", + G_CALLBACK(widget_focus), dp); 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; + g_signal_connect(G_OBJECT(w), "row-activated", + G_CALLBACK(listbox_doubleclick), dp); + g_signal_connect(G_OBJECT(w), "focus_in_event", + G_CALLBACK(widget_focus), 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) { + g_object_set(G_OBJECT(cellrend), + "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, + (const char *)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; + + label = gtk_label_new(ctrl->generic.label); +#if GTK_CHECK_VERSION(3,0,0) + gtk_label_set_width_chars(GTK_LABEL(label), 3); +#endif + + shortcut_add(scs, label, ctrl->listbox.shortcut, + SHORTCUT_UCTRL, uc); 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); + columns_force_same_height(COLUMNS(container), + label, w); + } + gtk_widget_show(label); + gtk_widget_show(w); + + w = container; uc->label = label; - } - break; + } + + break; case CTRL_TEXT: +#if !GTK_CHECK_VERSION(3,0,0) /* - * Wrapping text widgets don't sit well with the GTK + * Wrapping text widgets don't sit well with the GTK2 * layout model, in which widgets state a minimum size * and the whole window then adjusts to the smallest * size it can sensibly take given its contents. A @@ -1752,11 +2527,20 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, * than one line). */ uc->text = w = gtk_label_new("X"); - gtk_misc_set_alignment(GTK_MISC(w), 0.0, 0.0); - gtk_label_set_line_wrap(GTK_LABEL(w), TRUE); uc->textsig = - gtk_signal_connect(GTK_OBJECT(w), "size-allocate", - GTK_SIGNAL_FUNC(label_sizealloc), dp); + g_signal_connect(G_OBJECT(w), "size-allocate", + G_CALLBACK(label_sizealloc), dp); +#else + /* + * In GTK3, this is all fixed, because the main aim of the + * new 'height-for-width' geometry management is to make + * wrapping labels behave sensibly. So now we can just do + * the obvious thing. + */ + uc->text = w = gtk_label_new(uc->ctrl->generic.label); +#endif + align_label_left(GTK_LABEL(w)); + gtk_label_set_line_wrap(GTK_LABEL(w), TRUE); break; } @@ -1782,6 +2566,9 @@ struct selparam { GtkWidget *panel; #if !GTK_CHECK_VERSION(2,0,0) GtkWidget *treeitem; +#else + int depth; + GtkTreePath *treepath; #endif struct Shortcuts shortcuts; }; @@ -1803,7 +2590,7 @@ static void treeselection_changed(GtkTreeSelection *treeselection, sp = &sps[spindex]; page_num = gtk_notebook_page_num(sp->panels, sp->panel); - gtk_notebook_set_page(sp->panels, page_num); + gtk_notebook_set_current_page(sp->panels, page_num); dlg_refresh(NULL, sp->dp); @@ -1858,7 +2645,7 @@ gint tree_focus(GtkContainer *container, GtkDirectionType direction, { struct dlgparam *dp = (struct dlgparam *)data; - gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus"); + g_signal_stop_emission_by_name(G_OBJECT(container), "focus"); /* * If there's a focused treeitem, we return FALSE to cause the * focus to move on to some totally other control. If not, we @@ -1872,8 +2659,8 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) { struct dlgparam *dp = (struct dlgparam *)data; - if (event->keyval == GDK_Escape && dp->cancelbutton) { - gtk_signal_emit_by_name(GTK_OBJECT(dp->cancelbutton), "clicked"); + if (event->keyval == GDK_KEY_Escape && dp->cancelbutton) { + g_signal_emit_by_name(G_OBJECT(dp->cancelbutton), "clicked"); return TRUE; } @@ -1905,15 +2692,13 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) case CTRL_BUTTON: /* Check boxes and buttons get the focus _and_ get toggled. */ gtk_widget_grab_focus(sc->uc->toplevel); - gtk_signal_emit_by_name(GTK_OBJECT(sc->uc->toplevel), - "clicked"); + g_signal_emit_by_name(G_OBJECT(sc->uc->toplevel), "clicked"); break; case CTRL_FILESELECT: case CTRL_FONTSELECT: /* File/font selectors have their buttons pressed (ooer), * and focus transferred to the edit box. */ - gtk_signal_emit_by_name(GTK_OBJECT(sc->uc->button), - "clicked"); + g_signal_emit_by_name(G_OBJECT(sc->uc->button), "clicked"); gtk_widget_grab_focus(sc->uc->entry); break; case CTRL_RADIO: @@ -1938,18 +2723,14 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) for (i = 0; i < sc->uc->ctrl->radio.nbuttons; i++) if (schr == sc->uc->ctrl->radio.shortcuts[i]) { gtk_widget_grab_focus(sc->uc->buttons[i]); - gtk_signal_emit_by_name - (GTK_OBJECT(sc->uc->buttons[i]), "clicked"); + g_signal_emit_by_name + (G_OBJECT(sc->uc->buttons[i]), "clicked"); } } 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; @@ -1959,19 +2740,36 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) * We need to manufacture a button press event :-/ */ bev.type = GDK_BUTTON_PRESS; bev.button = 1; - 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); + g_signal_emit_by_name(G_OBJECT(sc->uc->optmenu), + "button_press_event", + &bev, &returnval); + 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; @@ -2022,10 +2820,9 @@ int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) } } } - gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), - "key_press_event"); + g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event"); if (j >= 0) { - gtk_signal_emit_by_name(GTK_OBJECT(dp->treeitems[j]), "toggle"); + g_signal_emit_by_name(G_OBJECT(dp->treeitems[j]), "toggle"); gtk_widget_grab_focus(dp->treeitems[j]); } return TRUE; @@ -2036,14 +2833,12 @@ int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) * branches. */ if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left) { - gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), - "key_press_event"); + g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event"); gtk_tree_item_collapse(GTK_TREE_ITEM(widget)); return TRUE; } if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right) { - gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), - "key_press_event"); + g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event"); gtk_tree_item_expand(GTK_TREE_ITEM(widget)); return TRUE; } @@ -2055,20 +2850,24 @@ int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) static void shortcut_highlight(GtkWidget *labelw, int chr) { GtkLabel *label = GTK_LABEL(labelw); - gchar *currstr, *pattern; + const gchar *currstr; + gchar *pattern; int i; - gtk_label_get(label, &currstr); +#if !GTK_CHECK_VERSION(2,0,0) + { + gchar *currstr_nonconst; + gtk_label_get(label, &currstr_nonconst); + currstr = currstr_nonconst; + } +#else + currstr = gtk_label_get_text(label); +#endif + for (i = 0; currstr[i]; i++) if (tolower((unsigned char)currstr[i]) == chr) { - GtkRequisition req; - pattern = dupprintf("%*s_", i, ""); - - gtk_widget_size_request(GTK_WIDGET(label), &req); gtk_label_set_pattern(label, pattern); - gtk_widget_set_usize(GTK_WIDGET(label), -1, req.height); - sfree(pattern); break; } @@ -2086,7 +2885,7 @@ void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw, scs->sc[chr].action = action; - if (action == SHORTCUT_FOCUS) { + if (action == SHORTCUT_FOCUS || action == SHORTCUT_TREE) { scs->sc[chr].uc = NULL; scs->sc[chr].widget = (GtkWidget *)ptr; } else { @@ -2097,87 +2896,71 @@ void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw, 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)); + g_object_ref_sink(G_OBJECT(listitem)); return req.height; +#else + int height; + GtkCellRenderer *cr = gtk_cell_renderer_text_new(); +#if GTK_CHECK_VERSION(3,0,0) + { + GtkRequisition req; + /* + * Since none of my list items wraps in this GUI, no + * interesting width-for-height behaviour should be happening, + * so I don't think it should matter here whether I ask for + * the minimum or natural height. + */ + gtk_cell_renderer_get_preferred_size(cr, w, &req, NULL); + height = req.height; + } +#else + gtk_cell_renderer_get_size(cr, w, NULL, NULL, NULL, NULL, &height); +#endif + g_object_ref(G_OBJECT(cr)); + g_object_ref_sink(G_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) +void initial_treeview_collapse(struct dlgparam *dp, GtkWidget *tree) { -#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(GTK_DIALOG(window)->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). + * Collapse the deeper branches of the treeview into the state we + * like them to start off in. See comment below in do_config_box. */ - gtk_alignment_set_padding(GTK_ALIGNMENT(align), 8, 8, 8, 8); - 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); + int i; + for (i = 0; i < dp->nselparams; i++) + if (dp->selparams[i].depth >= 2) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree), + dp->selparams[i].treepath); +} #endif + +#if GTK_CHECK_VERSION(3,0,0) +void treeview_map_event(GtkWidget *tree, gpointer data) +{ + struct dlgparam *dp = (struct dlgparam *)data; + GtkAllocation alloc; + gtk_widget_get_allocation(tree, &alloc); + gtk_widget_set_size_request(tree, alloc.width, -1); + initial_treeview_collapse(dp, tree); } +#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) @@ -2198,22 +2981,21 @@ int do_config_box(const char *title, Config *cfg, int midsession, dlg_init(&dp); - listitemheight = get_listitemheight(); - for (index = 0; index < lenof(scs.sc); index++) { scs.sc[index].action = SHORTCUT_EMPTY; } - window = gtk_dialog_new(); + window = our_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); hbox = gtk_hbox_new(FALSE, 4); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), hbox, TRUE, TRUE, 0); + our_dialog_add_to_content_area(GTK_WINDOW(window), hbox, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); gtk_widget_show(hbox); vbox = gtk_vbox_new(FALSE, 4); @@ -2243,11 +3025,11 @@ int do_config_box(const char *title, Config *cfg, int midsession, tree = gtk_tree_new(); 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); + g_signal_connect(G_OBJECT(tree), "focus", + G_CALLBACK(tree_focus), &dp); #endif - gtk_signal_connect(GTK_OBJECT(tree), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), &dp); + g_signal_connect(G_OBJECT(tree), "focus_in_event", + G_CALLBACK(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); @@ -2265,9 +3047,9 @@ int do_config_box(const char *title, Config *cfg, int midsession, 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); + our_dialog_set_action_area(GTK_WINDOW(window), w); } else { int j = path ? ctrl_path_compare(s->pathname, path) : 0; if (j != INT_MAX) { /* add to treeview, start new panel */ @@ -2310,7 +3092,8 @@ int do_config_box(const char *title, Config *cfg, int midsession, page_num = gtk_notebook_page_num(GTK_NOTEBOOK(panels), panelvbox); - gtk_notebook_set_page(GTK_NOTEBOOK(panels), page_num); + gtk_notebook_set_current_page(GTK_NOTEBOOK(panels), + page_num); } if (nselparams >= selparamsize) { @@ -2340,17 +3123,22 @@ int do_config_box(const char *title, Config *cfg, int midsession, -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); @@ -2372,10 +3160,10 @@ int do_config_box(const char *title, Config *cfg, int midsession, treeitemlevels[j] = GTK_TREE_ITEM(treeitem); treelevels[j] = NULL; - gtk_signal_connect(GTK_OBJECT(treeitem), "key_press_event", - GTK_SIGNAL_FUNC(tree_key_press), &dp); - gtk_signal_connect(GTK_OBJECT(treeitem), "focus_in_event", - GTK_SIGNAL_FUNC(widget_focus), &dp); + g_signal_connect(G_OBJECT(treeitem), "key_press_event", + G_CALLBACK(tree_key_press), &dp); + g_signal_connect(G_OBJECT(treeitem), "focus_in_event", + G_CALLBACK(widget_focus), &dp); gtk_widget_show(treeitem); @@ -2388,30 +3176,66 @@ int do_config_box(const char *title, Config *cfg, int midsession, 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) + /* + * 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, and then when the + * collapsed branches are expanded later, the tree view will + * jarringly change size. + * + * So instead we start with everything expanded; then, once the + * tree view has computed its resulting width requirement, we + * collapse the relevant rows, but force the width to be the value + * we just retrieved. This arranges that the tree view is wide + * enough to have all branches expanded without further resizing. + */ + + dp.nselparams = nselparams; + dp.selparams = selparams; + +#if !GTK_CHECK_VERSION(3,0,0) + { + /* + * In GTK2, we can just do the job right now. + */ + GtkRequisition req; + gtk_widget_size_request(tree, &req); + initial_treeview_collapse(&dp, tree); + gtk_widget_set_size_request(tree, req.width, -1); + } +#else + /* + * But in GTK3, we have to wait until the widget is about to be + * mapped, because the size computation won't have been done yet. + */ + g_signal_connect(G_OBJECT(tree), "map", + G_CALLBACK(treeview_map_event), &dp); +#endif /* GTK 2 vs 3 */ +#endif /* GTK 2+ vs 1 */ + #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 *); - for (index = 0; index < nselparams; index++) { - gtk_signal_connect(GTK_OBJECT(selparams[index].treeitem), "select", - GTK_SIGNAL_FUNC(treeitem_sel), - &selparams[index]); + g_signal_connect(G_OBJECT(selparams[index].treeitem), "select", + G_CALLBACK(treeitem_sel), + &selparams[index]); dp.treeitems[index] = selparams[index].treeitem; } #endif - dp.data = cfg; + dp.data = conf; dlg_refresh(NULL, &dp); dp.shortcuts = &selparams[0].shortcuts; @@ -2467,12 +3291,13 @@ int do_config_box(const char *title, Config *cfg, int midsession, break; } - gtk_signal_connect(GTK_OBJECT(window), "destroy", - GTK_SIGNAL_FUNC(window_destroy), NULL); - gtk_signal_connect(GTK_OBJECT(window), "key_press_event", - GTK_SIGNAL_FUNC(win_key_press), &dp); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(window_destroy), NULL); + g_signal_connect(G_OBJECT(window), "key_press_event", + G_CALLBACK(win_key_press), &dp); gtk_main(); + post_main(); dlg_cleanup(&dp); sfree(selparams); @@ -2486,7 +3311,8 @@ static void messagebox_handler(union control *ctrl, void *dlg, if (event == EVENT_ACTION) dlg_end(dlg, ctrl->generic.context.i); } -int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) +int messagebox(GtkWidget *parentwin, const char *title, const char *msg, + int minwid, ...) { GtkWidget *window, *w0, *w1; struct controlbox *ctrlbox; @@ -2494,7 +3320,7 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) union control *c; struct dlgparam dp; struct Shortcuts scs; - int index, ncols; + int index, ncols, min_type; va_list ap; dlg_init(&dp); @@ -2505,13 +3331,23 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) ctrlbox = ctrl_new_box(); + /* + * Preliminary pass over the va_list, to count up the number of + * buttons and find out what kinds there are. + */ ncols = 0; va_start(ap, minwid); + min_type = +1; while (va_arg(ap, char *) != NULL) { - ncols++; + int type; + (void) va_arg(ap, int); /* shortcut */ - (void) va_arg(ap, int); /* normal/default/cancel */ + type = va_arg(ap, int); /* normal/default/cancel */ (void) va_arg(ap, int); /* end value */ + + ncols++; + if (min_type > type) + min_type = type; } va_end(ap); @@ -2536,7 +3372,17 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) c->generic.column = index++; if (type > 0) c->button.isdefault = TRUE; - else if (type < 0) + + /* We always arrange that _some_ button is labelled as + * 'iscancel', so that pressing Escape will always cause + * win_key_press to do something. The button we choose is + * whichever has the smallest type value: this means that real + * cancel buttons (labelled -1) will be picked if one is + * there, or in cases where the options are yes/no (1,0) then + * no will be picked, and if there's only one option (a box + * that really is just showing a _message_ and not even asking + * a question) then that will be picked. */ + if (type == min_type) c->button.iscancel = TRUE; } va_end(ap); @@ -2544,16 +3390,15 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) s1 = ctrl_getset(ctrlbox, "x", "", ""); ctrl_text(s1, msg, HELPCTX(no_help)); - window = gtk_dialog_new(); + window = our_dialog_new(); gtk_window_set_title(GTK_WINDOW(window), title); - w0 = layout_ctrls(&dp, &scs, s0, 0, GTK_WINDOW(window)); - set_dialog_action_area(GTK_DIALOG(window), w0); + w0 = layout_ctrls(&dp, &scs, s0, GTK_WINDOW(window)); + our_dialog_set_action_area(GTK_WINDOW(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), - w1, TRUE, TRUE, 0); + gtk_widget_set_size_request(w1, minwid+20, -1); + our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0); gtk_widget_show(w1); dp.shortcuts = &scs; @@ -2570,12 +3415,13 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); gtk_widget_show(window); - gtk_signal_connect(GTK_OBJECT(window), "destroy", - GTK_SIGNAL_FUNC(window_destroy), NULL); - gtk_signal_connect(GTK_OBJECT(window), "key_press_event", - GTK_SIGNAL_FUNC(win_key_press), &dp); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(window_destroy), NULL); + g_signal_connect(G_OBJECT(window), "key_press_event", + G_CALLBACK(win_key_press), &dp); gtk_main(); + post_main(); dlg_cleanup(&dp); ctrl_free_box(ctrlbox); @@ -2583,15 +3429,6 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) return dp.retval; } -static int string_width(char *text) -{ - GtkWidget *label = gtk_label_new(text); - GtkRequisition req; - gtk_widget_size_request(label, &req); - gtk_object_sink(GTK_OBJECT(label)); - return req.width; -} - int reallyclose(void *frontend) { char *title = dupcat(appname, " Exit Confirmation", NULL); @@ -2605,8 +3442,8 @@ int reallyclose(void *frontend) return ret; } -int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, - char *keystr, char *fingerprint, +int verify_ssh_host_key(void *frontend, char *host, int port, + const char *keytype, char *keystr, char *fingerprint, void (*callback)(void *ctx, int result), void *ctx) { static const char absenttxt[] = @@ -2683,7 +3520,8 @@ int askalg(void *frontend, const char *algtype, const char *algname, text = dupprintf(msg, algtype, algname); ret = messagebox(GTK_WIDGET(get_window(frontend)), "PuTTY Security Alert", text, - string_width("Continue with connection?"), + string_width("Reasonably long line of text as a width" + " template"), "Yes", 'y', 0, 1, "No", 'n', 0, 0, NULL); @@ -2703,14 +3541,21 @@ void old_keyfile_warning(void) */ } -void fatal_message_box(void *window, char *msg) +void fatal_message_box(void *window, const char *msg) { messagebox(window, "PuTTY Fatal Error", msg, string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"), "OK", 'o', 1, 1, NULL); } -void fatalbox(char *p, ...) +void nonfatal_message_box(void *window, const char *msg) +{ + messagebox(window, "PuTTY Error", msg, + string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"), + "OK", 'o', 1, 1, NULL); +} + +void fatalbox(const char *p, ...) { va_list ap; char *msg; @@ -2722,6 +3567,17 @@ void fatalbox(char *p, ...) cleanup_exit(1); } +void nonfatal(const 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) @@ -2730,17 +3586,26 @@ static void about_close_clicked(GtkButton *button, gpointer data) aboutbox = NULL; } +static void about_key_press(GtkWidget *widget, GdkEventKey *event, + gpointer data) +{ + if (event->keyval == GDK_KEY_Escape && aboutbox) { + gtk_widget_destroy(aboutbox); + aboutbox = NULL; + } +} + static void licence_clicked(GtkButton *button, gpointer data) { char *title; - char *licence = - "Copyright 1997-2008 Simon Tatham.\n\n" + const char *licence = + "Copyright 1997-2015 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 " @@ -2776,6 +3641,7 @@ static void licence_clicked(GtkButton *button, gpointer data) void about_box(void *window) { GtkWidget *w; + GtkBox *action_area; char *title; if (aboutbox) { @@ -2783,45 +3649,46 @@ void about_box(void *window) return; } - aboutbox = gtk_dialog_new(); + aboutbox = our_dialog_new(); gtk_container_set_border_width(GTK_CONTAINER(aboutbox), 10); title = dupcat("About ", appname, NULL); gtk_window_set_title(GTK_WINDOW(aboutbox), title); sfree(title); w = gtk_button_new_with_label("Close"); - GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(w, TRUE); gtk_window_set_default(GTK_WINDOW(aboutbox), w); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(aboutbox)->action_area), - w, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(w), "clicked", - GTK_SIGNAL_FUNC(about_close_clicked), NULL); + action_area = our_dialog_make_action_hbox(GTK_WINDOW(aboutbox)); + gtk_box_pack_end(action_area, w, FALSE, FALSE, 0); + g_signal_connect(G_OBJECT(w), "clicked", + G_CALLBACK(about_close_clicked), NULL); gtk_widget_show(w); w = gtk_button_new_with_label("View Licence"); - GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(aboutbox)->action_area), - w, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(w), "clicked", - GTK_SIGNAL_FUNC(licence_clicked), NULL); + gtk_widget_set_can_default(w, TRUE); + gtk_box_pack_end(action_area, w, FALSE, FALSE, 0); + g_signal_connect(G_OBJECT(w), "clicked", + G_CALLBACK(licence_clicked), NULL); gtk_widget_show(w); w = gtk_label_new(appname); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox), - w, FALSE, FALSE, 0); + our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 0); gtk_widget_show(w); w = gtk_label_new(ver); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox), - w, FALSE, FALSE, 5); + our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 5); gtk_widget_show(w); - w = gtk_label_new("Copyright 1997-2008 Simon Tatham. All rights reserved"); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox), - w, FALSE, FALSE, 5); + w = gtk_label_new("Copyright 1997-2015 Simon Tatham. All rights reserved"); + our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 5); gtk_widget_show(w); + g_signal_connect(G_OBJECT(aboutbox), "key_press_event", + G_CALLBACK(about_key_press), NULL); + set_transient_window_pos(GTK_WIDGET(window), aboutbox); + gtk_window_set_transient_for(GTK_WINDOW(aboutbox), + GTK_WINDOW(window)); gtk_widget_show(aboutbox); } @@ -2844,6 +3711,7 @@ static void eventlog_destroy(GtkWidget *widget, gpointer data) es->window = NULL; sfree(es->seldata); + es->seldata = NULL; dlg_cleanup(&es->dp); ctrl_free_box(es->eventbox); } @@ -2919,7 +3787,7 @@ void eventlog_selection_get(GtkWidget *widget, GtkSelectionData *seldata, { struct eventlog_stuff *es = (struct eventlog_stuff *)data; - gtk_selection_data_set(seldata, seldata->target, 8, + gtk_selection_data_set(seldata, gtk_selection_data_get_target(seldata), 8, (unsigned char *)es->seldata, es->sellen); } @@ -2934,7 +3802,14 @@ gint eventlog_selection_clear(GtkWidget *widget, GdkEventSelection *seldata, */ 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); @@ -2950,7 +3825,7 @@ void showeventlog(void *estuff, void *parentwin) GtkWidget *parent = GTK_WIDGET(parentwin); struct controlset *s0, *s1; union control *c; - int listitemheight, index; + int index; char *title; if (es->window) { @@ -2984,25 +3859,20 @@ void showeventlog(void *estuff, void *parentwin) c->listbox.percentages[1] = 10; c->listbox.percentages[2] = 65; - listitemheight = get_listitemheight(); - - es->window = window = gtk_dialog_new(); + es->window = window = our_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)); - set_dialog_action_area(GTK_DIALOG(window), w0); + w0 = layout_ctrls(&es->dp, &es->scs, s0, GTK_WINDOW(window)); + our_dialog_set_action_area(GTK_WINDOW(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" - " IS QUITE LONG 'COS SSH LOG ENTRIES" - " ARE WIDE"), -1); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), - w1, TRUE, TRUE, 0); + gtk_widget_set_size_request(w1, 20 + string_width + ("LINE OF TEXT GIVING WIDTH OF EVENT LOG IS " + "QUITE LONG 'COS SSH LOG ENTRIES ARE WIDE"), + -1); + our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0); gtk_widget_show(w1); es->dp.data = es; @@ -3021,14 +3891,14 @@ void showeventlog(void *estuff, void *parentwin) gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); gtk_widget_show(window); - gtk_signal_connect(GTK_OBJECT(window), "destroy", - GTK_SIGNAL_FUNC(eventlog_destroy), es); - gtk_signal_connect(GTK_OBJECT(window), "key_press_event", - GTK_SIGNAL_FUNC(win_key_press), &es->dp); - gtk_signal_connect(GTK_OBJECT(window), "selection_get", - GTK_SIGNAL_FUNC(eventlog_selection_get), es); - gtk_signal_connect(GTK_OBJECT(window), "selection_clear_event", - GTK_SIGNAL_FUNC(eventlog_selection_clear), es); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(eventlog_destroy), es); + g_signal_connect(G_OBJECT(window), "key_press_event", + G_CALLBACK(win_key_press), &es->dp); + g_signal_connect(G_OBJECT(window), "selection_get", + G_CALLBACK(eventlog_selection_get), es); + g_signal_connect(G_OBJECT(window), "selection_clear_event", + G_CALLBACK(eventlog_selection_clear), es); } void *eventlogstuff_new(void) @@ -3063,7 +3933,7 @@ void logevent_dlg(void *estuff, const char *string) 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[] = @@ -3075,7 +3945,7 @@ int askappend(void *frontend, Filename filename, 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,