nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 04:22:47 -05:00
Code Issues Projects Releases Wiki Activity

Make the configuration dialog non-modal.

Browse Source 
Now every call to do_config_box is replaced with a call to
create_config_box, which returns immediately having constructed the
new GTK window object, and is passed a callback function which it will
arrange to be called when the dialog terminates (whether by OK or by
Cancel). That callback is now what triggers the construction of a
session window after 'Open' is pressed in the initial config box, or
the actual mid-session reconfiguration action after 'Apply' is pressed
in a Change Settings box.

We were already prepared to ignore the re-selection of 'Change
Settings' from the context menu of a window that already had a Change
Settings box open (and not accidentally create a second config box for
the same window); but now we do slightly better, by finding the
existing config box and un-minimising and raising it, in case the user
had forgotten it was there.

That's a useful featurelet, but not the main purpose of this change.
The mani point, of course, is that now the multi-window GtkApplication
based front ends now don't do anything confusing to the nesting of
gtk_main() when config boxes are involved. Whether you're changing the
settings of one (or more than one) of your already-running sessions,
preparing to start up a new PuTTY connection, or both at once, we stay
in the same top-level instance of gtk_main() and all sessions' top-
level callbacks continue to run sensibly.
This commit is contained in:
Simon Tatham
2017-11-26 11:58:02 +00:00
parent 94a2904ab6
commit 817e4ad2dd
7 changed files with 217 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
unix/gtkwin.c
View File

@ -130,7 +130,7 @@ struct gui_data {
Conf *conf;
void *eventlogstuff;
guint32 input_event_time; /* Timestamp of the most recent input event. */
int reconfiguring;
GtkWidget *reconfigure_dialog;
#if GTK_CHECK_VERSION(3,4,0)
gdouble cumulative_scroll;
#endif
@ -2007,7 +2007,6 @@ static void exit_callback(void *vinst)
if (close_on_exit == FORCE_ON ||
(close_on_exit == AUTO && exitcode == 0)) {
gtk_widget_destroy(inst->window);
gtk_main_quit();
}
}
}
@ -2022,6 +2021,10 @@ void notify_remote_exit(void *frontend)
static void delete_inst(struct gui_data *inst)
{
delete_callbacks_for_context(inst);
if (inst->reconfigure_dialog) {
gtk_widget_destroy(inst->reconfigure_dialog);
inst->reconfigure_dialog = NULL;
}
if (inst->window) {
gtk_widget_destroy(inst->window);
inst->window = NULL;
@ -2059,7 +2062,7 @@ void destroy(GtkWidget *widget, gpointer data)
struct gui_data *inst = (struct gui_data *)data;
inst->window = NULL;
delete_inst(inst);
gtk_main_quit();
session_window_closed();
}
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
@ -3958,7 +3961,46 @@ void event_log_menuitem(GtkMenuItem *item, gpointer data)
showeventlog(inst->eventlogstuff, inst->window);
}
struct after_change_settings_dialog_ctx {
struct gui_data *inst;
Conf *newconf;
};
static void after_change_settings_dialog(void *vctx, int retval);
void change_settings_menuitem(GtkMenuItem *item, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
struct after_change_settings_dialog_ctx *ctx;
char *title;
if (inst->reconfigure_dialog) {
/*
* If this window already had a Change Settings box open, just
* find it and try to make it more prominent.
*/
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_deiconify(GTK_WINDOW(inst->reconfigure_dialog));
#endif
gdk_window_raise(gtk_widget_get_window(inst->reconfigure_dialog));
return;
}
title = dupcat(appname, " Reconfiguration", NULL);
ctx = snew(struct after_change_settings_dialog_ctx);
ctx->inst = inst;
ctx->newconf = conf_copy(inst->conf);
inst->reconfigure_dialog = create_config_box(
title, ctx->newconf, 1,
inst->back ? inst->back->cfg_info(inst->backhandle) : 0,
after_change_settings_dialog, ctx);
sfree(title);
}
static void after_change_settings_dialog(void *vctx, int retval)
{
/* This maps colour indices in inst->conf to those used in inst->cols. */
static const int ww[] = {
@ -3966,25 +4008,19 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
0, 8, 1, 9, 2, 10, 3, 11,
4, 12, 5, 13, 6, 14, 7, 15
};
struct gui_data *inst = (struct gui_data *)data;
char *title;
Conf *oldconf, *newconf;
struct after_change_settings_dialog_ctx ctx =
*(struct after_change_settings_dialog_ctx *)vctx;
struct gui_data *inst = ctx.inst;
Conf *oldconf = inst->conf, *newconf = ctx.newconf;
int i, j, need_size;
sfree(vctx); /* we've copied this already */
assert(lenof(ww) == NCFGCOLOURS);
if (inst->reconfiguring)
return;
else
inst->reconfiguring = TRUE;
inst->reconfigure_dialog = NULL;
title = dupcat(appname, " Reconfiguration", NULL);
oldconf = inst->conf;
newconf = conf_copy(inst->conf);
if (do_config_box(title, newconf, 1,
inst->back?inst->back->cfg_info(inst->backhandle):0)) {
if (retval) {
inst->conf = newconf;
/* Pass new config data to the logging module */
@ -4139,8 +4175,6 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
} else {
conf_free(newconf);
}
sfree(title);
inst->reconfiguring = FALSE;
}
static void change_font_size(struct gui_data *inst, int increment)
@ -4451,7 +4485,7 @@ static void get_monitor_geometry(GtkWidget *widget, GdkRectangle *geometry)
}
#endif
struct gui_data *new_session_window(Conf *conf, const char *geometry_string)
void new_session_window(Conf *conf, const char *geometry_string)
{
struct gui_data *inst;
@ -4781,6 +4815,4 @@ struct gui_data *new_session_window(Conf *conf, const char *geometry_string)
ldisc_echoedit_update(inst->ldisc); /* cause ldisc to notice changes */
inst->exited = FALSE;
return inst;
}