X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ec9f4fc6366aad23c69654952ea5c4c79e42fe7e..f89c329410c18fe1f09d843747fad77babb9f89c:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index 813b1574..b1cd7d0f 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -22,6 +22,7 @@ #include #include #include +#include #define PUTTY_DO_GLOBALS /* actually _define_ globals */ @@ -32,15 +33,30 @@ #define CAT(x,y) CAT2(x,y) #define ASSERT(x) enum {CAT(assertion_,__LINE__) = 1 / (x)} -#define NCOLOURS (lenof(((Config *)0)->colours)) +/* Colours come in two flavours: configurable, and xterm-extended. */ +#define NCFGCOLOURS (lenof(((Config *)0)->colours)) +#define NEXTCOLOURS 240 /* 216 colour-cube plus 24 shades of grey */ +#define NALLCOLOURS (NCFGCOLOURS + NEXTCOLOURS) GdkAtom compound_text_atom, utf8_string_atom; +extern char **pty_argv; /* declared in pty.c */ +extern int use_pty_argv; + +/* + * Timers are global across all sessions (even if we were handling + * multiple sessions, which we aren't), so the current timer ID is + * a global variable. + */ +static guint timer_id = 0; + struct gui_data { GtkWidget *window, *area, *sbar; GtkBox *hbox; GtkAdjustment *sbar_adjust; - GtkWidget *menu, *specialsmenu, *specialsitem1, *specialsitem2; + GtkWidget *menu, *specialsmenu, *specialsitem1, *specialsitem2, + *restartitem; + GtkWidget *sessionsmenu; GdkPixmap *pixmap; GdkFont *fonts[4]; /* normal, bold, wide, widebold */ struct { @@ -49,13 +65,13 @@ struct gui_data { } fontinfo[4]; int xpos, ypos, gotpos, gravity; GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor; - GdkColor cols[NCOLOURS]; + GdkColor cols[NALLCOLOURS]; GdkColormap *colmap; wchar_t *pastein_data; int direct_to_font; int pastein_data_len; - char *pasteout_data, *pasteout_data_utf8; - int pasteout_data_len, pasteout_data_utf8_len; + char *pasteout_data, *pasteout_data_ctext, *pasteout_data_utf8; + int pasteout_data_len, pasteout_data_ctext_len, pasteout_data_utf8_len; int font_width, font_height; int width, height; int ignore_sbar; @@ -75,6 +91,9 @@ struct gui_data { struct unicode_data ucsdata; Config cfg; void *eventlogstuff; + char *progname, **gtkargvstart; + int ngtkargs; + guint32 input_event_time; /* Timestamp of the most recent input event. */ }; struct draw_ctx { @@ -86,6 +105,8 @@ static int send_raw_mouse; static char *app_name = "pterm"; +static void start_backend(struct gui_data *inst); + char *x_get_default(const char *key) { return XGetDefault(GDK_DISPLAY(), app_name, key); @@ -139,6 +160,8 @@ int platform_default_i(const char *name, int def) { if (!strcmp(name, "CloseOnExit")) return 2; /* maps to FORCE_ON after painful rearrangement :-( */ + if (!strcmp(name, "WinNameAlways")) + return 0; /* X natively supports icon titles, so use 'em by default */ return def; } @@ -158,7 +181,7 @@ int from_backend(void *frontend, int is_stderr, const char *data, int len) return term_data(inst->term, is_stderr, data, len); } -void logevent(void *frontend, char *string) +void logevent(void *frontend, const char *string) { struct gui_data *inst = (struct gui_data *)frontend; @@ -336,7 +359,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) @@ -360,44 +383,53 @@ static void show_mouseptr(struct gui_data *inst, int show) inst->mouseptr_visible = show; } +void draw_backing_rect(struct gui_data *inst) +{ + GdkGC *gc = gdk_gc_new(inst->area->window); + gdk_gc_set_foreground(gc, &inst->cols[258]); /* default background */ + gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0, + inst->cfg.width * inst->font_width + 2*inst->cfg.window_border, + inst->cfg.height * inst->font_height + 2*inst->cfg.window_border); + gdk_gc_unref(gc); +} + gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; int w, h, need_size = 0; + /* + * See if the terminal size has changed, in which case we must + * let the terminal know. + */ w = (event->width - 2*inst->cfg.window_border) / inst->font_width; h = (event->height - 2*inst->cfg.window_border) / inst->font_height; - if (w != inst->width || h != inst->height) { - if (inst->pixmap) { - gdk_pixmap_unref(inst->pixmap); - inst->pixmap = NULL; - } inst->cfg.width = inst->width = w; inst->cfg.height = inst->height = h; need_size = 1; } - if (!inst->pixmap) { - GdkGC *gc; - - inst->pixmap = gdk_pixmap_new(widget->window, - (inst->cfg.width * inst->font_width + - 2*inst->cfg.window_border), - (inst->cfg.height * inst->font_height + - 2*inst->cfg.window_border), -1); - gc = gdk_gc_new(inst->area->window); - gdk_gc_set_foreground(gc, &inst->cols[18]); /* default background */ - gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0, - inst->cfg.width * inst->font_width + 2*inst->cfg.window_border, - inst->cfg.height * inst->font_height + 2*inst->cfg.window_border); - gdk_gc_unref(gc); + if (inst->pixmap) { + gdk_pixmap_unref(inst->pixmap); + inst->pixmap = NULL; } - if (need_size) { + inst->pixmap = gdk_pixmap_new(widget->window, + (inst->cfg.width * inst->font_width + + 2*inst->cfg.window_border), + (inst->cfg.height * inst->font_height + + 2*inst->cfg.window_border), -1); + + draw_backing_rect(inst); + + if (need_size && inst->term) { term_size(inst->term, h, w, inst->cfg.savelines); } + if (inst->term) + term_invalidate(inst->term); + return TRUE; } @@ -427,10 +459,15 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; char output[32]; - int start, end, special; + wchar_t ucsoutput[2]; + int ucsval, start, end, special, use_ucsoutput; + + /* Remember the timestamp. */ + inst->input_event_time = event->time; /* By default, nothing is generated. */ end = start = 0; + special = use_ucsoutput = FALSE; /* * If Alt is being released after typing an Alt+numberpad @@ -552,12 +589,21 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } special = FALSE; + use_ucsoutput = FALSE; /* ALT+things gives leading Escape. */ output[0] = '\033'; strncpy(output+1, event->string, 31); - output[31] = '\0'; - end = strlen(output); + if (!*event->string && + (ucsval = keysym_to_unicode(event->keyval)) >= 0) { + ucsoutput[0] = '\033'; + ucsoutput[1] = ucsval; + use_ucsoutput = TRUE; + end = 2; + } else { + output[31] = '\0'; + end = strlen(output); + } if (event->state & GDK_MOD1_MASK) { start = 0; if (end == 1) end = 0; @@ -568,6 +614,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (!event->string[0] && event->keyval == '`' && (event->state & GDK_CONTROL_MASK)) { output[1] = '\x1C'; + use_ucsoutput = FALSE; end = 2; } @@ -575,6 +622,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (event->keyval == GDK_Break && (event->state & GDK_CONTROL_MASK)) { output[1] = '\003'; + use_ucsoutput = FALSE; end = 2; special = TRUE; } @@ -583,6 +631,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * special to ldisc. */ if (event->keyval == GDK_Return) { output[1] = '\015'; + use_ucsoutput = FALSE; end = 2; special = TRUE; } @@ -594,6 +643,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == GDK_CONTROL_MASK) { output[1] = '\0'; + use_ucsoutput = FALSE; end = 2; } @@ -602,6 +652,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) { output[1] = '\240'; + use_ucsoutput = FALSE; end = 2; } @@ -609,6 +660,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (event->keyval == GDK_BackSpace && !(event->state & GDK_SHIFT_MASK)) { output[1] = inst->cfg.bksp_is_delete ? '\x7F' : '\x08'; + use_ucsoutput = FALSE; end = 2; special = TRUE; } @@ -616,6 +668,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (event->keyval == GDK_BackSpace && (event->state & GDK_SHIFT_MASK)) { output[1] = inst->cfg.bksp_is_delete ? '\x08' : '\x7F'; + use_ucsoutput = FALSE; end = 2; special = TRUE; } @@ -624,6 +677,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (event->keyval == GDK_ISO_Left_Tab || (event->keyval == GDK_Tab && (event->state & GDK_SHIFT_MASK))) { end = 1 + sprintf(output+1, "\033[Z"); + use_ucsoutput = FALSE; } /* @@ -648,6 +702,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) output[1] = keys[1]; else output[1] = keys[0]; + use_ucsoutput = FALSE; goto done; } } @@ -669,7 +724,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * in xterm function key mode we change which two... */ case GDK_KP_Add: - if (inst->cfg.funky_type == 2) { + if (inst->cfg.funky_type == FUNKY_XTERM) { if (event->state & GDK_SHIFT_MASK) xkey = 'l'; else @@ -700,6 +755,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) end = 1 + sprintf(output+1, "\033?%c", xkey); } else end = 1 + sprintf(output+1, "\033O%c", xkey); + use_ucsoutput = FALSE; goto done; } } @@ -798,15 +854,16 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) break; } /* Reorder edit keys to physical order */ - if (inst->cfg.funky_type == 3 && code <= 6) + if (inst->cfg.funky_type == FUNKY_VT400 && code <= 6) code = "\0\2\1\4\5\3\6"[code]; if (inst->term->vt52_mode && code > 0 && code <= 6) { end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]); + use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 5 && /* SCO function keys */ + if (inst->cfg.funky_type == FUNKY_SCO && /* SCO function keys */ code >= 11 && code <= 34) { char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{"; int index = 0; @@ -827,9 +884,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (event->state & GDK_SHIFT_MASK) index += 12; if (event->state & GDK_CONTROL_MASK) index += 24; end = 1 + sprintf(output+1, "\x1B[%c", codes[index]); + use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 5 && /* SCO small keypad */ + if (inst->cfg.funky_type == FUNKY_SCO && /* SCO small keypad */ code >= 1 && code <= 6) { char codes[] = "HL.FIG"; if (code == 3) { @@ -838,9 +896,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } else { end = 1 + sprintf(output+1, "\x1B[%c", codes[code-1]); } + use_ucsoutput = FALSE; goto done; } - if ((inst->term->vt52_mode || inst->cfg.funky_type == 4) && + if ((inst->term->vt52_mode || inst->cfg.funky_type == FUNKY_VT100P) && code >= 11 && code <= 24) { int offt = 0; if (code > 15) @@ -853,25 +912,30 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) else end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11 - offt); + use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 1 && code >= 11 && code <= 15) { + if (inst->cfg.funky_type == FUNKY_LINUX && code >= 11 && code <= 15) { end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11); + use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 2 && code >= 11 && code <= 14) { + if (inst->cfg.funky_type == FUNKY_XTERM && code >= 11 && code <= 14) { if (inst->term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11); else end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11); + use_ucsoutput = FALSE; goto done; } if (inst->cfg.rxvt_homeend && (code == 1 || code == 4)) { end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw"); + use_ucsoutput = FALSE; goto done; } if (code) { end = 1 + sprintf(output+1, "\x1B[%d~", code); + use_ucsoutput = FALSE; goto done; } } @@ -906,6 +970,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } else { end = 1 + sprintf(output+1, "\033[%c", xkey); } + use_ucsoutput = FALSE; goto done; } } @@ -929,32 +994,44 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * should never matter. */ output[end] = '\0'; /* NUL-terminate */ - ldisc_send(inst->ldisc, output+start, -2, 1); + if (inst->ldisc) + ldisc_send(inst->ldisc, output+start, -2, 1); } else if (!inst->direct_to_font) { - /* - * The stuff we've just generated is assumed to be - * ISO-8859-1! This sounds insane, but `man - * XLookupString' agrees: strings of this type returned - * from the X server are hardcoded to 8859-1. Strictly - * speaking we should be doing this using some sort of - * GtkIMContext, which (if we're lucky) would give us - * our data directly in Unicode; but that's not - * supported in GTK 1.2 as far as I can tell, and it's - * poorly documented even in 2.0, so it'll have to - * wait. - */ - lpage_send(inst->ldisc, CS_ISO8859_1, output+start, end-start, 1); + if (!use_ucsoutput) { + /* + * The stuff we've just generated is assumed to be + * ISO-8859-1! This sounds insane, but `man + * XLookupString' agrees: strings of this type + * returned from the X server are hardcoded to + * 8859-1. Strictly speaking we should be doing + * this using some sort of GtkIMContext, which (if + * we're lucky) would give us our data directly in + * Unicode; but that's not supported in GTK 1.2 as + * far as I can tell, and it's poorly documented + * even in 2.0, so it'll have to wait. + */ + if (inst->ldisc) + lpage_send(inst->ldisc, CS_ISO8859_1, output+start, + end-start, 1); + } else { + /* + * We generated our own Unicode key data from the + * keysym, so use that instead. + */ + if (inst->ldisc) + luni_send(inst->ldisc, ucsoutput+start, end-start, 1); + } } else { /* * In direct-to-font mode, we just send the string * exactly as we received it. */ - ldisc_send(inst->ldisc, output+start, end-start, 1); + if (inst->ldisc) + ldisc_send(inst->ldisc, output+start, end-start, 1); } show_mouseptr(inst, 0); term_seen_key_event(inst->term); - term_out(inst->term); } return TRUE; @@ -965,6 +1042,9 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data) struct gui_data *inst = (struct gui_data *)data; int shift, ctrl, alt, x, y, button, act; + /* Remember the timestamp. */ + inst->input_event_time = event->time; + show_mouseptr(inst, 1); if (event->button == 4 && event->type == GDK_BUTTON_PRESS) { @@ -1021,6 +1101,9 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) struct gui_data *inst = (struct gui_data *)data; int shift, ctrl, alt, x, y, button; + /* Remember the timestamp. */ + inst->input_event_time = event->time; + show_mouseptr(inst, 1); shift = event->state & GDK_SHIFT_MASK; @@ -1056,9 +1139,9 @@ void frontend_keypress(void *handle) exit(0); } -gint timer_func(gpointer data) +void notify_remote_exit(void *frontend) { - struct gui_data *inst = (struct gui_data *)data; + struct gui_data *inst = (struct gui_data *)frontend; int exitcode; if (!inst->exited && @@ -1067,11 +1150,52 @@ gint timer_func(gpointer data) if (inst->cfg.close_on_exit == FORCE_ON || (inst->cfg.close_on_exit == AUTO && exitcode == 0)) exit(0); /* just go. */ + if (inst->ldisc) { + ldisc_free(inst->ldisc); + inst->ldisc = NULL; + } + if (inst->back) { + inst->back->free(inst->backhandle); + inst->backhandle = NULL; + inst->back = NULL; + update_specials_menu(inst); + } + gtk_widget_show(inst->restartitem); } +} - term_update(inst->term); - term_blink(inst->term, 0); - return TRUE; +static gint timer_trigger(gpointer data) +{ + long now = GPOINTER_TO_INT(data); + long next; + long ticks; + + if (run_timers(now, &next)) { + ticks = next - GETTICKCOUNT(); + timer_id = gtk_timeout_add(ticks > 0 ? ticks : 1, timer_trigger, + GINT_TO_POINTER(next)); + } + + /* + * Never let a timer resume. If we need another one, we've + * asked for it explicitly above. + */ + return FALSE; +} + +void timer_change_notify(long next) +{ + long ticks; + + if (timer_id) + gtk_timeout_remove(timer_id); + + ticks = next - GETTICKCOUNT(); + if (ticks <= 0) + ticks = 1; /* just in case */ + + timer_id = gtk_timeout_add(ticks, timer_trigger, + GINT_TO_POINTER(next)); } void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) @@ -1097,8 +1221,7 @@ void destroy(GtkWidget *widget, gpointer data) gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; - inst->term->has_focus = event->in; - term_out(inst->term); + term_set_focus(inst->term, event->in); term_update(inst->term); show_mouseptr(inst, 1); return FALSE; @@ -1208,23 +1331,20 @@ static void real_palette_set(struct gui_data *inst, int n, int r, int g, int b) void set_window_background(struct gui_data *inst) { if (inst->area && inst->area->window) - gdk_window_set_background(inst->area->window, &inst->cols[18]); + gdk_window_set_background(inst->area->window, &inst->cols[258]); if (inst->window && inst->window->window) - gdk_window_set_background(inst->window->window, &inst->cols[18]); + gdk_window_set_background(inst->window->window, &inst->cols[258]); } void palette_set(void *frontend, int n, int r, int g, int b) { struct gui_data *inst = (struct gui_data *)frontend; - static const int first[21] = { - 0, 2, 4, 6, 8, 10, 12, 14, - 1, 3, 5, 7, 9, 11, 13, 15, - 16, 17, 18, 20, 22 - }; - real_palette_set(inst, first[n], r, g, b); - if (first[n] >= 18) - real_palette_set(inst, first[n] + 1, r, g, b); - if (first[n] == 18) + if (n >= 16) + n += 256 - 16; + if (n > NALLCOLOURS) + return; + real_palette_set(inst, n, r, g, b); + if (n == 258) set_window_background(inst); } @@ -1233,30 +1353,44 @@ void palette_reset(void *frontend) struct gui_data *inst = (struct gui_data *)frontend; /* This maps colour indices in inst->cfg to those used in inst->cols. */ static const int ww[] = { - 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, - 0, 1, 2, 3, 4, 5 + 256, 257, 258, 259, 260, 261, + 0, 8, 1, 9, 2, 10, 3, 11, + 4, 12, 5, 13, 6, 14, 7, 15 }; - gboolean success[NCOLOURS]; + gboolean success[NALLCOLOURS]; int i; - assert(lenof(ww) == NCOLOURS); + assert(lenof(ww) == NCFGCOLOURS); if (!inst->colmap) { inst->colmap = gdk_colormap_get_system(); } else { - gdk_colormap_free_colors(inst->colmap, inst->cols, NCOLOURS); + gdk_colormap_free_colors(inst->colmap, inst->cols, NALLCOLOURS); } - for (i = 0; i < NCOLOURS; i++) { - inst->cols[i].red = inst->cfg.colours[ww[i]][0] * 0x0101; - inst->cols[i].green = inst->cfg.colours[ww[i]][1] * 0x0101; - inst->cols[i].blue = inst->cfg.colours[ww[i]][2] * 0x0101; + for (i = 0; i < NCFGCOLOURS; i++) { + inst->cols[ww[i]].red = inst->cfg.colours[i][0] * 0x0101; + inst->cols[ww[i]].green = inst->cfg.colours[i][1] * 0x0101; + inst->cols[ww[i]].blue = inst->cfg.colours[i][2] * 0x0101; } - gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS, + for (i = 0; i < NEXTCOLOURS; i++) { + if (i < 216) { + int r = i / 36, g = (i / 6) % 6, b = i % 6; + inst->cols[i+16].red = r * 0x3333; + inst->cols[i+16].green = g * 0x3333; + inst->cols[i+16].blue = b * 0x3333; + } else { + int shade = i - 216; + shade = (shade + 1) * 0xFFFF / (NEXTCOLOURS - 216 + 1); + inst->cols[i+16].red = inst->cols[i+16].green = + inst->cols[i+16].blue = shade; + } + } + + gdk_colormap_alloc_colors(inst->colmap, inst->cols, NALLCOLOURS, FALSE, FALSE, success); - for (i = 0; i < NCOLOURS; i++) { + for (i = 0; i < NALLCOLOURS; i++) { if (!success[i]) g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n", appname, i, inst->cfg.colours[i][0], @@ -1266,21 +1400,70 @@ void palette_reset(void *frontend) set_window_background(inst); } +/* Ensure that all the cut buffers exist - according to the ICCCM, we must + * do this before we start using cut buffers. + */ +void init_cutbuffers() +{ + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, "", 0); + XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), + XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, "", 0); +} + +/* Store the data in a cut-buffer. */ +void store_cutbuffer(char * ptr, int len) +{ + /* ICCCM says we must rotate the buffers before storing to buffer 0. */ + XRotateBuffers(GDK_DISPLAY(), 1); + XStoreBytes(GDK_DISPLAY(), ptr, len); +} + +/* Retrieve data from a cut-buffer. + * Returned data needs to be freed with XFree(). + */ +char * retrieve_cutbuffer(int * nbytes) +{ + char * ptr; + ptr = XFetchBytes(GDK_DISPLAY(), nbytes); + if (*nbytes <= 0 && ptr != 0) { + XFree(ptr); + ptr = 0; + } + return ptr; +} + void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) { struct gui_data *inst = (struct gui_data *)frontend; if (inst->pasteout_data) sfree(inst->pasteout_data); + if (inst->pasteout_data_ctext) + sfree(inst->pasteout_data_ctext); if (inst->pasteout_data_utf8) sfree(inst->pasteout_data_utf8); /* - * Set up UTF-8 paste data. This only happens if we aren't in - * direct-to-font mode using the D800 hack. + * Set up UTF-8 and compound text paste data. This only happens + * if we aren't in direct-to-font mode using the D800 hack. */ if (!inst->direct_to_font) { wchar_t *tmp = data; int tmplen = len; + XTextProperty tp; + char *list[1]; inst->pasteout_data_utf8 = snewn(len*6, char); inst->pasteout_data_utf8_len = len*6; @@ -1294,11 +1477,29 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) } else { inst->pasteout_data_utf8 = sresize(inst->pasteout_data_utf8, - inst->pasteout_data_utf8_len, char); + inst->pasteout_data_utf8_len + 1, char); + inst->pasteout_data_utf8[inst->pasteout_data_utf8_len] = '\0'; } + + /* + * Now let Xlib convert our UTF-8 data into compound text. + */ + list[0] = inst->pasteout_data_utf8; + if (Xutf8TextListToTextProperty(GDK_DISPLAY(), list, 1, + XCompoundTextStyle, &tp) == 0) { + inst->pasteout_data_ctext = snewn(tp.nitems+1, char); + memcpy(inst->pasteout_data_ctext, tp.value, tp.nitems); + inst->pasteout_data_ctext_len = tp.nitems; + XFree(tp.value); + } else { + inst->pasteout_data_ctext = NULL; + inst->pasteout_data_ctext_len = 0; + } } else { inst->pasteout_data_utf8 = NULL; inst->pasteout_data_utf8_len = 0; + inst->pasteout_data_ctext = NULL; + inst->pasteout_data_ctext_len = 0; } inst->pasteout_data = snewn(len*6, char); @@ -1315,12 +1516,15 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) sresize(inst->pasteout_data, inst->pasteout_data_len, char); } + store_cutbuffer(inst->pasteout_data, inst->pasteout_data_len); + if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY, - GDK_CURRENT_TIME)) { + inst->input_event_time)) { gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 1); - gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, - compound_text_atom, 1); + if (inst->pasteout_data_ctext) + gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, + compound_text_atom, 1); if (inst->pasteout_data_utf8) gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, utf8_string_atom, 1); @@ -1338,6 +1542,10 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata, gtk_selection_data_set(seldata, seldata->target, 8, 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, + inst->pasteout_data_ctext_len); else gtk_selection_data_set(seldata, seldata->target, 8, inst->pasteout_data, inst->pasteout_data_len); @@ -1347,13 +1555,18 @@ gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, gpointer data) { struct gui_data *inst = (struct gui_data *)data; + term_deselect(inst->term); if (inst->pasteout_data) sfree(inst->pasteout_data); + if (inst->pasteout_data_ctext) + sfree(inst->pasteout_data_ctext); if (inst->pasteout_data_utf8) sfree(inst->pasteout_data_utf8); inst->pasteout_data = NULL; inst->pasteout_data_len = 0; + inst->pasteout_data_ctext = NULL; + inst->pasteout_data_ctext_len = 0; inst->pasteout_data_utf8 = NULL; inst->pasteout_data_utf8_len = 0; return TRUE; @@ -1377,14 +1590,16 @@ void request_paste(void *frontend) * fall back to an ordinary string. */ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - utf8_string_atom, GDK_CURRENT_TIME); + utf8_string_atom, + inst->input_event_time); } else { /* * If we're in direct-to-font mode, we disable UTF-8 * pasting, and go straight to ordinary string data. */ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); + GDK_SELECTION_TYPE_STRING, + inst->input_event_time); } } @@ -1394,40 +1609,107 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, guint time, gpointer data) { struct gui_data *inst = (struct gui_data *)data; + XTextProperty tp; + char **list; + char *text; + int length, count, ret; + int free_list_required = 0; + int free_required = 0; + int charset; if (seldata->target == utf8_string_atom && seldata->length <= 0) { /* - * Failed to get a UTF-8 selection string. Try an ordinary + * Failed to get a UTF-8 selection string. Try compound + * text next. + */ + gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, + compound_text_atom, + inst->input_event_time); + return; + } + + if (seldata->target == compound_text_atom && seldata->length <= 0) { + /* + * Failed to get UTF-8 or compound text. Try an ordinary * string. */ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); + GDK_SELECTION_TYPE_STRING, + inst->input_event_time); return; } /* - * Any other failure should just go foom. + * If we have data, but it's not of a type we can deal with, + * we have to ignore the data. */ - if (seldata->length <= 0 || - (seldata->type != GDK_SELECTION_TYPE_STRING && - seldata->type != utf8_string_atom)) - return; /* Nothing happens. */ + if (seldata->length > 0 && + seldata->type != GDK_SELECTION_TYPE_STRING && + seldata->type != compound_text_atom && + seldata->type != utf8_string_atom) + return; + + /* + * If we have no data, try looking in a cut buffer. + */ + if (seldata->length <= 0) { + text = retrieve_cutbuffer(&length); + if (length == 0) + return; + /* Xterm is rumoured to expect Latin-1, though I havn't checked the + * source, so use that as a de-facto standard. */ + charset = CS_ISO8859_1; + free_required = 1; + } else { + /* + * Convert COMPOUND_TEXT into UTF-8. + */ + if (seldata->type == compound_text_atom) { + tp.value = seldata->data; + tp.encoding = (Atom) seldata->type; + tp.format = seldata->format; + tp.nitems = seldata->length; + ret = Xutf8TextPropertyToTextList(GDK_DISPLAY(), &tp, + &list, &count); + if (ret != 0 || count != 1) { + /* + * Compound text failed; fall back to STRING. + */ + gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, + GDK_SELECTION_TYPE_STRING, + inst->input_event_time); + return; + } + text = list[0]; + length = strlen(list[0]); + charset = CS_UTF8; + free_list_required = 1; + } else { + text = (char *)seldata->data; + length = seldata->length; + charset = (seldata->type == utf8_string_atom ? + CS_UTF8 : inst->ucsdata.line_codepage); + } + } if (inst->pastein_data) sfree(inst->pastein_data); - inst->pastein_data = snewn(seldata->length, wchar_t); - inst->pastein_data_len = seldata->length; + inst->pastein_data = snewn(length, wchar_t); + inst->pastein_data_len = length; inst->pastein_data_len = - mb_to_wc((seldata->type == utf8_string_atom ? - CS_UTF8 : inst->ucsdata.line_codepage), - 0, seldata->data, seldata->length, + mb_to_wc(charset, 0, text, length, inst->pastein_data, inst->pastein_data_len); term_do_paste(inst->term); if (term_paste_pending(inst->term)) inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst); + + if (free_list_required) + XFreeStringList(list); + if (free_required) + XFree(text); } gint idle_paste_func(gpointer data) @@ -1453,12 +1735,24 @@ void get_clip(void *frontend, wchar_t ** p, int *len) } } +static void set_window_titles(struct gui_data *inst) +{ + /* + * We must always call set_icon_name after calling set_title, + * since set_title will write both names. Irritating, but such + * is life. + */ + gtk_window_set_title(GTK_WINDOW(inst->window), inst->wintitle); + if (!inst->cfg.win_name_always) + gdk_window_set_icon_name(inst->window->window, inst->icontitle); +} + void set_title(void *frontend, char *title) { struct gui_data *inst = (struct gui_data *)frontend; strncpy(inst->wintitle, title, lenof(inst->wintitle)); inst->wintitle[lenof(inst->wintitle)-1] = '\0'; - gtk_window_set_title(GTK_WINDOW(inst->window), inst->wintitle); + set_window_titles(inst); } void set_icon(void *frontend, char *title) @@ -1466,7 +1760,7 @@ void set_icon(void *frontend, char *title) struct gui_data *inst = (struct gui_data *)frontend; strncpy(inst->icontitle, title, lenof(inst->icontitle)); inst->icontitle[lenof(inst->icontitle)-1] = '\0'; - gdk_window_set_icon_name(inst->window->window, inst->icontitle); + set_window_titles(inst); } void set_sbar(void *frontend, int total, int start, int page) @@ -1553,31 +1847,39 @@ void free_ctx(Context ctx) * * We are allowed to fiddle with the contents of `text'. */ -void do_text_internal(Context ctx, int x, int y, char *text, int len, +void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, unsigned long attr, int lattr) { struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; - + int ncombining, combining; int nfg, nbg, t, fontid, shadow, rlen, widefactor; + if (attr & TATTR_COMBINING) { + ncombining = len; + len = 1; + } else + ncombining = 1; + 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 |= 1; - if (inst->cfg.bold_colour && (attr & ATTR_BLINK)) - nbg |= 1; + if (inst->cfg.bold_colour && (attr & ATTR_BOLD)) { + if (nfg < 16) nfg |= 8; + else if (nfg >= 256) nfg |= 1; + } + if (inst->cfg.bold_colour && (attr & ATTR_BLINK)) { + if (nbg < 16) nbg |= 8; + else if (nbg >= 256) nbg |= 1; + } if (attr & TATTR_ACTCURS) { - nfg = NCOLOURS-2; - nbg = NCOLOURS-1; + nfg = 260; + nbg = 261; } fontid = shadow = 0; @@ -1596,7 +1898,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, shadow = 1; } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; @@ -1629,9 +1931,9 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, wchar_t *wcs; int i; - wcs = snewn(len+1, wchar_t); - for (i = 0; i < len; i++) { - wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK)); + wcs = snewn(len*ncombining+1, wchar_t); + for (i = 0; i < len*ncombining; i++) { + wcs[i] = text[i]; } if (inst->fonts[fontid] == NULL) { @@ -1662,33 +1964,40 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, * FIXME: when we have a wide-char equivalent of * from_unicode, use it instead of this. */ - for (i = 0; i <= len; i++) - gwcs[i] = wcs[i]; - gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, - x*inst->font_width+inst->cfg.window_border, - y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, - gwcs, len*2); + for (combining = 0; combining < ncombining; combining++) { + for (i = 0; i <= len; i++) + gwcs[i] = wcs[i + combining]; + gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, + gwcs, len*2); + if (shadow) + gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, + x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset, + y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, + gwcs, len*2); + } sfree(gwcs); } else { 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, - x*inst->font_width+inst->cfg.window_border, - y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, - gcs, len); + for (combining = 0; combining < ncombining; combining++) { + wc_to_mb(inst->fontinfo[fontid].charset, 0, + wcs + combining, len, gcs, len, ".", NULL, NULL); + gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, + gcs, len); + if (shadow) + gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, + x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset, + y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, + gcs, len); + } sfree(gcs); } sfree(wcs); } - if (shadow) { - gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, - x*inst->font_width+inst->cfg.window_border + inst->cfg.shadowboldoffset, - y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, - text, len); - } - if (attr & ATTR_UNDER) { int uheight = inst->fonts[0]->ascent + 1; if (uheight >= inst->font_height) @@ -1699,7 +2008,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, y*inst->font_height + uheight + inst->cfg.window_border); } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { /* * I can't find any plausible StretchBlt equivalent in the * X server, so I'm going to do this the slow and painful @@ -1715,13 +2024,13 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, y*inst->font_height+inst->cfg.window_border, x*inst->font_width+inst->cfg.window_border + 2*i+1, y*inst->font_height+inst->cfg.window_border, - len * inst->font_width - i, inst->font_height); + len * widefactor * inst->font_width - i, inst->font_height); } len *= 2; - if (lattr != LATTR_WIDE) { + if ((lattr & LATTR_MODE) != LATTR_WIDE) { int dt, db; /* Now stretch vertically, in the same way. */ - if (lattr == LATTR_BOT) + if ((lattr & LATTR_MODE) == LATTR_BOT) dt = 0, db = 1; else dt = 1, db = 0; @@ -1729,15 +2038,15 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, x*inst->font_width+inst->cfg.window_border, y*inst->font_height+inst->cfg.window_border+dt*i+db, - x*widefactor*inst->font_width+inst->cfg.window_border, + x*inst->font_width+inst->cfg.window_border, y*inst->font_height+inst->cfg.window_border+dt*(i+1), - len * inst->font_width, inst->font_height-i-1); + len * widefactor * inst->font_width, inst->font_height-i-1); } } } } -void do_text(Context ctx, int x, int y, char *text, int len, +void do_text(Context ctx, int x, int y, wchar_t *text, int len, unsigned long attr, int lattr) { struct draw_ctx *dctx = (struct draw_ctx *)ctx; @@ -1753,7 +2062,7 @@ void do_text(Context ctx, int x, int y, char *text, int len, widefactor = 1; } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; @@ -1770,14 +2079,14 @@ void do_text(Context ctx, int x, int y, char *text, int len, len*widefactor*inst->font_width, inst->font_height); } -void do_cursor(Context ctx, int x, int y, char *text, int len, +void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, unsigned long attr, int lattr) { struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; - int passive, widefactor; + int active, passive, widefactor; if (attr & TATTR_PASCURS) { attr &= ~TATTR_PASCURS; @@ -1786,16 +2095,21 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, passive = 0; if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) { attr &= ~TATTR_ACTCURS; - } + active = 1; + } else + active = 0; do_text_internal(ctx, x, y, text, len, attr, lattr); + if (attr & TATTR_COMBINING) + len = 1; + if (attr & ATTR_WIDE) { widefactor = 2; } else { widefactor = 1; } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; @@ -1811,11 +2125,11 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, * if it's passive. */ if (passive) { - gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]); + gdk_gc_set_foreground(gc, &inst->cols[261]); gdk_draw_rectangle(inst->pixmap, gc, 0, x*inst->font_width+inst->cfg.window_border, y*inst->font_height+inst->cfg.window_border, - len*inst->font_width-1, inst->font_height-1); + len*widefactor*inst->font_width-1, inst->font_height-1); } } else { int uheight; @@ -1823,7 +2137,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, int char_width; - if ((attr & ATTR_WIDE) || lattr != LATTR_NORM) + if ((attr & ATTR_WIDE) || (lattr & LATTR_MODE) != LATTR_NORM) char_width = 2*inst->font_width; else char_width = inst->font_width; @@ -1837,7 +2151,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, starty = y * inst->font_height + inst->cfg.window_border + uheight; dx = 1; dy = 0; - length = len * char_width; + length = len * widefactor * char_width; } else { int xadjust = 0; if (attr & TATTR_RIGHTCURS) @@ -1849,7 +2163,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, length = inst->font_height; } - gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]); + gdk_gc_set_foreground(gc, &inst->cols[261]); if (passive) { for (i = 0; i < length; i++) { if (i % 2 == 0) { @@ -1858,10 +2172,10 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, startx += dx; starty += dy; } - } else { + } else if (active) { gdk_draw_line(inst->pixmap, gc, startx, starty, startx + (length-1) * dx, starty + (length-1) * dy); - } + } /* else no cursor (e.g., blinked off) */ } gdk_draw_pixmap(inst->area->window, gc, inst->pixmap, @@ -2028,8 +2342,7 @@ int do_cmdline(int argc, char **argv, int do_everything, struct gui_data *inst, Config *cfg) { int err = 0; - extern char **pty_argv; /* declared in pty.c */ - extern int use_pty_argv; + char *val; /* * Macros to make argument handling easier. Note that because @@ -2049,11 +2362,21 @@ int do_cmdline(int argc, char **argv, int do_everything, } #define SECOND_PASS_ONLY { if (!do_everything) continue; } - char *val; while (--argc > 0) { 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); @@ -2228,17 +2551,6 @@ int do_cmdline(int argc, char **argv, int do_everything, return err; } -static void block_signal(int sig, int block_it) { - sigset_t ss; - - sigemptyset(&ss); - sigaddset(&ss, sig); - if(sigprocmask(block_it ? SIG_BLOCK : SIG_UNBLOCK, &ss, 0) < 0) { - perror("sigprocmask"); - exit(1); - } -} - /* * This function retrieves the character set encoding of a font. It * returns the character set without the X11 hack (in case the user @@ -2315,9 +2627,63 @@ void uxsel_input_remove(int id) { gdk_input_remove(id); } +char *guess_derived_font_name(GdkFont *font, int bold, int wide) +{ + XFontStruct *xfs = GDK_FONT_XFONT(font); + Display *disp = GDK_FONT_XDISPLAY(font); + Atom fontprop = XInternAtom(disp, "FONT", False); + unsigned long ret; + if (XGetFontProperty(xfs, fontprop, &ret)) { + char *name = XGetAtomName(disp, (Atom)ret); + if (name && name[0] == '-') { + char *strings[13]; + char *dupname, *extrafree = NULL, *ret; + char *p, *q; + int nstr; + + p = q = dupname = dupstr(name); /* skip initial minus */ + nstr = 0; + + while (*p && nstr < lenof(strings)) { + if (*p == '-') { + *p = '\0'; + strings[nstr++] = p+1; + } + p++; + } + + if (nstr < lenof(strings)) + return NULL; /* XLFD was malformed */ + + if (bold) + strings[2] = "bold"; + + if (wide) { + /* 4 is `wideness', which obviously may have changed. */ + /* 5 is additional style, which may be e.g. `ja' or `ko'. */ + strings[4] = strings[5] = "*"; + strings[11] = extrafree = dupprintf("%d", 2*atoi(strings[11])); + } + + ret = dupcat("-", strings[ 0], "-", strings[ 1], "-", strings[ 2], + "-", strings[ 3], "-", strings[ 4], "-", strings[ 5], + "-", strings[ 6], "-", strings[ 7], "-", strings[ 8], + "-", strings[ 9], "-", strings[10], "-", strings[11], + "-", strings[12], NULL); + sfree(extrafree); + sfree(dupname); + + return ret; + } + } + return NULL; +} + void setup_fonts_ucs(struct gui_data *inst) { int font_charset; + char *name; + int guessed; if (inst->fonts[0]) gdk_font_unref(inst->fonts[0]); @@ -2335,42 +2701,85 @@ void setup_fonts_ucs(struct gui_data *inst) exit(1); } font_charset = set_font_info(inst, 0); - if (inst->cfg.boldfont.name[0]) { - inst->fonts[1] = gdk_font_load(inst->cfg.boldfont.name); - if (!inst->fonts[1]) { + + if (inst->cfg.shadowbold) { + inst->fonts[1] = NULL; + } else { + if (inst->cfg.boldfont.name[0]) { + name = inst->cfg.boldfont.name; + guessed = FALSE; + } else { + name = guess_derived_font_name(inst->fonts[0], TRUE, FALSE); + guessed = TRUE; + } + inst->fonts[1] = name ? gdk_font_load(name) : NULL; + if (inst->fonts[1]) { + set_font_info(inst, 1); + } else if (!guessed) { fprintf(stderr, "%s: unable to load bold font \"%s\"\n", appname, inst->cfg.boldfont.name); exit(1); } - set_font_info(inst, 1); - } else - inst->fonts[1] = NULL; + if (guessed) + sfree(name); + } + if (inst->cfg.widefont.name[0]) { - inst->fonts[2] = gdk_font_load(inst->cfg.widefont.name); - if (!inst->fonts[2]) { - fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname, - inst->cfg.widefont.name); - exit(1); - } + name = inst->cfg.widefont.name; + guessed = FALSE; + } else { + name = guess_derived_font_name(inst->fonts[0], FALSE, TRUE); + guessed = TRUE; + } + inst->fonts[2] = name ? gdk_font_load(name) : NULL; + if (inst->fonts[2]) { set_font_info(inst, 2); - } else - inst->fonts[2] = NULL; - if (inst->cfg.wideboldfont.name[0]) { - inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont.name); - if (!inst->fonts[3]) { - fprintf(stderr, "%s: unable to load wide/bold font \"%s\"\n", - appname, inst->cfg.wideboldfont.name); + } else if (!guessed) { + fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname, + inst->cfg.widefont.name); + exit(1); + } + if (guessed) + sfree(name); + + if (inst->cfg.shadowbold) { + inst->fonts[3] = NULL; + } else { + if (inst->cfg.wideboldfont.name[0]) { + name = inst->cfg.wideboldfont.name; + guessed = FALSE; + } else { + /* + * Here we have some choices. We can widen the bold font, + * bolden the wide font, or widen and bolden the standard + * font. Try them all, in that order! + */ + if (inst->cfg.widefont.name[0]) + name = guess_derived_font_name(inst->fonts[2], TRUE, FALSE); + else if (inst->cfg.boldfont.name[0]) + name = guess_derived_font_name(inst->fonts[1], FALSE, TRUE); + else + name = guess_derived_font_name(inst->fonts[0], TRUE, TRUE); + guessed = TRUE; + } + inst->fonts[3] = name ? gdk_font_load(name) : NULL; + if (inst->fonts[3]) { + set_font_info(inst, 3); + } else if (!guessed) { + fprintf(stderr, "%s: unable to load wide/bold font \"%s\"\n", appname, + inst->cfg.wideboldfont.name); exit(1); } - set_font_info(inst, 3); - } else - inst->fonts[3] = NULL; + if (guessed) + sfree(name); + } inst->font_width = gdk_char_width(inst->fonts[0], ' '); inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent; - inst->direct_to_font = init_ucs(&inst->ucsdata, - inst->cfg.line_codepage, font_charset); + inst->direct_to_font = init_ucs(&inst->ucsdata, inst->cfg.line_codepage, + inst->cfg.utf8_override, font_charset, + inst->cfg.vtmode); } void set_geom_hints(struct gui_data *inst) @@ -2399,7 +2808,8 @@ void reset_terminal_menuitem(GtkMenuItem *item, gpointer data) { struct gui_data *inst = (struct gui_data *)data; term_pwron(inst->term); - ldisc_send(inst->ldisc, NULL, 0, 0); + if (inst->ldisc) + ldisc_send(inst->ldisc, NULL, 0, 0); } void copy_all_menuitem(GtkMenuItem *item, gpointer data) @@ -2411,9 +2821,11 @@ 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); + if (inst->back) + inst->back->special(inst->backhandle, code); } void about_menuitem(GtkMenuItem *item, gpointer data) @@ -2432,18 +2844,21 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) { /* This maps colour indices in inst->cfg to those used in inst->cols. */ static const int ww[] = { - 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, - 0, 1, 2, 3, 4, 5 + 256, 257, 258, 259, 260, 261, + 0, 8, 1, 9, 2, 10, 3, 11, + 4, 12, 5, 13, 6, 14, 7, 15 }; struct gui_data *inst = (struct gui_data *)data; char *title = dupcat(appname, " Reconfiguration", NULL); Config cfg2, oldcfg; int i, need_size; + assert(lenof(ww) == NCFGCOLOURS); + cfg2 = inst->cfg; /* structure copy */ - if (do_config_box(title, &cfg2, 1)) { + if (do_config_box(title, &cfg2, 1, + inst->back?inst->back->cfg_info(inst->backhandle):0)) { oldcfg = inst->cfg; /* structure copy */ inst->cfg = cfg2; /* structure copy */ @@ -2454,11 +2869,13 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) * Flush the line discipline's edit buffer in the case * where local editing has just been disabled. */ - ldisc_send(inst->ldisc, NULL, 0, 0); + if (inst->ldisc) + ldisc_send(inst->ldisc, NULL, 0, 0); /* Pass new config data to the terminal */ term_reconfig(inst->term, &cfg2); /* Pass new config data to the back end */ - inst->back->reconfig(inst->backhandle, &cfg2); + if (inst->back) + inst->back->reconfig(inst->backhandle, &cfg2); /* * Just setting inst->cfg is sufficient to cause colour @@ -2468,13 +2885,24 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) * have to the new default, on the assumption that the user * is most likely to want an immediate update. */ - for (i = 0; i < NCOLOURS; i++) { - if (oldcfg.colours[ww[i]][0] != cfg2.colours[ww[i]][0] || - oldcfg.colours[ww[i]][1] != cfg2.colours[ww[i]][1] || - oldcfg.colours[ww[i]][2] != cfg2.colours[ww[i]][2]) - real_palette_set(inst, i, cfg2.colours[ww[i]][0], - cfg2.colours[ww[i]][1], - cfg2.colours[ww[i]][2]); + for (i = 0; i < NCFGCOLOURS; i++) { + if (oldcfg.colours[i][0] != cfg2.colours[i][0] || + oldcfg.colours[i][1] != cfg2.colours[i][1] || + oldcfg.colours[i][2] != cfg2.colours[i][2]) { + real_palette_set(inst, ww[i], cfg2.colours[i][0], + cfg2.colours[i][1], + cfg2.colours[i][2]); + + /* + * If the default background has changed, we must + * repaint the space in between the window border + * and the text area. + */ + if (i == 258) { + set_window_background(inst); + draw_backing_rect(inst); + } + } } /* @@ -2497,6 +2925,7 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) */ if (strcmp(oldcfg.wintitle, cfg2.wintitle)) set_title(inst, cfg2.wintitle); + set_window_titles(inst); /* * Redo the whole tangled fonts and Unicode mess if @@ -2506,7 +2935,9 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) strcmp(oldcfg.boldfont.name, cfg2.boldfont.name) || strcmp(oldcfg.widefont.name, cfg2.widefont.name) || strcmp(oldcfg.wideboldfont.name, cfg2.wideboldfont.name) || - strcmp(oldcfg.line_codepage, cfg2.line_codepage)) { + strcmp(oldcfg.line_codepage, cfg2.line_codepage) || + oldcfg.vtmode != cfg2.vtmode || + oldcfg.shadowbold != cfg2.shadowbold) { setup_fonts_ucs(inst); need_size = 1; } else @@ -2533,33 +2964,290 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) } term_invalidate(inst->term); + + /* + * We do an explicit full redraw here to ensure the window + * border has been redrawn as well as the text area. + */ + gtk_widget_queue_draw(inst->area); } sfree(title); } +void fork_and_exec_self(struct gui_data *inst, int fd_to_close, ...) +{ + /* + * Re-execing ourself is not an exact science under Unix. I do + * the best I can by using /proc/self/exe if available and by + * assuming argv[0] can be found on $PATH if not. + * + * Note that we also have to reconstruct the elements of the + * original argv which gtk swallowed, since the user wants the + * new session to appear on the same X display as the old one. + */ + char **args; + va_list ap; + int i, n; + int pid; + + /* + * Collect the arguments with which to re-exec ourself. + */ + va_start(ap, fd_to_close); + n = 2; /* progname and terminating NULL */ + n += inst->ngtkargs; + while (va_arg(ap, char *) != NULL) + n++; + va_end(ap); + + args = snewn(n, char *); + args[0] = inst->progname; + args[n-1] = NULL; + for (i = 0; i < inst->ngtkargs; i++) + args[i+1] = inst->gtkargvstart[i]; + + i++; + va_start(ap, fd_to_close); + while ((args[i++] = va_arg(ap, char *)) != NULL); + va_end(ap); + + assert(i == n); + + /* + * Do the double fork. + */ + pid = fork(); + if (pid < 0) { + perror("fork"); + return; + } + + if (pid == 0) { + int pid2 = fork(); + if (pid2 < 0) { + perror("fork"); + _exit(1); + } else if (pid2 > 0) { + /* + * First child has successfully forked second child. My + * Work Here Is Done. Note the use of _exit rather than + * exit: the latter appears to cause destroy messages + * to be sent to the X server. I suspect gtk uses + * atexit. + */ + _exit(0); + } + + /* + * If we reach here, we are the second child, so we now + * actually perform the exec. + */ + if (fd_to_close >= 0) + close(fd_to_close); + + execv("/proc/self/exe", args); + execvp(inst->progname, args); + perror("exec"); + _exit(127); + + } else { + int status; + waitpid(pid, &status, 0); + } + +} + +void dup_session_menuitem(GtkMenuItem *item, gpointer gdata) +{ + struct gui_data *inst = (struct gui_data *)gdata; + /* + * For this feature we must marshal cfg and (possibly) pty_argv + * into a byte stream, create a pipe, and send this byte stream + * to the child through the pipe. + */ + int i, ret, size; + char *data; + char option[80]; + int pipefd[2]; + + if (pipe(pipefd) < 0) { + perror("pipe"); + return; + } + + size = sizeof(inst->cfg); + if (use_pty_argv && pty_argv) { + for (i = 0; pty_argv[i]; i++) + size += strlen(pty_argv[i]) + 1; + } + + data = snewn(size, char); + memcpy(data, &inst->cfg, sizeof(inst->cfg)); + if (use_pty_argv && pty_argv) { + int p = sizeof(inst->cfg); + for (i = 0; pty_argv[i]; i++) { + strcpy(data + p, pty_argv[i]); + p += strlen(pty_argv[i]) + 1; + } + assert(p == size); + } + + sprintf(option, "---[%d,%d]", pipefd[0], size); + fcntl(pipefd[0], F_SETFD, 0); + fork_and_exec_self(inst, pipefd[1], option, NULL); + close(pipefd[0]); + + i = ret = 0; + while (i < size && (ret = write(pipefd[1], data + i, size - i)) > 0) + i += ret; + if (ret < 0) + perror("write to pipe"); + close(pipefd[1]); + sfree(data); +} + +int read_dupsession_data(struct gui_data *inst, Config *cfg, char *arg) +{ + int fd, i, ret, size; + char *data; + + if (sscanf(arg, "---[%d,%d]", &fd, &size) != 2) { + fprintf(stderr, "%s: malformed magic argument `%s'\n", appname, arg); + exit(1); + } + + data = snewn(size, char); + i = ret = 0; + while (i < size && (ret = read(fd, data + i, size - i)) > 0) + i += ret; + if (ret < 0) { + perror("read from pipe"); + exit(1); + } else if (i < size) { + fprintf(stderr, "%s: unexpected EOF in Duplicate Session data\n", + appname); + exit(1); + } + + memcpy(cfg, data, sizeof(Config)); + if (use_pty_argv && size > sizeof(Config)) { + int n = 0; + i = sizeof(Config); + while (i < size) { + while (i < size && data[i]) i++; + if (i >= size) { + fprintf(stderr, "%s: malformed Duplicate Session data\n", + appname); + exit(1); + } + i++; + n++; + } + pty_argv = snewn(n+1, char *); + pty_argv[n] = NULL; + n = 0; + i = sizeof(Config); + while (i < size) { + char *p = data + i; + while (i < size && data[i]) i++; + assert(i < size); + i++; + pty_argv[n++] = dupstr(p); + } + } + + return 0; +} + +void new_session_menuitem(GtkMenuItem *item, gpointer data) +{ + struct gui_data *inst = (struct gui_data *)data; + + fork_and_exec_self(inst, -1, NULL); +} + +void restart_session_menuitem(GtkMenuItem *item, gpointer data) +{ + struct gui_data *inst = (struct gui_data *)data; + + if (!inst->back) { + logevent(inst, "----- Session restarted -----"); + start_backend(inst); + inst->exited = FALSE; + } +} + +void saved_session_menuitem(GtkMenuItem *item, gpointer data) +{ + struct gui_data *inst = (struct gui_data *)data; + char *str = (char *)gtk_object_get_data(GTK_OBJECT(item), "user-data"); + + fork_and_exec_self(inst, -1, "-load", str, NULL); +} + +void saved_session_freedata(GtkMenuItem *item, gpointer data) +{ + char *str = (char *)gtk_object_get_data(GTK_OBJECT(item), "user-data"); + + sfree(str); +} + void update_specials_menu(void *frontend) { struct gui_data *inst = (struct gui_data *)frontend; const struct telnet_special *specials; - specials = inst->back->get_specials(inst->backhandle); + if (inst->back) + specials = inst->back->get_specials(inst->backhandle); + else + specials = NULL; + + /* I believe this disposes of submenus too. */ gtk_container_foreach(GTK_CONTAINER(inst->specialsmenu), (GtkCallback)gtk_widget_destroy, NULL); if (specials) { int i; - GtkWidget *menuitem; - for (i = 0; specials[i].name; i++) { - if (*specials[i].name) { + GtkWidget *menu = inst->specialsmenu; + /* A lame "stack" for submenus that will do for now. */ + GtkWidget *saved_menu = NULL; + int nesting = 1; + for (i = 0; nesting > 0; i++) { + GtkWidget *menuitem = NULL; + switch (specials[i].code) { + case TS_SUBMENU: + assert (nesting < 2); + saved_menu = menu; /* XXX lame stacking */ + menu = gtk_menu_new(); + menuitem = gtk_menu_item_new_with_label(specials[i].name); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); + gtk_container_add(GTK_CONTAINER(saved_menu), menuitem); + gtk_widget_show(menuitem); + menuitem = NULL; + nesting++; + break; + case TS_EXITMENU: + nesting--; + if (nesting) { + menu = saved_menu; /* XXX lame stacking */ + saved_menu = NULL; + } + break; + case TS_SEP: + menuitem = gtk_menu_item_new(); + break; + default: 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 - menuitem = gtk_menu_item_new(); - gtk_container_add(GTK_CONTAINER(inst->specialsmenu), menuitem); - gtk_widget_show(menuitem); + break; + } + if (menuitem) { + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_widget_show(menuitem); + } } gtk_widget_show(inst->specialsitem1); gtk_widget_show(inst->specialsitem2); @@ -2569,17 +3257,52 @@ void update_specials_menu(void *frontend) } } -int pt_main(int argc, char **argv) +static void start_backend(struct gui_data *inst) { extern Backend *select_backend(Config *cfg); - extern int cfgbox(Config *cfg); - struct gui_data *inst; + char *realhost; + const char *error; - /* defer any child exit handling until we're ready to deal with - * it */ - block_signal(SIGCHLD, 1); + inst->back = select_backend(&inst->cfg); + + error = inst->back->init((void *)inst, &inst->backhandle, + &inst->cfg, inst->cfg.host, inst->cfg.port, + &realhost, inst->cfg.tcp_nodelay, + inst->cfg.tcp_keepalives); + + if (error) { + char *msg = dupprintf("Unable to open connection to %s:\n%s", + inst->cfg.host, error); + inst->exited = TRUE; + fatal_message_box(inst->window, msg); + sfree(msg); + exit(0); + } + + if (inst->cfg.wintitle[0]) { + set_title(inst, inst->cfg.wintitle); + set_icon(inst, inst->cfg.wintitle); + } else { + char *title = make_default_wintitle(realhost); + set_title(inst, title); + set_icon(inst, title); + sfree(title); + } + inst->back->provide_logctx(inst->backhandle, inst->logctx); + + term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle); + + inst->ldisc = + ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle, + inst); - gtk_init(&argc, &argv); + gtk_widget_hide(inst->restartitem); +} + +int pt_main(int argc, char **argv) +{ + extern int cfgbox(Config *cfg); + struct gui_data *inst; /* * Create an instance structure and initialise to zeroes @@ -2588,16 +3311,41 @@ int pt_main(int argc, char **argv) memset(inst, 0, sizeof(*inst)); inst->alt_keycode = -1; /* this one needs _not_ to be zero */ - if (do_cmdline(argc, argv, 0, inst, &inst->cfg)) - exit(1); /* pre-defaults pass to get -class */ - do_defaults(NULL, &inst->cfg); - if (do_cmdline(argc, argv, 1, inst, &inst->cfg)) - exit(1); /* post-defaults, do everything */ + /* defer any child exit handling until we're ready to deal with + * it */ + block_signal(SIGCHLD, 1); - cmdline_run_saved(&inst->cfg); + inst->progname = argv[0]; + /* + * Copy the original argv before letting gtk_init fiddle with + * it. It will be required later. + */ + { + int i, oldargc; + inst->gtkargvstart = snewn(argc-1, char *); + for (i = 1; i < argc; i++) + inst->gtkargvstart[i-1] = dupstr(argv[i]); + oldargc = argc; + gtk_init(&argc, &argv); + inst->ngtkargs = oldargc - argc; + } + + if (argc > 1 && !strncmp(argv[1], "---", 3)) { + read_dupsession_data(inst, &inst->cfg, argv[1]); + /* Splatter this argument so it doesn't clutter a ps listing */ + memset(argv[1], 0, strlen(argv[1])); + } else { + if (do_cmdline(argc, argv, 0, inst, &inst->cfg)) + exit(1); /* pre-defaults pass to get -class */ + do_defaults(NULL, &inst->cfg); + if (do_cmdline(argc, argv, 1, inst, &inst->cfg)) + exit(1); /* post-defaults, do everything */ - if (!*inst->cfg.host && !cfgbox(&inst->cfg)) - exit(0); /* config box hit Cancel */ + cmdline_run_saved(&inst->cfg); + + if (!*inst->cfg.host && !cfgbox(&inst->cfg)) + exit(0); /* config box hit Cancel */ + } if (!compound_text_atom) compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE); @@ -2605,6 +3353,7 @@ int pt_main(int argc, char **argv) utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE); setup_fonts_ucs(inst); + init_cutbuffers(); inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -2686,7 +3435,6 @@ int pt_main(int argc, char **argv) if (inst->cfg.scrollbar) gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed", GTK_SIGNAL_FUNC(scrollbar_moved), inst); - gtk_timeout_add(20, timer_func, inst); gtk_widget_add_events(GTK_WIDGET(inst->area), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -2702,7 +3450,7 @@ int pt_main(int argc, char **argv) { GtkWidget *menuitem; char *s; - extern const int use_event_log; + extern const int use_event_log, new_session, saved_sessions; inst->menu = gtk_menu_new(); @@ -2715,6 +3463,39 @@ int pt_main(int argc, char **argv) gtk_signal_connect(GTK_OBJECT(menuitem), "activate", \ GTK_SIGNAL_FUNC(func), inst); \ } while (0) + if (new_session) + MKMENUITEM("New Session", new_session_menuitem); + MKMENUITEM("Restart Session", restart_session_menuitem); + inst->restartitem = menuitem; + gtk_widget_hide(inst->restartitem); + MKMENUITEM("Duplicate Session", dup_session_menuitem); + if (saved_sessions) { + struct sesslist sesslist; + int i; + + inst->sessionsmenu = gtk_menu_new(); + + get_sesslist(&sesslist, TRUE); + for (i = 1; i < sesslist.nsessions; i++) { + menuitem = gtk_menu_item_new_with_label(sesslist.sessions[i]); + gtk_container_add(GTK_CONTAINER(inst->sessionsmenu), menuitem); + gtk_widget_show(menuitem); + gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", + dupstr(sesslist.sessions[i])); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", + GTK_SIGNAL_FUNC(saved_session_menuitem), + inst); + gtk_signal_connect(GTK_OBJECT(menuitem), "destroy", + GTK_SIGNAL_FUNC(saved_session_freedata), + inst); + } + get_sesslist(&sesslist, FALSE); + + MKMENUITEM("Saved Sessions", NULL); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), + inst->sessionsmenu); + } + MKMENUITEM(NULL, NULL); MKMENUITEM("Change Settings", change_settings_menuitem); MKMENUITEM(NULL, NULL); if (use_event_log) @@ -2725,6 +3506,8 @@ int pt_main(int argc, char **argv) inst->specialsitem1 = menuitem; MKMENUITEM(NULL, NULL); inst->specialsitem2 = menuitem; + gtk_widget_hide(inst->specialsitem1); + gtk_widget_hide(inst->specialsitem2); MKMENUITEM("Clear Scrollback", clear_scrollback_menuitem); MKMENUITEM("Reset Terminal", reset_terminal_menuitem); MKMENUITEM("Copy All", copy_all_menuitem); @@ -2752,44 +3535,23 @@ int pt_main(int argc, char **argv) term_size(inst->term, inst->cfg.height, inst->cfg.width, inst->cfg.savelines); - inst->back = select_backend(&inst->cfg); - { - char *realhost, *error; - - error = inst->back->init((void *)inst, &inst->backhandle, - &inst->cfg, inst->cfg.host, inst->cfg.port, - &realhost, inst->cfg.tcp_nodelay); - - if (error) { - char *msg = dupprintf("Unable to open connection to %s:\n%s", - inst->cfg.host, error); - inst->exited = TRUE; - fatal_message_box(inst->window, msg); - sfree(msg); - return 0; - } + start_backend(inst); - if (inst->cfg.wintitle[0]) - set_title(inst, inst->cfg.wintitle); - else { - char *title = make_default_wintitle(realhost); - set_title(inst, title); - sfree(title); - } - } - inst->back->provide_logctx(inst->backhandle, inst->logctx); - update_specials_menu(inst); - - term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle); - - inst->ldisc = - ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle, inst); ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */ /* now we're reday to deal with the child exit handler being * called */ block_signal(SIGCHLD, 0); + /* + * Block SIGPIPE: if we attempt Duplicate Session or similar + * and it falls over in some way, we certainly don't want + * SIGPIPE terminating the main pterm/PuTTY. Note that we do + * this _after_ (at least pterm) forks off its child process, + * since the child wants SIGPIPE handled in the usual way. + */ + block_signal(SIGPIPE, 1); + inst->exited = FALSE; gtk_main();