X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/61ef0c16fb901a7c8992e8f46318c609146c0fbc..HEAD:/terminal.c diff --git a/terminal.c b/terminal.c index 996a01fb..113edc4f 100644 --- a/terminal.c +++ b/terminal.c @@ -989,7 +989,7 @@ static void resizeline(Terminal *term, termline *line, int cols) static int sblines(Terminal *term) { int sblines = count234(term->scrollback); - if (term->cfg.erase_to_scrollback && + if (term->erase_to_scrollback && term->alt_which && term->alt_screen) { sblines += term->alt_sblines; } @@ -1015,7 +1015,7 @@ static termline *lineptr(Terminal *term, int y, int lineno, int screen) assert(!screen); - if (term->cfg.erase_to_scrollback && + if (term->erase_to_scrollback && term->alt_which && term->alt_screen) { altlines = term->alt_sblines; } @@ -1065,32 +1065,32 @@ static termline *lineptr(Terminal *term, int y, int lineno, int screen) static void term_schedule_tblink(Terminal *term); static void term_schedule_cblink(Terminal *term); -static void term_timer(void *ctx, long now) +static void term_timer(void *ctx, unsigned long now) { Terminal *term = (Terminal *)ctx; int update = FALSE; - if (term->tblink_pending && now - term->next_tblink >= 0) { + if (term->tblink_pending && now == term->next_tblink) { term->tblinker = !term->tblinker; term->tblink_pending = FALSE; term_schedule_tblink(term); update = TRUE; } - if (term->cblink_pending && now - term->next_cblink >= 0) { + if (term->cblink_pending && now == term->next_cblink) { term->cblinker = !term->cblinker; term->cblink_pending = FALSE; term_schedule_cblink(term); update = TRUE; } - if (term->in_vbell && now - term->vbell_end >= 0) { + if (term->in_vbell && now == term->vbell_end) { term->in_vbell = FALSE; update = TRUE; } if (update || - (term->window_update_pending && now - term->next_update >= 0)) + (term->window_update_pending && now == term->next_update)) term_update(term); } @@ -1133,7 +1133,7 @@ static void term_schedule_tblink(Terminal *term) */ static void term_schedule_cblink(Terminal *term) { - if (term->cfg.blink_cur && term->has_focus) { + if (term->blink_cur && term->has_focus) { if (!term->cblink_pending) term->next_cblink = schedule_timer(CBLINK_DELAY, term_timer, term); term->cblink_pending = TRUE; @@ -1197,11 +1197,11 @@ static void power_on(Terminal *term, int clear) for (i = 0; i < term->cols; i++) term->tabs[i] = (i % 8 == 0 ? TRUE : FALSE); } - term->alt_om = term->dec_om = term->cfg.dec_om; + term->alt_om = term->dec_om = conf_get_int(term->conf, CONF_dec_om); term->alt_ins = term->insert = FALSE; term->alt_wnext = term->wrapnext = term->save_wnext = term->alt_save_wnext = FALSE; - term->alt_wrap = term->wrap = term->cfg.wrap_mode; + term->alt_wrap = term->wrap = conf_get_int(term->conf, CONF_wrap_mode); term->alt_cset = term->cset = term->save_cset = term->alt_save_cset = 0; term->alt_utf = term->utf = term->save_utf = term->alt_save_utf = 0; term->utf_state = 0; @@ -1216,19 +1216,22 @@ static void power_on(Terminal *term, int clear) term->default_attr = term->save_attr = term->alt_save_attr = term->curr_attr = ATTR_DEFAULT; term->term_editing = term->term_echoing = FALSE; - term->app_cursor_keys = term->cfg.app_cursor; - term->app_keypad_keys = term->cfg.app_keypad; - term->use_bce = term->cfg.bce; - term->blink_is_real = term->cfg.blinktext; + term->app_cursor_keys = conf_get_int(term->conf, CONF_app_cursor); + term->app_keypad_keys = conf_get_int(term->conf, CONF_app_keypad); + term->use_bce = conf_get_int(term->conf, CONF_bce); + term->blink_is_real = conf_get_int(term->conf, CONF_blinktext); term->erase_char = term->basic_erase_char; term->alt_which = 0; term_print_finish(term); term->xterm_mouse = 0; + term->xterm_extended_mouse = 0; + term->urxvt_extended_mouse = 0; set_raw_mouse_mode(term->frontend, FALSE); + term->bracketed_paste = FALSE; { int i; for (i = 0; i < 256; i++) - term->wordness[i] = term->cfg.wordness[i]; + term->wordness[i] = conf_get_int_int(term->conf, CONF_wordness, i); } if (term->screen) { swap_screen(term, 1, FALSE, FALSE); @@ -1261,7 +1264,7 @@ void term_update(Terminal *term) ctx = get_ctx(term->frontend); if (ctx) { int need_sbar_update = term->seen_disp_event; - if (term->seen_disp_event && term->cfg.scroll_on_disp) { + if (term->seen_disp_event && term->scroll_on_disp) { term->disptop = 0; /* return to main screen */ term->seen_disp_event = 0; need_sbar_update = TRUE; @@ -1300,7 +1303,7 @@ void term_seen_key_event(Terminal *term) /* * Reset the scrollback on keypress, if we're doing that. */ - if (term->cfg.scroll_on_key) { + if (term->scroll_on_key) { term->disptop = 0; /* return to main screen */ seen_disp_event(term); } @@ -1328,12 +1331,82 @@ static void set_erase_char(Terminal *term) } /* + * We copy a bunch of stuff out of the Conf structure into local + * fields in the Terminal structure, to avoid the repeated tree234 + * lookups which would be involved in fetching them from the former + * every time. + */ +void term_copy_stuff_from_conf(Terminal *term) +{ + term->ansi_colour = conf_get_int(term->conf, CONF_ansi_colour); + term->arabicshaping = conf_get_int(term->conf, CONF_arabicshaping); + term->beep = conf_get_int(term->conf, CONF_beep); + term->bellovl = conf_get_int(term->conf, CONF_bellovl); + term->bellovl_n = conf_get_int(term->conf, CONF_bellovl_n); + term->bellovl_s = conf_get_int(term->conf, CONF_bellovl_s); + term->bellovl_t = conf_get_int(term->conf, CONF_bellovl_t); + term->bidi = conf_get_int(term->conf, CONF_bidi); + term->bksp_is_delete = conf_get_int(term->conf, CONF_bksp_is_delete); + term->blink_cur = conf_get_int(term->conf, CONF_blink_cur); + term->blinktext = conf_get_int(term->conf, CONF_blinktext); + term->cjk_ambig_wide = conf_get_int(term->conf, CONF_cjk_ambig_wide); + term->conf_height = conf_get_int(term->conf, CONF_height); + term->conf_width = conf_get_int(term->conf, CONF_width); + term->crhaslf = conf_get_int(term->conf, CONF_crhaslf); + term->erase_to_scrollback = conf_get_int(term->conf, CONF_erase_to_scrollback); + term->funky_type = conf_get_int(term->conf, CONF_funky_type); + term->lfhascr = conf_get_int(term->conf, CONF_lfhascr); + term->logflush = conf_get_int(term->conf, CONF_logflush); + term->logtype = conf_get_int(term->conf, CONF_logtype); + term->mouse_override = conf_get_int(term->conf, CONF_mouse_override); + term->nethack_keypad = conf_get_int(term->conf, CONF_nethack_keypad); + term->no_alt_screen = conf_get_int(term->conf, CONF_no_alt_screen); + term->no_applic_c = conf_get_int(term->conf, CONF_no_applic_c); + term->no_applic_k = conf_get_int(term->conf, CONF_no_applic_k); + term->no_dbackspace = conf_get_int(term->conf, CONF_no_dbackspace); + term->no_mouse_rep = conf_get_int(term->conf, CONF_no_mouse_rep); + term->no_remote_charset = conf_get_int(term->conf, CONF_no_remote_charset); + term->no_remote_resize = conf_get_int(term->conf, CONF_no_remote_resize); + term->no_remote_wintitle = conf_get_int(term->conf, CONF_no_remote_wintitle); + term->rawcnp = conf_get_int(term->conf, CONF_rawcnp); + term->rect_select = conf_get_int(term->conf, CONF_rect_select); + term->remote_qtitle_action = conf_get_int(term->conf, CONF_remote_qtitle_action); + term->rxvt_homeend = conf_get_int(term->conf, CONF_rxvt_homeend); + term->scroll_on_disp = conf_get_int(term->conf, CONF_scroll_on_disp); + term->scroll_on_key = conf_get_int(term->conf, CONF_scroll_on_key); + term->xterm_256_colour = conf_get_int(term->conf, CONF_xterm_256_colour); + + /* + * Parse the control-character escapes in the configured + * answerback string. + */ + { + char *answerback = conf_get_str(term->conf, CONF_answerback); + int maxlen = strlen(answerback); + + term->answerback = snewn(maxlen, char); + term->answerbacklen = 0; + + while (*answerback) { + char *n; + char c = ctrlparse(answerback, &n); + if (n) { + term->answerback[term->answerbacklen++] = c; + answerback = n; + } else { + term->answerback[term->answerbacklen++] = *answerback++; + } + } + } +} + +/* * When the user reconfigures us, we need to check the forbidden- * alternate-screen config option, disable raw mouse mode if the * user has disabled mouse reporting, and abandon a print job if * the user has disabled printing. */ -void term_reconfig(Terminal *term, Config *cfg) +void term_reconfig(Terminal *term, Conf *conf) { /* * Before adopting the new config, check all those terminal @@ -1345,21 +1418,28 @@ void term_reconfig(Terminal *term, Config *cfg) int reset_wrap, reset_decom, reset_bce, reset_tblink, reset_charclass; int i; - reset_wrap = (term->cfg.wrap_mode != cfg->wrap_mode); - reset_decom = (term->cfg.dec_om != cfg->dec_om); - reset_bce = (term->cfg.bce != cfg->bce); - reset_tblink = (term->cfg.blinktext != cfg->blinktext); + reset_wrap = (conf_get_int(term->conf, CONF_wrap_mode) != + conf_get_int(conf, CONF_wrap_mode)); + reset_decom = (conf_get_int(term->conf, CONF_dec_om) != + conf_get_int(conf, CONF_dec_om)); + reset_bce = (conf_get_int(term->conf, CONF_bce) != + conf_get_int(conf, CONF_bce)); + reset_tblink = (conf_get_int(term->conf, CONF_blinktext) != + conf_get_int(conf, CONF_blinktext)); reset_charclass = 0; - for (i = 0; i < lenof(term->cfg.wordness); i++) - if (term->cfg.wordness[i] != cfg->wordness[i]) + for (i = 0; i < 256; i++) + if (conf_get_int_int(term->conf, CONF_wordness, i) != + conf_get_int_int(conf, CONF_wordness, i)) reset_charclass = 1; /* * If the bidi or shaping settings have changed, flush the bidi * cache completely. */ - if (term->cfg.arabicshaping != cfg->arabicshaping || - term->cfg.bidi != cfg->bidi) { + if (conf_get_int(term->conf, CONF_arabicshaping) != + conf_get_int(conf, CONF_arabicshaping) || + conf_get_int(term->conf, CONF_bidi) != + conf_get_int(conf, CONF_bidi)) { for (i = 0; i < term->bidi_cache_size; i++) { sfree(term->pre_bidi_cache[i].chars); sfree(term->post_bidi_cache[i].chars); @@ -1370,39 +1450,41 @@ void term_reconfig(Terminal *term, Config *cfg) } } - term->cfg = *cfg; /* STRUCTURE COPY */ + conf_free(term->conf); + term->conf = conf_copy(conf); if (reset_wrap) - term->alt_wrap = term->wrap = term->cfg.wrap_mode; + term->alt_wrap = term->wrap = conf_get_int(term->conf, CONF_wrap_mode); if (reset_decom) - term->alt_om = term->dec_om = term->cfg.dec_om; + term->alt_om = term->dec_om = conf_get_int(term->conf, CONF_dec_om); if (reset_bce) { - term->use_bce = term->cfg.bce; + term->use_bce = conf_get_int(term->conf, CONF_bce); set_erase_char(term); } if (reset_tblink) { - term->blink_is_real = term->cfg.blinktext; + term->blink_is_real = conf_get_int(term->conf, CONF_blinktext); } if (reset_charclass) for (i = 0; i < 256; i++) - term->wordness[i] = term->cfg.wordness[i]; + term->wordness[i] = conf_get_int_int(term->conf, CONF_wordness, i); - if (term->cfg.no_alt_screen) + if (conf_get_int(term->conf, CONF_no_alt_screen)) swap_screen(term, 0, FALSE, FALSE); - if (term->cfg.no_mouse_rep) { + if (conf_get_int(term->conf, CONF_no_mouse_rep)) { term->xterm_mouse = 0; set_raw_mouse_mode(term->frontend, 0); } - if (term->cfg.no_remote_charset) { + if (conf_get_int(term->conf, CONF_no_remote_charset)) { term->cset_attr[0] = term->cset_attr[1] = CSET_ASCII; term->sco_acs = term->alt_sco_acs = 0; term->utf = 0; } - if (!*term->cfg.printer) { + if (!conf_get_str(term->conf, CONF_printer)) { term_print_finish(term); } term_schedule_tblink(term); term_schedule_cblink(term); + term_copy_stuff_from_conf(term); } /* @@ -1423,7 +1505,7 @@ void term_clrsb(Terminal *term) /* * Initialise the terminal. */ -Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata, +Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata, void *frontend) { Terminal *term; @@ -1435,7 +1517,7 @@ Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata, term = snew(Terminal); term->frontend = frontend; term->ucsdata = ucsdata; - term->cfg = *mycfg; /* STRUCTURE COPY */ + term->conf = conf_copy(myconf); term->logctx = NULL; term->compatibility_level = TM_PUTTY; strcpy(term->id_string, "\033[?6c"); @@ -1459,6 +1541,8 @@ Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata, term->selstate = NO_SELECTION; term->curstype = 0; + term_copy_stuff_from_conf(term); + term->screen = term->alt_screen = term->scrollback = NULL; term->tempsblines = 0; term->alt_sblines = 0; @@ -1537,12 +1621,18 @@ void term_free(Terminal *term) for (i = 0; i < term->bidi_cache_size; i++) { sfree(term->pre_bidi_cache[i].chars); sfree(term->post_bidi_cache[i].chars); + sfree(term->post_bidi_cache[i].forward); + sfree(term->post_bidi_cache[i].backward); } sfree(term->pre_bidi_cache); sfree(term->post_bidi_cache); + sfree(term->tabs); + expire_timer_context(term); + conf_free(term->conf); + sfree(term); } @@ -1627,7 +1717,8 @@ void term_size(Terminal *term, int newrows, int newcols, int newsavelines) while (term->rows > newrows) { if (term->curs.y < term->rows - 1) { /* delete bottom row, unless it contains the cursor */ - sfree(delpos234(term->screen, term->rows - 1)); + line = delpos234(term->screen, term->rows - 1); + freeline(line); } else { /* push top row to scrollback */ line = delpos234(term->screen, 0); @@ -1889,15 +1980,26 @@ static void check_selection(Terminal *term, pos from, pos to) static void scroll(Terminal *term, int topline, int botline, int lines, int sb) { termline *line; - int i, seltop, olddisptop, shift; + int i, seltop, scrollwinsize; +#ifdef OPTIMISE_SCROLL + int olddisptop, shift; +#endif /* OPTIMISE_SCROLL */ if (topline != 0 || term->alt_which != 0) sb = FALSE; +#ifdef OPTIMISE_SCROLL olddisptop = term->disptop; shift = lines; +#endif /* OPTIMISE_SCROLL */ + + scrollwinsize = botline - topline + 1; + if (lines < 0) { - while (lines < 0) { + lines = -lines; + if (lines > scrollwinsize) + lines = scrollwinsize; + while (lines-- > 0) { line = delpos234(term->screen, botline); resizeline(term, line, term->cols); for (i = 0; i < term->cols; i++) @@ -1919,11 +2021,11 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb) term->selend.x = 0; } } - - lines++; } } else { - while (lines > 0) { + if (lines > scrollwinsize) + lines = scrollwinsize; + while (lines-- > 0) { line = delpos234(term->screen, topline); #ifdef TERM_CC_DIAGS cc_check(line); @@ -2009,8 +2111,6 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb) } } } - - lines--; } } #ifdef OPTIMISE_SCROLL @@ -2238,7 +2338,7 @@ static void erase_lots(Terminal *term, if (start.y == 0 && start.x == 0 && end.x == 0 && erase_lattr) erasing_lines_from_top = 1; - if (term->cfg.erase_to_scrollback && erasing_lines_from_top) { + if (term->erase_to_scrollback && erasing_lines_from_top) { /* If it's a whole number of lines, starting at the top, and * we're fully erasing them, erase by scrolling and keep the * lines in the scrollback. */ @@ -2329,13 +2429,13 @@ static void toggle_mode(Terminal *term, int mode, int query, int state) term->blink_is_real = FALSE; term->vt52_bold = FALSE; } else { - term->blink_is_real = term->cfg.blinktext; + term->blink_is_real = term->blinktext; } term_schedule_tblink(term); break; case 3: /* DECCOLM: 80/132 columns */ deselect(term); - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) request_resize(term->frontend, state ? 132 : 80, term->rows); term->reset_132 = state; term->alt_t = term->marg_t = 0; @@ -2382,7 +2482,7 @@ static void toggle_mode(Terminal *term, int mode, int query, int state) case 47: /* alternate screen */ compatibility(OTHER); deselect(term); - swap_screen(term, term->cfg.no_alt_screen ? 0 : state, FALSE, FALSE); + swap_screen(term, term->no_alt_screen ? 0 : state, FALSE, FALSE); term->disptop = 0; break; case 1000: /* xterm mouse 1 (normal) */ @@ -2393,28 +2493,37 @@ static void toggle_mode(Terminal *term, int mode, int query, int state) term->xterm_mouse = state ? 2 : 0; set_raw_mouse_mode(term->frontend, state); break; + case 1006: /* xterm extended mouse */ + term->xterm_extended_mouse = state ? 1 : 0; + break; + case 1015: /* urxvt extended mouse */ + term->urxvt_extended_mouse = state ? 1 : 0; + break; case 1047: /* alternate screen */ compatibility(OTHER); deselect(term); - swap_screen(term, term->cfg.no_alt_screen ? 0 : state, TRUE, TRUE); + swap_screen(term, term->no_alt_screen ? 0 : state, TRUE, TRUE); term->disptop = 0; break; case 1048: /* save/restore cursor */ - if (!term->cfg.no_alt_screen) + if (!term->no_alt_screen) save_cursor(term, state); if (!state) seen_disp_event(term); break; case 1049: /* cursor & alternate screen */ - if (state && !term->cfg.no_alt_screen) + if (state && !term->no_alt_screen) save_cursor(term, state); if (!state) seen_disp_event(term); compatibility(OTHER); deselect(term); - swap_screen(term, term->cfg.no_alt_screen ? 0 : state, TRUE, FALSE); - if (!state && !term->cfg.no_alt_screen) + swap_screen(term, term->no_alt_screen ? 0 : state, TRUE, FALSE); + if (!state && !term->no_alt_screen) save_cursor(term, state); term->disptop = 0; break; + case 2004: /* xterm bracketed paste */ + term->bracketed_paste = state ? TRUE : FALSE; + break; } else switch (mode) { case 4: /* IRM: set insert mode */ @@ -2449,14 +2558,14 @@ static void do_osc(Terminal *term) switch (term->esc_args[0]) { case 0: case 1: - if (!term->cfg.no_remote_wintitle) + if (!term->no_remote_wintitle) set_icon(term->frontend, term->osc_string); if (term->esc_args[0] == 1) break; /* fall through: parameter 0 means set both */ case 2: case 21: - if (!term->cfg.no_remote_wintitle) + if (!term->no_remote_wintitle) set_title(term->frontend, term->osc_string); break; } @@ -2466,10 +2575,10 @@ static void do_osc(Terminal *term) /* * ANSI printing routines. */ -static void term_print_setup(Terminal *term) +static void term_print_setup(Terminal *term, char *printer) { bufchain_clear(&term->printer_buf); - term->print_job = printer_start_job(term->cfg.printer); + term->print_job = printer_start_job(printer); } static void term_print_flush(Terminal *term) { @@ -2544,7 +2653,7 @@ static void term_out(Terminal *term) * Optionally log the session traffic to a file. Useful for * debugging and possibly also useful for actual logging. */ - if (term->cfg.logtype == LGTYP_DEBUG && term->logctx) + if (term->logtype == LGTYP_DEBUG && term->logctx) logtraffic(term->logctx, (unsigned char) c, LGTYP_DEBUG); } else { c = unget; @@ -2736,7 +2845,7 @@ static void term_out(Terminal *term) term->curs.x--; term->wrapnext = FALSE; /* destructive backspace might be disabled */ - if (!term->cfg.no_dbackspace) { + if (!term->no_dbackspace) { check_boundary(term, term->curs.x, term->curs.y); check_boundary(term, term->curs.x+1, term->curs.y); copy_termchar(scrlineptr(term->curs.y), @@ -2756,19 +2865,8 @@ static void term_out(Terminal *term) */ compatibility(ANSIMIN); if (term->ldisc) { - char abuf[lenof(term->cfg.answerback)], *s, *d; - for (s = term->cfg.answerback, d = abuf; *s;) { - char *n; - char c = ctrlparse(s, &n); - if (n) { - *d++ = c; - s = n; - } else { - *d++ = *s++; - } - } lpage_send(term->ldisc, DEFAULT_CODEPAGE, - abuf, d - abuf, 0); + term->answerback, term->answerbacklen, 0); } break; case '\007': /* BEL: Bell */ @@ -2795,7 +2893,7 @@ static void term_out(Terminal *term) * t seconds ago. */ while (term->beephead && - term->beephead->ticks < ticks - term->cfg.bellovl_t) { + term->beephead->ticks < ticks - term->bellovl_t) { struct beeptime *tmp = term->beephead; term->beephead = tmp->next; sfree(tmp); @@ -2804,16 +2902,16 @@ static void term_out(Terminal *term) term->nbeeps--; } - if (term->cfg.bellovl && term->beep_overloaded && - ticks - term->lastbeep >= (unsigned)term->cfg.bellovl_s) { + if (term->bellovl && term->beep_overloaded && + ticks - term->lastbeep >= (unsigned)term->bellovl_s) { /* * If we're currently overloaded and the * last beep was more than s seconds ago, * leave overload mode. */ term->beep_overloaded = FALSE; - } else if (term->cfg.bellovl && !term->beep_overloaded && - term->nbeeps >= term->cfg.bellovl_n) { + } else if (term->bellovl && !term->beep_overloaded && + term->nbeeps >= term->bellovl_n) { /* * Now, if we have n or more beeps * remaining in the queue, go into overload @@ -2826,10 +2924,10 @@ static void term_out(Terminal *term) /* * Perform an actual beep if we're not overloaded. */ - if (!term->cfg.bellovl || !term->beep_overloaded) { - do_beep(term->frontend, term->cfg.beep); + if (!term->bellovl || !term->beep_overloaded) { + do_beep(term->frontend, term->beep); - if (term->cfg.beep == BELL_VISUAL) { + if (term->beep == BELL_VISUAL) { term_schedule_vbell(term, FALSE, 0); } } @@ -2871,12 +2969,12 @@ static void term_out(Terminal *term) seen_disp_event(term); term->paste_hold = 0; - if (term->cfg.crhaslf) { - if (term->curs.y == term->marg_b) - scroll(term, term->marg_t, term->marg_b, 1, TRUE); - else if (term->curs.y < term->rows - 1) - term->curs.y++; - } + if (term->crhaslf) { + if (term->curs.y == term->marg_b) + scroll(term, term->marg_t, term->marg_b, 1, TRUE); + else if (term->curs.y < term->rows - 1) + term->curs.y++; + } if (term->logctx) logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII); break; @@ -2896,7 +2994,7 @@ static void term_out(Terminal *term) scroll(term, term->marg_t, term->marg_b, 1, TRUE); else if (term->curs.y < term->rows - 1) term->curs.y++; - if (term->cfg.lfhascr) + if (term->lfhascr) term->curs.x = 0; term->wrapnext = FALSE; seen_disp_event(term); @@ -2938,9 +3036,9 @@ static void term_out(Terminal *term) if (DIRECT_CHAR(c)) width = 1; if (!width) - width = (term->cfg.cjk_ambig_wide ? - mk_wcwidth_cjk((wchar_t) c) : - mk_wcwidth((wchar_t) c)); + width = (term->cjk_ambig_wide ? + mk_wcwidth_cjk((unsigned int) c) : + mk_wcwidth((unsigned int) c)); if (term->wrapnext && term->wrap && width > 0) { cline->lattr |= LATTR_WRAPPED; @@ -3161,7 +3259,7 @@ static void term_out(Terminal *term) if (term->ldisc) /* cause ldisc to notice changes */ ldisc_send(term->ldisc, NULL, 0, 0); if (term->reset_132) { - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) request_resize(term->frontend, 80, term->rows); term->reset_132 = 0; } @@ -3226,55 +3324,55 @@ static void term_out(Terminal *term) /* GZD4: G0 designate 94-set */ case ANSI('A', '('): compatibility(VT100); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[0] = CSET_GBCHR; break; case ANSI('B', '('): compatibility(VT100); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[0] = CSET_ASCII; break; case ANSI('0', '('): compatibility(VT100); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[0] = CSET_LINEDRW; break; case ANSI('U', '('): compatibility(OTHER); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[0] = CSET_SCOACS; break; /* G1D4: G1-designate 94-set */ case ANSI('A', ')'): compatibility(VT100); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[1] = CSET_GBCHR; break; case ANSI('B', ')'): compatibility(VT100); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[1] = CSET_ASCII; break; case ANSI('0', ')'): compatibility(VT100); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[1] = CSET_LINEDRW; break; case ANSI('U', ')'): compatibility(OTHER); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->cset_attr[1] = CSET_SCOACS; break; /* DOCS: Designate other coding system */ case ANSI('8', '%'): /* Old Linux code */ case ANSI('G', '%'): compatibility(OTHER); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->utf = 1; break; case ANSI('@', '%'): compatibility(OTHER); - if (!term->cfg.no_remote_charset) + if (!term->no_remote_charset) term->utf = 0; break; } @@ -3290,8 +3388,8 @@ static void term_out(Terminal *term) } term->termstate = SEEN_CSI; } else if (c == ';') { - if (++term->esc_nargs <= ARGS_MAX) - term->esc_args[term->esc_nargs - 1] = ARG_DEFAULT; + if (term->esc_nargs < ARGS_MAX) + term->esc_args[term->esc_nargs++] = ARG_DEFAULT; term->termstate = SEEN_CSI; } else if (c < '@') { if (term->esc_query) @@ -3458,12 +3556,15 @@ static void term_out(Terminal *term) case ANSI_QUE('i'): compatibility(VT100); { + char *printer; if (term->esc_nargs != 1) break; - if (term->esc_args[0] == 5 && *term->cfg.printer) { + if (term->esc_args[0] == 5 && + (printer = conf_get_str(term->conf, + CONF_printer))[0]) { term->printing = TRUE; term->only_printing = !term->esc_query; term->print_state = 0; - term_print_setup(term); + term_print_setup(term, printer); } else if (term->esc_args[0] == 4 && term->printing) { term_print_finish(term); @@ -3586,15 +3687,15 @@ static void term_out(Terminal *term) break; case 10: /* SCO acs off */ compatibility(SCOANSI); - if (term->cfg.no_remote_charset) break; + if (term->no_remote_charset) break; term->sco_acs = 0; break; case 11: /* SCO acs on */ compatibility(SCOANSI); - if (term->cfg.no_remote_charset) break; + if (term->no_remote_charset) break; term->sco_acs = 1; break; case 12: /* SCO acs on, |0x80 */ compatibility(SCOANSI); - if (term->cfg.no_remote_charset) break; + if (term->no_remote_charset) break; term->sco_acs = 2; break; case 22: /* disable bold */ compatibility2(OTHER, VT220); @@ -3717,7 +3818,7 @@ static void term_out(Terminal *term) && (term->esc_args[0] < 1 || term->esc_args[0] >= 24)) { compatibility(VT340TEXT); - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) request_resize(term->frontend, term->cols, def(term->esc_args[0], 24)); deselect(term); @@ -3737,7 +3838,7 @@ static void term_out(Terminal *term) break; case 3: if (term->esc_nargs >= 3) { - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) move_window(term->frontend, def(term->esc_args[1], 0), def(term->esc_args[2], 0)); @@ -3762,10 +3863,10 @@ static void term_out(Terminal *term) break; case 8: if (term->esc_nargs >= 3) { - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) request_resize(term->frontend, - def(term->esc_args[2], term->cfg.width), - def(term->esc_args[1], term->cfg.height)); + def(term->esc_args[2], term->conf_width), + def(term->esc_args[1], term->conf_height)); } break; case 9: @@ -3820,8 +3921,8 @@ static void term_out(Terminal *term) break; case 20: if (term->ldisc && - term->cfg.remote_qtitle_action != TITLE_NONE) { - if(term->cfg.remote_qtitle_action == TITLE_REAL) + term->remote_qtitle_action != TITLE_NONE) { + if(term->remote_qtitle_action == TITLE_REAL) p = get_window_title(term->frontend, TRUE); else p = EMPTY_WINDOW_TITLE; @@ -3833,8 +3934,8 @@ static void term_out(Terminal *term) break; case 21: if (term->ldisc && - term->cfg.remote_qtitle_action != TITLE_NONE) { - if(term->cfg.remote_qtitle_action == TITLE_REAL) + term->remote_qtitle_action != TITLE_NONE) { + if(term->remote_qtitle_action == TITLE_REAL) p = get_window_title(term->frontend, FALSE); else p = EMPTY_WINDOW_TITLE; @@ -3870,10 +3971,10 @@ static void term_out(Terminal *term) */ compatibility(VT420); if (term->esc_nargs == 1 && term->esc_args[0] > 0) { - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) request_resize(term->frontend, term->cols, def(term->esc_args[0], - term->cfg.height)); + term->conf_height)); deselect(term); } break; @@ -3885,10 +3986,11 @@ static void term_out(Terminal *term) */ compatibility(VT340TEXT); if (term->esc_nargs <= 1) { - if (!term->cfg.no_remote_resize) + if (!term->no_remote_resize) request_resize(term->frontend, def(term->esc_args[0], - term->cfg.width), term->rows); + term->conf_width), + term->rows); deselect(term); } break; @@ -4090,7 +4192,7 @@ static void term_out(Terminal *term) * Well we should do a soft reset at this point ... */ if (!has_compat(VT420) && has_compat(VT100)) { - if (!term->cfg.no_remote_resize) { + if (!term->no_remote_resize) { if (term->reset_132) request_resize(132, 24); else @@ -4325,7 +4427,7 @@ static void term_out(Terminal *term) * emulation. */ term->vt52_mode = FALSE; - term->blink_is_real = term->cfg.blinktext; + term->blink_is_real = term->blinktext; term_schedule_tblink(term); break; #if 0 @@ -4469,7 +4571,7 @@ static void term_out(Terminal *term) } term_print_flush(term); - if (term->cfg.logflush) + if (term->logflush) logflush(term->logctx); } @@ -4572,7 +4674,7 @@ static termchar *term_bidi_line(Terminal *term, struct termline *ldata, int it; /* Do Arabic shaping and bidi. */ - if(!term->cfg.bidi || !term->cfg.arabicshaping) { + if(!term->bidi || !term->arabicshaping) { if (!term_bidi_cache_hit(term, scr_y, ldata->chars, term->cols)) { @@ -4590,7 +4692,7 @@ static termchar *term_bidi_line(Terminal *term, struct termline *ldata, switch (uc & CSET_MASK) { case CSET_LINEDRW: - if (!term->cfg.rawcnp) { + if (!term->rawcnp) { uc = term->ucsdata->unitab_xterm[uc & 0xFF]; break; } @@ -4611,19 +4713,19 @@ static termchar *term_bidi_line(Terminal *term, struct termline *ldata, } term->wcFrom[it].origwc = term->wcFrom[it].wc = - (wchar_t)uc; + (unsigned int)uc; term->wcFrom[it].index = it; } - if(!term->cfg.bidi) + if(!term->bidi) do_bidi(term->wcFrom, term->cols); /* this is saved iff done from inside the shaping */ - if(!term->cfg.bidi && term->cfg.arabicshaping) + if(!term->bidi && term->arabicshaping) for(it=0; itcols; it++) term->wcTo[it] = term->wcFrom[it]; - if(!term->cfg.arabicshaping) + if(!term->arabicshaping) do_shape(term->wcFrom, term->wcTo, term->cols); if (term->ltemp_size < ldata->size) { @@ -4685,14 +4787,14 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) /* Depends on: * screen array, disptop, scrtop, * selection, rv, - * cfg.blinkpc, blink_is_real, tblinker, - * curs.y, curs.x, cblinker, cfg.blink_cur, cursor_on, has_focus, wrapnext + * blinkpc, blink_is_real, tblinker, + * curs.y, curs.x, cblinker, blink_cur, cursor_on, has_focus, wrapnext */ /* Has the cursor position or type changed ? */ if (term->cursor_on) { if (term->has_focus) { - if (term->cblinker || !term->cfg.blink_cur) + if (term->cblinker || !term->blink_cur) cursor = TATTR_ACTCURS; else cursor = 0; @@ -4770,7 +4872,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) termchar *lchars; int dirty_line, dirty_run, selected; unsigned long attr = 0, cset = 0; - int updated_line = 0; int start = 0; int ccount = 0; int last_run_dirty = 0; @@ -4801,11 +4902,11 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) tchar = d->chr; tattr = d->attr; - if (!term->cfg.ansi_colour) + if (!term->ansi_colour) tattr = (tattr & ~(ATTR_FGMASK | ATTR_BGMASK)) | ATTR_DEFFG | ATTR_DEFBG; - if (!term->cfg.xterm_256_colour) { + if (!term->xterm_256_colour) { int colour; colour = (tattr & ATTR_FGMASK) >> ATTR_FGSHIFT; if (colour >= 16 && colour < 256) @@ -4935,9 +5036,13 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) break_run = ((tattr ^ attr) & term->attr_mask) != 0; +#ifdef USES_VTLINE_HACK /* Special hack for VT100 Linedraw glyphs */ - if (tchar >= 0x23BA && tchar <= 0x23BD) + if ((tchar >= 0x23BA && tchar <= 0x23BD) || + (j > 0 && (newline[j-1].chr >= 0x23BA && + newline[j-1].chr <= 0x23BD))) break_run = TRUE; +#endif /* * Separate out sequences of characters that have the @@ -4968,8 +5073,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) if (attr & (TATTR_ACTCURS | TATTR_PASCURS)) do_cursor(ctx, start, i, ch, ccount, attr, ldata->lattr); - - updated_line = 1; } start = j; ccount = 0; @@ -4987,10 +5090,17 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) dirty_run = TRUE; } - if (ccount >= chlen) { + if (ccount+2 > chlen) { chlen = ccount + 256; ch = sresize(ch, chlen, wchar_t); } + +#ifdef PLATFORM_IS_UTF16 + if (tchar > 0x10000 && tchar < 0x110000) { + ch[ccount++] = (wchar_t) HIGH_SURROGATE_OF(tchar); + ch[ccount++] = (wchar_t) LOW_SURROGATE_OF(tchar); + } else +#endif /* PLATFORM_IS_UTF16 */ ch[ccount++] = (wchar_t) tchar; if (d->cc_next) { @@ -5014,10 +5124,17 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) break; } - if (ccount >= chlen) { + if (ccount+2 > chlen) { chlen = ccount + 256; ch = sresize(ch, chlen, wchar_t); } + +#ifdef PLATFORM_IS_UTF16 + if (schar > 0x10000 && schar < 0x110000) { + ch[ccount++] = (wchar_t) HIGH_SURROGATE_OF(schar); + ch[ccount++] = (wchar_t) LOW_SURROGATE_OF(schar); + } else +#endif /* PLATFORM_IS_UTF16 */ ch[ccount++] = (wchar_t) schar; } @@ -5054,8 +5171,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) if (attr & (TATTR_ACTCURS | TATTR_PASCURS)) do_cursor(ctx, start, i, ch, ccount, attr, ldata->lattr); - - updated_line = 1; } unlineptr(ldata); @@ -5137,6 +5252,31 @@ void term_scroll(Terminal *term, int rel, int where) } /* + * Scroll the scrollback to centre it on the beginning or end of the + * current selection, if any. + */ +void term_scroll_to_selection(Terminal *term, int which_end) +{ + pos target; + int y; + int sbtop = -sblines(term); + + if (term->selstate != SELECTED) + return; + if (which_end) + target = term->selend; + else + target = term->selstart; + + y = target.y - term->rows/2; + if (y < sbtop) + y = sbtop; + else if (y > 0) + y = 0; + term_scroll(term, -1, y); +} + +/* * Helper routine for clipme(): growing buffer. */ typedef struct { @@ -5226,7 +5366,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel) sprintf(cbuf, "", (ldata[top.x] & 0xFFFF)); #else wchar_t cbuf[16], *p; - int set, c; + int c; int x = top.x; if (ldata->chars[x].chr == UCSWIDE) { @@ -5240,7 +5380,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel) switch (uc & CSET_MASK) { case CSET_LINEDRW: - if (!term->cfg.rawcnp) { + if (!term->rawcnp) { uc = term->ucsdata->unitab_xterm[uc & 0xFF]; break; } @@ -5260,7 +5400,6 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel) break; } - set = (uc & CSET_MASK); c = (uc & ~CSET_MASK); #ifdef PLATFORM_IS_UTF16 if (uc > 0x10000 && uc < 0x110000) { @@ -5495,7 +5634,8 @@ static pos sel_spread_half(Terminal *term, pos p, int dir) else break; } else { - if (ldata->lattr & LATTR_WRAPPED) { + if (p.y+1 < term->rows && + (ldata->lattr & LATTR_WRAPPED)) { termline *ldata2; ldata2 = lineptr(p.y+1); if (wordtype(term, UCSGET(ldata2->chars, 0)) @@ -5580,7 +5720,12 @@ void term_do_paste(Terminal *term) if (term->paste_buffer) sfree(term->paste_buffer); term->paste_pos = term->paste_hold = term->paste_len = 0; - term->paste_buffer = snewn(len, wchar_t); + term->paste_buffer = snewn(len + 12, wchar_t); + + if (term->bracketed_paste) { + memcpy(term->paste_buffer, L"\033[200~", 6 * sizeof(wchar_t)); + term->paste_len += 6; + } p = q = data; while (p < data + len) { @@ -5604,6 +5749,12 @@ void term_do_paste(Terminal *term) q = p; } + if (term->bracketed_paste) { + memcpy(term->paste_buffer + term->paste_len, + L"\033[201~", 6 * sizeof(wchar_t)); + term->paste_len += 6; + } + /* Assume a small paste will be OK in one go. */ if (term->paste_len < 256) { if (term->ldisc) @@ -5623,8 +5774,8 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, pos selpoint; termline *ldata; int raw_mouse = (term->xterm_mouse && - !term->cfg.no_mouse_rep && - !(term->cfg.mouse_override && shift)); + !term->no_mouse_rep && + !(term->mouse_override && shift)); int default_seltype; if (y < 0) { @@ -5675,25 +5826,26 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, if (raw_mouse && (term->selstate != ABOUT_TO) && (term->selstate != DRAGGING)) { int encstate = 0, r, c; - char abuf[16]; + char abuf[32]; + int len = 0; if (term->ldisc) { switch (braw) { case MBT_LEFT: - encstate = 0x20; /* left button down */ + encstate = 0x00; /* left button down */ break; case MBT_MIDDLE: - encstate = 0x21; + encstate = 0x01; break; case MBT_RIGHT: - encstate = 0x22; + encstate = 0x02; break; case MBT_WHEEL_UP: - encstate = 0x60; + encstate = 0x40; break; case MBT_WHEEL_DOWN: - encstate = 0x61; + encstate = 0x41; break; default: break; /* placate gcc warning about enum use */ } @@ -5704,7 +5856,9 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, encstate += 0x20; break; case MA_RELEASE: - encstate = 0x23; + /* If multiple extensions are enabled, the xterm 1006 is used, so it's okay to check for only that */ + if (!term->xterm_extended_mouse) + encstate = 0x03; term->mouse_is_down = 0; break; case MA_CLICK: @@ -5718,11 +5872,18 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, encstate += 0x04; if (ctrl) encstate += 0x10; - r = y + 33; - c = x + 33; - - sprintf(abuf, "\033[M%c%c%c", encstate, c, r); - ldisc_send(term->ldisc, abuf, 6, 0); + r = y + 1; + c = x + 1; + + /* Check the extensions in decreasing order of preference. Encoding the release event above assumes that 1006 comes first. */ + if (term->xterm_extended_mouse) { + len = sprintf(abuf, "\033[<%d;%d;%d%c", encstate, c, r, a == MA_RELEASE ? 'm' : 'M'); + } else if (term->urxvt_extended_mouse) { + len = sprintf(abuf, "\033[%d;%d;%dM", encstate + 32, c, r); + } else if (c <= 223 && r <= 223) { + len = sprintf(abuf, "\033[M%c%c%c", encstate + 32, c + 32, r + 32); + } + ldisc_send(term->ldisc, abuf, len, 0); } return; } @@ -5731,7 +5892,7 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, * Set the selection type (rectangular or normal) at the start * of a selection attempt, from the state of Alt. */ - if (!alt ^ !term->cfg.rect_select) + if (!alt ^ !term->rect_select) default_seltype = RECTANGULAR; else default_seltype = LEXICOGRAPHIC; @@ -5841,447 +6002,50 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, request_paste(term->frontend); } + /* + * Since terminal output is suppressed during drag-selects, we + * should make sure to write any pending output if one has just + * finished. + */ + if (term->selstate != DRAGGING) + term_out(term); term_update(term); } -void term_key(Terminal *term, Key_Sym keysym, wchar_t *text, size_t tlen, - unsigned int modifiers, unsigned int flags) +int format_arrow_key(char *buf, Terminal *term, int xkey, int ctrl) { - char output[10]; - char *p = output; - int prependesc = FALSE; -#if 0 - int i; - - fprintf(stderr, "keysym = %d, %d chars:", keysym, tlen); - for (i = 0; i < tlen; i++) - fprintf(stderr, " %04x", (unsigned)text[i]); - fprintf(stderr, "\n"); -#endif - - /* XXX Num Lock */ - if ((flags & PKF_REPEAT) && term->repeat_off) - return; - - /* Currently, Meta always just prefixes everything with ESC. */ - if (modifiers & PKM_META) - prependesc = TRUE; - modifiers &= ~PKM_META; - - /* - * Alt is only used for Alt+keypad, which isn't supported yet, so - * ignore it. - */ - modifiers &= ~PKM_ALT; - - /* Standard local function keys */ - switch (modifiers & (PKM_SHIFT | PKM_CONTROL)) { - case PKM_SHIFT: - if (keysym == PK_PAGEUP) - /* scroll up one page */; - if (keysym == PK_PAGEDOWN) - /* scroll down on page */; - if (keysym == PK_INSERT) - term_do_paste(term); - break; - case PKM_CONTROL: - if (keysym == PK_PAGEUP) - /* scroll up one line */; - if (keysym == PK_PAGEDOWN) - /* scroll down one line */; - /* Control-Numlock for app-keypad mode switch */ - if (keysym == PK_PF1) - term->app_keypad_keys ^= 1; - break; - } - - if (modifiers & PKM_ALT) { - /* Alt+F4 (close) */ - /* Alt+Return (full screen) */ - /* Alt+Space (system menu) */ - } - - if (keysym == PK_NULL && (modifiers & PKM_CONTROL) && tlen == 1 && - text[0] >= 0x20 && text[0] <= 0x7e) { - /* ASCII chars + Control */ - if ((text[0] >= 0x40 && text[0] <= 0x5f) || - (text[0] >= 0x61 && text[0] <= 0x7a)) - text[0] &= 0x1f; - else { - /* - * Control-2 should return ^@ (0x00), Control-6 should return - * ^^ (0x1E), and Control-Minus should return ^_ (0x1F). Since - * the DOS keyboard handling did it, and we have nothing better - * to do with the key combo in question, we'll also map - * Control-Backquote to ^\ (0x1C). - */ - switch (text[0]) { - case ' ': text[0] = 0x00; break; - case '-': text[0] = 0x1f; break; - case '/': text[0] = 0x1f; break; - case '2': text[0] = 0x00; break; - case '3': text[0] = 0x1b; break; - case '4': text[0] = 0x1c; break; - case '5': text[0] = 0x1d; break; - case '6': text[0] = 0x1e; break; - case '7': text[0] = 0x1f; break; - case '8': text[0] = 0x7f; break; - case '`': text[0] = 0x1c; break; - } - } - } - - /* Nethack keypad */ - if (term->cfg.nethack_keypad) { - char c = 0; - switch (keysym) { - case PK_KP1: c = 'b'; break; - case PK_KP2: c = 'j'; break; - case PK_KP3: c = 'n'; break; - case PK_KP4: c = 'h'; break; - case PK_KP5: c = '.'; break; - case PK_KP6: c = 'l'; break; - case PK_KP7: c = 'y'; break; - case PK_KP8: c = 'k'; break; - case PK_KP9: c = 'u'; break; - default: break; /* else gcc warns `enum value not used' */ - } - if (c != 0) { - if (c != '.') { - if (modifiers & PKM_CONTROL) - c &= 0x1f; - else if (modifiers & PKM_SHIFT) - c = toupper((unsigned char)c); - } - *p++ = c; - goto done; - } - } - - /* Numeric Keypad */ - if (PK_ISKEYPAD(keysym)) { - int xkey = 0; + char *p = buf; + if (term->vt52_mode) + p += sprintf((char *) p, "\x1B%c", xkey); + else { + int app_flg = (term->app_cursor_keys && !term->no_applic_c); +#if 0 /* - * In VT400 mode, PFn always emits an escape sequence. In - * Linux and tilde modes, this only happens in app keypad mode. + * RDB: VT100 & VT102 manuals both state the app cursor + * keys only work if the app keypad is on. + * + * SGT: That may well be true, but xterm disagrees and so + * does at least one application, so I've #if'ed this out + * and the behaviour is back to PuTTY's original: app + * cursor and app keypad are independently switchable + * modes. If anyone complains about _this_ I'll have to + * put in a configurable option. */ - if (term->cfg.funky_type == FUNKY_VT400 || - ((term->cfg.funky_type == FUNKY_LINUX || - term->cfg.funky_type == FUNKY_TILDE) && - term->app_keypad_keys && !term->cfg.no_applic_k)) { - switch (keysym) { - case PK_PF1: xkey = 'P'; break; - case PK_PF2: xkey = 'Q'; break; - case PK_PF3: xkey = 'R'; break; - case PK_PF4: xkey = 'S'; break; - default: break; /* else gcc warns `enum value not used' */ - } - } - if (term->app_keypad_keys && !term->cfg.no_applic_k) { - switch (keysym) { - case PK_KP0: xkey = 'p'; break; - case PK_KP1: xkey = 'q'; break; - case PK_KP2: xkey = 'r'; break; - case PK_KP3: xkey = 's'; break; - case PK_KP4: xkey = 't'; break; - case PK_KP5: xkey = 'u'; break; - case PK_KP6: xkey = 'v'; break; - case PK_KP7: xkey = 'w'; break; - case PK_KP8: xkey = 'x'; break; - case PK_KP9: xkey = 'y'; break; - case PK_KPDECIMAL: xkey = 'n'; break; - case PK_KPENTER: xkey = 'M'; break; - default: break; /* else gcc warns `enum value not used' */ - } - if (term->cfg.funky_type == FUNKY_XTERM && tlen > 0) { - /* - * xterm can't see the layout of the keypad, so it has - * to rely on the X keysyms returned by the keys. - * Hence, we look at the strings here, not the PuTTY - * keysyms (which describe the layout). - */ - switch (text[0]) { - case '+': - if (modifiers & PKM_SHIFT) - xkey = 'l'; - else - xkey = 'k'; - break; - case '/': xkey = 'o'; break; - case '*': xkey = 'j'; break; - case '-': xkey = 'm'; break; - } - } else { - /* - * In all other modes, we try to retain the layout of - * the DEC keypad in application mode. - */ - switch (keysym) { - case PK_KPBIGPLUS: - /* This key covers the '-' and ',' keys on a VT220 */ - if (modifiers & PKM_SHIFT) - xkey = 'm'; /* VT220 '-' */ - else - xkey = 'l'; /* VT220 ',' */ - break; - case PK_KPMINUS: xkey = 'm'; break; - case PK_KPCOMMA: xkey = 'l'; break; - default: break; /* else gcc warns `enum value not used' */ - } - } - } - if (xkey) { - if (term->vt52_mode) { - if (xkey >= 'P' && xkey <= 'S') - p += sprintf((char *) p, "\x1B%c", xkey); - else - p += sprintf((char *) p, "\x1B?%c", xkey); - } else - p += sprintf((char *) p, "\x1BO%c", xkey); - goto done; - } - /* Not in application mode -- treat the number pad as arrow keys? */ - if ((flags & PKF_NUMLOCK) == 0) { - switch (keysym) { - case PK_KP0: keysym = PK_INSERT; break; - case PK_KP1: keysym = PK_END; break; - case PK_KP2: keysym = PK_DOWN; break; - case PK_KP3: keysym = PK_PAGEDOWN; break; - case PK_KP4: keysym = PK_LEFT; break; - case PK_KP5: keysym = PK_REST; break; - case PK_KP6: keysym = PK_RIGHT; break; - case PK_KP7: keysym = PK_HOME; break; - case PK_KP8: keysym = PK_UP; break; - case PK_KP9: keysym = PK_PAGEUP; break; - default: break; /* else gcc warns `enum value not used' */ - } - } - } - - /* Miscellaneous keys */ - switch (keysym) { - case PK_ESCAPE: - *p++ = 0x1b; - goto done; - case PK_BACKSPACE: - if (modifiers == 0) - *p++ = (term->cfg.bksp_is_delete ? 0x7F : 0x08); - else if (modifiers == PKM_SHIFT) - /* We do the opposite of what is configured */ - *p++ = (term->cfg.bksp_is_delete ? 0x08 : 0x7F); - else break; - goto done; - case PK_TAB: - if (modifiers == 0) - *p++ = 0x09; - else if (modifiers == PKM_SHIFT) - *p++ = 0x1B, *p++ = '[', *p++ = 'Z'; - else break; - goto done; - /* XXX window.c has ctrl+shift+space sending 0xa0 */ - case PK_PAUSE: - if (modifiers == PKM_CONTROL) - *p++ = 26; - else break; - goto done; - case PK_RETURN: - case PK_KPENTER: /* Odd keypad modes handled above */ - if (modifiers == 0) { - *p++ = 0x0d; - if (term->cr_lf_return) - *p++ = 0x0a; - goto done; - } - default: break; /* else gcc warns `enum value not used' */ - } + if (!term->app_keypad_keys) + app_flg = 0; +#endif + /* Useful mapping of Ctrl-arrows */ + if (ctrl) + app_flg = !app_flg; - /* SCO function keys and editing keys */ - if (term->cfg.funky_type == FUNKY_SCO) { - if (PK_ISFKEY(keysym) && keysym <= PK_F12) { - static char const codes[] = - "MNOPQRSTUVWX" "YZabcdefghij" "klmnopqrstuv" "wxyz@[\\]^_`{"; - int index = keysym - PK_F1; - - if (modifiers & PKM_SHIFT) index += 12; - if (modifiers & PKM_CONTROL) index += 24; - p += sprintf((char *) p, "\x1B[%c", codes[index]); - goto done; - } - if (PK_ISEDITING(keysym)) { - int xkey = 0; - - switch (keysym) { - case PK_DELETE: *p++ = 0x7f; goto done; - case PK_HOME: xkey = 'H'; break; - case PK_INSERT: xkey = 'L'; break; - case PK_END: xkey = 'F'; break; - case PK_PAGEUP: xkey = 'I'; break; - case PK_PAGEDOWN: xkey = 'G'; break; - default: break; /* else gcc warns `enum value not used' */ - } + if (app_flg) + p += sprintf((char *) p, "\x1BO%c", xkey); + else p += sprintf((char *) p, "\x1B[%c", xkey); - } - } - - if (PK_ISEDITING(keysym) && (modifiers & PKM_SHIFT) == 0) { - int code; - - if (term->cfg.funky_type == FUNKY_XTERM) { - /* Xterm shuffles these keys, apparently. */ - switch (keysym) { - case PK_HOME: keysym = PK_INSERT; break; - case PK_INSERT: keysym = PK_HOME; break; - case PK_DELETE: keysym = PK_END; break; - case PK_END: keysym = PK_PAGEUP; break; - case PK_PAGEUP: keysym = PK_DELETE; break; - case PK_PAGEDOWN: keysym = PK_PAGEDOWN; break; - default: break; /* else gcc warns `enum value not used' */ - } - } - - /* RXVT Home/End */ - if (term->cfg.rxvt_homeend && - (keysym == PK_HOME || keysym == PK_END)) { - p += sprintf((char *) p, keysym == PK_HOME ? "\x1B[H" : "\x1BOw"); - goto done; - } - - if (term->vt52_mode) { - int xkey; - - /* - * A real VT52 doesn't have these, and a VT220 doesn't - * send anything for them in VT52 mode. - */ - switch (keysym) { - case PK_HOME: xkey = 'H'; break; - case PK_INSERT: xkey = 'L'; break; - case PK_DELETE: xkey = 'M'; break; - case PK_END: xkey = 'E'; break; - case PK_PAGEUP: xkey = 'I'; break; - case PK_PAGEDOWN: xkey = 'G'; break; - default: xkey=0; break; /* else gcc warns `enum value not used'*/ - } - p += sprintf((char *) p, "\x1B%c", xkey); - goto done; - } - - switch (keysym) { - case PK_HOME: code = 1; break; - case PK_INSERT: code = 2; break; - case PK_DELETE: code = 3; break; - case PK_END: code = 4; break; - case PK_PAGEUP: code = 5; break; - case PK_PAGEDOWN: code = 6; break; - default: code = 0; break; /* else gcc warns `enum value not used' */ - } - p += sprintf((char *) p, "\x1B[%d~", code); - goto done; - } - - if (PK_ISFKEY(keysym)) { - /* Map Shift+F1-F10 to F11-F20 */ - if (keysym >= PK_F1 && keysym <= PK_F10 && (modifiers & PKM_SHIFT)) - keysym += 10; - if ((term->vt52_mode || term->cfg.funky_type == FUNKY_VT100P) && - keysym <= PK_F14) { - /* XXX This overrides the XTERM/VT52 mode below */ - int offt = 0; - if (keysym >= PK_F6) offt++; - if (keysym >= PK_F12) offt++; - p += sprintf((char *) p, term->vt52_mode ? "\x1B%c" : "\x1BO%c", - 'P' + keysym - PK_F1 - offt); - goto done; - } - if (term->cfg.funky_type == FUNKY_LINUX && keysym <= PK_F5) { - p += sprintf((char *) p, "\x1B[[%c", 'A' + keysym - PK_F1); - goto done; - } - if (term->cfg.funky_type == FUNKY_XTERM && keysym <= PK_F4) { - if (term->vt52_mode) - p += sprintf((char *) p, "\x1B%c", 'P' + keysym - PK_F1); - else - p += sprintf((char *) p, "\x1BO%c", 'P' + keysym - PK_F1); - goto done; - } - p += sprintf((char *) p, "\x1B[%d~", 11 + keysym - PK_F1); - goto done; } - if (PK_ISCURSOR(keysym)) { - int xkey; - - switch (keysym) { - case PK_UP: xkey = 'A'; break; - case PK_DOWN: xkey = 'B'; break; - case PK_RIGHT: xkey = 'C'; break; - case PK_LEFT: xkey = 'D'; break; - case PK_REST: xkey = 'G'; break; /* centre key on number pad */ - default: xkey = 0; break; /* else gcc warns `enum value not used' */ - } - if (term->vt52_mode) - p += sprintf((char *) p, "\x1B%c", xkey); - else { - int app_flg = (term->app_cursor_keys && !term->cfg.no_applic_c); - - /* Useful mapping of Ctrl-arrows */ - if (modifiers == PKM_CONTROL) - app_flg = !app_flg; - - if (app_flg) - p += sprintf((char *) p, "\x1BO%c", xkey); - else - p += sprintf((char *) p, "\x1B[%c", xkey); - } - goto done; - } - - done: - if (p > output || tlen > 0) { - /* - * Interrupt an ongoing paste. I'm not sure - * this is sensible, but for the moment it's - * preferable to having to faff about buffering - * things. - */ - term_nopaste(term); - - /* - * We need not bother about stdin backlogs - * here, because in GUI PuTTY we can't do - * anything about it anyway; there's no means - * of asking Windows to hold off on KEYDOWN - * messages. We _have_ to buffer everything - * we're sent. - */ - term_seen_key_event(term); - - if (prependesc) { -#if 0 - fprintf(stderr, "sending ESC\n"); -#endif - ldisc_send(term->ldisc, "\x1b", 1, 1); - } - - if (p > output) { -#if 0 - fprintf(stderr, "sending %d bytes:", p - output); - for (i = 0; i < p - output; i++) - fprintf(stderr, " %02x", output[i]); - fprintf(stderr, "\n"); -#endif - ldisc_send(term->ldisc, output, p - output, 1); - } else if (tlen > 0) { -#if 0 - fprintf(stderr, "sending %d unichars:", tlen); - for (i = 0; i < tlen; i++) - fprintf(stderr, " %04x", (unsigned) text[i]); - fprintf(stderr, "\n"); -#endif - luni_send(term->ldisc, text, tlen, 1); - } - } + return p - buf; } void term_nopaste(Terminal *term) @@ -6344,6 +6108,14 @@ void term_deselect(Terminal *term) { deselect(term); term_update(term); + + /* + * Since terminal output is suppressed during drag-selects, we + * should make sure to write any pending output if one has just + * finished. + */ + if (term->selstate != DRAGGING) + term_out(term); } int term_ldisc(Terminal *term, int option) @@ -6431,9 +6203,9 @@ char *term_get_ttymode(Terminal *term, const char *mode) { char *val = NULL; if (strcmp(mode, "ERASE") == 0) { - val = term->cfg.bksp_is_delete ? "^?" : "^H"; + val = term->bksp_is_delete ? "^?" : "^H"; } - /* FIXME: perhaps we should set ONLCR based on cfg.lfhascr as well? */ + /* FIXME: perhaps we should set ONLCR based on lfhascr as well? */ /* FIXME: or ECHO and friends based on local echo state? */ return dupstr(val); } @@ -6479,7 +6251,7 @@ int term_get_userpass_input(Terminal *term, prompts_t *p, { int i; for (i = 0; i < (int)p->n_prompts; i++) - memset(p->prompts[i]->result, 0, p->prompts[i]->result_len); + prompt_set_result(p->prompts[i], ""); } } @@ -6506,8 +6278,8 @@ int term_get_userpass_input(Terminal *term, prompts_t *p, case 10: case 13: term_data(term, 0, "\r\n", 2); + prompt_ensure_result_size(pr, s->pos + 1); pr->result[s->pos] = '\0'; - pr->result[pr->result_len - 1] = '\0'; /* go to next prompt, if any */ s->curr_prompt++; s->done_prompt = 0; @@ -6542,10 +6314,9 @@ int term_get_userpass_input(Terminal *term, prompts_t *p, * when we're doing password input, because some people * have control characters in their passwords. */ - if ((!pr->echo || - (c >= ' ' && c <= '~') || - ((unsigned char) c >= 160)) - && s->pos < pr->result_len - 1) { + if (!pr->echo || (c >= ' ' && c <= '~') || + ((unsigned char) c >= 160)) { + prompt_ensure_result_size(pr, s->pos + 1); pr->result[s->pos++] = c; if (pr->echo) term_data(term, 0, &c, 1);