X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkdlg.c;h=573111aeede967676f5f2d6c4a86c87c43226046;hb=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d;hp=6e97b448faef185aa316056d5e28a4c184340894;hpb=78592116a5297991135ef2a4c0efd0173a665379;p=PuTTY.git diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c index 6e97b448..573111ae 100644 --- a/unix/gtkdlg.c +++ b/unix/gtkdlg.c @@ -6,26 +6,30 @@ #include #include #include + #include #if !GTK_CHECK_VERSION(3,0,0) #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 -#include "gtkcompat.h" - -#include "gtkcols.h" -#include "gtkfont.h" - #ifdef TESTMODE #define PUTTY_DO_GLOBALS /* actually _define_ globals */ #endif -#include "putty.h" #include "storage.h" #include "dialog.h" #include "tree234.h" @@ -83,6 +87,9 @@ struct dlgparam { #if !GTK_CHECK_VERSION(2,0,0) GtkWidget *currtreeitem, **treeitems; int ntreeitems; +#else + int nselparams; + struct selparam *selparams; #endif int retval; }; @@ -127,8 +134,13 @@ static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event, #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); @@ -1027,10 +1039,12 @@ 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) { @@ -1066,11 +1080,23 @@ static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child) 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_get_content_area(GTK_DIALOG(window))), @@ -1094,6 +1120,9 @@ void dlg_error_msg(void *dlg, const char *msg) set_transient_window_pos(dp->window, window); gtk_widget_show(window); gtk_main(); +#endif + + post_main(); } /* @@ -1132,20 +1161,36 @@ 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); - GtkWidget *okbutton, *cancelbutton; +#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); - gtk_color_selection_set_has_opacity_control(cs, FALSE); -#if GTK_CHECK_VERSION(2,0,0) +#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; @@ -1164,6 +1209,13 @@ void dlg_coloursel_start(union control *ctrl, void *dlg, int r, int g, int b) } #endif + 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, @@ -1177,7 +1229,6 @@ void dlg_coloursel_start(union control *ctrl, void *dlg, int r, int g, int b) (gpointer)coloursel); g_object_set_data(G_OBJECT(cancelbutton), "user-data", (gpointer)coloursel); - g_object_set_data(G_OBJECT(coloursel), "user-data", (gpointer)uc); g_signal_connect(G_OBJECT(okbutton), "clicked", G_CALLBACK(coloursel_ok), (gpointer)dp); g_signal_connect(G_OBJECT(cancelbutton), "clicked", @@ -1188,6 +1239,7 @@ void dlg_coloursel_start(union control *ctrl, void *dlg, int r, int g, int b) g_signal_connect_swapped(G_OBJECT(cancelbutton), "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer)coloursel); +#endif gtk_widget_show(coloursel); } @@ -1623,16 +1675,43 @@ static void fontsel_ok(GtkButton *button, gpointer data) #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 = g_object_get_data(G_OBJECT(button), "user-data"); struct uctrl *uc = g_object_get_data(G_OBJECT(coloursel), "user-data"); - GtkColorSelection *cs = GTK_COLOR_SELECTION - (gtk_color_selection_dialog_get_color_selection - (GTK_COLOR_SELECTION_DIALOG(coloursel))); + #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; @@ -1641,6 +1720,9 @@ static void coloursel_ok(GtkButton *button, gpointer data) } #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]); @@ -1661,6 +1743,8 @@ static void coloursel_cancel(GtkButton *button, gpointer data) 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; @@ -1673,8 +1757,8 @@ static void filefont_clicked(GtkButton *button, gpointer data) (uc->ctrl->fileselect.for_writing ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_OPEN), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + 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); @@ -1790,6 +1874,7 @@ static void filefont_clicked(GtkButton *button, gpointer data) } } +#if !GTK_CHECK_VERSION(3,0,0) static void label_sizealloc(GtkWidget *widget, GtkAllocation *alloc, gpointer data) { @@ -1800,6 +1885,7 @@ static void label_sizealloc(GtkWidget *widget, GtkAllocation *alloc, gtk_label_set_text(GTK_LABEL(uc->text), uc->ctrl->generic.label); g_signal_handler_disconnect(G_OBJECT(uc->text), uc->textsig); } +#endif /* ---------------------------------------------------------------------- * This function does the main layout work: it reads a controlset, @@ -1977,7 +2063,6 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, break; case CTRL_EDITBOX: { - GtkRequisition req; GtkWidget *signalobject; if (ctrl->editbox.has_list) { @@ -2021,18 +2106,27 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, 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_size_request(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; @@ -2055,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_size_request(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); @@ -2071,7 +2164,6 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, case CTRL_FONTSELECT: { GtkWidget *ww; - GtkRequisition req; const char *browsebtn = (ctrl->generic.type == CTRL_FILESELECT ? "Browse..." : "Change..."); @@ -2094,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_size_request(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); @@ -2103,6 +2202,8 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, columns_add(COLUMNS(w), ww, 1, 1); gtk_widget_show(ww); + 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 = @@ -2193,6 +2294,9 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, */ 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) @@ -2299,6 +2403,8 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, 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); @@ -2328,7 +2434,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, g_object_set(G_OBJECT(cellrend), "ellipsize", PANGO_ELLIPSIZE_END, "ellipsize-set", TRUE, - NULL); + (const char *)NULL); } column = gtk_tree_view_column_new_with_attributes ("heading", cellrend, "text", i+1, (char *)NULL); @@ -2360,12 +2466,14 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, if (ctrl->generic.label) { GtkWidget *label, *container; - GtkRequisition req; 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_FOCUS, w); + SHORTCUT_UCTRL, uc); container = columns_new(4); if (ctrl->listbox.percentwidth == 100) { @@ -2380,10 +2488,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_size_request(w, &req); - gtk_widget_set_size_request(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); @@ -2394,8 +2500,9 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs, 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 @@ -2420,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 = 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; } @@ -2750,14 +2866,8 @@ static void shortcut_highlight(GtkWidget *labelw, int chr) 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_size_request(GTK_WIDGET(label), -1, req.height); - sfree(pattern); break; } @@ -2775,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 { @@ -2797,7 +2907,21 @@ int get_listitemheight(GtkWidget *w) #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)); @@ -2805,74 +2929,31 @@ int get_listitemheight(GtkWidget *w) #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. + * 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_box_pack_start(GTK_BOX(dlg->action_area), w, TRUE, TRUE, 0); - -#else - /* - * In GTK 2, the action area is now a GtkHButtonBox and its - * layout behaviour seems to be different: it doesn't stretch - * to cover the full width of the window, but instead finds its - * own preferred width and right-aligns that within the window. - * This isn't what we want, because we have both left-aligned - * and right-aligned buttons coming out of the above call to - * layout_ctrls(), and right-aligning the whole thing will - * result in the former being centred and looking weird. - * - * So instead we abandon the dialog's action area completely: - * we gtk_widget_hide() it in the below code, and we also call - * gtk_dialog_set_has_separator() to remove the separator above - * it. We then insert our own action area into the end of the - * dialog's main vbox, and add our own separator above that. - * - * (Ideally, if we were a native GTK app, we would use the - * GtkHButtonBox's _own_ innate ability to support one set of - * buttons being right-aligned and one left-aligned. But to do - * that here, we would have to either (a) pick apart our cross- - * platform layout structures and treat them specially for this - * particular set of controls, which would be painful, or else - * (b) develop a special and simpler cross-platform - * representation for these particular controls, and introduce - * special-case code into all the _other_ platforms to handle - * it. Neither appeals. Therefore, I regretfully discard the - * GTKHButtonBox and go it alone.) - */ - - GtkWidget *align; - align = gtk_alignment_new(0, 0, 1, 1); - gtk_container_add(GTK_CONTAINER(align), w); - /* - * The purpose of this GtkAlignment is to provide padding - * around the buttons. The padding we use is twice the padding - * used in our GtkColumns, because we nest two GtkColumns most - * of the time (one separating the tree view from the main - * controls, and another for the main controls themselves). - */ -#if GTK_CHECK_VERSION(2,4,0) - gtk_alignment_set_padding(GTK_ALIGNMENT(align), 8, 8, 8, 8); -#endif - gtk_widget_show(align); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(dlg)), - align, FALSE, TRUE, 0); - w = gtk_hseparator_new(); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(dlg)), - w, FALSE, TRUE, 0); - gtk_widget_show(w); - gtk_widget_hide(gtk_dialog_get_action_area(dlg)); - g_object_set(G_OBJECT(dlg), "has-separator", TRUE, (const char *)NULL); + 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, Conf *conf, int midsession, int protcfginfo) @@ -2904,7 +2985,7 @@ int do_config_box(const char *title, Conf *conf, int midsession, scs.sc[index].action = SHORTCUT_EMPTY; } - window = gtk_dialog_new(); + window = our_dialog_new(); ctrlbox = ctrl_new_box(); protocol = conf_get_int(conf, CONF_protocol); @@ -2914,9 +2995,7 @@ int do_config_box(const char *title, Conf *conf, int midsession, gtk_window_set_title(GTK_WINDOW(window), title); hbox = gtk_hbox_new(FALSE, 4); - gtk_box_pack_start - (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))), - 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); @@ -2970,7 +3049,7 @@ int do_config_box(const char *title, Conf *conf, int midsession, if (!*s->pathname) { 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 */ @@ -3104,33 +3183,43 @@ int do_config_box(const char *title, Conf *conf, int midsession, } #if GTK_CHECK_VERSION(2,0,0) - { - GtkRequisition req; - int i; + /* + * We want our tree view to come up with all branches at depth 2 + * or more collapsed. However, if we start off with those branches + * collapsed, then the tree view's size request will be calculated + * based on the width of the collapsed tree, 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. + */ - /* - * We want our tree view to come up with all branches at - * depth 2 or more collapsed. However, if we start off - * with those branches collapsed, then the tree view's - * size request will be calculated based on the width of - * the collapsed tree. So instead we start with them all - * expanded; then we ask for the current size request, - * collapse the relevant rows, and force the width to the - * value we just computed. This arranges that the tree - * view is wide enough to have all branches expanded - * safely. - */ + 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); - - for (i = 0; i < nselparams; i++) - if (selparams[i].depth >= 2) - gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree), - selparams[i].treepath); - + initial_treeview_collapse(&dp, tree); gtk_widget_set_size_request(tree, req.width, -1); } -#endif +#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", @@ -3138,7 +3227,6 @@ int do_config_box(const char *title, Conf *conf, int midsession, #else dp.ntreeitems = nselparams; dp.treeitems = snewn(dp.ntreeitems, GtkWidget *); - for (index = 0; index < nselparams; index++) { g_signal_connect(G_OBJECT(selparams[index].treeitem), "select", G_CALLBACK(treeitem_sel), @@ -3209,6 +3297,7 @@ int do_config_box(const char *title, Conf *conf, int midsession, G_CALLBACK(win_key_press), &dp); gtk_main(); + post_main(); dlg_cleanup(&dp); sfree(selparams); @@ -3231,7 +3320,7 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg, union control *c; struct dlgparam dp; struct Shortcuts scs; - int index, ncols; + int index, ncols, min_type; va_list ap; dlg_init(&dp); @@ -3242,13 +3331,23 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg, 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); @@ -3273,7 +3372,17 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg, 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); @@ -3281,17 +3390,15 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg, 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, GTK_WINDOW(window)); - set_dialog_action_area(GTK_DIALOG(window), w0); + our_dialog_set_action_area(GTK_WINDOW(window), w0); gtk_widget_show(w0); w1 = layout_ctrls(&dp, &scs, s1, GTK_WINDOW(window)); gtk_container_set_border_width(GTK_CONTAINER(w1), 10); gtk_widget_set_size_request(w1, minwid+20, -1); - gtk_box_pack_start - (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))), - w1, TRUE, TRUE, 0); + our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0); gtk_widget_show(w1); dp.shortcuts = &scs; @@ -3314,6 +3421,7 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg, G_CALLBACK(win_key_press), &dp); gtk_main(); + post_main(); dlg_cleanup(&dp); ctrl_free_box(ctrlbox); @@ -3321,15 +3429,6 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg, return dp.retval; } -int string_width(const char *text) -{ - GtkWidget *label = gtk_label_new(text); - GtkRequisition req; - gtk_widget_size_request(label, &req); - g_object_ref_sink(G_OBJECT(label)); - return req.width; -} - int reallyclose(void *frontend) { char *title = dupcat(appname, " Exit Confirmation", NULL); @@ -3421,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); @@ -3486,6 +3586,15 @@ 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; @@ -3532,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) { @@ -3539,7 +3649,7 @@ 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); @@ -3548,38 +3658,34 @@ void about_box(void *window) w = gtk_button_new_with_label("Close"); gtk_widget_set_can_default(w, TRUE); gtk_window_set_default(GTK_WINDOW(aboutbox), w); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(aboutbox))), - w, FALSE, FALSE, 0); + 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_can_default(w, TRUE); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(aboutbox))), - w, FALSE, FALSE, 0); + 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_get_content_area(GTK_DIALOG(aboutbox))), - 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_get_content_area(GTK_DIALOG(aboutbox))), - 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-2015 Simon Tatham. All rights reserved"); - gtk_box_pack_start - (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(aboutbox))), - w, FALSE, FALSE, 5); + 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)); @@ -3753,12 +3859,12 @@ void showeventlog(void *estuff, void *parentwin) c->listbox.percentages[1] = 10; c->listbox.percentages[2] = 65; - 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, GTK_WINDOW(window)); - set_dialog_action_area(GTK_DIALOG(window), w0); + our_dialog_set_action_area(GTK_WINDOW(window), w0); gtk_widget_show(w0); w1 = layout_ctrls(&es->dp, &es->scs, s1, GTK_WINDOW(window)); gtk_container_set_border_width(GTK_CONTAINER(w1), 10); @@ -3766,9 +3872,7 @@ void showeventlog(void *estuff, void *parentwin) ("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_get_content_area(GTK_DIALOG(window))), - w1, TRUE, TRUE, 0); + our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0); gtk_widget_show(w1); es->dp.data = es;