X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fpterm.c;h=59a99c1ec1503c598fe6c01be351ea496531f438;hb=cdbb891f0ff44f4494452970ff69465179c0be1e;hp=04c722c3524f27000c1603d9239cf7aa01878d74;hpb=0047bbe70fc4d0df7b5f0057971071c348aff018;p=PuTTY.git diff --git a/unix/pterm.c b/unix/pterm.c index 04c722c3..59a99c1e 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -40,6 +40,13 @@ GdkAtom compound_text_atom, utf8_string_atom; extern char **pty_argv; /* declared in pty.c */ extern int use_pty_argv; +/* + * Timers are global across all sessions (even if we were handling + * multiple sessions, which we aren't), so the current timer ID is + * a global variable. + */ +static guint timer_id = 0; + struct gui_data { GtkWidget *window, *area, *sbar; GtkBox *hbox; @@ -714,7 +721,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * in xterm function key mode we change which two... */ case GDK_KP_Add: - if (inst->cfg.funky_type == 2) { + if (inst->cfg.funky_type == FUNKY_XTERM) { if (event->state & GDK_SHIFT_MASK) xkey = 'l'; else @@ -844,7 +851,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) break; } /* Reorder edit keys to physical order */ - if (inst->cfg.funky_type == 3 && code <= 6) + if (inst->cfg.funky_type == FUNKY_VT400 && code <= 6) code = "\0\2\1\4\5\3\6"[code]; if (inst->term->vt52_mode && code > 0 && code <= 6) { @@ -853,7 +860,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) goto done; } - if (inst->cfg.funky_type == 5 && /* SCO function keys */ + if (inst->cfg.funky_type == FUNKY_SCO && /* SCO function keys */ code >= 11 && code <= 34) { char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{"; int index = 0; @@ -877,7 +884,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 5 && /* SCO small keypad */ + if (inst->cfg.funky_type == FUNKY_SCO && /* SCO small keypad */ code >= 1 && code <= 6) { char codes[] = "HL.FIG"; if (code == 3) { @@ -889,7 +896,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) use_ucsoutput = FALSE; goto done; } - if ((inst->term->vt52_mode || inst->cfg.funky_type == 4) && + if ((inst->term->vt52_mode || inst->cfg.funky_type == FUNKY_VT100P) && code >= 11 && code <= 24) { int offt = 0; if (code > 15) @@ -905,12 +912,12 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 1 && code >= 11 && code <= 15) { + if (inst->cfg.funky_type == FUNKY_LINUX && code >= 11 && code <= 15) { end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11); use_ucsoutput = FALSE; goto done; } - if (inst->cfg.funky_type == 2 && code >= 11 && code <= 14) { + if (inst->cfg.funky_type == FUNKY_XTERM && code >= 11 && code <= 14) { if (inst->term->vt52_mode) end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11); else @@ -1022,7 +1029,6 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) show_mouseptr(inst, 0); term_seen_key_event(inst->term); - term_out(inst->term); } return TRUE; @@ -1130,9 +1136,9 @@ void frontend_keypress(void *handle) exit(0); } -gint timer_func(gpointer data) +void notify_remote_exit(void *frontend) { - struct gui_data *inst = (struct gui_data *)data; + struct gui_data *inst = (struct gui_data *)frontend; int exitcode; if (!inst->exited && @@ -1153,10 +1159,40 @@ gint timer_func(gpointer data) } gtk_widget_show(inst->restartitem); } +} - term_update(inst->term); - term_blink(inst->term, 0); - return TRUE; +static gint timer_trigger(gpointer data) +{ + long now = GPOINTER_TO_INT(data); + long next; + long ticks; + + if (run_timers(now, &next)) { + ticks = next - GETTICKCOUNT(); + timer_id = gtk_timeout_add(ticks > 0 ? ticks : 1, timer_trigger, + GINT_TO_POINTER(next)); + } + + /* + * Never let a timer resume. If we need another one, we've + * asked for it explicitly above. + */ + return FALSE; +} + +void timer_change_notify(long next) +{ + long ticks; + + if (timer_id) + gtk_timeout_remove(timer_id); + + ticks = next - GETTICKCOUNT(); + if (ticks <= 0) + ticks = 1; /* just in case */ + + timer_id = gtk_timeout_add(ticks, timer_trigger, + GINT_TO_POINTER(next)); } void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) @@ -1182,8 +1218,7 @@ void destroy(GtkWidget *widget, gpointer data) gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; - inst->term->has_focus = event->in; - term_out(inst->term); + term_set_focus(inst->term, event->in); term_update(inst->term); show_mouseptr(inst, 1); return FALSE; @@ -1798,15 +1833,21 @@ void free_ctx(Context ctx) * * We are allowed to fiddle with the contents of `text'. */ -void do_text_internal(Context ctx, int x, int y, char *text, int len, +void do_text_internal(Context ctx, int x, int y, wchar_t *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 ncombining, combining; int nfg, nbg, t, fontid, shadow, rlen, widefactor; + if (attr & TATTR_COMBINING) { + ncombining = len; + len = 1; + } else + ncombining = 1; + nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0); nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT); @@ -1841,7 +1882,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, shadow = 1; } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; @@ -1874,9 +1915,9 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, 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)); + wcs = snewn(len*ncombining+1, wchar_t); + for (i = 0; i < len*ncombining; i++) { + wcs[i] = text[i]; } if (inst->fonts[fontid] == NULL) { @@ -1907,33 +1948,40 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, * 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); + for (combining = 0; combining < ncombining; combining++) { + for (i = 0; i <= len; i++) + gwcs[i] = wcs[i + combining]; + 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); + if (shadow) + gdk_draw_text_wc(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, + 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); + for (combining = 0; combining < ncombining; combining++) { + wc_to_mb(inst->fontinfo[fontid].charset, 0, + wcs + combining, 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); + 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, + 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) @@ -1944,7 +1992,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, y*inst->font_height + uheight + inst->cfg.window_border); } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != 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 @@ -1960,13 +2008,13 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, 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 * widefactor * inst->font_width - i, inst->font_height); } len *= 2; - if (lattr != LATTR_WIDE) { + if ((lattr & LATTR_MODE) != LATTR_WIDE) { int dt, db; /* Now stretch vertically, in the same way. */ - if (lattr == LATTR_BOT) + if ((lattr & LATTR_MODE) == LATTR_BOT) dt = 0, db = 1; else dt = 1, db = 0; @@ -1974,15 +2022,15 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, 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, + x*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); + len * widefactor * inst->font_width, inst->font_height-i-1); } } } } -void do_text(Context ctx, int x, int y, char *text, int len, +void do_text(Context ctx, int x, int y, wchar_t *text, int len, unsigned long attr, int lattr) { struct draw_ctx *dctx = (struct draw_ctx *)ctx; @@ -1998,7 +2046,7 @@ void do_text(Context ctx, int x, int y, char *text, int len, widefactor = 1; } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; @@ -2015,14 +2063,14 @@ void do_text(Context ctx, int x, int y, char *text, int len, len*widefactor*inst->font_width, inst->font_height); } -void do_cursor(Context ctx, int x, int y, char *text, int len, +void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, unsigned long attr, int lattr) { struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; GdkGC *gc = dctx->gc; - int passive, widefactor; + int active, passive, widefactor; if (attr & TATTR_PASCURS) { attr &= ~TATTR_PASCURS; @@ -2031,16 +2079,21 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, passive = 0; if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) { attr &= ~TATTR_ACTCURS; - } + active = 1; + } else + active = 0; do_text_internal(ctx, x, y, text, len, attr, lattr); + if (attr & TATTR_COMBINING) + len = 1; + if (attr & ATTR_WIDE) { widefactor = 2; } else { widefactor = 1; } - if (lattr != LATTR_NORM) { + if ((lattr & LATTR_MODE) != LATTR_NORM) { x *= 2; if (x >= inst->term->cols) return; @@ -2060,7 +2113,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, 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); + len*widefactor*inst->font_width-1, inst->font_height-1); } } else { int uheight; @@ -2068,7 +2121,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, int char_width; - if ((attr & ATTR_WIDE) || lattr != LATTR_NORM) + if ((attr & ATTR_WIDE) || (lattr & LATTR_MODE) != LATTR_NORM) char_width = 2*inst->font_width; else char_width = inst->font_width; @@ -2082,7 +2135,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, starty = y * inst->font_height + inst->cfg.window_border + uheight; dx = 1; dy = 0; - length = len * char_width; + length = len * widefactor * char_width; } else { int xadjust = 0; if (attr & TATTR_RIGHTCURS) @@ -2103,10 +2156,10 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, startx += dx; starty += dy; } - } else { + } else if (active) { gdk_draw_line(inst->pixmap, gc, startx, starty, startx + (length-1) * dx, starty + (length-1) * dy); - } + } /* else no cursor (e.g., blinked off) */ } gdk_draw_pixmap(inst->area->window, gc, inst->pixmap, @@ -2719,8 +2772,8 @@ void setup_fonts_ucs(struct gui_data *inst) inst->font_width = gdk_char_width(inst->fonts[0], ' '); inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent; - inst->direct_to_font = init_ucs(&inst->ucsdata, - inst->cfg.line_codepage, font_charset, + inst->direct_to_font = init_ucs(&inst->ucsdata, inst->cfg.line_codepage, + inst->cfg.utf8_override, font_charset, inst->cfg.vtmode); } @@ -3142,22 +3195,51 @@ void update_specials_menu(void *frontend) else specials = NULL; + /* I believe this disposes of submenus too. */ gtk_container_foreach(GTK_CONTAINER(inst->specialsmenu), (GtkCallback)gtk_widget_destroy, NULL); if (specials) { int i; - GtkWidget *menuitem; - for (i = 0; specials[i].name; i++) { - if (*specials[i].name) { + GtkWidget *menu = inst->specialsmenu; + /* A lame "stack" for submenus that will do for now. */ + GtkWidget *saved_menu = NULL; + int nesting = 1; + for (i = 0; nesting > 0; i++) { + GtkWidget *menuitem = NULL; + switch (specials[i].code) { + case TS_SUBMENU: + assert (nesting < 2); + saved_menu = menu; /* XXX lame stacking */ + menu = gtk_menu_new(); + menuitem = gtk_menu_item_new_with_label(specials[i].name); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); + gtk_container_add(GTK_CONTAINER(saved_menu), menuitem); + gtk_widget_show(menuitem); + menuitem = NULL; + nesting++; + break; + case TS_EXITMENU: + nesting--; + if (nesting) { + menu = saved_menu; /* XXX lame stacking */ + saved_menu = NULL; + } + break; + case TS_SEP: + menuitem = gtk_menu_item_new(); + break; + default: menuitem = gtk_menu_item_new_with_label(specials[i].name); gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", GINT_TO_POINTER(specials[i].code)); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(special_menuitem), inst); - } else - menuitem = gtk_menu_item_new(); - gtk_container_add(GTK_CONTAINER(inst->specialsmenu), menuitem); - gtk_widget_show(menuitem); + break; + } + if (menuitem) { + gtk_container_add(GTK_CONTAINER(menu), menuitem); + gtk_widget_show(menuitem); + } } gtk_widget_show(inst->specialsitem1); gtk_widget_show(inst->specialsitem2); @@ -3199,7 +3281,6 @@ static void start_backend(struct gui_data *inst) sfree(title); } inst->back->provide_logctx(inst->backhandle, inst->logctx); - update_specials_menu(inst); term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle); @@ -3346,7 +3427,6 @@ int pt_main(int argc, char **argv) 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); gtk_widget_add_events(GTK_WIDGET(inst->area), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -3418,6 +3498,8 @@ int pt_main(int argc, char **argv) inst->specialsitem1 = menuitem; MKMENUITEM(NULL, NULL); inst->specialsitem2 = menuitem; + gtk_widget_hide(inst->specialsitem1); + gtk_widget_hide(inst->specialsitem2); MKMENUITEM("Clear Scrollback", clear_scrollback_menuitem); MKMENUITEM("Reset Terminal", reset_terminal_menuitem); MKMENUITEM("Copy All", copy_all_menuitem);