nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Revamp GTK's session close handling using toplevel callbacks.

Browse Source 
Instead of having a special GTK idle function for dealing with session
closing, I now use the new top-level callback mechanism which is
slightly simpler for calling a one-off function.

Also in this commit, I've arranged for connection_fatal to queue a
call to the same session close function after displaying the message
box, with the effect that now all the same processing takes place no
matter whether the session closes cleanly or uncleanly - e.g. the SSH
specials submenu is cleaned out, as it should be.

[originally from svn r10022]
This commit is contained in:
Simon Tatham 2013-08-17 16:06:22 +00:00
parent 43c9748ac9
commit a44366585f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unix/gtkwin.c
View File

@ -93,7 +93,6 @@ struct gui_data {
int ignore_sbar; int ignore_sbar;
int mouseptr_visible; int mouseptr_visible;
int busy_status; int busy_status;
guint term_exit_idle_id;
guint toplevel_callback_idle_id; guint toplevel_callback_idle_id;
int alt_keycode; int alt_keycode;
int alt_digits; int alt_digits;
@ -136,6 +135,7 @@ static int send_raw_mouse;
static char *app_name = "pterm"; static char *app_name = "pterm";
static void start_backend(struct gui_data *inst); static void start_backend(struct gui_data *inst);
static void exit_callback(void *vinst);
char *x_get_default(const char *key) char *x_get_default(const char *key)
{ {
@ -151,11 +151,10 @@ void connection_fatal(void *frontend, char *p, ...)
va_start(ap, p); va_start(ap, p);
msg = dupvprintf(p, ap); msg = dupvprintf(p, ap);
va_end(ap); va_end(ap);
inst->exited = TRUE;
fatal_message_box(inst->window, msg); fatal_message_box(inst->window, msg);
sfree(msg); sfree(msg);
if (conf_get_int(inst->conf, CONF_close_on_exit) == FORCE_ON)
cleanup_exit(1); queue_toplevel_callback(exit_callback, inst);
} }
/* /*
@ -1364,9 +1363,9 @@ void frontend_keypress(void *handle)
cleanup_exit(0); cleanup_exit(0);
} }
static gint idle_exit_func(gpointer data) static void exit_callback(void *vinst)
{ {
struct gui_data *inst = (struct gui_data *)data; struct gui_data *inst = (struct gui_data *)vinst;
int exitcode, close_on_exit; int exitcode, close_on_exit;
if (!inst->exited && if (!inst->exited &&
@ -1387,16 +1386,13 @@ static gint idle_exit_func(gpointer data)
update_specials_menu(inst); update_specials_menu(inst);
gtk_widget_set_sensitive(inst->restartitem, TRUE); gtk_widget_set_sensitive(inst->restartitem, TRUE);
} }
gtk_idle_remove(inst->term_exit_idle_id);
return TRUE;
} }
void notify_remote_exit(void *frontend) void notify_remote_exit(void *frontend)
{ {
struct gui_data *inst = (struct gui_data *)frontend; struct gui_data *inst = (struct gui_data *)frontend;
inst->term_exit_idle_id = gtk_idle_add(idle_exit_func, inst); queue_toplevel_callback(exit_callback, inst);
} }
static gint idle_toplevel_callback_func(gpointer data) static gint idle_toplevel_callback_func(gpointer data)