X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/8a9977e54db756281cf0d9f4a8322ce24b001a61..c683b25ae5c61a90fb78da577fd8d1b92cbe8fd6:/unix/gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index c4c255aa..311cf38a 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -663,13 +663,12 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	    end = 2;
 	}
 
-	/* Control-Break is the same as Control-C */
+	/* Control-Break sends a Break special to the backend */
 	if (event->keyval == GDK_Break &&
 	    (event->state & GDK_CONTROL_MASK)) {
-	    output[1] = '\003';
-	    use_ucsoutput = FALSE;
-	    end = 2;
-	    special = TRUE;
+	    if (inst->back)
+		inst->back->special(inst->backhandle, TS_BRK);
+	    return TRUE;
 	}
 
 	/* We handle Return ourselves, because it needs to be flagged as
@@ -1205,6 +1204,7 @@ void notify_remote_exit(void *frontend)
 	    inst->back->free(inst->backhandle);
 	    inst->backhandle = NULL;
 	    inst->back = NULL;
+            term_provide_resize_fn(inst->term, NULL, NULL);
 	    update_specials_menu(inst);
 	}
 	gtk_widget_show(inst->restartitem);
@@ -1867,7 +1867,7 @@ void sys_cursor(void *frontend, int x, int y)
  */
 void do_beep(void *frontend, int mode)
 {
-    if (mode != BELL_VISUAL)
+    if (mode == BELL_DEFAULT)
 	gdk_beep();
 }
 
@@ -3301,6 +3301,36 @@ static void update_savedsess_menu(GtkMenuItem *menuitem, gpointer data)
     get_sesslist(&sesslist, FALSE); /* free up */
 }
 
+void set_window_icon(GtkWidget *window, const char *const *const *icon,
+		     int n_icon)
+{
+    GdkPixmap *iconpm;
+    GdkBitmap *iconmask;
+#if GTK_CHECK_VERSION(2,0,0)
+    GList *iconlist;
+    int n;
+#endif
+
+    if (!n_icon)
+	return;
+
+    gtk_widget_realize(window);
+    iconpm = gdk_pixmap_create_from_xpm_d(window->window, &iconmask,
+					  NULL, (gchar **)icon[0]);
+    gdk_window_set_icon(window->window, NULL, iconpm, iconmask);
+
+#if GTK_CHECK_VERSION(2,0,0)
+    iconlist = NULL;
+    for (n = 0; n < n_icon; n++) {
+	iconlist =
+	    g_list_append(iconlist,
+			  gdk_pixbuf_new_from_xpm_data((const gchar **)
+						       icon[n]));
+    }
+    gdk_window_set_icon_list(window->window, iconlist);
+#endif
+}
+
 void update_specials_menu(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
@@ -3455,7 +3485,8 @@ int pt_main(int argc, char **argv)
 
 	cmdline_run_saved(&inst->cfg);
 
-	if (!cfg_launchable(&inst->cfg) && !cfgbox(&inst->cfg))
+	if ((!loaded_session || !cfg_launchable(&inst->cfg)) &&
+	    !cfgbox(&inst->cfg))
 	    exit(0);		       /* config box hit Cancel */
     }
 
@@ -3552,6 +3583,12 @@ int pt_main(int argc, char **argv)
 			  GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
 			  GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
 
+    {
+	extern const char *const *const main_icon[];
+	extern const int n_main_icon;
+	set_window_icon(inst->window, main_icon, n_main_icon);
+    }
+
     gtk_widget_show(inst->window);
 
     set_window_background(inst);