X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/12d200b1fbbb18f5dfd4934c39278fe33f8b78f0..b9d7bcadee831e9b59fb785f2464a5fc1897bd1a:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index d258f9e4..2791693a 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -3,19 +3,27 @@ * 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 #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) @@ -29,7 +37,7 @@ struct gui_data { GtkAdjustment *sbar_adjust; GdkPixmap *pixmap; GdkFont *fonts[2]; /* normal and bold (for now!) */ - GdkCursor *rawcursor, *textcursor; + GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor; GdkColor cols[NCOLOURS]; GdkColormap *colmap; wchar_t *pastein_data; @@ -38,15 +46,21 @@ struct gui_data { int pasteout_data_len; int font_width, font_height; int ignore_sbar; + int mouseptr_visible; + guint term_paste_idle_id; GdkAtom compound_text_atom; + int alt_keycode; char wintitle[sizeof(((Config *)0)->wintitle)]; + char icontitle[sizeof(((Config *)0)->wintitle)]; + int master_fd, master_func_id, exited; + void *ldisc; }; static struct gui_data the_inst; static struct gui_data *inst = &the_inst; /* so we always write `inst->' */ static int send_raw_mouse; -void ldisc_update(int echo, int edit) +void ldisc_update(void *frontend, int echo, int edit) { /* * This is a stub in pterm. If I ever produce a Unix @@ -59,8 +73,10 @@ void ldisc_update(int echo, int edit) int askappend(char *filename) { /* - * FIXME: for the moment we just wipe the log file. Since I - * haven't yet enabled logging, this shouldn't matter yet! + * Logging in an xterm-alike is liable to be something you only + * do at serious diagnostic need. Hence, I'm going to take the + * easy option for now and assume we always want to overwrite + * log files. I can always make it properly configurable later. */ return 2; } @@ -68,10 +84,20 @@ int askappend(char *filename) void logevent(char *string) { /* - * FIXME: event log entries are currently ignored. + * This is not a very helpful function: events are logged + * pretty much exclusively by the back end, and our pty back + * end is self-contained. So we need do nothing. */ } +int font_dimension(int which) /* 0 for width, 1 for height */ +{ + 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). @@ -98,7 +124,15 @@ Mouse_Button translate_button(Mouse_Button button) */ void set_iconic(int iconic) { - /* FIXME: currently ignored */ + /* + * GTK 1.2 doesn't know how to do this. + */ +#if GTK_CHECK_VERSION(2,0,0) + if (iconic) + gtk_window_iconify(GTK_WINDOW(inst->window)); + else + gtk_window_deiconify(GTK_WINDOW(inst->window)); +#endif } /* @@ -106,7 +140,16 @@ void set_iconic(int iconic) */ void move_window(int x, int y) { - /* FIXME: currently ignored */ + /* + * 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 } /* @@ -115,7 +158,10 @@ void move_window(int x, int y) */ void set_zorder(int top) { - /* FIXME: currently ignored */ + if (top) + gdk_window_raise(inst->window->window); + else + gdk_window_lower(inst->window->window); } /* @@ -123,7 +169,7 @@ void set_zorder(int top) */ void refresh_window(void) { - /* FIXME: currently ignored */ + term_invalidate(term); } /* @@ -132,7 +178,15 @@ void refresh_window(void) */ void set_zoomed(int zoomed) { - /* FIXME: currently ignored */ + /* + * GTK 1.2 doesn't know how to do this. + */ +#if GTK_CHECK_VERSION(2,0,0) + if (iconic) + gtk_window_maximize(GTK_WINDOW(inst->window)); + else + gtk_window_unmaximize(GTK_WINDOW(inst->window)); +#endif } /* @@ -140,7 +194,7 @@ void set_zoomed(int zoomed) */ int is_iconic(void) { - return 0; /* FIXME */ + return !gdk_window_is_viewable(inst->window->window); } /* @@ -148,7 +202,16 @@ int is_iconic(void) */ void get_window_pos(int *x, int *y) { - *x = 3; *y = 4; /* FIXME */ + /* + * 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 } /* @@ -156,7 +219,16 @@ void get_window_pos(int *x, int *y) */ void get_window_pixels(int *x, int *y) { - *x = 1; *y = 2; /* FIXME */ + /* + * 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 } /* @@ -164,17 +236,29 @@ void get_window_pixels(int *x, int *y) */ char *get_window_title(int icon) { - return inst->wintitle; + return icon ? inst->wintitle : inst->icontitle; } gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data) { /* - * FIXME: warn on close? + * We could implement warn-on-close here if we really wanted + * to. */ return FALSE; } +void show_mouseptr(int show) +{ + if (!cfg.hide_mouseptr) + show = 1; + if (show) + gdk_window_set_cursor(inst->area->window, inst->currcursor); + else + gdk_window_set_cursor(inst->area->window, inst->blankcursor); + inst->mouseptr_visible = show; +} + gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; @@ -210,38 +294,7 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) } if (need_size) { - term_size(h, w, cfg.savelines); - } - - /* - * Set up the colour map. - */ - if (!inst->colmap) { - static const int ww[] = { - 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, - 0, 1, 2, 3, 4, 5 - }; - gboolean success[NCOLOURS]; - int i; - - inst->colmap = gdk_colormap_get_system(); - - assert(lenof(ww) == NCOLOURS); - - 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; - } - - gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS, - FALSE, FALSE, success); - 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]); - } + term_size(term, h, w, cfg.savelines); } return TRUE; @@ -275,6 +328,25 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer 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. + */ + 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) { +#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 { @@ -288,22 +360,69 @@ 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; + 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; +#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(term, 0, -cfg.height/2); return TRUE; } if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) { - term_scroll(0, +cfg.height/2); + term_scroll(term, 0, +cfg.height/2); return TRUE; } @@ -320,9 +439,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) strncpy(output+1, event->string, 31); output[31] = '\0'; end = strlen(output); - if (event->state & GDK_MOD1_MASK) + if (event->state & GDK_MOD1_MASK) { start = 0; - else + if (end == 1) end = 0; + } else start = 1; /* Control-` is the same as Control-\ (unless gtk has a better idea) */ @@ -363,6 +483,12 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) output[1] = 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] = cfg.bksp_is_delete ? '\x08' : '\x7F'; + end = 2; + } /* Shift-Tab is ESC [ Z */ if (event->keyval == GDK_ISO_Left_Tab || @@ -371,9 +497,35 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } /* + * NetHack keypad mode. + */ + if (cfg.nethack_keypad) { + char *keys = NULL; + switch (event->keyval) { + case GDK_KP_1: case GDK_KP_End: keys = "bB"; break; + case GDK_KP_2: case GDK_KP_Down: keys = "jJ"; break; + case GDK_KP_3: case GDK_KP_Page_Down: keys = "nN"; break; + case GDK_KP_4: case GDK_KP_Left: keys = "hH"; break; + case GDK_KP_5: case GDK_KP_Begin: keys = ".."; break; + case GDK_KP_6: case GDK_KP_Right: keys = "lL"; break; + case GDK_KP_7: case GDK_KP_Home: keys = "yY"; break; + case GDK_KP_8: case GDK_KP_Up: keys = "kK"; break; + case GDK_KP_9: case GDK_KP_Page_Up: keys = "uU"; break; + } + if (keys) { + end = 2; + if (event->state & GDK_SHIFT_MASK) + output[1] = keys[1]; + else + output[1] = keys[0]; + goto done; + } + } + + /* * Application keypad mode. */ - if (app_keypad_keys && !cfg.no_applic_k) { + if (term->app_keypad_keys && !cfg.no_applic_k) { int xkey = 0; switch (event->keyval) { case GDK_Num_Lock: xkey = 'P'; break; @@ -411,7 +563,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break; } if (xkey) { - if (vt52_mode) { + if (term->vt52_mode) { if (xkey >= 'P' && xkey <= 'S') end = 1 + sprintf(output+1, "\033%c", xkey); else @@ -519,7 +671,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) if (cfg.funky_type == 3 && code <= 6) code = "\0\2\1\4\5\3\6"[code]; - if (vt52_mode && code > 0 && code <= 6) { + if (term->vt52_mode && code > 0 && code <= 6) { end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]); goto done; } @@ -558,13 +710,14 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } goto done; } - if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) { + if ((term->vt52_mode || cfg.funky_type == 4) && + code >= 11 && code <= 24) { int offt = 0; if (code > 15) offt++; if (code > 21) offt++; - if (vt52_mode) + if (term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11 - offt); else @@ -577,7 +730,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) goto done; } if (cfg.funky_type == 2 && code >= 11 && code <= 14) { - if (vt52_mode) + if (term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11); else end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11); @@ -615,9 +768,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * app cursor keys mode they do ESC O A instead. * Ctrl toggles the two modes. */ - if (vt52_mode) { + if (term->vt52_mode) { end = 1 + sprintf(output+1, "\033%c", xkey); - } else if (!app_cursor_keys ^ + } else if (!term->app_cursor_keys ^ !(event->state & GDK_CONTROL_MASK)) { end = 1 + sprintf(output+1, "\033O%c", xkey); } else { @@ -626,20 +779,24 @@ 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 - ldisc_send(output+start, end-start, 1); - term_out(); + + ldisc_send(inst->ldisc, output+start, end-start, 1); + show_mouseptr(0); + term_seen_key_event(term); + term_out(term); } return TRUE; @@ -650,6 +807,17 @@ 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); + + if (event->button == 4 && event->type == GDK_BUTTON_PRESS) { + term_scroll(term, 0, -5); + return TRUE; + } + if (event->button == 5 && event->type == GDK_BUTTON_PRESS) { + term_scroll(term, 0, +5); + return TRUE; + } + shift = event->state & GDK_SHIFT_MASK; ctrl = event->state & GDK_CONTROL_MASK; alt = event->state & GDK_MOD1_MASK; @@ -677,7 +845,7 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data) x = (event->x - cfg.window_border) / inst->font_width; y = (event->y - cfg.window_border) / inst->font_height; - term_mouse(button, act, x, y, shift, ctrl, alt); + term_mouse(term, button, act, x, y, shift, ctrl, alt); return TRUE; } @@ -687,6 +855,8 @@ 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); + shift = event->state & GDK_SHIFT_MASK; ctrl = event->state & GDK_CONTROL_MASK; alt = event->state & GDK_MOD1_MASK; @@ -702,22 +872,96 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) x = (event->x - cfg.window_border) / inst->font_width; y = (event->y - cfg.window_border) / inst->font_height; - term_mouse(button, MA_DRAG, x, y, shift, ctrl, alt); + term_mouse(term, button, MA_DRAG, x, y, shift, ctrl, alt); return TRUE; } +void done_with_pty(struct gui_data *inst) +{ + extern void pty_close(void); + + if (inst->master_fd >= 0) { + pty_close(); + inst->master_fd = -1; + gtk_input_remove(inst->master_func_id); + } + + if (!inst->exited && back->exitcode(backhandle) >= 0) { + int exitcode = back->exitcode(backhandle); + int clean; + + clean = WIFEXITED(exitcode) && (WEXITSTATUS(exitcode) == 0); + + /* + * Terminate now, if the Close On Exit setting is + * appropriate. + */ + if (cfg.close_on_exit == COE_ALWAYS || + (cfg.close_on_exit == COE_NORMAL && clean)) + exit(0); + + /* + * Otherwise, output an indication that the session has + * closed. + */ + { + char message[512]; + if (WIFEXITED(exitcode)) + sprintf(message, "\r\n[pterm: process terminated with exit" + " code %d]\r\n", WEXITSTATUS(exitcode)); + else if (WIFSIGNALED(exitcode)) +#ifdef HAVE_NO_STRSIGNAL + sprintf(message, "\r\n[pterm: process terminated on signal" + " %d]\r\n", WTERMSIG(exitcode)); +#else + sprintf(message, "\r\n[pterm: process terminated on signal" + " %d (%.400s)]\r\n", WTERMSIG(exitcode), + strsignal(WTERMSIG(exitcode))); +#endif + from_backend((void *)term, 0, message, strlen(message)); + } + inst->exited = 1; + } +} + +void frontend_keypress(void *handle) +{ + struct gui_data *inst = (struct gui_data *)handle; + + /* + * If our child process has exited but not closed, terminate on + * any keypress. + */ + if (inst->exited) + exit(0); +} + gint timer_func(gpointer data) { - /* struct gui_data *inst = (struct gui_data *)data; */ + struct gui_data *inst = (struct gui_data *)data; - term_update(); + if (back->exitcode(backhandle) >= 0) { + /* + * The primary child process died. We could keep the + * terminal open for remaining subprocesses to output to, + * but conventional wisdom seems to feel that that's the + * Wrong Thing for an xterm-alike, so we bail out now + * (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. + */ + done_with_pty(inst); + } + + term_update(term); + term_blink(term, 0); return TRUE; } void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) { - /* struct gui_data *inst = (struct gui_data *)data; */ + struct gui_data *inst = (struct gui_data *)data; char buf[4096]; int ret; @@ -729,16 +973,14 @@ void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) * to happen. Boo. */ if (ret == 0 || (ret < 0 && errno == EIO)) { - exit(0); - } - - if (ret < 0) { + done_with_pty(inst); + } else if (ret < 0) { perror("read pty master"); exit(1); - } - if (ret > 0) - from_backend(0, buf, ret); - term_out(); + } else if (ret > 0) + from_backend(term, 0, buf, ret); + term_blink(term, 1); + term_out(term); } void destroy(GtkWidget *widget, gpointer data) @@ -748,9 +990,10 @@ void destroy(GtkWidget *widget, gpointer data) gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) { - has_focus = event->in; - term_out(); - term_update(); + term->has_focus = event->in; + term_out(term); + term_update(term); + show_mouseptr(1); return FALSE; } @@ -762,23 +1005,149 @@ void set_raw_mouse_mode(int activate) activate = activate && !cfg.no_mouse_rep; send_raw_mouse = activate; if (send_raw_mouse) - gdk_window_set_cursor(inst->area->window, inst->rawcursor); + inst->currcursor = inst->rawcursor; else - gdk_window_set_cursor(inst->area->window, inst->textcursor); + inst->currcursor = inst->textcursor; + show_mouseptr(inst->mouseptr_visible); } void request_resize(int w, int h) { - /* FIXME: currently ignored */ + 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(&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*cfg.window_border; + area_y = inst->font_height * h + 2*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) +{ + gboolean success[1]; + + inst->cols[n].red = r * 0x0101; + inst->cols[n].green = g * 0x0101; + inst->cols[n].blue = b * 0x0101; + + gdk_colormap_alloc_colors(inst->colmap, inst->cols + n, 1, + FALSE, FALSE, success); + if (!success[0]) + g_error("pterm: couldn't allocate colour %d (#%02x%02x%02x)\n", + n, r, g, b); +} + +void set_window_background(void) +{ + if (inst->area && inst->area->window) + gdk_window_set_background(inst->area->window, &inst->cols[18]); + if (inst->window && inst->window->window) + gdk_window_set_background(inst->window->window, &inst->cols[18]); } void palette_set(int n, int r, int g, int b) { - /* FIXME: currently ignored */ + 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); + if (first[n] >= 18) + real_palette_set(first[n] + 1, r, g, b); + if (first[n] == 18) + set_window_background(); } + void palette_reset(void) { - /* FIXME: currently ignored */ + /* This maps colour indices in 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, + 0, 1, 2, 3, 4, 5 + }; + gboolean success[NCOLOURS]; + int i; + + assert(lenof(ww) == NCOLOURS); + + if (!inst->colmap) { + inst->colmap = gdk_colormap_get_system(); + } else { + gdk_colormap_free_colors(inst->colmap, inst->cols, NCOLOURS); + } + + 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; + } + + gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS, + FALSE, FALSE, success); + 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]); + } + + set_window_background(); } void write_clip(wchar_t * data, int len, int must_deselect) @@ -809,7 +1178,7 @@ void selection_get(GtkWidget *widget, GtkSelectionData *seldata, gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata, gpointer data) { - term_deselect(); + term_deselect(term); if (inst->pasteout_data) sfree(inst->pasteout_data); inst->pasteout_data = NULL; @@ -828,6 +1197,8 @@ void request_paste(void) GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); } +gint idle_paste_func(gpointer data); /* forward ref */ + void selection_received(GtkWidget *widget, GtkSelectionData *seldata, gpointer data) { @@ -843,9 +1214,25 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, mb_to_wc(0, 0, seldata->data, seldata->length, inst->pastein_data, inst->pastein_data_len); - term_do_paste(); + term_do_paste(term); + + if (term_paste_pending(term)) + inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst); +} + +gint idle_paste_func(gpointer data) +{ + struct gui_data *inst = (struct gui_data *)data; + + if (term_paste_pending(term)) + term_paste(term); + else + gtk_idle_remove(inst->term_paste_idle_id); + + return TRUE; } + void get_clip(wchar_t ** p, int *len) { if (p) { @@ -863,11 +1250,15 @@ void set_title(char *title) void set_icon(char *title) { - /* FIXME: currently ignored */ + 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) { + if (!cfg.scrollbar) + return; inst->sbar_adjust->lower = 0; inst->sbar_adjust->upper = total; inst->sbar_adjust->value = start; @@ -881,8 +1272,10 @@ void set_sbar(int total, int start, int page) void scrollbar_moved(GtkAdjustment *adj, gpointer data) { + if (!cfg.scrollbar) + return; if (!inst->ignore_sbar) - term_scroll(1, (int)adj->value); + term_scroll(term, 1, (int)adj->value); } void sys_cursor(int x, int y) @@ -928,19 +1321,15 @@ 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; + int nfg, nbg, t, fontid, shadow; GdkGC *gc = (GdkGC *)ctx; /* * NYI: - * - ATTR_WIDE (is this for Unicode CJK? I hope so) - * - LATTR_* (ESC # 4 double-width and double-height stuff) - * - cursor shapes other than block - * - VT100 line drawing stuff; code pages in general! - * - shadow bolding + * - Unicode, code pages, and ATTR_WIDE for CJK support. */ nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); @@ -959,6 +1348,22 @@ void do_text(Context ctx, int x, int y, char *text, int len, nbg = NCOLOURS-1; } + fontid = shadow = 0; + if ((attr & ATTR_BOLD) && !cfg.bold_colour) { + if (inst->fonts[1]) + fontid = 1; + else + shadow = 1; + } + + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= term->cols) + return; + if (x + len*2 > term->cols) + len = (term->cols-x)/2; /* trim to LH half */ + } + gdk_gc_set_foreground(gc, &inst->cols[nbg]); gdk_draw_rectangle(inst->pixmap, gc, 1, x*inst->font_width+cfg.window_border, @@ -966,11 +1371,18 @@ void do_text(Context ctx, int x, int y, char *text, int len, len*inst->font_width, inst->font_height); gdk_gc_set_foreground(gc, &inst->cols[nfg]); - gdk_draw_text(inst->pixmap, inst->fonts[0], gc, + gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, x*inst->font_width+cfg.window_border, y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent, text, len); + if (shadow) { + gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, + x*inst->font_width+cfg.window_border + cfg.shadowboldoffset, + y*inst->font_height+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) @@ -981,6 +1393,60 @@ void do_text(Context ctx, int x, int y, char *text, int len, y*inst->font_height + uheight + 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 * inst->font_width; i++) { + gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, + x*inst->font_width+cfg.window_border + 2*i, + y*inst->font_height+cfg.window_border, + x*inst->font_width+cfg.window_border + 2*i+1, + y*inst->font_height+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+cfg.window_border, + y*inst->font_height+cfg.window_border+dt*i+db, + x*inst->font_width+cfg.window_border, + y*inst->font_height+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) +{ + GdkGC *gc = (GdkGC *)ctx; + + do_text_internal(ctx, x, y, text, len, attr, lattr); + + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= term->cols) + return; + if (x + len*2 > term->cols) + len = (term->cols-x)/2; /* 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, @@ -995,28 +1461,91 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, int passive; GdkGC *gc = (GdkGC *)ctx; - /* - * 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) && cfg.cursor_type != 0) { + attr &= ~TATTR_ACTCURS; + } + do_text_internal(ctx, x, y, text, len, attr, lattr); + + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= term->cols) + return; + if (x + len*2 > term->cols) + len = (term->cols-x)/2; /* trim to LH half */ + len *= 2; + } + + if (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+cfg.window_border, + y*inst->font_height+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 (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 + cfg.window_border; + starty = y * inst->font_height + 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 + cfg.window_border + xadjust; + starty = y * inst->font_height + 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+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); } GdkCursor *make_mouse_ptr(int cursor_val) @@ -1043,12 +1572,12 @@ GdkCursor *make_mouse_ptr(int cursor_val) gchar text[2]; gint lb, rb, wid, asc, desc, w, h, x, y; - if (cursor_val < 0) { + if (cursor_val == -2) { gdk_font_unref(cursor_font); return NULL; } - if (!cursor_font) + if (cursor_val >= 0 && !cursor_font) cursor_font = gdk_font_load("cursor"); /* @@ -1056,10 +1585,15 @@ GdkCursor *make_mouse_ptr(int cursor_val) * mask character for this, because it's typically slightly * bigger than the main character. */ - text[1] = '\0'; - text[0] = (char)cursor_val + 1; - gdk_string_extents(cursor_font, text, &lb, &rb, &wid, &asc, &desc); - w = rb-lb; h = asc+desc; x = -lb; y = asc; + if (cursor_val >= 0) { + text[1] = '\0'; + text[0] = (char)cursor_val + 1; + gdk_string_extents(cursor_font, text, &lb, &rb, &wid, &asc, &desc); + w = rb-lb; h = asc+desc; x = -lb; y = asc; + } else { + w = h = 1; + x = y = 0; + } source = gdk_pixmap_new(NULL, w, h, 1); mask = gdk_pixmap_new(NULL, w, h, 1); @@ -1067,25 +1601,29 @@ GdkCursor *make_mouse_ptr(int cursor_val) /* * Draw the mask character on the mask pixmap. */ - text[1] = '\0'; - text[0] = (char)cursor_val + 1; gc = gdk_gc_new(mask); gdk_gc_set_foreground(gc, &dbg); gdk_draw_rectangle(mask, gc, 1, 0, 0, w, h); - gdk_gc_set_foreground(gc, &dfg); - gdk_draw_text(mask, cursor_font, gc, x, y, text, 1); + if (cursor_val >= 0) { + text[1] = '\0'; + text[0] = (char)cursor_val + 1; + gdk_gc_set_foreground(gc, &dfg); + gdk_draw_text(mask, cursor_font, gc, x, y, text, 1); + } gdk_gc_unref(gc); /* * Draw the main character on the source pixmap. */ - text[1] = '\0'; - text[0] = (char)cursor_val; gc = gdk_gc_new(source); gdk_gc_set_foreground(gc, &dbg); gdk_draw_rectangle(source, gc, 1, 0, 0, w, h); - gdk_gc_set_foreground(gc, &dfg); - gdk_draw_text(source, cursor_font, gc, x, y, text, 1); + if (cursor_val >= 0) { + text[1] = '\0'; + text[0] = (char)cursor_val; + gdk_gc_set_foreground(gc, &dfg); + gdk_draw_text(source, cursor_font, gc, x, y, text, 1); + } gdk_gc_unref(gc); /* @@ -1113,26 +1651,106 @@ void modalfatalbox(char *p, ...) exit(1); } -int main(int argc, char **argv) +char *get_x_display(void) +{ + return gdk_get_display(); +} + +char *app_name = "pterm"; + +int do_cmdline(int argc, char **argv, int do_everything) { - 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. + */ +#define EXPECTS_ARG do { \ + if (--argc <= 0) { \ + err = 1; \ + fprintf(stderr, "pterm: %s expects an argument\n", p); \ + } else \ + val = *++argv; \ +} while (0) +#define SECOND_PASS_ONLY do { \ + if (!do_everything) continue; \ +} while (0) - 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, val, sizeof(cfg.font)); + cfg.font[sizeof(cfg.font)-1] = '\0'; + + } else if (!strcmp(p, "-fb")) { + EXPECTS_ARG; + SECOND_PASS_ONLY; + strncpy(cfg.boldfont, val, sizeof(cfg.boldfont)); + cfg.boldfont[sizeof(cfg.boldfont)-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 *)); @@ -1143,18 +1761,100 @@ int main(int argc, char **argv) break; /* finished command-line processing */ } else err = 1, fprintf(stderr, "pterm: -e expects an argument\n"); - } - 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"); + + } 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, val, sizeof(cfg.logfilename)); + cfg.logfilename[sizeof(cfg.logfilename)-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 { + err = 1; + fprintf(stderr, "pterm: unrecognized option '%s'\n", p); } } + return err; +} + +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 */ + + pty_pre_init(); + + gtk_init(&argc, &argv); + + if (do_cmdline(argc, argv, 0)) /* pre-defaults pass to get -class */ + exit(1); + do_defaults(NULL, &cfg); + if (do_cmdline(argc, argv, 1)) /* post-defaults, do everything */ + exit(1); + + /* + * Initialise the whole instance structure to zeroes + */ + memset(inst, 0, sizeof(*inst)); + inst->fonts[0] = gdk_font_load(cfg.font); - inst->fonts[1] = NULL; /* FIXME: what about bold font? */ + if (!inst->fonts[0]) { + fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font); + exit(1); + } + if (cfg.boldfont[0]) { + inst->fonts[1] = gdk_font_load(cfg.boldfont); + if (!inst->fonts[1]) { + fprintf(stderr, "pterm: unable to load bold font \"%s\"\n", + cfg.boldfont); + exit(1); + } + } else + inst->fonts[1] = NULL; + inst->font_width = gdk_char_width(inst->fonts[0], ' '); inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent; @@ -1162,9 +1862,6 @@ int main(int argc, char **argv) init_ucs(); - back = &pty_backend; - back->init(NULL, 0, NULL, 0); - inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); if (cfg.wintitle[0]) @@ -1172,15 +1869,27 @@ int main(int argc, char **argv) else set_title("pterm"); + /* + * Set up the colour map. + */ + palette_reset(); + 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); + if (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 (cfg.scrollbar) { + if (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)); @@ -1205,6 +1914,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", @@ -1225,27 +1936,46 @@ 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 (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_BUTTON_MOTION_MASK); + GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK); gtk_widget_show(inst->area); - gtk_widget_show(inst->sbar); + if (cfg.scrollbar) + gtk_widget_show(inst->sbar); gtk_widget_show(GTK_WIDGET(inst->hbox)); gtk_widget_show(inst->window); + set_window_background(); + inst->textcursor = make_mouse_ptr(GDK_XTERM); inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR); - make_mouse_ptr(-1); /* clean up cursor font */ - gdk_window_set_cursor(inst->area->window, inst->textcursor); + inst->blankcursor = make_mouse_ptr(-1); + make_mouse_ptr(-2); /* clean up cursor font */ + inst->currcursor = inst->textcursor; + show_mouseptr(1); + + term = term_init(); + + back = &pty_backend; + back->init((void *)term, &backhandle, NULL, 0, NULL, 0); + + term_provide_resize_fn(term, back->size, backhandle); + + term_size(term, cfg.height, cfg.width, cfg.savelines); + + inst->ldisc = ldisc_create(term, back, 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); gtk_main();