X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/12d200b1fbbb18f5dfd4934c39278fe33f8b78f0..614bb468761f5cc8fd243f0f0083e9df95bdaa6a:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index d258f9e4..58f9846e 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -29,7 +29,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,6 +38,8 @@ 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; char wintitle[sizeof(((Config *)0)->wintitle)]; }; @@ -59,8 +61,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,7 +72,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. */ } @@ -170,16 +176,33 @@ char *get_window_title(int icon) 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; 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; @@ -213,37 +236,6 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) 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]); - } - } - return TRUE; } @@ -289,7 +281,6 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * NYI: - * - nethack mode * - alt+numpad * - Compose key (!!! requires Unicode faff before even trying) */ @@ -371,6 +362,32 @@ 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) { @@ -638,8 +655,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; @@ -650,6 +670,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; @@ -687,6 +709,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; @@ -710,6 +734,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; @@ -751,6 +788,7 @@ gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) has_focus = event->in; term_out(); term_update(); + show_mouseptr(1); return FALSE; } @@ -762,9 +800,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(inst->mouseptr_visible); } void request_resize(int w, int h) @@ -772,13 +811,65 @@ void request_resize(int w, int h) /* FIXME: currently ignored */ } +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 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); } + 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]); + } } void write_clip(wchar_t * data, int len, int must_deselect) @@ -828,6 +919,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) { @@ -844,8 +937,24 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, inst->pastein_data, inst->pastein_data_len); term_do_paste(); + + if (term_paste_pending()) + 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_paste(); + else + gtk_idle_remove(inst->term_paste_idle_id); + + return TRUE; } + void get_clip(wchar_t ** p, int *len) { if (p) { @@ -936,10 +1045,8 @@ void do_text(Context ctx, int x, int y, char *text, int len, /* * NYI: - * - ATTR_WIDE (is this for Unicode CJK? I hope so) - * - LATTR_* (ESC # 4 double-width and double-height stuff) + * - Unicode, code pages, and ATTR_WIDE for CJK support. * - cursor shapes other than block - * - VT100 line drawing stuff; code pages in general! * - shadow bolding */ @@ -959,6 +1066,14 @@ void do_text(Context ctx, int x, int y, char *text, int len, nbg = NCOLOURS-1; } + if (lattr != LATTR_NORM) { + x *= 2; + if (x >= cols) + return; + if (x + len*2 > cols) + len = (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, @@ -981,6 +1096,44 @@ 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); + } + } + 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, @@ -1043,12 +1196,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 +1209,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 +1225,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); /* @@ -1151,6 +1313,20 @@ int main(int argc, char **argv) } else err = 1, fprintf(stderr, "pterm: -T expects an argument\n"); } + 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"); + } + if (!strcmp(p, "-hide")) { + cfg.hide_mouseptr = 1; + } + if (!strcmp(p, "-nethack")) { + cfg.nethack_keypad = 1; + } } inst->fonts[0] = gdk_font_load(cfg.font); @@ -1232,7 +1408,7 @@ 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); @@ -1241,8 +1417,10 @@ int main(int argc, char **argv) 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_init(); term_size(24, 80, 2000);