X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e634699906875560987ba8d6aa776ef7b8394301..57e636ca459fb23c1ebf9c0e2c9c9b0391e2e6ef:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index befd7de7..228f4dfb 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -24,12 +24,12 @@ #define NCOLOURS (lenof(((Config *)0)->colours)) struct gui_data { - GtkWidget *area, *sbar; + GtkWidget *window, *area, *sbar; GtkBox *hbox; 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; @@ -37,6 +37,9 @@ struct gui_data { char *pasteout_data; int pasteout_data_len; int font_width, font_height; + int ignore_sbar; + GdkAtom compound_text_atom; + char wintitle[sizeof(((Config *)0)->wintitle)]; }; static struct gui_data the_inst; @@ -65,7 +68,9 @@ 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. */ } @@ -161,32 +166,54 @@ void get_window_pixels(int *x, int *y) */ char *get_window_title(int icon) { - return "FIXME: window title retrieval not yet implemented"; + return inst->wintitle; } 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); +} + gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; + int w, h, need_size = 0; - if (inst->pixmap) - gdk_pixmap_unref(inst->pixmap); - - 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); + w = (event->width - 2*cfg.window_border) / inst->font_width; + h = (event->height - 2*cfg.window_border) / inst->font_height; - { + if (w != cfg.width || h != cfg.height) { + if (inst->pixmap) { + gdk_pixmap_unref(inst->pixmap); + inst->pixmap = NULL; + } + cfg.width = w; + 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); + 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, @@ -195,11 +222,14 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) gdk_gc_unref(gc); } + if (need_size) { + term_size(h, w, cfg.savelines); + } + /* * Set up the colour map. */ - inst->colmap = gdk_colormap_get_system(); - { + if (!inst->colmap) { static const int ww[] = { 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, @@ -208,6 +238,8 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) gboolean success[NCOLOURS]; int i; + inst->colmap = gdk_colormap_get_system(); + assert(lenof(ww) == NCOLOURS); for (i = 0; i < NCOLOURS; i++) { @@ -270,11 +302,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * NYI: - * - Shift-PgUp/PgDn for scrollbar * - nethack mode * - alt+numpad * - Compose key (!!! requires Unicode faff before even trying) - * - Shift-Ins for paste (need to deal with pasting first) */ /* @@ -290,6 +320,14 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) return TRUE; } + /* + * Neither does Shift-Ins. + */ + if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) { + request_paste(); + return TRUE; + } + /* ALT+things gives leading Escape. */ output[0] = '\033'; strncpy(output+1, event->string, 31); @@ -613,8 +651,11 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) printf("\n"); } #endif - ldisc_send(output+start, end-start, 1); - term_out(); + if (end-start > 0) { + ldisc_send(output+start, end-start, 1); + show_mouseptr(0); + term_out(); + } } return TRUE; @@ -625,6 +666,8 @@ 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); + shift = event->state & GDK_SHIFT_MASK; ctrl = event->state & GDK_CONTROL_MASK; alt = event->state & GDK_MOD1_MASK; @@ -662,6 +705,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; @@ -685,6 +730,19 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) gint timer_func(gpointer data) { /* struct gui_data *inst = (struct gui_data *)data; */ + extern int pty_child_is_dead(); /* declared in pty.c */ + + if (pty_child_is_dead()) { + /* + * 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. + */ + exit(0); + } term_update(); return TRUE; @@ -726,6 +784,7 @@ gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) has_focus = event->in; term_out(); term_update(); + show_mouseptr(1); return FALSE; } @@ -737,9 +796,10 @@ 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(1); } void request_resize(int w, int h) @@ -769,6 +829,8 @@ void write_clip(wchar_t * data, int len, int must_deselect) GDK_CURRENT_TIME)) { gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 1); + gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY, + inst->compound_text_atom, 1); } } @@ -829,7 +891,9 @@ void get_clip(wchar_t ** p, int *len) void set_title(char *title) { - /* FIXME: currently ignored */ + 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) @@ -845,12 +909,15 @@ void set_sbar(int total, int start, int page) inst->sbar_adjust->page_size = page; inst->sbar_adjust->step_increment = 1; inst->sbar_adjust->page_increment = page/2; + inst->ignore_sbar = TRUE; gtk_adjustment_changed(inst->sbar_adjust); + inst->ignore_sbar = FALSE; } void scrollbar_moved(GtkAdjustment *adj, gpointer data) { - term_scroll(1, (int)adj->value); + if (!inst->ignore_sbar) + term_scroll(1, (int)adj->value); } void sys_cursor(int x, int y) @@ -904,12 +971,10 @@ void do_text(Context ctx, int x, int y, char *text, int len, /* * NYI: - * - ATTR_WIDE (is this for Unicode CJK? I hope so) + * - Unicode, code pages, and ATTR_WIDE for CJK support. * - LATTR_* (ESC # 4 double-width and double-height stuff) * - cursor shapes other than block - * - VT100 line drawing stuff; code pages in general! * - shadow bolding - * - underline */ nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); @@ -988,6 +1053,98 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, } } +GdkCursor *make_mouse_ptr(int cursor_val) +{ + /* + * Truly hideous hack: GTK doesn't allow us to set the mouse + * cursor foreground and background colours unless we've _also_ + * created our own cursor from bitmaps. Therefore, I need to + * load the `cursor' font and draw glyphs from it on to + * pixmaps, in order to construct my cursors with the fg and bg + * I want. This is a gross hack, but it's more self-contained + * than linking in Xlib to find the X window handle to + * inst->area and calling XRecolorCursor, and it's more + * futureproof than hard-coding the shapes as bitmap arrays. + */ + static GdkFont *cursor_font = NULL; + GdkPixmap *source, *mask; + GdkGC *gc; + GdkColor cfg = { 0, 65535, 65535, 65535 }; + GdkColor cbg = { 0, 0, 0, 0 }; + GdkColor dfg = { 1, 65535, 65535, 65535 }; + GdkColor dbg = { 0, 0, 0, 0 }; + GdkCursor *ret; + gchar text[2]; + gint lb, rb, wid, asc, desc, w, h, x, y; + + if (cursor_val == -2) { + gdk_font_unref(cursor_font); + return NULL; + } + + if (cursor_val >= 0 && !cursor_font) + cursor_font = gdk_font_load("cursor"); + + /* + * Get the text extent of the cursor in question. We use the + * mask character for this, because it's typically slightly + * bigger than the main character. + */ + 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); + + /* + * Draw the mask character on the mask pixmap. + */ + gc = gdk_gc_new(mask); + gdk_gc_set_foreground(gc, &dbg); + gdk_draw_rectangle(mask, gc, 1, 0, 0, w, h); + 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. + */ + gc = gdk_gc_new(source); + gdk_gc_set_foreground(gc, &dbg); + gdk_draw_rectangle(source, gc, 1, 0, 0, w, h); + 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); + + /* + * Create the cursor. + */ + ret = gdk_cursor_new_from_pixmap(source, mask, &cfg, &cbg, x, y); + + /* + * Clean up. + */ + gdk_pixmap_unref(source); + gdk_pixmap_unref(mask); + + return ret; +} + void modalfatalbox(char *p, ...) { va_list ap; @@ -1001,24 +1158,66 @@ void modalfatalbox(char *p, ...) int main(int argc, char **argv) { - GtkWidget *window; extern int pty_master_fd; /* declared in pty.c */ + extern char **pty_argv; /* declared in pty.c */ + int err = 0; gtk_init(&argc, &argv); do_defaults(NULL, &cfg); + 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 (--argc > 0) { + int i; + pty_argv = smalloc((argc+1) * sizeof(char *)); + ++argv; + for (i = 0; i < argc; i++) + pty_argv[i] = argv[i]; + pty_argv[argc] = NULL; + 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"); + } + if (!strcmp(p, "-hide")) { + cfg.hide_mouseptr = 1; + } + } + 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); + init_ucs(); back = &pty_backend; back->init(NULL, 0, NULL, 0); - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + if (cfg.wintitle[0]) + set_title(cfg.wintitle); + else + set_title("pterm"); + inst->area = gtk_drawing_area_new(); gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), inst->font_width * cfg.width + 2*cfg.window_border, @@ -1026,10 +1225,10 @@ int main(int argc, char **argv) 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)); - gtk_box_pack_start(inst->hbox, inst->area, FALSE, FALSE, 0); - gtk_box_pack_start(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(window), GTK_WIDGET(inst->hbox)); + gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox)); { GdkGeometry geom; @@ -1041,20 +1240,20 @@ int main(int argc, char **argv) geom.width_inc = inst->font_width; geom.height_inc = inst->font_height; geom.min_aspect = geom.max_aspect = 0; - gtk_window_set_geometry_hints(GTK_WINDOW(window), inst->area, &geom, + gtk_window_set_geometry_hints(GTK_WINDOW(inst->window), inst->area, &geom, GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | GDK_HINT_RESIZE_INC); } - gtk_signal_connect(GTK_OBJECT(window), "destroy", + gtk_signal_connect(GTK_OBJECT(inst->window), "destroy", GTK_SIGNAL_FUNC(destroy), inst); - gtk_signal_connect(GTK_OBJECT(window), "delete_event", + gtk_signal_connect(GTK_OBJECT(inst->window), "delete_event", GTK_SIGNAL_FUNC(delete_window), inst); - gtk_signal_connect(GTK_OBJECT(window), "key_press_event", + gtk_signal_connect(GTK_OBJECT(inst->window), "key_press_event", GTK_SIGNAL_FUNC(key_event), inst); - gtk_signal_connect(GTK_OBJECT(window), "focus_in_event", + gtk_signal_connect(GTK_OBJECT(inst->window), "focus_in_event", GTK_SIGNAL_FUNC(focus_event), inst); - gtk_signal_connect(GTK_OBJECT(window), "focus_out_event", + gtk_signal_connect(GTK_OBJECT(inst->window), "focus_out_event", GTK_SIGNAL_FUNC(focus_event), inst); gtk_signal_connect(GTK_OBJECT(inst->area), "configure_event", GTK_SIGNAL_FUNC(configure_area), inst); @@ -1079,16 +1278,19 @@ int main(int argc, char **argv) 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); gtk_widget_show(GTK_WIDGET(inst->hbox)); - gtk_widget_show(window); - - inst->textcursor = gdk_cursor_new(GDK_XTERM); - inst->rawcursor = gdk_cursor_new(GDK_ARROW); - gdk_window_set_cursor(inst->area->window, inst->textcursor); + 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 */ + inst->currcursor = inst->textcursor; + show_mouseptr(1); term_init(); term_size(24, 80, 2000);