X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8e20db058dd2c1bdb376961e7a0c18343ebd1f3b..b9d7bcadee831e9b59fb785f2464a5fc1897bd1a:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index 5af9ba1a..2791693a 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -3,14 +3,19 @@ * back end, all running as a GTK application. Wish me luck. */ +#define _GNU_SOURCE + #include #include #include +#include #include #include #include #include #include +#include +#include #include #include #include @@ -18,6 +23,7 @@ #define PUTTY_DO_GLOBALS /* actually _define_ globals */ #include "putty.h" +#include "terminal.h" #define CAT2(x,y) x ## y #define CAT(x,y) CAT2(x,y) @@ -46,13 +52,15 @@ struct gui_data { int alt_keycode; char wintitle[sizeof(((Config *)0)->wintitle)]; char icontitle[sizeof(((Config *)0)->wintitle)]; + int master_fd, master_func_id, exited; + void *ldisc; }; static struct gui_data the_inst; static struct gui_data *inst = &the_inst; /* so we always write `inst->' */ static int send_raw_mouse; -void ldisc_update(int echo, int edit) +void ldisc_update(void *frontend, int echo, int edit) { /* * This is a stub in pterm. If I ever produce a Unix @@ -161,7 +169,7 @@ void set_zorder(int top) */ void refresh_window(void) { - term_invalidate(); + term_invalidate(term); } /* @@ -286,7 +294,7 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) } if (need_size) { - term_size(h, w, cfg.savelines); + term_size(term, h, w, cfg.savelines); } return TRUE; @@ -410,11 +418,11 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * at all. */ if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) { - term_scroll(0, -cfg.height/2); + term_scroll(term, 0, -cfg.height/2); return TRUE; } if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) { - term_scroll(0, +cfg.height/2); + term_scroll(term, 0, +cfg.height/2); return TRUE; } @@ -431,9 +439,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) strncpy(output+1, event->string, 31); output[31] = '\0'; end = strlen(output); - if (event->state & GDK_MOD1_MASK) + if (event->state & GDK_MOD1_MASK) { start = 0; - else + if (end == 1) end = 0; + } else start = 1; /* Control-` is the same as Control-\ (unless gtk has a better idea) */ @@ -516,7 +525,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * Application keypad mode. */ - if (app_keypad_keys && !cfg.no_applic_k) { + if (term->app_keypad_keys && !cfg.no_applic_k) { int xkey = 0; switch (event->keyval) { case GDK_Num_Lock: xkey = 'P'; break; @@ -554,7 +563,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break; } if (xkey) { - if (vt52_mode) { + if (term->vt52_mode) { if (xkey >= 'P' && xkey <= 'S') end = 1 + sprintf(output+1, "\033%c", xkey); else @@ -662,7 +671,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (cfg.funky_type == 3 && code <= 6) code = "\0\2\1\4\5\3\6"[code]; - if (vt52_mode && code > 0 && code <= 6) { + if (term->vt52_mode && code > 0 && code <= 6) { end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]); goto done; } @@ -701,13 +710,14 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } goto done; } - if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) { + if ((term->vt52_mode || cfg.funky_type == 4) && + code >= 11 && code <= 24) { int offt = 0; if (code > 15) offt++; if (code > 21) offt++; - if (vt52_mode) + if (term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11 - offt); else @@ -720,7 +730,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) goto done; } if (cfg.funky_type == 2 && code >= 11 && code <= 14) { - if (vt52_mode) + if (term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11); else end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11); @@ -758,9 +768,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * app cursor keys mode they do ESC O A instead. * Ctrl toggles the two modes. */ - if (vt52_mode) { + if (term->vt52_mode) { end = 1 + sprintf(output+1, "\033%c", xkey); - } else if (!app_cursor_keys ^ + } else if (!term->app_cursor_keys ^ !(event->state & GDK_CONTROL_MASK)) { end = 1 + sprintf(output+1, "\033O%c", xkey); } else { @@ -783,9 +793,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) printf("\n"); #endif - ldisc_send(output+start, end-start, 1); + ldisc_send(inst->ldisc, output+start, end-start, 1); show_mouseptr(0); - term_out(); + term_seen_key_event(term); + term_out(term); } return TRUE; @@ -799,11 +810,11 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data) show_mouseptr(1); if (event->button == 4 && event->type == GDK_BUTTON_PRESS) { - term_scroll(0, -5); + term_scroll(term, 0, -5); return TRUE; } if (event->button == 5 && event->type == GDK_BUTTON_PRESS) { - term_scroll(0, +5); + term_scroll(term, 0, +5); return TRUE; } @@ -834,7 +845,7 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data) x = (event->x - cfg.window_border) / inst->font_width; y = (event->y - cfg.window_border) / inst->font_height; - term_mouse(button, act, x, y, shift, ctrl, alt); + term_mouse(term, button, act, x, y, shift, ctrl, alt); return TRUE; } @@ -861,36 +872,96 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) x = (event->x - cfg.window_border) / inst->font_width; y = (event->y - cfg.window_border) / inst->font_height; - term_mouse(button, MA_DRAG, x, y, shift, ctrl, alt); + term_mouse(term, button, MA_DRAG, x, y, shift, ctrl, alt); return TRUE; } +void done_with_pty(struct gui_data *inst) +{ + extern void pty_close(void); + + if (inst->master_fd >= 0) { + pty_close(); + inst->master_fd = -1; + gtk_input_remove(inst->master_func_id); + } + + if (!inst->exited && back->exitcode(backhandle) >= 0) { + int exitcode = back->exitcode(backhandle); + int clean; + + clean = WIFEXITED(exitcode) && (WEXITSTATUS(exitcode) == 0); + + /* + * Terminate now, if the Close On Exit setting is + * appropriate. + */ + if (cfg.close_on_exit == COE_ALWAYS || + (cfg.close_on_exit == COE_NORMAL && clean)) + exit(0); + + /* + * Otherwise, output an indication that the session has + * closed. + */ + { + char message[512]; + if (WIFEXITED(exitcode)) + sprintf(message, "\r\n[pterm: process terminated with exit" + " code %d]\r\n", WEXITSTATUS(exitcode)); + else if (WIFSIGNALED(exitcode)) +#ifdef HAVE_NO_STRSIGNAL + sprintf(message, "\r\n[pterm: process terminated on signal" + " %d]\r\n", WTERMSIG(exitcode)); +#else + sprintf(message, "\r\n[pterm: process terminated on signal" + " %d (%.400s)]\r\n", WTERMSIG(exitcode), + strsignal(WTERMSIG(exitcode))); +#endif + from_backend((void *)term, 0, message, strlen(message)); + } + inst->exited = 1; + } +} + +void frontend_keypress(void *handle) +{ + struct gui_data *inst = (struct gui_data *)handle; + + /* + * If our child process has exited but not closed, terminate on + * any keypress. + */ + if (inst->exited) + exit(0); +} + gint timer_func(gpointer data) { - /* struct gui_data *inst = (struct gui_data *)data; */ - extern int pty_child_is_dead(); /* declared in pty.c */ + struct gui_data *inst = (struct gui_data *)data; - if (pty_child_is_dead()) { + if (back->exitcode(backhandle) >= 0) { /* * The primary child process died. We could keep the * terminal open for remaining subprocesses to output to, * but conventional wisdom seems to feel that that's the - * Wrong Thing for an xterm-alike, so we bail out now. This - * would be easy enough to change or make configurable if - * necessary. + * Wrong Thing for an xterm-alike, so we bail out now + * (though we don't necessarily _close_ the window, + * depending on the state of Close On Exit). This would be + * easy enough to change or make configurable if necessary. */ - exit(0); + done_with_pty(inst); } - term_update(); - term_blink(0); + term_update(term); + term_blink(term, 0); return TRUE; } void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) { - /* struct gui_data *inst = (struct gui_data *)data; */ + struct gui_data *inst = (struct gui_data *)data; char buf[4096]; int ret; @@ -902,17 +973,14 @@ void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) * to happen. Boo. */ if (ret == 0 || (ret < 0 && errno == EIO)) { - exit(0); - } - - if (ret < 0) { + done_with_pty(inst); + } else if (ret < 0) { perror("read pty master"); exit(1); - } - if (ret > 0) - from_backend(0, buf, ret); - term_blink(1); - term_out(); + } else if (ret > 0) + from_backend(term, 0, buf, ret); + term_blink(term, 1); + term_out(term); } void destroy(GtkWidget *widget, gpointer data) @@ -922,9 +990,9 @@ void destroy(GtkWidget *widget, gpointer data) gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) { - has_focus = event->in; - term_out(); - term_update(); + term->has_focus = event->in; + term_out(term); + term_update(term); show_mouseptr(1); return FALSE; } @@ -1024,6 +1092,14 @@ void real_palette_set(int n, int r, int g, int b) n, r, g, b); } +void set_window_background(void) +{ + if (inst->area && inst->area->window) + gdk_window_set_background(inst->area->window, &inst->cols[18]); + if (inst->window && inst->window->window) + gdk_window_set_background(inst->window->window, &inst->cols[18]); +} + void palette_set(int n, int r, int g, int b) { static const int first[21] = { @@ -1034,6 +1110,8 @@ void palette_set(int n, int r, int g, int b) real_palette_set(first[n], r, g, b); if (first[n] >= 18) real_palette_set(first[n] + 1, r, g, b); + if (first[n] == 18) + set_window_background(); } void palette_reset(void) @@ -1068,6 +1146,8 @@ void palette_reset(void) g_error("pterm: couldn't allocate colour %d (#%02x%02x%02x)\n", i, cfg.colours[i][0], cfg.colours[i][1], cfg.colours[i][2]); } + + set_window_background(); } void write_clip(wchar_t * data, int len, int must_deselect) @@ -1098,7 +1178,7 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata, gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, gpointer data) { - term_deselect(); + term_deselect(term); if (inst->pasteout_data) sfree(inst->pasteout_data); inst->pasteout_data = NULL; @@ -1134,9 +1214,9 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, mb_to_wc(0, 0, seldata->data, seldata->length, inst->pastein_data, inst->pastein_data_len); - term_do_paste(); + term_do_paste(term); - if (term_paste_pending()) + if (term_paste_pending(term)) inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst); } @@ -1144,8 +1224,8 @@ gint idle_paste_func(gpointer data) { struct gui_data *inst = (struct gui_data *)data; - if (term_paste_pending()) - term_paste(); + if (term_paste_pending(term)) + term_paste(term); else gtk_idle_remove(inst->term_paste_idle_id); @@ -1195,7 +1275,7 @@ void scrollbar_moved(GtkAdjustment *adj, gpointer data) if (!cfg.scrollbar) return; if (!inst->ignore_sbar) - term_scroll(1, (int)adj->value); + term_scroll(term, 1, (int)adj->value); } void sys_cursor(int x, int y) @@ -1278,10 +1358,10 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, if (lattr != LATTR_NORM) { x *= 2; - if (x >= cols) + if (x >= term->cols) return; - if (x + len*2 > cols) - len = (cols-x)/2; /* trim to LH half */ + if (x + len*2 > term->cols) + len = (term->cols-x)/2; /* trim to LH half */ } gdk_gc_set_foreground(gc, &inst->cols[nbg]); @@ -1296,16 +1376,9 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, text, len); - /* - * X fonts seem to be pretty consistent about leaving the - * _left_ pixel of the cell blank rather than the right. Hence - * I'm going to hard-code shadow bolding as displaying one - * pixel to the left rather than try to work out whether it - * should be left or right. - */ if (shadow) { gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, - x*inst->font_width+cfg.window_border - 1, + x*inst->font_width+cfg.window_border + cfg.shadowboldoffset, y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, text, len); } @@ -1367,10 +1440,10 @@ void do_text(Context ctx, int x, int y, char *text, int len, if (lattr != LATTR_NORM) { x *= 2; - if (x >= cols) + if (x >= term->cols) return; - if (x + len*2 > cols) - len = (cols-x)/2; /* trim to LH half */ + if (x + len*2 > term->cols) + len = (term->cols-x)/2; /* trim to LH half */ len *= 2; } @@ -1400,10 +1473,10 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, if (lattr != LATTR_NORM) { x *= 2; - if (x >= cols) + if (x >= term->cols) return; - if (x + len*2 > cols) - len = (cols-x)/2; /* trim to LH half */ + if (x + len*2 > term->cols) + len = (term->cols-x)/2; /* trim to LH half */ len *= 2; } @@ -1708,7 +1781,7 @@ int do_cmdline(int argc, char **argv, int do_everything) } else if (!strcmp(p, "-ut")) { SECOND_PASS_ONLY; - cfg.stamp_utmp = 0; + cfg.stamp_utmp = 1; } else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) { SECOND_PASS_ONLY; @@ -1733,6 +1806,14 @@ int do_cmdline(int argc, char **argv, int do_everything) } else if (!strcmp(p, "-name")) { EXPECTS_ARG; app_name = val; + + } else if (!strcmp(p, "-xrm")) { + EXPECTS_ARG; + provide_xrm_string(val); + + } else { + err = 1; + fprintf(stderr, "pterm: unrecognized option '%s'\n", p); } } @@ -1754,6 +1835,11 @@ int main(int argc, char **argv) if (do_cmdline(argc, argv, 1)) /* post-defaults, do everything */ exit(1); + /* + * Initialise the whole instance structure to zeroes + */ + memset(inst, 0, sizeof(*inst)); + inst->fonts[0] = gdk_font_load(cfg.font); if (!inst->fonts[0]) { fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font); @@ -1865,6 +1951,8 @@ int main(int argc, char **argv) gtk_widget_show(GTK_WIDGET(inst->hbox)); gtk_widget_show(inst->window); + set_window_background(); + inst->textcursor = make_mouse_ptr(GDK_XTERM); inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR); inst->blankcursor = make_mouse_ptr(-1); @@ -1872,13 +1960,22 @@ int main(int argc, char **argv) inst->currcursor = inst->textcursor; show_mouseptr(1); + term = term_init(); + back = &pty_backend; - back->init(NULL, 0, NULL, 0); + back->init((void *)term, &backhandle, NULL, 0, NULL, 0); + + term_provide_resize_fn(term, back->size, backhandle); + + term_size(term, cfg.height, cfg.width, cfg.savelines); - gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst); + inst->ldisc = ldisc_create(term, back, backhandle, inst); + ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */ - term_init(); - term_size(cfg.height, cfg.width, cfg.savelines); + inst->master_fd = pty_master_fd; + inst->exited = FALSE; + inst->master_func_id = gdk_input_add(pty_master_fd, GDK_INPUT_READ, + pty_input_func, inst); gtk_main();