X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fd02b8c05f488843ebb7a4ff9c1ec494f740b6b9..c5e438ecf3f6d7b8caab10e43a452f3555149309:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index ebdc5a8e..cc459625 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -3,21 +3,28 @@ * 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 #include +#include +#include +#include #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) @@ -44,15 +51,32 @@ struct gui_data { guint term_paste_idle_id; GdkAtom compound_text_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; + void *ldisc; + Backend *back; + void *backhandle; + Terminal *term; + void *logctx; +}; + +struct draw_ctx { + GdkGC *gc; + struct gui_data *inst; }; -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) +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) { /* * This is a stub in pterm. If I ever produce a Unix @@ -62,7 +86,7 @@ void ldisc_update(int echo, int edit) */ } -int askappend(char *filename) +int askappend(void *frontend, char *filename) { /* * Logging in an xterm-alike is liable to be something you only @@ -73,7 +97,7 @@ int askappend(char *filename) return 2; } -void logevent(char *string) +void logevent(void *frontend, char *string) { /* * This is not a very helpful function: events are logged @@ -82,8 +106,10 @@ void logevent(char *string) */ } -int font_dimension(int which) /* 0 for width, 1 for height */ +int font_dimension(void *frontend, int which)/* 0 for width, 1 for height */ { + struct gui_data *inst = (struct gui_data *)frontend; + if (which) return inst->font_height; else @@ -99,8 +125,10 @@ int font_dimension(int which) /* 0 for width, 1 for height */ * mouse or a means of faking it, and there is no need to switch * buttons around at all. */ -Mouse_Button translate_button(Mouse_Button button) +Mouse_Button translate_button(void *frontend, Mouse_Button button) { + /* struct gui_data *inst = (struct gui_data *)frontend; */ + if (button == MBT_LEFT) return MBT_SELECT; if (button == MBT_MIDDLE) @@ -114,12 +142,13 @@ Mouse_Button translate_button(Mouse_Button button) * Minimise or restore the window in response to a server-side * request. */ -void set_iconic(int iconic) +void set_iconic(void *frontend, int iconic) { /* * GTK 1.2 doesn't know how to do this. */ #if GTK_CHECK_VERSION(2,0,0) + struct gui_data *inst = (struct gui_data *)frontend; if (iconic) gtk_window_iconify(GTK_WINDOW(inst->window)); else @@ -130,8 +159,9 @@ void set_iconic(int iconic) /* * Move the window in response to a server-side request. */ -void move_window(int x, int y) +void move_window(void *frontend, int x, int y) { + struct gui_data *inst = (struct gui_data *)frontend; /* * I assume that when the GTK version of this call is available * we should use it. Not sure how it differs from the GDK one, @@ -148,8 +178,9 @@ void move_window(int x, int y) * Move the window to the top or bottom of the z-order in response * to a server-side request. */ -void set_zorder(int top) +void set_zorder(void *frontend, int top) { + struct gui_data *inst = (struct gui_data *)frontend; if (top) gdk_window_raise(inst->window->window); else @@ -159,21 +190,23 @@ void set_zorder(int top) /* * Refresh the window in response to a server-side request. */ -void refresh_window(void) +void refresh_window(void *frontend) { - term_invalidate(); + struct gui_data *inst = (struct gui_data *)frontend; + term_invalidate(inst->term); } /* * Maximise or restore the window in response to a server-side * request. */ -void set_zoomed(int zoomed) +void set_zoomed(void *frontend, int zoomed) { /* * GTK 1.2 doesn't know how to do this. */ #if GTK_CHECK_VERSION(2,0,0) + struct gui_data *inst = (struct gui_data *)frontend; if (iconic) gtk_window_maximize(GTK_WINDOW(inst->window)); else @@ -184,16 +217,18 @@ void set_zoomed(int zoomed) /* * Report whether the window is iconic, for terminal reports. */ -int is_iconic(void) +int is_iconic(void *frontend) { + struct gui_data *inst = (struct gui_data *)frontend; return !gdk_window_is_viewable(inst->window->window); } /* * Report the window's position, for terminal reports. */ -void get_window_pos(int *x, int *y) +void get_window_pos(void *frontend, int *x, int *y) { + struct gui_data *inst = (struct gui_data *)frontend; /* * I assume that when the GTK version of this call is available * we should use it. Not sure how it differs from the GDK one, @@ -209,8 +244,9 @@ void get_window_pos(int *x, int *y) /* * Report the window's pixel size, for terminal reports. */ -void get_window_pixels(int *x, int *y) +void get_window_pixels(void *frontend, int *x, int *y) { + struct gui_data *inst = (struct gui_data *)frontend; /* * I assume that when the GTK version of this call is available * we should use it. Not sure how it differs from the GDK one, @@ -226,8 +262,9 @@ void get_window_pixels(int *x, int *y) /* * Return the window or icon title. */ -char *get_window_title(int icon) +char *get_window_title(void *frontend, int icon) { + struct gui_data *inst = (struct gui_data *)frontend; return icon ? inst->wintitle : inst->icontitle; } @@ -240,7 +277,7 @@ gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data) return FALSE; } -void show_mouseptr(int show) +static void show_mouseptr(struct gui_data *inst, int show) { if (!cfg.hide_mouseptr) show = 1; @@ -286,7 +323,7 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) } if (need_size) { - term_size(h, w, cfg.savelines); + term_size(inst->term, h, w, cfg.savelines); } return TRUE; @@ -294,7 +331,7 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data) { - /* struct gui_data *inst = (struct gui_data *)data; */ + struct gui_data *inst = (struct gui_data *)data; /* * Pass the exposed rectangle to terminal.c, which will call us @@ -316,7 +353,7 @@ gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data) gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { - /* struct gui_data *inst = (struct gui_data *)data; */ + struct gui_data *inst = (struct gui_data *)data; char output[32]; int start, end; @@ -326,11 +363,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 @@ -363,6 +406,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 */ } @@ -397,6 +441,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 @@ -410,11 +455,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(inst->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(inst->term, 0, +cfg.height/2); return TRUE; } @@ -422,7 +467,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * Neither does Shift-Ins. */ if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) { - request_paste(); + request_paste(inst); return TRUE; } @@ -431,10 +476,11 @@ 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) - start = end = 0; - else - start = end = 1; + if (event->state & GDK_MOD1_MASK) { + start = 0; + if (end == 1) end = 0; + } else + start = 1; /* Control-` is the same as Control-\ (unless gtk has a better idea) */ if (!event->string[0] && event->keyval == '`' && @@ -516,7 +562,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * Application keypad mode. */ - if (app_keypad_keys && !cfg.no_applic_k) { + if (inst->term->app_keypad_keys && !cfg.no_applic_k) { int xkey = 0; switch (event->keyval) { case GDK_Num_Lock: xkey = 'P'; break; @@ -554,7 +600,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 (inst->term->vt52_mode) { if (xkey >= 'P' && xkey <= 'S') end = 1 + sprintf(output+1, "\033%c", xkey); else @@ -662,7 +708,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 (inst->term->vt52_mode && code > 0 && code <= 6) { end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]); goto done; } @@ -701,13 +747,14 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } goto done; } - if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) { + if ((inst->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 (inst->term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11 - offt); else @@ -720,7 +767,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 (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); @@ -758,9 +805,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 (inst->term->vt52_mode) { end = 1 + sprintf(output+1, "\033%c", xkey); - } else if (!app_cursor_keys ^ + } else if (!inst->term->app_cursor_keys ^ !(event->state & GDK_CONTROL_MASK)) { end = 1 + sprintf(output+1, "\033O%c", xkey); } else { @@ -783,9 +830,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) printf("\n"); #endif - ldisc_send(output+start, end-start, 1); - show_mouseptr(0); - term_out(); + 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; @@ -796,14 +844,14 @@ 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; - show_mouseptr(1); + show_mouseptr(inst, 1); if (event->button == 4 && event->type == GDK_BUTTON_PRESS) { - term_scroll(0, -5); + term_scroll(inst->term, 0, -5); return TRUE; } if (event->button == 5 && event->type == GDK_BUTTON_PRESS) { - term_scroll(0, +5); + term_scroll(inst->term, 0, +5); return TRUE; } @@ -834,7 +882,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(inst->term, button, act, x, y, shift, ctrl, alt); return TRUE; } @@ -844,7 +892,7 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) struct gui_data *inst = (struct gui_data *)data; int shift, ctrl, alt, x, y, button; - show_mouseptr(1); + show_mouseptr(inst, 1); shift = event->state & GDK_SHIFT_MASK; ctrl = event->state & GDK_CONTROL_MASK; @@ -861,36 +909,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(inst->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 && inst->back->exitcode(inst->backhandle) >= 0) { + int exitcode = inst->back->exitcode(inst->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 *)inst->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 (inst->back->exitcode(inst->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(inst->term); + term_blink(inst->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 +1010,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(inst->term, 0, buf, ret); + term_blink(inst->term, 1); + term_out(inst->term); } void destroy(GtkWidget *widget, gpointer data) @@ -922,29 +1027,32 @@ void destroy(GtkWidget *widget, gpointer data) gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) { - has_focus = event->in; - term_out(); - term_update(); - show_mouseptr(1); + struct gui_data *inst = (struct gui_data *)data; + inst->term->has_focus = event->in; + term_out(inst->term); + term_update(inst->term); + show_mouseptr(inst, 1); return FALSE; } /* * set or clear the "raw mouse message" mode */ -void set_raw_mouse_mode(int activate) +void set_raw_mouse_mode(void *frontend, int activate) { + struct gui_data *inst = (struct gui_data *)frontend; activate = activate && !cfg.no_mouse_rep; send_raw_mouse = activate; if (send_raw_mouse) inst->currcursor = inst->rawcursor; else inst->currcursor = inst->textcursor; - show_mouseptr(inst->mouseptr_visible); + show_mouseptr(inst, inst->mouseptr_visible); } -void request_resize(int w, int h) +void request_resize(void *frontend, int w, int h) { + struct gui_data *inst = (struct gui_data *)frontend; int large_x, large_y; int offset_x, offset_y; int area_x, area_y; @@ -970,7 +1078,7 @@ void request_resize(int w, int h) * bogus size request which guarantees to be bigger than the * current size of the drawing area. */ - get_window_pixels(&large_x, &large_y); + get_window_pixels(inst, &large_x, &large_y); large_x += 32; large_y += 32; @@ -1009,7 +1117,7 @@ void request_resize(int w, int h) #endif } -void real_palette_set(int n, int r, int g, int b) +static void real_palette_set(struct gui_data *inst, int n, int r, int g, int b) { gboolean success[1]; @@ -1024,20 +1132,32 @@ void real_palette_set(int n, int r, int g, int b) n, r, g, b); } -void palette_set(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]); + if (inst->window && inst->window->window) + gdk_window_set_background(inst->window->window, &inst->cols[18]); +} + +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(first[n], r, g, b); + real_palette_set(inst, first[n], r, g, b); if (first[n] >= 18) - real_palette_set(first[n] + 1, r, g, b); + real_palette_set(inst, first[n] + 1, r, g, b); + if (first[n] == 18) + set_window_background(inst); } -void palette_reset(void) +void palette_reset(void *frontend) { + struct gui_data *inst = (struct gui_data *)frontend; /* This maps colour indices in cfg to those used in inst->cols. */ static const int ww[] = { 6, 7, 8, 9, 10, 11, 12, 13, @@ -1068,10 +1188,13 @@ 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(inst); } -void write_clip(wchar_t * data, int len, int must_deselect) +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); inst->pasteout_data = smalloc(len); @@ -1091,6 +1214,7 @@ void write_clip(wchar_t * data, int len, int must_deselect) 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); } @@ -1098,7 +1222,8 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata, gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, gpointer data) { - term_deselect(); + struct gui_data *inst = (struct gui_data *)data; + term_deselect(inst->term); if (inst->pasteout_data) sfree(inst->pasteout_data); inst->pasteout_data = NULL; @@ -1106,8 +1231,9 @@ gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, return TRUE; } -void request_paste(void) +void request_paste(void *frontend) { + struct gui_data *inst = (struct gui_data *)frontend; /* * In Unix, pasting is asynchronous: all we can do at the * moment is to call gtk_selection_convert(), and when the data @@ -1120,8 +1246,10 @@ void request_paste(void) gint idle_paste_func(gpointer data); /* forward ref */ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, - gpointer data) + guint time, gpointer data) { + struct gui_data *inst = (struct gui_data *)data; + if (seldata->length <= 0 || seldata->type != GDK_SELECTION_TYPE_STRING) return; /* Nothing happens. */ @@ -1134,9 +1262,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(inst->term); - if (term_paste_pending()) + if (term_paste_pending(inst->term)) inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst); } @@ -1144,8 +1272,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(inst->term)) + term_paste(inst->term); else gtk_idle_remove(inst->term_paste_idle_id); @@ -1153,30 +1281,35 @@ gint idle_paste_func(gpointer data) } -void get_clip(wchar_t ** p, int *len) +void get_clip(void *frontend, wchar_t ** p, int *len) { + struct gui_data *inst = (struct gui_data *)frontend; + if (p) { *p = inst->pastein_data; *len = inst->pastein_data_len; } } -void set_title(char *title) +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); } -void set_icon(char *title) +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); } -void set_sbar(int total, int start, int page) +void set_sbar(void *frontend, int total, int start, int page) { + struct gui_data *inst = (struct gui_data *)frontend; if (!cfg.scrollbar) return; inst->sbar_adjust->lower = 0; @@ -1192,22 +1325,31 @@ void set_sbar(int total, int start, int page) void scrollbar_moved(GtkAdjustment *adj, gpointer data) { + struct gui_data *inst = (struct gui_data *)data; + if (!cfg.scrollbar) return; if (!inst->ignore_sbar) - term_scroll(1, (int)adj->value); + term_scroll(inst->term, 1, (int)adj->value); } -void sys_cursor(int x, int y) +void sys_cursor(void *frontend, int x, int y) { /* * This is meaningless under X. */ } -void beep(int mode) +/* + * 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) @@ -1220,19 +1362,27 @@ int CharWidth(Context ctx, int uc) return 1; } -Context get_ctx(void) +Context get_ctx(void *frontend) { - GdkGC *gc; + struct gui_data *inst = (struct gui_data *)frontend; + struct draw_ctx *dctx; + if (!inst->area->window) return NULL; - gc = gdk_gc_new(inst->area->window); - return gc; + + dctx = smalloc(sizeof(*dctx)); + dctx->inst = inst; + dctx->gc = gdk_gc_new(inst->area->window); + return dctx; } void free_ctx(Context ctx) { - GdkGC *gc = (GdkGC *)ctx; + struct draw_ctx *dctx = (struct draw_ctx *)ctx; + /* struct gui_data *inst = dctx->inst; */ + GdkGC *gc = dctx->gc; gdk_gc_unref(gc); + sfree(dctx); } /* @@ -1244,8 +1394,11 @@ void free_ctx(Context ctx) void do_text_internal(Context ctx, int x, int y, char *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 nfg, nbg, t, fontid, shadow; - GdkGC *gc = (GdkGC *)ctx; /* * NYI: @@ -1278,10 +1431,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 >= inst->term->cols) return; - if (x + len*2 > cols) - len = (cols-x)/2; /* trim to LH half */ + if (x + len*2 > inst->term->cols) + len = (inst->term->cols-x)/2; /* trim to LH half */ } gdk_gc_set_foreground(gc, &inst->cols[nbg]); @@ -1296,16 +1449,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); } @@ -1361,16 +1507,18 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, void do_text(Context ctx, int x, int y, char *text, int len, unsigned long attr, int lattr) { - GdkGC *gc = (GdkGC *)ctx; + struct draw_ctx *dctx = (struct draw_ctx *)ctx; + struct gui_data *inst = dctx->inst; + GdkGC *gc = dctx->gc; do_text_internal(ctx, x, y, text, len, attr, lattr); if (lattr != LATTR_NORM) { x *= 2; - if (x >= cols) + if (x >= inst->term->cols) return; - if (x + len*2 > cols) - len = (cols-x)/2; /* trim to LH half */ + if (x + len*2 > inst->term->cols) + len = (inst->term->cols-x)/2; /* trim to LH half */ len *= 2; } @@ -1385,8 +1533,11 @@ void do_text(Context ctx, int x, int y, char *text, int len, void do_cursor(Context ctx, int x, int y, char *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; - GdkGC *gc = (GdkGC *)ctx; if (attr & TATTR_PASCURS) { attr &= ~TATTR_PASCURS; @@ -1400,10 +1551,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 >= inst->term->cols) return; - if (x + len*2 > cols) - len = (cols-x)/2; /* trim to LH half */ + if (x + len*2 > inst->term->cols) + len = (inst->term->cols-x)/2; /* trim to LH half */ len *= 2; } @@ -1475,7 +1626,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, len*inst->font_width, inst->font_height); } -GdkCursor *make_mouse_ptr(int cursor_val) +GdkCursor *make_mouse_ptr(struct gui_data *inst, int cursor_val) { /* * Truly hideous hack: GTK doesn't allow us to set the mouse @@ -1578,12 +1729,37 @@ void modalfatalbox(char *p, ...) exit(1); } -char *get_x_display(void) +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) { @@ -1708,7 +1884,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; @@ -1738,6 +1914,13 @@ 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); } } @@ -1748,6 +1931,7 @@ 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; pty_pre_init(); @@ -1759,6 +1943,13 @@ int main(int argc, char **argv) if (do_cmdline(argc, argv, 1)) /* post-defaults, do everything */ exit(1); + /* + * Create an instance structure and initialise to zeroes + */ + 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); @@ -1784,14 +1975,14 @@ int main(int argc, char **argv) inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); if (cfg.wintitle[0]) - set_title(cfg.wintitle); + set_title(inst, cfg.wintitle); else - set_title("pterm"); + set_title(inst, "pterm"); /* * Set up the colour map. */ - palette_reset(); + palette_reset(inst); inst->area = gtk_drawing_area_new(); gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), @@ -1870,20 +2061,34 @@ int main(int argc, char **argv) gtk_widget_show(GTK_WIDGET(inst->hbox)); gtk_widget_show(inst->window); - inst->textcursor = make_mouse_ptr(GDK_XTERM); - inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR); - inst->blankcursor = make_mouse_ptr(-1); - make_mouse_ptr(-2); /* clean up cursor font */ + set_window_background(inst); + + inst->textcursor = make_mouse_ptr(inst, GDK_XTERM); + inst->rawcursor = make_mouse_ptr(inst, GDK_LEFT_PTR); + inst->blankcursor = make_mouse_ptr(inst, -1); + make_mouse_ptr(inst, -2); /* clean up cursor font */ inst->currcursor = inst->textcursor; - show_mouseptr(1); + show_mouseptr(inst, 1); + + inst->term = term_init(inst); + inst->logctx = log_init(inst); + term_provide_logctx(inst->term, inst->logctx); + + inst->back = &pty_backend; + inst->back->init((void *)inst->term, &inst->backhandle, NULL, 0, NULL, 0); + inst->back->provide_logctx(inst->backhandle, inst->logctx); + + term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle); - back = &pty_backend; - back->init(NULL, 0, NULL, 0); + term_size(inst->term, cfg.height, cfg.width, cfg.savelines); - gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst); + inst->ldisc = ldisc_create(inst->term, inst->back, inst->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();