X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b3530065042b900e2828c629fb9d4b48ec3511d8..3d88e64dfcf5dc0fd361ce0c504c67a9196ce44c:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index c612fd3b..6d6a9a58 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -3,19 +3,30 @@ * 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 #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) @@ -28,27 +39,88 @@ struct gui_data { GtkBox *hbox; GtkAdjustment *sbar_adjust; GdkPixmap *pixmap; - GdkFont *fonts[2]; /* normal and bold (for now!) */ + GdkFont *fonts[4]; /* normal, bold, wide, widebold */ + struct { + int charset; + int is_wide; + } fontinfo[4]; GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor; GdkColor cols[NCOLOURS]; GdkColormap *colmap; wchar_t *pastein_data; + int direct_to_font; 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; + void *ldisc; + Backend *back; + void *backhandle; + Terminal *term; + void *logctx; + struct unicode_data ucsdata; + Config cfg; +}; + +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(const char *key) +{ + return XGetDefault(GDK_DISPLAY(), app_name, key); +} + +/* + * Default settings that are specific to pterm. + */ +FontSpec platform_default_fontspec(const char *name) +{ + FontSpec ret; + if (!strcmp(name, "Font")) + strcpy(ret.name, "fixed"); + else + *ret.name = '\0'; + return ret; +} + +Filename platform_default_filename(const char *name) +{ + Filename ret; + if (!strcmp(name, "LogFileName")) + strcpy(ret.path, "putty.log"); + else + *ret.path = '\0'; + return ret; +} + +char *platform_default_s(const char *name) +{ + return NULL; +} + +int platform_default_i(const char *name, int def) +{ + if (!strcmp(name, "CloseOnExit")) + return 2; /* maps to FORCE_ON after painful rearrangement :-( */ + return def; +} + +void ldisc_update(void *frontend, int echo, int edit) { /* * This is a stub in pterm. If I ever produce a Unix @@ -58,7 +130,7 @@ void ldisc_update(int echo, int edit) */ } -int askappend(char *filename) +int askappend(void *frontend, Filename filename) { /* * Logging in an xterm-alike is liable to be something you only @@ -69,7 +141,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 @@ -78,6 +150,16 @@ void logevent(char *string) */ } +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 + return inst->font_width; +} + /* * Translate a raw mouse button designation (LEFT, MIDDLE, RIGHT) * into a cooked one (SELECT, EXTEND, PASTE). @@ -87,8 +169,10 @@ void logevent(char *string) * 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) +static Mouse_Button translate_button(Mouse_Button button) { + /* struct gui_data *inst = (struct gui_data *)frontend; */ + if (button == MBT_LEFT) return MBT_SELECT; if (button == MBT_MIDDLE) @@ -102,75 +186,130 @@ 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) { - /* FIXME: currently ignored */ + /* + * 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 + gtk_window_deiconify(GTK_WINDOW(inst->window)); +#endif } /* * 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) { - /* FIXME: currently ignored */ + 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, + * though. + */ +#if GTK_CHECK_VERSION(2,0,0) + gtk_window_move(GTK_WINDOW(inst->window), x, y); +#else + gdk_window_move(inst->window->window, x, y); +#endif } /* * 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) { - /* FIXME: currently ignored */ + struct gui_data *inst = (struct gui_data *)frontend; + if (top) + gdk_window_raise(inst->window->window); + else + gdk_window_lower(inst->window->window); } /* * Refresh the window in response to a server-side request. */ -void refresh_window(void) +void refresh_window(void *frontend) { - /* FIXME: currently ignored */ + 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) { - /* FIXME: currently ignored */ + /* + * 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 + gtk_window_unmaximize(GTK_WINDOW(inst->window)); +#endif } /* * Report whether the window is iconic, for terminal reports. */ -int is_iconic(void) +int is_iconic(void *frontend) { - return 0; /* FIXME */ + 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) { - *x = 3; *y = 4; /* FIXME */ + 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, + * though. + */ +#if GTK_CHECK_VERSION(2,0,0) + gtk_window_get_position(GTK_WINDOW(inst->window), x, y); +#else + gdk_window_get_position(inst->window->window, x, y); +#endif } /* * 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) { - *x = 1; *y = 2; /* FIXME */ + 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, + * though. + */ +#if GTK_CHECK_VERSION(2,0,0) + gtk_window_get_size(GTK_WINDOW(inst->window), x, y); +#else + gdk_window_get_size(inst->window->window, x, y); +#endif } /* * Return the window or icon title. */ -char *get_window_title(int icon) +char *get_window_title(void *frontend, int icon) { - return inst->wintitle; + struct gui_data *inst = (struct gui_data *)frontend; + return icon ? inst->wintitle : inst->icontitle; } gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data) @@ -182,9 +321,9 @@ 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) + if (!inst->cfg.hide_mouseptr) show = 1; if (show) gdk_window_set_cursor(inst->area->window, inst->currcursor); @@ -198,42 +337,37 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) struct gui_data *inst = (struct gui_data *)data; int w, h, need_size = 0; - /* - * Set up the colour map. - */ - palette_reset(); - - w = (event->width - 2*cfg.window_border) / inst->font_width; - h = (event->height - 2*cfg.window_border) / inst->font_height; + w = (event->width - 2*inst->cfg.window_border) / inst->font_width; + h = (event->height - 2*inst->cfg.window_border) / inst->font_height; - if (w != cfg.width || h != cfg.height) { + if (w != inst->cfg.width || h != inst->cfg.height) { if (inst->pixmap) { gdk_pixmap_unref(inst->pixmap); inst->pixmap = NULL; } - cfg.width = w; - cfg.height = h; + inst->cfg.width = w; + inst->cfg.height = h; need_size = 1; } if (!inst->pixmap) { GdkGC *gc; inst->pixmap = gdk_pixmap_new(widget->window, - (cfg.width * inst->font_width + - 2*cfg.window_border), - (cfg.height * inst->font_height + - 2*cfg.window_border), -1); + (inst->cfg.width * inst->font_width + + 2*inst->cfg.window_border), + (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, - cfg.width * inst->font_width + 2*cfg.window_border, - cfg.height * inst->font_height + 2*cfg.window_border); + 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); } if (need_size) { - term_size(h, w, cfg.savelines); + term_size(inst->term, h, w, inst->cfg.savelines); } return TRUE; @@ -241,7 +375,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 @@ -263,10 +397,35 @@ 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; + /* By default, nothing is generated. */ + end = start = 0; + + /* + * 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_digits > 1) { +#ifdef KEY_DEBUGGING + printf("Alt key up, keycode = %d\n", inst->alt_keycode); +#endif + output[0] = inst->alt_keycode; + end = 1; + goto done; + } + if (event->type == GDK_KEY_PRESS) { #ifdef KEY_DEBUGGING { @@ -280,22 +439,79 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) #endif /* - * NYI: - * - nethack mode - * - alt+numpad - * - Compose key (!!! requires Unicode faff before even trying) + * NYI: Compose key (!!! requires Unicode faff before even trying) + */ + + /* + * If Alt has just been pressed, we start potentially + * accumulating an Alt+numberpad code. We do this by + * setting alt_keycode to -1 (nothing yet but plausible). */ + 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 */ + } + + /* + * If we're seeing a numberpad key press with Mod1 down, + * consider adding it to alt_keycode if that's sensible. + * Anything _else_ with Mod1 down cancels any possibility + * of an ALT keycode: we set alt_keycode to -2. + */ + if ((event->state & GDK_MOD1_MASK) && inst->alt_keycode != -2) { + int digit = -1; + switch (event->keyval) { + case GDK_KP_0: case GDK_KP_Insert: digit = 0; break; + case GDK_KP_1: case GDK_KP_End: digit = 1; break; + case GDK_KP_2: case GDK_KP_Down: digit = 2; break; + case GDK_KP_3: case GDK_KP_Page_Down: digit = 3; break; + case GDK_KP_4: case GDK_KP_Left: digit = 4; break; + case GDK_KP_5: case GDK_KP_Begin: digit = 5; break; + case GDK_KP_6: case GDK_KP_Right: digit = 6; break; + case GDK_KP_7: case GDK_KP_Home: digit = 7; break; + case GDK_KP_8: case GDK_KP_Up: digit = 8; break; + case GDK_KP_9: case GDK_KP_Page_Up: digit = 9; break; + } + if (digit < 0) + inst->alt_keycode = -2; /* it's invalid */ + else { +#ifdef KEY_DEBUGGING + printf("Adding digit %d to keycode %d", digit, + inst->alt_keycode); +#endif + if (inst->alt_keycode == -1) + 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 + /* Having used this digit, we now do nothing more with it. */ + goto done; + } + } /* * Shift-PgUp and Shift-PgDn don't even generate keystrokes * at all. */ if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) { - term_scroll(0, -cfg.height/2); + term_scroll(inst->term, 0, -inst->cfg.height/2); + return TRUE; + } + if (event->keyval == GDK_Page_Up && (event->state & GDK_CONTROL_MASK)) { + term_scroll(inst->term, 0, -1); return TRUE; } if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) { - term_scroll(0, +cfg.height/2); + term_scroll(inst->term, 0, +inst->cfg.height/2); + return TRUE; + } + if (event->keyval == GDK_Page_Down && (event->state & GDK_CONTROL_MASK)) { + term_scroll(inst->term, 0, +1); return TRUE; } @@ -303,7 +519,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; } @@ -312,9 +528,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) */ @@ -352,7 +569,13 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* We don't let GTK tell us what Backspace is! We know better. */ if (event->keyval == GDK_BackSpace && !(event->state & GDK_SHIFT_MASK)) { - output[1] = cfg.bksp_is_delete ? '\x7F' : '\x08'; + output[1] = inst->cfg.bksp_is_delete ? '\x7F' : '\x08'; + end = 2; + } + /* For Shift Backspace, do opposite of what is configured. */ + if (event->keyval == GDK_BackSpace && + (event->state & GDK_SHIFT_MASK)) { + output[1] = inst->cfg.bksp_is_delete ? '\x08' : '\x7F'; end = 2; } @@ -365,7 +588,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * NetHack keypad mode. */ - if (cfg.nethack_keypad) { + if (inst->cfg.nethack_keypad) { char *keys = NULL; switch (event->keyval) { case GDK_KP_1: case GDK_KP_End: keys = "bB"; break; @@ -391,7 +614,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 && !inst->cfg.no_applic_k) { int xkey = 0; switch (event->keyval) { case GDK_Num_Lock: xkey = 'P'; break; @@ -405,7 +628,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * in xterm function key mode we change which two... */ case GDK_KP_Add: - if (cfg.funky_type == 2) { + if (inst->cfg.funky_type == 2) { if (event->state & GDK_SHIFT_MASK) xkey = 'l'; else @@ -429,7 +652,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 @@ -534,15 +757,15 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) break; } /* Reorder edit keys to physical order */ - if (cfg.funky_type == 3 && code <= 6) + if (inst->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; } - if (cfg.funky_type == 5 && /* SCO function keys */ + if (inst->cfg.funky_type == 5 && /* SCO function keys */ code >= 11 && code <= 34) { char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{"; int index = 0; @@ -565,7 +788,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) end = 1 + sprintf(output+1, "\x1B[%c", codes[index]); goto done; } - if (cfg.funky_type == 5 && /* SCO small keypad */ + if (inst->cfg.funky_type == 5 && /* SCO small keypad */ code >= 1 && code <= 6) { char codes[] = "HL.FIG"; if (code == 3) { @@ -576,13 +799,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 || inst->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 @@ -590,18 +814,18 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) "\x1BO%c", code + 'P' - 11 - offt); goto done; } - if (cfg.funky_type == 1 && code >= 11 && code <= 15) { + if (inst->cfg.funky_type == 1 && code >= 11 && code <= 15) { end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11); goto done; } - if (cfg.funky_type == 2 && code >= 11 && code <= 14) { - if (vt52_mode) + if (inst->cfg.funky_type == 2 && code >= 11 && code <= 14) { + 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); goto done; } - if (cfg.rxvt_homeend && (code == 1 || code == 4)) { + if (inst->cfg.rxvt_homeend && (code == 1 || code == 4)) { end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw"); goto done; } @@ -633,9 +857,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 { @@ -644,23 +868,45 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) goto done; } } + goto done; + } - done: + done: + if (end-start > 0) { #ifdef KEY_DEBUGGING - { - int i; - printf("generating sequence:"); - for (i = start; i < end; i++) - printf(" %02x", (unsigned char) output[i]); - printf("\n"); - } + int i; + printf("generating sequence:"); + for (i = start; i < end; i++) + printf(" %02x", (unsigned char) output[i]); + printf("\n"); #endif - if (end-start > 0) { - ldisc_send(output+start, end-start, 1); - show_mouseptr(0); - term_out(); + + if (!inst->direct_to_font) { + /* + * 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); + } 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); } + + show_mouseptr(inst, 0); + term_seen_key_event(inst->term); + term_out(inst->term); } return TRUE; @@ -671,7 +917,16 @@ 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(inst->term, 0, -5); + return TRUE; + } + if (event->button == 5 && event->type == GDK_BUTTON_PRESS) { + term_scroll(inst->term, 0, +5); + return TRUE; + } shift = event->state & GDK_SHIFT_MASK; ctrl = event->state & GDK_CONTROL_MASK; @@ -693,14 +948,15 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data) default: return FALSE; /* don't know this event type */ } - if (send_raw_mouse && !(cfg.mouse_override && shift) && + if (send_raw_mouse && !(inst->cfg.mouse_override && shift) && act != MA_CLICK && act != MA_RELEASE) return TRUE; /* we ignore these in raw mouse mode */ - x = (event->x - cfg.window_border) / inst->font_width; - y = (event->y - cfg.window_border) / inst->font_height; + x = (event->x - inst->cfg.window_border) / inst->font_width; + y = (event->y - inst->cfg.window_border) / inst->font_height; - term_mouse(button, act, x, y, shift, ctrl, alt); + term_mouse(inst->term, button, translate_button(button), act, + x, y, shift, ctrl, alt); return TRUE; } @@ -710,7 +966,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; @@ -724,38 +980,100 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) else return FALSE; /* don't even know what button! */ - x = (event->x - cfg.window_border) / inst->font_width; - y = (event->y - cfg.window_border) / inst->font_height; + x = (event->x - inst->cfg.window_border) / inst->font_width; + y = (event->y - inst->cfg.window_border) / inst->font_height; - term_mouse(button, MA_DRAG, x, y, shift, ctrl, alt); + term_mouse(inst->term, button, translate_button(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 (inst->cfg.close_on_exit == FORCE_ON || + (inst->cfg.close_on_exit == AUTO && 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_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; @@ -767,16 +1085,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_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) @@ -786,33 +1102,97 @@ 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) { - activate = activate && !cfg.no_mouse_rep; + struct gui_data *inst = (struct gui_data *)frontend; + activate = activate && !inst->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) { - /* FIXME: currently ignored */ + struct gui_data *inst = (struct gui_data *)frontend; + int large_x, large_y; + int offset_x, offset_y; + int area_x, area_y; + GtkRequisition inner, outer; + + /* + * This is a heinous hack dreamed up by the gnome-terminal + * people to get around a limitation in gtk. The problem is + * that in order to set the size correctly we really need to be + * calling gtk_window_resize - but that needs to know the size + * of the _whole window_, not the drawing area. So what we do + * is to set an artificially huge size request on the drawing + * area, recompute the resulting size request on the window, + * and look at the difference between the two. That gives us + * the x and y offsets we need to translate drawing area size + * into window size for real, and then we call + * gtk_window_resize. + */ + + /* + * We start by retrieving the current size of the whole window. + * Adding a bit to _that_ will give us a value we can use as a + * bogus size request which guarantees to be bigger than the + * current size of the drawing area. + */ + get_window_pixels(inst, &large_x, &large_y); + large_x += 32; + large_y += 32; + +#if GTK_CHECK_VERSION(2,0,0) + gtk_widget_set_size_request(inst->area, large_x, large_y); +#else + gtk_widget_set_usize(inst->area, large_x, large_y); +#endif + gtk_widget_size_request(inst->area, &inner); + gtk_widget_size_request(inst->window, &outer); + + offset_x = outer.width - inner.width; + offset_y = outer.height - inner.height; + + area_x = inst->font_width * w + 2*inst->cfg.window_border; + area_y = inst->font_height * h + 2*inst->cfg.window_border; + + /* + * Now we must set the size request on the drawing area back to + * something sensible before we commit the real resize. Best + * way to do this, I think, is to set it to what the size is + * really going to end up being. + */ +#if GTK_CHECK_VERSION(2,0,0) + gtk_widget_set_size_request(inst->area, area_x, area_y); +#else + gtk_widget_set_usize(inst->area, area_x, area_y); +#endif + +#if GTK_CHECK_VERSION(2,0,0) + gtk_window_resize(GTK_WINDOW(inst->window), + area_x + offset_x, area_y + offset_y); +#else + gdk_window_resize(inst->window->window, + area_x + offset_x, area_y + offset_y); +#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]; @@ -827,21 +1207,33 @@ 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) { - /* This maps colour indices in cfg to those used in inst->cols. */ + struct gui_data *inst = (struct gui_data *)frontend; + /* This maps colour indices in inst->cfg to those used in inst->cols. */ static const int ww[] = { 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, @@ -859,9 +1251,9 @@ void palette_reset(void) } for (i = 0; i < NCOLOURS; i++) { - inst->cols[i].red = cfg.colours[ww[i]][0] * 0x0101; - inst->cols[i].green = cfg.colours[ww[i]][1] * 0x0101; - inst->cols[i].blue = cfg.colours[ww[i]][2] * 0x0101; + inst->cols[i].red = inst->cfg.colours[ww[i]][0] * 0x0101; + inst->cols[i].green = inst->cfg.colours[ww[i]][1] * 0x0101; + inst->cols[i].blue = inst->cfg.colours[ww[i]][2] * 0x0101; } gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS, @@ -869,18 +1261,60 @@ void palette_reset(void) for (i = 0; i < NCOLOURS; i++) { if (!success[i]) 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]); + i, inst->cfg.colours[i][0], inst->cfg.colours[i][1], inst->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); - inst->pasteout_data_len = len; - wc_to_mb(0, 0, data, len, inst->pasteout_data, inst->pasteout_data_len, - NULL, NULL); + 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. + */ + if (!inst->direct_to_font) { + wchar_t *tmp = data; + int tmplen = len; + + inst->pasteout_data_utf8 = snewn(len*6, char); + inst->pasteout_data_utf8_len = len*6; + inst->pasteout_data_utf8_len = + charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8, + inst->pasteout_data_utf8_len, + CS_UTF8, NULL, NULL, 0); + if (inst->pasteout_data_utf8_len == 0) { + sfree(inst->pasteout_data_utf8); + inst->pasteout_data_utf8 = NULL; + } else { + inst->pasteout_data_utf8 = + sresize(inst->pasteout_data_utf8, + inst->pasteout_data_utf8_len, char); + } + } else { + inst->pasteout_data_utf8 = NULL; + inst->pasteout_data_utf8_len = 0; + } + + inst->pasteout_data = snewn(len*6, char); + inst->pasteout_data_len = len*6; + inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0, + data, len, inst->pasteout_data, + inst->pasteout_data_len, + NULL, NULL, NULL); + if (inst->pasteout_data_len == 0) { + sfree(inst->pasteout_data); + inst->pasteout_data = NULL; + } else { + inst->pasteout_data = + sresize(inst->pasteout_data, inst->pasteout_data_len, char); + } if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME)) { @@ -888,58 +1322,109 @@ void write_clip(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); + if (inst->pasteout_data_utf8) + gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, + inst->utf8_string_atom, 1); } } void selection_get(GtkWidget *widget, GtkSelectionData *seldata, guint info, guint time_stamp, gpointer data) { - gtk_selection_data_set(seldata, GDK_SELECTION_TYPE_STRING, 8, - inst->pasteout_data, inst->pasteout_data_len); + struct gui_data *inst = (struct gui_data *)data; + 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, gpointer data) { - term_deselect(); + struct gui_data *inst = (struct gui_data *)data; + 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; } -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 * comes back _then_ we can call term_do_paste(). */ - gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); + + if (!inst->direct_to_font) { + /* + * 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, + inst->utf8_string_atom, GDK_CURRENT_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); + } } 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->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) sfree(inst->pastein_data); - inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t)); + inst->pastein_data = snewn(seldata->length, 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 : inst->ucsdata.line_codepage), + 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); } @@ -947,8 +1432,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); @@ -956,28 +1441,37 @@ 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) { - /* FIXME: currently ignored */ + 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 (!inst->cfg.scrollbar) + return; inst->sbar_adjust->lower = 0; inst->sbar_adjust->upper = total; inst->sbar_adjust->value = start; @@ -991,23 +1485,34 @@ 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 (!inst->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) +int char_width(Context ctx, int uc) { /* * Under X, any fixed-width font really _is_ fixed-width. @@ -1017,19 +1522,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 = snew(struct draw_ctx); + 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); } /* @@ -1038,97 +1551,326 @@ void free_ctx(Context ctx) * * We are allowed to fiddle with the contents of `text'. */ -void do_text(Context ctx, int x, int y, char *text, int len, - unsigned long attr, int lattr) +void do_text_internal(Context ctx, int x, int y, char *text, int len, + unsigned long attr, int lattr) { - int nfg, nbg, t; - GdkGC *gc = (GdkGC *)ctx; + struct draw_ctx *dctx = (struct draw_ctx *)ctx; + struct gui_data *inst = dctx->inst; + GdkGC *gc = dctx->gc; - /* - * NYI: - * - Unicode, code pages, and ATTR_WIDE for CJK support. - * - LATTR_* (ESC # 4 double-width and double-height stuff) - * - cursor shapes other than block - * - shadow bolding - */ + int nfg, nbg, t, fontid, shadow, rlen, widefactor; - nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); - nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT); + nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); + nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0); + nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT); + nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0); if (attr & ATTR_REVERSE) { t = nfg; nfg = nbg; nbg = t; } - if (cfg.bold_colour && (attr & ATTR_BOLD)) - nfg++; - if (cfg.bold_colour && (attr & ATTR_BLINK)) - nbg++; + if (inst->cfg.bold_colour && (attr & ATTR_BOLD)) + nfg |= 1; + if (inst->cfg.bold_colour && (attr & ATTR_BLINK)) + nbg |= 1; if (attr & TATTR_ACTCURS) { nfg = NCOLOURS-2; nbg = NCOLOURS-1; } + fontid = shadow = 0; + + if (attr & ATTR_WIDE) { + widefactor = 2; + fontid |= 2; + } else { + widefactor = 1; + } + + if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) { + if (inst->fonts[fontid | 1]) + fontid |= 1; + else + shadow = 1; + } + + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= inst->term->cols) + return; + if (x + len*2*widefactor > inst->term->cols) + len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */ + rlen = len * 2; + } else + rlen = len; + + { + GdkRectangle r; + + r.x = x*inst->font_width+inst->cfg.window_border; + r.y = y*inst->font_height+inst->cfg.window_border; + r.width = rlen*widefactor*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); + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border, + rlen*widefactor*inst->font_width, inst->font_height); gdk_gc_set_foreground(gc, &inst->cols[nfg]); - gdk_draw_text(inst->pixmap, inst->fonts[0], 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 = snewn(len+1, wchar_t); + for (i = 0; i < len; i++) { + wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK)); + } + + if (inst->fonts[fontid] == NULL) { + /* + * The font for this contingency does not exist. + * Typically this means we've been given ATTR_WIDE + * character and have no wide font. So we display + * nothing at all; such is life. + */ + } else if (inst->fontinfo[fontid].is_wide) { + /* + * At least one version of gdk_draw_text_wc() has a + * weird bug whereby it reads `len' elements of the + * input string, but only draws `len/2'. Hence I'm + * going to make its input array twice as long as it + * theoretically needs to be, and pass in twice the + * actual number of characters. If a fixed gdk actually + * takes the doubled length seriously, then (a) the + * array will stand scrutiny up to the full length, (b) + * the spare elements of the array are full of zeroes + * which will probably be an empty glyph in the font, + * and (c) the clip rectangle should prevent it causing + * trouble anyway. + */ + gwcs = snewn(len*2+1, GdkWChar); + memset(gwcs, 0, sizeof(GdkWChar) * (len*2+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+inst->cfg.window_border, + 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); + 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) uheight = inst->font_height - 1; - gdk_draw_line(inst->pixmap, gc, x*inst->font_width+cfg.window_border, - y*inst->font_height + uheight + cfg.window_border, - (x+len)*inst->font_width-1+cfg.window_border, - y*inst->font_height + uheight + cfg.window_border); + gdk_draw_line(inst->pixmap, gc, x*inst->font_width+inst->cfg.window_border, + y*inst->font_height + uheight + inst->cfg.window_border, + (x+len)*widefactor*inst->font_width-1+inst->cfg.window_border, + y*inst->font_height + uheight + inst->cfg.window_border); + } + + if (lattr != 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 + * way. This will involve repeated calls to + * gdk_draw_pixmap() to stretch the text horizontally. It's + * O(N^2) in time and O(N) in network bandwidth, but you + * try thinking of a better way. :-( + */ + int i; + for (i = 0; i < len * widefactor * inst->font_width; i++) { + gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, + x*inst->font_width+inst->cfg.window_border + 2*i, + 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 *= 2; + if (lattr != LATTR_WIDE) { + int dt, db; + /* Now stretch vertically, in the same way. */ + if (lattr == LATTR_BOT) + dt = 0, db = 1; + else + dt = 1, db = 0; + for (i = 0; i < inst->font_height; i+=2) { + 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, + y*inst->font_height+inst->cfg.window_border+dt*(i+1), + len * inst->font_width, inst->font_height-i-1); + } + } + } +} + +void do_text(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 widefactor; + + do_text_internal(ctx, x, y, text, len, attr, lattr); + + if (attr & ATTR_WIDE) { + widefactor = 2; + } else { + widefactor = 1; + } + + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= inst->term->cols) + return; + if (x + len*2*widefactor > inst->term->cols) + len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */ + len *= 2; } gdk_draw_pixmap(inst->area->window, gc, inst->pixmap, - x*inst->font_width+cfg.window_border, - y*inst->font_height+cfg.window_border, - x*inst->font_width+cfg.window_border, - y*inst->font_height+cfg.window_border, - len*inst->font_width, inst->font_height); + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border, + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border, + len*widefactor*inst->font_width, inst->font_height); } void do_cursor(Context ctx, int x, int y, char *text, int len, unsigned long attr, int lattr) { - int passive; - GdkGC *gc = (GdkGC *)ctx; + struct draw_ctx *dctx = (struct draw_ctx *)ctx; + struct gui_data *inst = dctx->inst; + GdkGC *gc = dctx->gc; + + int passive, widefactor; - /* - * NYI: cursor shapes other than block - */ if (attr & TATTR_PASCURS) { attr &= ~TATTR_PASCURS; passive = 1; } else passive = 0; - do_text(ctx, x, y, text, len, attr, lattr); - if (passive) { + if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) { + attr &= ~TATTR_ACTCURS; + } + do_text_internal(ctx, x, y, text, len, attr, lattr); + + if (attr & ATTR_WIDE) { + widefactor = 2; + } else { + widefactor = 1; + } + + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= inst->term->cols) + return; + if (x + len*2*widefactor > inst->term->cols) + len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */ + len *= 2; + } + + if (inst->cfg.cursor_type == 0) { + /* + * An active block cursor will already have been done by + * the above do_text call, so we only need to do anything + * if it's passive. + */ + if (passive) { + gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]); + 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); + } + } else { + int uheight; + int startx, starty, dx, dy, length, i; + + int char_width; + + if ((attr & ATTR_WIDE) || lattr != LATTR_NORM) + char_width = 2*inst->font_width; + else + char_width = inst->font_width; + + if (inst->cfg.cursor_type == 1) { + uheight = inst->fonts[0]->ascent + 1; + if (uheight >= inst->font_height) + uheight = inst->font_height - 1; + + startx = x * inst->font_width + inst->cfg.window_border; + starty = y * inst->font_height + inst->cfg.window_border + uheight; + dx = 1; + dy = 0; + length = len * char_width; + } else { + int xadjust = 0; + if (attr & TATTR_RIGHTCURS) + xadjust = char_width - 1; + startx = x * inst->font_width + inst->cfg.window_border + xadjust; + starty = y * inst->font_height + inst->cfg.window_border; + dx = 0; + dy = 1; + length = inst->font_height; + } + gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]); - gdk_draw_rectangle(inst->pixmap, gc, 0, - x*inst->font_width+cfg.window_border, - y*inst->font_height+cfg.window_border, - len*inst->font_width-1, inst->font_height-1); - gdk_draw_pixmap(inst->area->window, gc, inst->pixmap, - x*inst->font_width+cfg.window_border, - y*inst->font_height+cfg.window_border, - x*inst->font_width+cfg.window_border, - y*inst->font_height+cfg.window_border, - len*inst->font_width, inst->font_height); + if (passive) { + for (i = 0; i < length; i++) { + if (i % 2 == 0) { + gdk_draw_point(inst->pixmap, gc, startx, starty); + } + startx += dx; + starty += dy; + } + } else { + gdk_draw_line(inst->pixmap, gc, startx, starty, + startx + (length-1) * dx, starty + (length-1) * dy); + } } + + gdk_draw_pixmap(inst->area->window, gc, inst->pixmap, + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border, + x*inst->font_width+inst->cfg.window_border, + y*inst->font_height+inst->cfg.window_border, + len*widefactor*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 @@ -1231,29 +1973,163 @@ void modalfatalbox(char *p, ...) exit(1); } -int main(int argc, char **argv) +char *get_x_display(void *frontend) +{ + return gdk_get_display(); +} + +long get_windowid(void *frontend) +{ + Terminal *term = (Terminal *)frontend; + struct gui_data *inst = (struct gui_data *)(term->frontend); + return (long)GDK_WINDOW_XWINDOW(inst->area->window); +} + +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, Config *cfg) { - extern int pty_master_fd; /* declared in pty.c */ - extern char **pty_argv; /* declared in pty.c */ int err = 0; + extern char **pty_argv; /* declared in pty.c */ - gtk_init(&argc, &argv); + /* + * 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 { \ + if (--argc <= 0) { \ + err = 1; \ + fprintf(stderr, "pterm: %s expects an argument\n", p); \ + continue; \ + } else \ + val = *++argv; \ +} +#define SECOND_PASS_ONLY { if (!do_everything) continue; } - do_defaults(NULL, &cfg); + /* + * TODO: + * + * finish -geometry + */ + char *val; while (--argc > 0) { char *p = *++argv; - if (!strcmp(p, "-fn")) { - if (--argc > 0) { - strncpy(cfg.font, *++argv, sizeof(cfg.font)); - cfg.font[sizeof(cfg.font)-1] = '\0'; - } else - err = 1, fprintf(stderr, "pterm: -fn expects an argument\n"); - } - if (!strcmp(p, "-e")) { + if (!strcmp(p, "-fn") || !strcmp(p, "-font")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg->font.name, val, sizeof(cfg->font.name)); + cfg->font.name[sizeof(cfg->font.name)-1] = '\0'; + + } else if (!strcmp(p, "-fb")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg->boldfont.name, val, sizeof(cfg->boldfont.name)); + cfg->boldfont.name[sizeof(cfg->boldfont.name)-1] = '\0'; + + } else if (!strcmp(p, "-fw")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg->widefont.name, val, sizeof(cfg->widefont.name)); + cfg->widefont.name[sizeof(cfg->widefont.name)-1] = '\0'; + + } else if (!strcmp(p, "-fwb")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg->wideboldfont.name, val, sizeof(cfg->wideboldfont.name)); + cfg->wideboldfont.name[sizeof(cfg->wideboldfont.name)-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; + SECOND_PASS_ONLY; + + flags = XParseGeometry(val, &x, &y, &w, &h); + if (flags & WidthValue) + cfg->width = w; + if (flags & HeightValue) + cfg->height = h; + + /* + * Apparently setting the initial window position is + * difficult in GTK 1.2. Not entirely sure why this + * should be. 2.0 has gtk_window_parse_geometry(), + * which would help... For the moment, though, I can't + * be bothered with this. + */ + + } else if (!strcmp(p, "-sl")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + cfg->savelines = atoi(val); + + } else if (!strcmp(p, "-fg") || !strcmp(p, "-bg") || + !strcmp(p, "-bfg") || !strcmp(p, "-bbg") || + !strcmp(p, "-cfg") || !strcmp(p, "-cbg")) { + GdkColor col; + + EXPECTS_ARG; + SECOND_PASS_ONLY; + if (!gdk_color_parse(val, &col)) { + err = 1; + fprintf(stderr, "pterm: unable to parse colour \"%s\"\n", val); + } else { + int index; + index = (!strcmp(p, "-fg") ? 0 : + !strcmp(p, "-bg") ? 2 : + !strcmp(p, "-bfg") ? 1 : + !strcmp(p, "-bbg") ? 3 : + !strcmp(p, "-cfg") ? 4 : + !strcmp(p, "-cbg") ? 5 : -1); + assert(index != -1); + cfg->colours[index][0] = col.red / 256; + cfg->colours[index][1] = col.green / 256; + cfg->colours[index][2] = col.blue / 256; + } + + } else if (!strcmp(p, "-e")) { + /* This option swallows all further arguments. */ + if (!do_everything) + break; + if (--argc > 0) { int i; - pty_argv = smalloc((argc+1) * sizeof(char *)); + pty_argv = snewn(argc+1, char *); ++argv; for (i = 0; i < argc; i++) pty_argv[i] = argv[i]; @@ -1261,68 +2137,257 @@ int main(int argc, char **argv) break; /* finished command-line processing */ } else err = 1, fprintf(stderr, "pterm: -e expects an argument\n"); + + } else if (!strcmp(p, "-T")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg->wintitle, val, sizeof(cfg->wintitle)); + cfg->wintitle[sizeof(cfg->wintitle)-1] = '\0'; + + } else if (!strcmp(p, "-log")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg->logfilename.path, val, sizeof(cfg->logfilename.path)); + cfg->logfilename.path[sizeof(cfg->logfilename.path)-1] = '\0'; + cfg->logtype = LGTYP_DEBUG; + + } else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) { + SECOND_PASS_ONLY; + cfg->stamp_utmp = 0; + + } else if (!strcmp(p, "-ut")) { + SECOND_PASS_ONLY; + cfg->stamp_utmp = 1; + + } else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) { + SECOND_PASS_ONLY; + cfg->login_shell = 0; + + } else if (!strcmp(p, "-ls")) { + SECOND_PASS_ONLY; + cfg->login_shell = 1; + + } else if (!strcmp(p, "-nethack")) { + SECOND_PASS_ONLY; + cfg->nethack_keypad = 1; + + } else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) { + SECOND_PASS_ONLY; + cfg->scrollbar = 0; + + } else if (!strcmp(p, "-sb")) { + SECOND_PASS_ONLY; + cfg->scrollbar = 0; + + } else if (!strcmp(p, "-name")) { + EXPECTS_ARG; + app_name = val; + + } else if (!strcmp(p, "-xrm")) { + 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); } - if (!strcmp(p, "-T")) { - if (--argc > 0) { - strncpy(cfg.wintitle, *++argv, sizeof(cfg.wintitle)); - cfg.wintitle[sizeof(cfg.wintitle)-1] = '\0'; - } else - err = 1, fprintf(stderr, "pterm: -T expects an argument\n"); + } + + 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); + } +} + +/* + * This function retrieves the character set encoding of a font. It + * returns the character set without the X11 hack (in case the user + * asks to use the font's own encoding). + */ +static int 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; + int retval = CS_NONE; + + 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); + retval = 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; + retval = CS_UTF8; + } + + /* + * 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; + } + + sfree(encoding); } - if (!strcmp(p, "-log")) { - if (--argc > 0) { - strncpy(cfg.logfilename, *++argv, sizeof(cfg.logfilename)); - cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0'; - cfg.logtype = LGTYP_DEBUG; - } else - err = 1, fprintf(stderr, "pterm: -log expects an argument\n"); + } + + return retval; +} + +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; + int font_charset; + + /* defer any child exit handling until we're ready to deal with + * it */ + block_signal(SIGCHLD, 1); + + pty_pre_init(); + + gtk_init(&argc, &argv); + + /* + * Create an instance structure and initialise to zeroes + */ + inst = snew(struct gui_data); + memset(inst, 0, sizeof(*inst)); + inst->alt_keycode = -1; /* this one needs _not_ to be zero */ + + if (do_cmdline(argc, argv, 0, &inst->cfg)) + exit(1); /* pre-defaults pass to get -class */ + do_defaults(NULL, &inst->cfg); + if (do_cmdline(argc, argv, 1, &inst->cfg)) + exit(1); /* post-defaults, do everything */ + + inst->fonts[0] = gdk_font_load(inst->cfg.font.name); + if (!inst->fonts[0]) { + fprintf(stderr, "pterm: unable to load font \"%s\"\n", + inst->cfg.font.name); + 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]) { + fprintf(stderr, "pterm: unable to load bold font \"%s\"\n", + inst->cfg.boldfont.name); + exit(1); } - if (!strcmp(p, "-hide")) { - cfg.hide_mouseptr = 1; + set_font_info(inst, 1); + } else + inst->fonts[1] = NULL; + if (inst->cfg.widefont.name[0]) { + inst->fonts[2] = gdk_font_load(inst->cfg.widefont.name); + if (!inst->fonts[2]) { + fprintf(stderr, "pterm: unable to load wide font \"%s\"\n", + inst->cfg.widefont.name); + exit(1); } - if (!strcmp(p, "-nethack")) { - cfg.nethack_keypad = 1; + 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, "pterm: unable to load wide/bold font \"%s\"\n", + inst->cfg.wideboldfont.name); + exit(1); } - } + set_font_info(inst, 3); + } else + inst->fonts[3] = NULL; - inst->fonts[0] = gdk_font_load(cfg.font); - inst->fonts[1] = NULL; /* FIXME: what about bold font? */ inst->font_width = gdk_char_width(inst->fonts[0], ' '); 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(); - - back = &pty_backend; - back->init(NULL, 0, NULL, 0); + inst->direct_to_font = init_ucs(&inst->ucsdata, + inst->cfg.line_codepage, font_charset); inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - if (cfg.wintitle[0]) - set_title(cfg.wintitle); + if (inst->cfg.wintitle[0]) + set_title(inst, inst->cfg.wintitle); else - set_title("pterm"); + set_title(inst, "pterm"); + + /* + * Set up the colour map. + */ + palette_reset(inst); inst->area = gtk_drawing_area_new(); gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), - inst->font_width * cfg.width + 2*cfg.window_border, - inst->font_height * cfg.height + 2*cfg.window_border); - inst->sbar_adjust = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 0, 0, 0, 0)); - inst->sbar = gtk_vscrollbar_new(inst->sbar_adjust); + inst->font_width * inst->cfg.width + 2*inst->cfg.window_border, + inst->font_height * inst->cfg.height + 2*inst->cfg.window_border); + if (inst->cfg.scrollbar) { + inst->sbar_adjust = GTK_ADJUSTMENT(gtk_adjustment_new(0,0,0,0,0,0)); + inst->sbar = gtk_vscrollbar_new(inst->sbar_adjust); + } inst->hbox = GTK_BOX(gtk_hbox_new(FALSE, 0)); + if (inst->cfg.scrollbar) { + if (inst->cfg.scrollbar_on_left) + gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0); + else + gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0); + } gtk_box_pack_start(inst->hbox, inst->area, TRUE, TRUE, 0); - gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox)); { GdkGeometry geom; - geom.min_width = inst->font_width + 2*cfg.window_border; - geom.min_height = inst->font_height + 2*cfg.window_border; + geom.min_width = inst->font_width + 2*inst->cfg.window_border; + geom.min_height = inst->font_height + 2*inst->cfg.window_border; geom.max_width = geom.max_height = -1; - geom.base_width = 2*cfg.window_border; - geom.base_height = 2*cfg.window_border; + geom.base_width = 2*inst->cfg.window_border; + geom.base_height = 2*inst->cfg.window_border; geom.width_inc = inst->font_width; geom.height_inc = inst->font_height; geom.min_aspect = geom.max_aspect = 0; @@ -1337,6 +2402,8 @@ int main(int argc, char **argv) GTK_SIGNAL_FUNC(delete_window), inst); gtk_signal_connect(GTK_OBJECT(inst->window), "key_press_event", GTK_SIGNAL_FUNC(key_event), inst); + gtk_signal_connect(GTK_OBJECT(inst->window), "key_release_event", + GTK_SIGNAL_FUNC(key_event), inst); gtk_signal_connect(GTK_OBJECT(inst->window), "focus_in_event", GTK_SIGNAL_FUNC(focus_event), inst); gtk_signal_connect(GTK_OBJECT(inst->window), "focus_out_event", @@ -1357,30 +2424,56 @@ int main(int argc, char **argv) GTK_SIGNAL_FUNC(selection_get), inst); gtk_signal_connect(GTK_OBJECT(inst->area), "selection_clear_event", GTK_SIGNAL_FUNC(selection_clear), inst); - gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed", - GTK_SIGNAL_FUNC(scrollbar_moved), inst); + if (inst->cfg.scrollbar) + gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed", + GTK_SIGNAL_FUNC(scrollbar_moved), inst); gtk_timeout_add(20, timer_func, inst); - gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst); gtk_widget_add_events(GTK_WIDGET(inst->area), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK); gtk_widget_show(inst->area); - gtk_widget_show(inst->sbar); + if (inst->cfg.scrollbar) + gtk_widget_show(inst->sbar); 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->cfg, &inst->ucsdata, inst); + inst->logctx = log_init(inst, &inst->cfg); + term_provide_logctx(inst->term, inst->logctx); + + inst->back = &pty_backend; + inst->back->init((void *)inst->term, &inst->backhandle, &inst->cfg, + NULL, 0, NULL, 0); + inst->back->provide_logctx(inst->backhandle, inst->logctx); + + term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle); + + term_size(inst->term, inst->cfg.height, inst->cfg.width, inst->cfg.savelines); + + 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 */ - term_init(); - term_size(24, 80, 2000); + 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); + /* now we're reday to deal with the child exit handler being + * called */ + block_signal(SIGCHLD, 0); + gtk_main(); return 0;