X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/d0a039b1f27c444ca842d97698fb87898a1d3f89..0a05eecbda1cf25e46ec4e3ae4379dfe4316d36d:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index e3ea2f91..04c722c3 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -22,6 +22,7 @@ #include #include #include +#include #define PUTTY_DO_GLOBALS /* actually _define_ globals */ @@ -43,7 +44,8 @@ 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 */ @@ -93,6 +95,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); @@ -980,7 +984,8 @@ 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) { if (!use_ucsoutput) { /* @@ -995,21 +1000,24 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * 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 (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. */ - luni_send(inst->ldisc, ucsoutput+start, end-start, 1); + 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); @@ -1133,6 +1141,17 @@ 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); @@ -1332,6 +1351,51 @@ 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; @@ -1378,7 +1442,10 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) 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; @@ -1400,6 +1467,8 @@ 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, inst->input_event_time)) { gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, @@ -1496,6 +1565,7 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, 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) { @@ -1521,42 +1591,56 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, } /* - * 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 != compound_text_atom && - 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; /* - * Convert COMPOUND_TEXT into UTF-8. + * If we have no data, try looking in a cut buffer. */ - 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); + if (seldata->length <= 0) { + text = retrieve_cutbuffer(&length); + if (length == 0) return; - } - text = list[0]; - length = strlen(list[0]); - charset = CS_UTF8; - free_list_required = 1; + /* 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 { - text = (char *)seldata->data; - length = seldata->length; - charset = (seldata->type == utf8_string_atom ? - CS_UTF8 : inst->ucsdata.line_codepage); + /* + * 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) @@ -1575,6 +1659,8 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, if (free_list_required) XFreeStringList(list); + if (free_required) + XFree(text); } gint idle_paste_func(gpointer data) @@ -2558,23 +2644,27 @@ void setup_fonts_ucs(struct gui_data *inst) } font_charset = set_font_info(inst, 0); - if (inst->cfg.boldfont.name[0]) { - name = inst->cfg.boldfont.name; - guessed = FALSE; + if (inst->cfg.shadowbold) { + inst->fonts[1] = NULL; } 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); + 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); + } + if (guessed) + sfree(name); } - if (guessed) - sfree(name); if (inst->cfg.widefont.name[0]) { name = inst->cfg.widefont.name; @@ -2594,33 +2684,37 @@ void setup_fonts_ucs(struct gui_data *inst) if (guessed) sfree(name); - if (inst->cfg.wideboldfont.name[0]) { - name = inst->cfg.wideboldfont.name; - guessed = FALSE; + if (inst->cfg.shadowbold) { + inst->fonts[3] = NULL; } 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); + 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); + } + if (guessed) + sfree(name); } - if (guessed) - sfree(name); inst->font_width = gdk_char_width(inst->fonts[0], ' '); inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent; @@ -2656,7 +2750,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) @@ -2671,7 +2766,8 @@ void special_menuitem(GtkMenuItem *item, gpointer 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) @@ -2712,11 +2808,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 @@ -2777,7 +2875,8 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) strcmp(oldcfg.widefont.name, cfg2.widefont.name) || strcmp(oldcfg.wideboldfont.name, cfg2.wideboldfont.name) || strcmp(oldcfg.line_codepage, cfg2.line_codepage) || - oldcfg.vtmode != cfg2.vtmode) { + oldcfg.vtmode != cfg2.vtmode || + oldcfg.shadowbold != cfg2.shadowbold) { setup_fonts_ucs(inst); need_size = 1; } else @@ -3006,6 +3105,17 @@ void new_session_menuitem(GtkMenuItem *item, gpointer 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; @@ -3027,7 +3137,11 @@ void update_specials_menu(void *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; + gtk_container_foreach(GTK_CONTAINER(inst->specialsmenu), (GtkCallback)gtk_widget_destroy, NULL); if (specials) { @@ -3053,9 +3167,51 @@ 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); + char *realhost; + const char *error; + + 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); + 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); + + gtk_widget_hide(inst->restartitem); +} + +int pt_main(int argc, char **argv) +{ extern int cfgbox(Config *cfg); struct gui_data *inst; @@ -3108,6 +3264,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); @@ -3220,6 +3377,9 @@ int pt_main(int argc, char **argv) } 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; @@ -3285,41 +3445,8 @@ 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; - const char *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); - 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); - 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