X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/27651070595bb37b38e15bdcd4ea0f00d3427e58..2dc6356a02ebe2e5c0428cefc18e64882d85b4a6:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index 74418ab9..9c86b326 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -16,12 +17,14 @@ #include #include #include -#include -#include #include #include +#include +#include +#include #define PUTTY_DO_GLOBALS /* actually _define_ globals */ + #include "putty.h" #include "terminal.h" @@ -37,19 +40,24 @@ struct gui_data { GtkAdjustment *sbar_adjust; GdkPixmap *pixmap; GdkFont *fonts[2]; /* normal and bold (for now!) */ + struct { + int charset; + int is_wide; + } fontinfo[2]; GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor; GdkColor cols[NCOLOURS]; GdkColormap *colmap; wchar_t *pastein_data; int pastein_data_len; - char *pasteout_data; - int pasteout_data_len; + char *pasteout_data, *pasteout_data_utf8; + int pasteout_data_len, pasteout_data_utf8_len; int font_width, font_height; int ignore_sbar; int mouseptr_visible; guint term_paste_idle_id; - GdkAtom compound_text_atom; + GdkAtom compound_text_atom, utf8_string_atom; int alt_keycode; + int alt_digits; char wintitle[sizeof(((Config *)0)->wintitle)]; char icontitle[sizeof(((Config *)0)->wintitle)]; int master_fd, master_func_id, exited; @@ -67,6 +75,13 @@ struct draw_ctx { static int send_raw_mouse; +static char *app_name = "pterm"; + +char *x_get_default(char *key) +{ + return XGetDefault(GDK_DISPLAY(), app_name, key); +} + void ldisc_update(void *frontend, int echo, int edit) { /* @@ -354,11 +369,17 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * If Alt is being released after typing an Alt+numberpad * sequence, we should generate the code that was typed. + * + * Note that we only do this if more than one key was actually + * pressed - I don't think Alt+NumPad4 should be ^D or that + * Alt+NumPad3 should be ^C, for example. There's no serious + * inconvenience in having to type a zero before a single-digit + * character code. */ if (event->type == GDK_KEY_RELEASE && (event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L || event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) && - inst->alt_keycode >= 0) { + inst->alt_keycode >= 0 && inst->alt_digits > 1) { #ifdef KEY_DEBUGGING printf("Alt key up, keycode = %d\n", inst->alt_keycode); #endif @@ -391,6 +412,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L || event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) { inst->alt_keycode = -1; + inst->alt_digits = 0; goto done; /* this generates nothing else */ } @@ -425,6 +447,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) inst->alt_keycode = digit; /* one-digit code */ else inst->alt_keycode = inst->alt_keycode * 10 + digit; + inst->alt_digits++; #ifdef KEY_DEBUGGING printf(" gives new code %d\n", inst->alt_keycode); #endif @@ -813,7 +836,19 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) printf("\n"); #endif - ldisc_send(inst->ldisc, output+start, end-start, 1); + /* + * 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); + show_mouseptr(inst, 0); term_seen_key_event(inst->term); term_out(inst->term); @@ -1180,9 +1215,26 @@ 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_utf8) + sfree(inst->pasteout_data_utf8); + + inst->pasteout_data_utf8 = smalloc(len*6); + inst->pasteout_data_utf8_len = len*6; + { + wchar_t *tmp = data; + int tmplen = len; + inst->pasteout_data_utf8_len = + charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8, + inst->pasteout_data_utf8_len, + CS_UTF8, NULL, NULL, 0); + inst->pasteout_data_utf8 = + srealloc(inst->pasteout_data_utf8, inst->pasteout_data_utf8_len); + } + inst->pasteout_data = smalloc(len); inst->pasteout_data_len = len; - wc_to_mb(0, 0, data, len, inst->pasteout_data, inst->pasteout_data_len, + wc_to_mb(line_codepage, 0, data, len, + inst->pasteout_data, inst->pasteout_data_len, NULL, NULL); if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY, @@ -1191,6 +1243,8 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect) GDK_SELECTION_TYPE_STRING, 1); gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, inst->compound_text_atom, 1); + gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, + inst->utf8_string_atom, 1); } } @@ -1198,8 +1252,13 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata, guint info, guint time_stamp, gpointer data) { struct gui_data *inst = (struct gui_data *)data; - gtk_selection_data_set(seldata, GDK_SELECTION_TYPE_STRING, 8, - inst->pasteout_data, inst->pasteout_data_len); + if (seldata->target == inst->utf8_string_atom) + gtk_selection_data_set(seldata, seldata->target, 8, + inst->pasteout_data_utf8, + inst->pasteout_data_utf8_len); + else + gtk_selection_data_set(seldata, seldata->target, 8, + inst->pasteout_data, inst->pasteout_data_len); } gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, @@ -1209,8 +1268,12 @@ gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, term_deselect(inst->term); if (inst->pasteout_data) sfree(inst->pasteout_data); + if (inst->pasteout_data_utf8) + sfree(inst->pasteout_data_utf8); inst->pasteout_data = NULL; inst->pasteout_data_len = 0; + inst->pasteout_data_utf8 = NULL; + inst->pasteout_data_utf8_len = 0; return TRUE; } @@ -1222,8 +1285,16 @@ void request_paste(void *frontend) * moment is to call gtk_selection_convert(), and when the data * comes back _then_ we can call term_do_paste(). */ + + /* + * First we attempt to retrieve the selection as a UTF-8 string + * (which we will convert to the correct code page before + * sending to the session, of course). If that fails, + * selection_received() will be informed and will fall back to + * an ordinary string. + */ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); + inst->utf8_string_atom, GDK_CURRENT_TIME); } gint idle_paste_func(gpointer data); /* forward ref */ @@ -1233,8 +1304,22 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, { struct gui_data *inst = (struct gui_data *)data; + if (seldata->target == inst->utf8_string_atom && seldata->length <= 0) { + /* + * Failed to get a UTF-8 selection string. Try an ordinary + * string. + */ + gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, + GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); + return; + } + + /* + * Any other failure should just go foom. + */ if (seldata->length <= 0 || - seldata->type != GDK_SELECTION_TYPE_STRING) + (seldata->type != GDK_SELECTION_TYPE_STRING && + seldata->type != inst->utf8_string_atom)) return; /* Nothing happens. */ if (inst->pastein_data) @@ -1242,8 +1327,11 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t)); inst->pastein_data_len = seldata->length; - mb_to_wc(0, 0, seldata->data, seldata->length, - inst->pastein_data, inst->pastein_data_len); + inst->pastein_data_len = + mb_to_wc((seldata->type == inst->utf8_string_atom ? + CS_UTF8 : line_codepage), + 0, seldata->data, seldata->length, + inst->pastein_data, inst->pastein_data_len); term_do_paste(inst->term); @@ -1323,12 +1411,19 @@ void sys_cursor(void *frontend, int x, int y) */ } +/* + * This is still called when mode==BELL_VISUAL, even though the + * visual bell is handled entirely within terminal.c, because we + * may want to perform additional actions on any kind of bell (for + * example, taskbar flashing in Windows). + */ void beep(void *frontend, int mode) { - gdk_beep(); + if (mode != BELL_VISUAL) + gdk_beep(); } -int CharWidth(Context ctx, int uc) +int char_width(Context ctx, int uc) { /* * Under X, any fixed-width font really _is_ fixed-width. @@ -1374,7 +1469,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; - int nfg, nbg, t, fontid, shadow; + int nfg, nbg, t, fontid, shadow, rlen; /* * NYI: @@ -1411,19 +1506,66 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, return; if (x + len*2 > inst->term->cols) len = (inst->term->cols-x)/2; /* trim to LH half */ + rlen = len * 2; + } else + rlen = len; + + { + GdkRectangle r; + + r.x = x*inst->font_width+cfg.window_border; + r.y = y*inst->font_height+cfg.window_border; + r.width = rlen*inst->font_width; + r.height = inst->font_height; + gdk_gc_set_clip_rectangle(gc, &r); } gdk_gc_set_foreground(gc, &inst->cols[nbg]); gdk_draw_rectangle(inst->pixmap, gc, 1, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border, - len*inst->font_width, inst->font_height); + rlen*inst->font_width, inst->font_height); gdk_gc_set_foreground(gc, &inst->cols[nfg]); - gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, - x*inst->font_width+cfg.window_border, - y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, - text, len); + { + GdkWChar *gwcs; + gchar *gcs; + wchar_t *wcs; + int i; + + wcs = smalloc(sizeof(wchar_t) * (len+1)); + for (i = 0; i < len; i++) { + wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK)); + } + + if (inst->fontinfo[fontid].is_wide) { + gwcs = smalloc(sizeof(GdkWChar) * (len+1)); + /* + * 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+cfg.window_border, + y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, + gwcs, len*2); + sfree(gwcs); + } else { + wchar_t *wcstmp = wcs; + int lentmp = len; + gcs = smalloc(sizeof(GdkWChar) * (len+1)); + charset_from_unicode(&wcstmp, &lentmp, gcs, len, + inst->fontinfo[fontid].charset, + NULL, ".", 1); + gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, + x*inst->font_width+cfg.window_border, + y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, + gcs, len); + sfree(gcs); + } + sfree(wcs); + } if (shadow) { gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, @@ -1710,7 +1852,32 @@ char *get_x_display(void *frontend) return gdk_get_display(); } -char *app_name = "pterm"; +static void help(FILE *fp) { + if(fprintf(fp, +"pterm option summary:\n" +"\n" +" --display DISPLAY Specify X display to use (note '--')\n" +" -name PREFIX Prefix when looking up resources (default: pterm)\n" +" -fn FONT Normal text font\n" +" -fb FONT Bold text font\n" +" -geometry WIDTHxHEIGHT Size of terminal in characters\n" +" -sl LINES Number of lines of scrollback\n" +" -fg COLOUR, -bg COLOUR Foreground/background colour\n" +" -bfg COLOUR, -bbg COLOUR Foreground/background bold colour\n" +" -cfg COLOUR, -bfg COLOUR Foreground/background cursor colour\n" +" -T TITLE Window title\n" +" -ut, +ut Do(default) or do not update utmp\n" +" -ls, +ls Do(default) or do not make shell a login shell\n" +" -sb, +sb Do(default) or do not display a scrollbar\n" +" -log PATH Log all output to a file\n" +" -nethack Map numeric keypad to hjklyubn direction keys\n" +" -xrm RESOURCE-STRING Set an X resource\n" +" -e COMMAND [ARGS...] Execute command (consumes all remaining args)\n" + ) < 0 || fflush(fp) < 0) { + perror("output error"); + exit(1); + } +} int do_cmdline(int argc, char **argv, int do_everything) { @@ -1718,18 +1885,22 @@ int do_cmdline(int argc, char **argv, int do_everything) extern char **pty_argv; /* declared in pty.c */ /* - * Macros to make argument handling easier. + * Macros to make argument handling easier. Note that because + * they need to call `continue', they cannot be contained in + * the usual do {...} while (0) wrapper to make them + * syntactically single statements; hence it is not legal to + * use one of these macros as an unbraced statement between + * `if' and `else'. */ -#define EXPECTS_ARG do { \ +#define EXPECTS_ARG { \ if (--argc <= 0) { \ err = 1; \ fprintf(stderr, "pterm: %s expects an argument\n", p); \ + continue; \ } else \ val = *++argv; \ -} while (0) -#define SECOND_PASS_ONLY do { \ - if (!do_everything) continue; \ -} while (0) +} +#define SECOND_PASS_ONLY { if (!do_everything) continue; } /* * TODO: @@ -1752,6 +1923,12 @@ int do_cmdline(int argc, char **argv, int do_everything) strncpy(cfg.boldfont, val, sizeof(cfg.boldfont)); cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0'; + } else if (!strcmp(p, "-cs")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg.line_codepage, val, sizeof(cfg.line_codepage)); + cfg.line_codepage[sizeof(cfg.line_codepage)-1] = '\0'; + } else if (!strcmp(p, "-geometry")) { int flags, x, y, w, h; EXPECTS_ARG; @@ -1865,6 +2042,10 @@ int do_cmdline(int argc, char **argv, int do_everything) EXPECTS_ARG; provide_xrm_string(val); + } else if(!strcmp(p, "-help") || !strcmp(p, "--help")) { + help(stdout); + exit(0); + } else { err = 1; fprintf(stderr, "pterm: unrecognized option '%s'\n", p); @@ -1874,12 +2055,89 @@ 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); + } +} + +static void set_font_info(struct gui_data *inst, int fontid) +{ + GdkFont *font = inst->fonts[fontid]; + XFontStruct *xfs = GDK_FONT_XFONT(font); + Display *disp = GDK_FONT_XDISPLAY(font); + Atom charset_registry, charset_encoding; + unsigned long registry_ret, encoding_ret; + charset_registry = XInternAtom(disp, "CHARSET_REGISTRY", False); + charset_encoding = XInternAtom(disp, "CHARSET_ENCODING", False); + inst->fontinfo[fontid].charset = CS_NONE; + inst->fontinfo[fontid].is_wide = 0; + if (XGetFontProperty(xfs, charset_registry, ®istry_ret) && + XGetFontProperty(xfs, charset_encoding, &encoding_ret)) { + char *reg, *enc; + reg = XGetAtomName(disp, (Atom)registry_ret); + enc = XGetAtomName(disp, (Atom)encoding_ret); + if (reg && enc) { + char *encoding = dupcat(reg, "-", enc, NULL); + inst->fontinfo[fontid].charset = charset_from_xenc(encoding); + /* FIXME: when libcharset supports wide encodings fix this. */ + if (!strcasecmp(encoding, "iso10646-1")) + inst->fontinfo[fontid].is_wide = 1; + + /* + * Hack for X line-drawing characters: if the primary + * font is encoded as ISO-8859-anything, and has valid + * glyphs in the first 32 char positions, it is assumed + * that those glyphs are the VT100 line-drawing + * character set. + * + * Actually, we'll hack even harder by only checking + * position 0x19 (vertical line, VT100 linedrawing + * `x'). Then we can check it easily by seeing if the + * ascent and descent differ. + */ + if (inst->fontinfo[fontid].charset == CS_ISO8859_1) { + int lb, rb, wid, asc, desc; + gchar text[2]; + + text[1] = '\0'; + text[0] = '\x12'; + gdk_string_extents(inst->fonts[fontid], text, + &lb, &rb, &wid, &asc, &desc); + if (asc != desc) + inst->fontinfo[fontid].charset = CS_ISO8859_1_X11; + } + + /* + * FIXME: this is a hack. Currently fonts with + * incomprehensible encodings are dealt with by + * pretending they're 8859-1. It's ugly, but it's good + * enough to stop things crashing. Should do something + * better here. + */ + if (inst->fontinfo[fontid].charset == CS_NONE) + inst->fontinfo[fontid].charset = CS_ISO8859_1; + + sfree(encoding); + } + } +} + int main(int argc, char **argv) { extern int pty_master_fd; /* declared in pty.c */ extern void pty_pre_init(void); /* declared in pty.c */ struct gui_data *inst; + /* defer any child exit handling until we're ready to deal with + * it */ + block_signal(SIGCHLD, 1); + pty_pre_init(); gtk_init(&argc, &argv); @@ -1895,12 +2153,14 @@ int main(int argc, char **argv) */ inst = smalloc(sizeof(*inst)); memset(inst, 0, sizeof(*inst)); + inst->alt_keycode = -1; /* this one needs _not_ to be zero */ inst->fonts[0] = gdk_font_load(cfg.font); if (!inst->fonts[0]) { fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font); exit(1); } + set_font_info(inst, 0); if (cfg.boldfont[0]) { inst->fonts[1] = gdk_font_load(cfg.boldfont); if (!inst->fonts[1]) { @@ -1908,6 +2168,7 @@ int main(int argc, char **argv) cfg.boldfont); exit(1); } + set_font_info(inst, 1); } else inst->fonts[1] = NULL; @@ -1915,6 +2176,7 @@ int main(int argc, char **argv) inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent; inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE); + inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE); init_ucs(); @@ -2016,7 +2278,7 @@ int main(int argc, char **argv) inst->currcursor = inst->textcursor; show_mouseptr(inst, 1); - inst->term = term_init(inst); + inst->term = term_init(&cfg, inst); inst->logctx = log_init(inst); term_provide_logctx(inst->term, inst->logctx); @@ -2028,7 +2290,8 @@ int main(int argc, char **argv) term_size(inst->term, cfg.height, cfg.width, cfg.savelines); - inst->ldisc = ldisc_create(inst->term, inst->back, inst->backhandle, inst); + inst->ldisc = + ldisc_create(&cfg, inst->term, inst->back, inst->backhandle, inst); ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */ inst->master_fd = pty_master_fd; @@ -2036,6 +2299,10 @@ int main(int argc, char **argv) inst->master_func_id = gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst); + /* now we're reday to deal with the child exit handler being + * called */ + block_signal(SIGCHLD, 0); + gtk_main(); return 0;