X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/aef05b788c268d43559a0183d1efe9c458724b94..d2c8d2746f843f8d9703f51281dd24aec624df2e:/unix/gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 920d7fe0..11c9c21d 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1466,22 +1466,23 @@ void palette_reset(void *frontend)
  */
 void init_cutbuffers()
 {
+    unsigned char empty[] = "";
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, empty, 0);
     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-		    XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, "", 0);
+		    XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);
 }
 
 /* Store the data in a cut-buffer. */
@@ -1601,15 +1602,16 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
     struct gui_data *inst = (struct gui_data *)data;
     if (seldata->target == utf8_string_atom)
 	gtk_selection_data_set(seldata, seldata->target, 8,
-			       inst->pasteout_data_utf8,
+			       (unsigned char *)inst->pasteout_data_utf8,
 			       inst->pasteout_data_utf8_len);
     else if (seldata->target == compound_text_atom)
 	gtk_selection_data_set(seldata, seldata->target, 8,
-			       inst->pasteout_data_ctext,
+			       (unsigned char *)inst->pasteout_data_ctext,
 			       inst->pasteout_data_ctext_len);
     else
 	gtk_selection_data_set(seldata, seldata->target, 8,
-			       inst->pasteout_data, inst->pasteout_data_len);
+			       (unsigned char *)inst->pasteout_data,
+			       inst->pasteout_data_len);
 }
 
 gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
@@ -1998,12 +2000,18 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 	    wcs[i] = text[i];
 	}
 
+	if (inst->fonts[fontid] == NULL && (fontid & 2)) {
+	    /*
+	     * We've been given ATTR_WIDE, but have no wide font.
+	     * Fall back to the non-wide font.
+	     */
+	    fontid &= ~2;
+	}
+
 	if (inst->fonts[fontid] == NULL) {
 	    /*
-	     * The font for this contingency does not exist.
-	     * Typically this means we've been given ATTR_WIDE
-	     * character and have no wide font. So we display
-	     * nothing at all; such is life.
+	     * The font for this contingency does not exist. So we
+	     * display nothing at all; such is life.
 	     */
 	} else if (inst->fontinfo[fontid].is_wide) {
 	    /*
@@ -2482,15 +2490,16 @@ int do_cmdline(int argc, char **argv, int do_everything,
 	    cfg->line_codepage[sizeof(cfg->line_codepage)-1] = '\0';
 
 	} else if (!strcmp(p, "-geometry")) {
-	    int flags, x, y, w, h;
+	    int flags, x, y;
+	    unsigned int w, h;
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
 
 	    flags = XParseGeometry(val, &x, &y, &w, &h);
 	    if (flags & WidthValue)
-		cfg->width = w;
+		cfg->width = (int)w;
 	    if (flags & HeightValue)
-		cfg->height = h;
+		cfg->height = (int)h;
 
             if (flags & (XValue | YValue)) {
                 inst->xpos = x;
@@ -3292,6 +3301,35 @@ 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;
+#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, NULL,
+					  NULL, (gchar **)icon[0]);
+    gdk_window_set_icon(window->window, NULL, iconpm, NULL);
+
+#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;
@@ -3543,6 +3581,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);