pterm's manpage now documents the NoRemoteQTitle resource. Should

[u/mdw/putty] / unix / pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index 751db8e..aba3ecb 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -344,7 +344,7 @@ void get_window_pixels(void *frontend, int *x, int *y)
 char *get_window_title(void *frontend, int icon)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    return icon ? inst->wintitle : inst->icontitle;
+    return icon ? inst->icontitle : inst->wintitle;
 }
 
 gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -2116,6 +2116,17 @@ int do_cmdline(int argc, char **argv, int do_everything,
        char *p = *++argv;
         int ret;
 
+       /*
+        * Shameless cheating. Debian requires all X terminal
+        * emulators to support `-T title'; but
+        * cmdline_process_param will eat -T (it means no-pty) and
+        * complain that pterm doesn't support it. So, in pterm
+        * only, we convert -T into -title.
+        */
+       if ((cmdline_tooltype & TOOLTYPE_NONNETWORK) &&
+           !strcmp(p, "-T"))
+           p = "-title";
+
         ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
                                     do_everything ? 1 : -1, cfg);
 
@@ -2474,7 +2485,8 @@ void copy_all_menuitem(GtkMenuItem *item, gpointer data)
 void special_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    int code = (int)gtk_object_get_data(GTK_OBJECT(item), "user-data");
+    int code = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item),
+                                                  "user-data"));
 
     inst->back->special(inst->backhandle, code);
 }
@@ -2825,7 +2837,7 @@ void update_specials_menu(void *frontend)
            if (*specials[i].name) {
                menuitem = gtk_menu_item_new_with_label(specials[i].name);
                gtk_object_set_data(GTK_OBJECT(menuitem), "user-data",
-                                   (gpointer)specials[i].code);
+                                   GINT_TO_POINTER(specials[i].code));
                gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                                   GTK_SIGNAL_FUNC(special_menuitem), inst);
            } else