X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5ecd7ad009cc5148c67b9d665f79a64083fae254..1d009ae71b849a95c86c3117d1b8f063fda8aae5:/unix/pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index db8f3a85..3eafe14a 100644
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -61,12 +61,13 @@ struct gui_data {
     int alt_digits;
     char wintitle[sizeof(((Config *)0)->wintitle)];
     char icontitle[sizeof(((Config *)0)->wintitle)];
-    int master_fd, master_func_id, exited;
+    int master_fd, master_func_id;
     void *ldisc;
     Backend *back;
     void *backhandle;
     Terminal *term;
     void *logctx;
+    int exited;
     struct unicode_data ucsdata;
     Config cfg;
 };
@@ -88,17 +89,35 @@ char *x_get_default(const char *key)
 /*
  * Default settings that are specific to pterm.
  */
-char *platform_default_s(const char *name)
+FontSpec platform_default_fontspec(const char *name)
 {
+    FontSpec ret;
     if (!strcmp(name, "Font"))
-	return "fixed";
+	strcpy(ret.name, "fixed");
+    else
+	*ret.name = '\0';
+    return ret;
+}
+
+Filename platform_default_filename(const char *name)
+{
+    Filename ret;
+    if (!strcmp(name, "LogFileName"))
+	strcpy(ret.path, "putty.log");
+    else
+	*ret.path = '\0';
+    return ret;
+}
+
+char *platform_default_s(const char *name)
+{
     return NULL;
 }
 
 int platform_default_i(const char *name, int def)
 {
     if (!strcmp(name, "CloseOnExit"))
-	return FORCE_ON;	       /* AUTO works badly in an xterm */
+	return 2;  /* maps to FORCE_ON after painful rearrangement :-( */
     return def;
 }
 
@@ -112,7 +131,7 @@ void ldisc_update(void *frontend, int echo, int edit)
      */
 }
 
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
 {
     /*
      * Logging in an xterm-alike is liable to be something you only
@@ -971,54 +990,6 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
     return TRUE;
 }
 
-void done_with_pty(struct gui_data *inst)
-{
-    extern void pty_close(void);
-
-    if (inst->master_fd >= 0) {
-	pty_close();
-	inst->master_fd = -1;
-	gtk_input_remove(inst->master_func_id);
-    }
-
-    if (!inst->exited && inst->back->exitcode(inst->backhandle) >= 0) {
-	int exitcode = inst->back->exitcode(inst->backhandle);
-	int clean;
-
-	clean = WIFEXITED(exitcode) && (WEXITSTATUS(exitcode) == 0);
-
-	/*
-	 * Terminate now, if the Close On Exit setting is
-	 * appropriate.
-	 */
-	if (inst->cfg.close_on_exit == FORCE_ON ||
-	    (inst->cfg.close_on_exit == AUTO && clean))
-	    exit(0);
-
-	/*
-	 * Otherwise, output an indication that the session has
-	 * closed.
-	 */
-	{
-	    char message[512];
-	    if (WIFEXITED(exitcode))
-		sprintf(message, "\r\n[pterm: process terminated with exit"
-			" code %d]\r\n", WEXITSTATUS(exitcode));
-	    else if (WIFSIGNALED(exitcode))
-#ifdef HAVE_NO_STRSIGNAL
-		sprintf(message, "\r\n[pterm: process terminated on signal"
-			" %d]\r\n", WTERMSIG(exitcode));
-#else
-		sprintf(message, "\r\n[pterm: process terminated on signal"
-			" %d (%.400s)]\r\n", WTERMSIG(exitcode),
-			strsignal(WTERMSIG(exitcode)));
-#endif
-	    from_backend((void *)inst->term, 0, message, strlen(message));
-	}
-	inst->exited = 1;
-    }
-}
-
 void frontend_keypress(void *handle)
 {
     struct gui_data *inst = (struct gui_data *)handle;
@@ -1034,18 +1005,13 @@ void frontend_keypress(void *handle)
 gint timer_func(gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
+    int exitcode;
 
-    if (inst->back->exitcode(inst->backhandle) >= 0) {
-	/*
-	 * The primary child process died. We could keep the
-	 * terminal open for remaining subprocesses to output to,
-	 * but conventional wisdom seems to feel that that's the
-	 * Wrong Thing for an xterm-alike, so we bail out now
-	 * (though we don't necessarily _close_ the window,
-	 * depending on the state of Close On Exit). This would be
-	 * easy enough to change or make configurable if necessary.
-	 */
-	done_with_pty(inst);
+    if ((exitcode = inst->back->exitcode(inst->backhandle)) >= 0) {
+	inst->exited = TRUE;
+	if (inst->cfg.close_on_exit == FORCE_ON ||
+	    (inst->cfg.close_on_exit == AUTO && exitcode == 0))
+	    exit(0);		       /* just go. */
     }
 
     term_update(inst->term);
@@ -1053,28 +1019,12 @@ gint timer_func(gpointer data)
     return TRUE;
 }
 
-void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
+void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
 {
-    struct gui_data *inst = (struct gui_data *)data;
-    char buf[4096];
-    int ret;
-
-    ret = read(sourcefd, buf, sizeof(buf));
-
-    /*
-     * Clean termination condition is that either ret == 0, or ret
-     * < 0 and errno == EIO. Not sure why the latter, but it seems
-     * to happen. Boo.
-     */
-    if (ret == 0 || (ret < 0 && errno == EIO)) {
-	done_with_pty(inst);
-    } else if (ret < 0) {
-	perror("read pty master");
-	exit(1);
-    } else if (ret > 0)
-	from_backend(inst->term, 0, buf, ret);
-    term_blink(inst->term, 1);
-    term_out(inst->term);
+    select_result(sourcefd,
+		  (condition == GDK_INPUT_READ ? 1 :
+		   condition == GDK_INPUT_WRITE ? 2 :
+		   condition == GDK_INPUT_EXCEPTION ? 4 : -1));
 }
 
 void destroy(GtkWidget *widget, gpointer data)
@@ -1265,7 +1215,7 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 	wchar_t *tmp = data;
 	int tmplen = len;
 
-	inst->pasteout_data_utf8 = smalloc(len*6);
+	inst->pasteout_data_utf8 = snewn(len*6, char);
 	inst->pasteout_data_utf8_len = len*6;
 	inst->pasteout_data_utf8_len =
 	    charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
@@ -1276,15 +1226,15 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 	    inst->pasteout_data_utf8 = NULL;
 	} else {
 	    inst->pasteout_data_utf8 =
-		srealloc(inst->pasteout_data_utf8,
-			 inst->pasteout_data_utf8_len);
+		sresize(inst->pasteout_data_utf8,
+			inst->pasteout_data_utf8_len, char);
 	}
     } else {
 	inst->pasteout_data_utf8 = NULL;
 	inst->pasteout_data_utf8_len = 0;
     }
 
