X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cbe2d68fd7c7c7bac692b3a2d200a5d2429ab201..533b1743c50f01d64c67cb69ccd0d8c6f9762092:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index 751db8e7..da1bc8d5 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 */ @@ -58,8 +60,8 @@ struct gui_data { 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; @@ -81,6 +83,7 @@ struct gui_data { void *eventlogstuff; char *progname, **gtkargvstart; int ngtkargs; + guint32 input_event_time; /* Timestamp of the most recent input event. */ }; struct draw_ctx { @@ -92,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); @@ -344,7 +349,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) @@ -368,11 +373,20 @@ 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[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); +} + gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; int w, h, need_size = 0; - GdkGC *gc; /* * See if the terminal size has changed, in which case we must @@ -397,12 +411,7 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) (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); + draw_backing_rect(inst); if (need_size && inst->term) { term_size(inst->term, h, w, inst->cfg.savelines); @@ -443,6 +452,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; @@ -702,7 +714,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 @@ -832,7 +844,7 @@ 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) { @@ -841,7 +853,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; @@ -865,7 +877,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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) { @@ -877,7 +889,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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) @@ -893,12 +905,12 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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 @@ -972,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) { /* @@ -987,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); @@ -1017,6 +1033,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) { @@ -1073,6 +1092,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; @@ -1119,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); @@ -1318,21 +1351,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; @@ -1346,11 +1428,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); @@ -1367,12 +1467,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); @@ -1390,6 +1493,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); @@ -1399,13 +1506,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; @@ -1429,14 +1541,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); } } @@ -1446,40 +1560,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) @@ -1617,15 +1798,21 @@ 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); @@ -1660,7 +1847,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; @@ -1693,9 +1880,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) { @@ -1726,33 +1913,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) @@ -1763,7 +1957,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 @@ -1779,13 +1973,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; @@ -1793,15 +1987,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; @@ -1817,7 +2011,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; @@ -1834,14 +2028,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; @@ -1850,16 +2044,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; @@ -1879,7 +2078,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, 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; @@ -1887,7 +2086,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; @@ -1901,7 +2100,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) @@ -1922,10 +2121,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, @@ -2116,6 +2315,17 @@ int do_cmdline(int argc, char **argv, int do_everything, char *p = *++argv; int ret; + /* + * Shameless cheating. Debian requires all X terminal + * emulators to support `-T title'; but + * cmdline_process_param will eat -T (it means no-pty) and + * complain that pterm doesn't support it. So, in pterm + * only, we convert -T into -title. + */ + if ((cmdline_tooltype & TOOLTYPE_NONNETWORK) && + !strcmp(p, "-T")) + p = "-title"; + ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL), do_everything ? 1 : -1, cfg); @@ -2377,9 +2587,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]); @@ -2397,42 +2661,84 @@ 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); } @@ -2462,7 +2768,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) @@ -2474,9 +2781,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) @@ -2517,11 +2826,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 @@ -2534,10 +2845,21 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data) 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]) + 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]); + + /* + * If the default background has changed, we must + * repaint the space in between the window border + * and the text area. + */ + if (i == 18) { + set_window_background(inst); + draw_backing_rect(inst); + } + } } /* @@ -2571,7 +2893,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 @@ -2598,6 +2921,12 @@ 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); } @@ -2794,6 +3123,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; @@ -2815,7 +3155,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) { @@ -2825,7 +3169,7 @@ void update_specials_menu(void *frontend) if (*specials[i].name) { menuitem = gtk_menu_item_new_with_label(specials[i].name); gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", - (gpointer)specials[i].code); + GINT_TO_POINTER(specials[i].code)); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(special_menuitem), inst); } else @@ -2841,9 +3185,50 @@ 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); + + 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; @@ -2896,6 +3281,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); @@ -3008,6 +3394,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; @@ -3046,6 +3435,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); @@ -3073,41 +3464,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; - } - - 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); + start_backend(inst); - 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