-    inst->pasteout_data = smalloc(len*6);
+    inst->pasteout_data = snewn(len*6, char);
     inst->pasteout_data_len = len*6;
     inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
 				       data, len, inst->pasteout_data,
@@ -1295,7 +1245,7 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 	inst->pasteout_data = NULL;
     } else {
 	inst->pasteout_data =
-	    srealloc(inst->pasteout_data, inst->pasteout_data_len);
+	    sresize(inst->pasteout_data, inst->pasteout_data_len, char);
     }
 
     if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
@@ -1396,7 +1346,7 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
     if (inst->pastein_data)
 	sfree(inst->pastein_data);
 
-    inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t));
+    inst->pastein_data = snewn(seldata->length, wchar_t);
     inst->pastein_data_len = seldata->length;
     inst->pastein_data_len =
 	mb_to_wc((seldata->type == inst->utf8_string_atom ?
@@ -1512,7 +1462,7 @@ Context get_ctx(void *frontend)
     if (!inst->area->window)
 	return NULL;
 
-    dctx = smalloc(sizeof(*dctx));
+    dctx = snew(struct draw_ctx);
     dctx->inst = inst;
     dctx->gc = gdk_gc_new(inst->area->window);
     return dctx;
@@ -1542,17 +1492,19 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 
     int nfg, nbg, t, fontid, shadow, rlen, widefactor;
 
-    nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
-    nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+    nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
+    nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
     if (attr & ATTR_REVERSE) {
 	t = nfg;
 	nfg = nbg;
 	nbg = t;
     }
     if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
-	nfg++;
+	nfg |= 1;
     if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
-	nbg++;
+	nbg |= 1;
     if (attr & TATTR_ACTCURS) {
 	nfg = NCOLOURS-2;
 	nbg = NCOLOURS-1;
@@ -1607,7 +1559,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 	wchar_t *wcs;
 	int i;
 
-	wcs = smalloc(sizeof(wchar_t) * (len+1));
+	wcs = snewn(len+1, wchar_t);
 	for (i = 0; i < len; i++) {
 	    wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
 	}
@@ -1634,7 +1586,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 	     * and (c) the clip rectangle should prevent it causing
 	     * trouble anyway.
 	     */
-	    gwcs = smalloc(sizeof(GdkWChar) * (len*2+1));
+	    gwcs = snewn(len*2+1, GdkWChar);
 	    memset(gwcs, 0, sizeof(GdkWChar) * (len*2+1));
 	    /*
 	     * FIXME: when we have a wide-char equivalent of
@@ -1648,7 +1600,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 			     gwcs, len*2);
 	    sfree(gwcs);
 	} else {
-	    gcs = smalloc(sizeof(GdkWChar) * (len+1));
+	    gcs = snewn(len+1, gchar);
 	    wc_to_mb(inst->fontinfo[fontid].charset, 0,
 		     wcs, len, gcs, len, ".", NULL, NULL);
 	    gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
@@ -1958,6 +1910,13 @@ char *get_x_display(void *frontend)
     return gdk_get_display();
 }
 
+long get_windowid(void *frontend)
+{
+    Terminal *term = (Terminal *)frontend;
+    struct gui_data *inst = (struct gui_data *)(term->frontend);
+    return (long)GDK_WINDOW_XWINDOW(inst->area->window);
+}
+
 static void help(FILE *fp) {
     if(fprintf(fp,
 "pterm option summary:\n"
@@ -1989,6 +1948,7 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 {
     int err = 0;
     extern char **pty_argv;	       /* declared in pty.c */
+    extern int use_pty_argv;
 
     /*
      * Macros to make argument handling easier. Note that because
@@ -2020,26 +1980,26 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 	if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg->font, val, sizeof(cfg->font));
-	    cfg->font[sizeof(cfg->font)-1] = '\0';
+	    strncpy(cfg->font.name, val, sizeof(cfg->font.name));
+	    cfg->font.name[sizeof(cfg->font.name)-1] = '\0';
 
 	} else if (!strcmp(p, "-fb")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg->boldfont, val, sizeof(cfg->boldfont));
-	    cfg->boldfont[sizeof(cfg->boldfont)-1] = '\0';
+	    strncpy(cfg->boldfont.name, val, sizeof(cfg->boldfont.name));
+	    cfg->boldfont.name[sizeof(cfg->boldfont.name)-1] = '\0';
 
 	} else if (!strcmp(p, "-fw")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg->widefont, val, sizeof(cfg->widefont));
-	    cfg->widefont[sizeof(cfg->widefont)-1] = '\0';
+	    strncpy(cfg->widefont.name, val, sizeof(cfg->widefont.name));
+	    cfg->widefont.name[sizeof(cfg->widefont.name)-1] = '\0';
 
 	} else if (!strcmp(p, "-fwb")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg->wideboldfont, val, sizeof(cfg->wideboldfont));
-	    cfg->wideboldfont[sizeof(cfg->wideboldfont)-1] = '\0';
+	    strncpy(cfg->wideboldfont.name, val, sizeof(cfg->wideboldfont.name));
+	    cfg->wideboldfont.name[sizeof(cfg->wideboldfont.name)-1] = '\0';
 
 	} else if (!strcmp(p, "-cs")) {
 	    EXPECTS_ARG;
@@ -2095,14 +2055,14 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 		cfg->colours[index][2] = col.blue / 256;
 	    }
 
-	} else if (!strcmp(p, "-e")) {
+	} else if (use_pty_argv && !strcmp(p, "-e")) {
 	    /* This option swallows all further arguments. */
 	    if (!do_everything)
 		break;
 
 	    if (--argc > 0) {
 		int i;
-		pty_argv = smalloc((argc+1) * sizeof(char *));
+		pty_argv = snewn(argc+1, char *);
 		++argv;
 		for (i = 0; i < argc; i++)
 		    pty_argv[i] = argv[i];
@@ -2120,8 +2080,8 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 	} else if (!strcmp(p, "-log")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(cfg->logfilename, val, sizeof(cfg->logfilename));
-	    cfg->logfilename[sizeof(cfg->logfilename)-1] = '\0';
+	    strncpy(cfg->logfilename.path, val, sizeof(cfg->logfilename.path));
+	    cfg->logfilename.path[sizeof(cfg->logfilename.path)-1] = '\0';
 	    cfg->logtype = LGTYP_DEBUG;
 
 	} else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
@@ -2248,10 +2208,22 @@ static int set_font_info(struct gui_data *inst, int fontid)
     return retval;
 }
 
-int main(int argc, char **argv)
+int uxsel_input_add(int fd, int rwx) {
+    int flags = 0;
+    if (rwx & 1) flags |= GDK_INPUT_READ;
+    if (rwx & 2) flags |= GDK_INPUT_WRITE;
+    if (rwx & 4) flags |= GDK_INPUT_EXCEPTION;
+    return gdk_input_add(fd, flags, fd_input_func, NULL);
+}
+
+void uxsel_input_remove(int id) {
+    gdk_input_remove(id);
+}
+
+int pt_main(int argc, char **argv)
 {
-    extern int pty_master_fd;	       /* declared in pty.c */
-    extern void pty_pre_init(void);    /* declared in pty.c */
+    extern Backend *select_backend(Config *cfg);
+    extern int cfgbox(Config *cfg);
     struct gui_data *inst;
     int font_charset;
 
@@ -2259,14 +2231,12 @@ int main(int argc, char **argv)
      * it */
     block_signal(SIGCHLD, 1);
 
-    pty_pre_init();
-
     gtk_init(&argc, &argv);
 
     /*
      * Create an instance structure and initialise to zeroes
      */
-    inst = smalloc(sizeof(*inst));
+    inst = snew(struct gui_data);
     memset(inst, 0, sizeof(*inst));
     inst->alt_keycode = -1;            /* this one needs _not_ to be zero */
 
@@ -2276,37 +2246,41 @@ int main(int argc, char **argv)
     if (do_cmdline(argc, argv, 1, &inst->cfg))
 	exit(1);		       /* post-defaults, do everything */
 
-    inst->fonts[0] = gdk_font_load(inst->cfg.font);
+    if (!cfgbox(&inst->cfg))
+	exit(0);		       /* config box hit Cancel */
+
+    inst->fonts[0] = gdk_font_load(inst->cfg.font.name);
     if (!inst->fonts[0]) {
-	fprintf(stderr, "pterm: unable to load font \"%s\"\n", inst->cfg.font);
+	fprintf(stderr, "pterm: unable to load font \"%s\"\n",
+		inst->cfg.font.name);
 	exit(1);
     }
     font_charset = set_font_info(inst, 0);
-    if (inst->cfg.boldfont[0]) {
-	inst->fonts[1] = gdk_font_load(inst->cfg.boldfont);
+    if (inst->cfg.boldfont.name[0]) {
+	inst->fonts[1] = gdk_font_load(inst->cfg.boldfont.name);
 	if (!inst->fonts[1]) {
 	    fprintf(stderr, "pterm: unable to load bold font \"%s\"\n",
-		    inst->cfg.boldfont);
+		    inst->cfg.boldfont.name);
 	    exit(1);
 	}
 	set_font_info(inst, 1);
     } else
 	inst->fonts[1] = NULL;
-    if (inst->cfg.widefont[0]) {
-	inst->fonts[2] = gdk_font_load(inst->cfg.widefont);
+    if (inst->cfg.widefont.name[0]) {
+	inst->fonts[2] = gdk_font_load(inst->cfg.widefont.name);
 	if (!inst->fonts[2]) {
 	    fprintf(stderr, "pterm: unable to load wide font \"%s\"\n",
-		    inst->cfg.boldfont);
+		    inst->cfg.widefont.name);
 	    exit(1);
 	}
 	set_font_info(inst, 2);
     } else
 	inst->fonts[2] = NULL;
-    if (inst->cfg.wideboldfont[0]) {
-	inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont);
+    if (inst->cfg.wideboldfont.name[0]) {
+	inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont.name);
 	if (!inst->fonts[3]) {
 	    fprintf(stderr, "pterm: unable to load wide/bold font \"%s\"\n",
-		    inst->cfg.boldfont);
+		    inst->cfg.wideboldfont.name);
 	    exit(1);
 	}
 	set_font_info(inst, 3);
@@ -2424,9 +2398,15 @@ int main(int argc, char **argv)
     inst->logctx = log_init(inst, &inst->cfg);
     term_provide_logctx(inst->term, inst->logctx);
 
-    inst->back = &pty_backend;
-    inst->back->init((void *)inst->term, &inst->backhandle, &inst->cfg,
-		     NULL, 0, NULL, 0);
+    uxsel_init();
+
+    inst->back = select_backend(&inst->cfg);
+    {
+	char *realhost;		       /* FIXME: don't ignore this! */
+	inst->back->init((void *)inst->term, &inst->backhandle, &inst->cfg,
+			 inst->cfg.host, inst->cfg.port, &realhost,
+			 inst->cfg.tcp_nodelay);
+    }
     inst->back->provide_logctx(inst->backhandle, inst->logctx);
 
     term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
@@ -2437,15 +2417,12 @@ int main(int argc, char **argv)
 	ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle, inst);
     ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
 
-    inst->master_fd = pty_master_fd;
-    inst->exited = FALSE;
-    inst->master_func_id = gdk_input_add(pty_master_fd, GDK_INPUT_READ,
-					 pty_input_func, inst);
-
     /* now we're reday to deal with the child exit handler being
      * called */
     block_signal(SIGCHLD, 0);
-    
+
+    inst->exited = FALSE;
+
     gtk_main();
 
     return 0;