+/*
+ * Terminal emulator.
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#define has_compat(x) ( ((CL_##x)&term->compatibility_level) != 0 )
+char *EMPTY_WINDOW_TITLE = "";
+
const char sco2ansicolour[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
#define sel_nl_sz (sizeof(sel_nl)/sizeof(wchar_t))
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;
}
assert(!screen);
- if (term->cfg.erase_to_scrollback &&
+ if (term->erase_to_scrollback &&
term->alt_which && term->alt_screen) {
altlines = term->alt_sblines;
}
*/
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;
{
term->alt_x = term->alt_y = 0;
term->savecurs.x = term->savecurs.y = 0;
+ term->alt_savecurs.x = term->alt_savecurs.y = 0;
term->alt_t = term->marg_t = 0;
if (term->rows != -1)
term->alt_b = term->marg_b = term->rows - 1;
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 = FALSE;
- term->alt_wrap = term->wrap = term->cfg.wrap_mode;
- term->alt_cset = term->cset = term->save_cset = 0;
- term->alt_utf = term->utf = term->save_utf = 0;
+ term->alt_wnext = term->wrapnext =
+ term->save_wnext = term->alt_save_wnext = FALSE;
+ 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;
- term->alt_sco_acs = term->sco_acs = term->save_sco_acs = 0;
- term->cset_attr[0] = term->cset_attr[1] = term->save_csattr = CSET_ASCII;
+ term->alt_sco_acs = term->sco_acs =
+ term->save_sco_acs = term->alt_save_sco_acs = 0;
+ term->cset_attr[0] = term->cset_attr[1] =
+ term->save_csattr = term->alt_save_csattr = CSET_ASCII;
term->rvideo = 0;
term->in_vbell = FALSE;
term->cursor_on = 1;
term->big_cursor = 0;
- term->default_attr = term->save_attr = term->curr_attr = ATTR_DEFAULT;
+ 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;
+ 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);
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;
/*
* 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);
}
}
/*
+ * 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
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);
}
}
- 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);
}
/*
/*
* 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;
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");
term->vt52_mode = FALSE;
term->cr_lf_return = FALSE;
term->seen_disp_event = FALSE;
- term->xterm_mouse = term->mouse_is_down = FALSE;
+ term->mouse_is_down = FALSE;
term->reset_132 = FALSE;
term->cblinker = term->tblinker = 0;
term->has_focus = 1;
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;
expire_timer_context(term);
+ conf_free(term->conf);
+
sfree(term);
}
addpos234(term->screen, line, 0);
term->curs.y += 1;
term->savecurs.y += 1;
+ term->alt_y += 1;
+ term->alt_savecurs.y += 1;
} else {
/* Add a new blank line at the bottom of the screen. */
line = newline(term, newcols, FALSE);
term->tempsblines += 1;
term->curs.y -= 1;
term->savecurs.y -= 1;
+ term->alt_y -= 1;
+ term->alt_savecurs.y -= 1;
}
term->rows -= 1;
}
term->savecurs.y = 0;
if (term->savecurs.y >= newrows)
term->savecurs.y = newrows - 1;
+ if (term->savecurs.x >= newcols)
+ term->savecurs.x = newcols - 1;
+ if (term->alt_savecurs.y < 0)
+ term->alt_savecurs.y = 0;
+ if (term->alt_savecurs.y >= newrows)
+ term->alt_savecurs.y = newrows - 1;
+ if (term->alt_savecurs.x >= newcols)
+ term->alt_savecurs.x = newcols - 1;
if (term->curs.y < 0)
term->curs.y = 0;
if (term->curs.y >= newrows)
term->curs.y = newrows - 1;
if (term->curs.x >= newcols)
term->curs.x = newcols - 1;
+ if (term->alt_y < 0)
+ term->alt_y = 0;
+ if (term->alt_y >= newrows)
+ term->alt_y = newrows - 1;
+ if (term->alt_x >= newcols)
+ term->alt_x = newcols - 1;
term->alt_x = term->alt_y = 0;
term->wrapnext = term->alt_wnext = FALSE;
{
term->resize_fn = resize_fn;
term->resize_ctx = resize_ctx;
- if (term->cols > 0 && term->rows > 0)
+ if (resize_fn && term->cols > 0 && term->rows > 0)
resize_fn(resize_ctx, term->cols, term->rows);
}
static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
{
int t;
+ pos tp;
tree234 *ttr;
if (!which)
t = term->sco_acs;
if (!reset) term->sco_acs = term->alt_sco_acs;
term->alt_sco_acs = t;
+
+ tp = term->savecurs;
+ if (!reset && !keep_cur_pos)
+ term->savecurs = term->alt_savecurs;
+ term->alt_savecurs = tp;
+ t = term->save_cset;
+ if (!reset && !keep_cur_pos)
+ term->save_cset = term->alt_save_cset;
+ term->alt_save_cset = t;
+ t = term->save_csattr;
+ if (!reset && !keep_cur_pos)
+ term->save_csattr = term->alt_save_csattr;
+ term->alt_save_csattr = t;
+ t = term->save_attr;
+ if (!reset && !keep_cur_pos)
+ term->save_attr = term->alt_save_attr;
+ term->alt_save_attr = t;
+ t = term->save_utf;
+ if (!reset && !keep_cur_pos)
+ term->save_utf = term->alt_save_utf;
+ term->alt_save_utf = t;
+ t = term->save_wnext;
+ if (!reset && !keep_cur_pos)
+ term->save_wnext = term->alt_save_wnext;
+ term->alt_save_wnext = t;
+ t = term->save_sco_acs;
+ if (!reset && !keep_cur_pos)
+ term->save_sco_acs = term->alt_save_sco_acs;
+ term->alt_save_sco_acs = t;
}
if (reset && term->screen) {
static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
{
termline *line;
- int i, seltop, olddisptop, shift;
+ int i, seltop;
+#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 */
if (lines < 0) {
while (lines < 0) {
line = delpos234(term->screen, botline);
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. */
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;
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 */
+ case 1000: /* xterm mouse 1 (normal) */
term->xterm_mouse = state ? 1 : 0;
set_raw_mouse_mode(term->frontend, state);
break;
- case 1002: /* xterm mouse 2 */
+ case 1002: /* xterm mouse 2 (inc. button drags) */
term->xterm_mouse = state ? 2 : 0;
set_raw_mouse_mode(term->frontend, state);
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 */
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;
}
/*
* 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)
{
* 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;
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),
*/
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 */
* 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);
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
/*
* 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);
}
}
term->wrapnext = FALSE;
seen_disp_event(term);
term->paste_hold = 0;
+
+ 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;
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);
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;
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;
}
/* 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;
}
}
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)
break;
case 'J': /* ED: erase screen or parts of it */
{
- unsigned int i = def(term->esc_args[0], 0) + 1;
- if (i > 3)
- i = 0;
- erase_lots(term, FALSE, !!(i & 2), !!(i & 1));
+ unsigned int i = def(term->esc_args[0], 0);
+ if (i == 3) {
+ /* Erase Saved Lines (xterm)
+ * This follows Thomas Dickey's xterm. */
+ term_clrsb(term);
+ } else {
+ i++;
+ if (i > 3)
+ i = 0;
+ erase_lots(term, FALSE, !!(i & 2), !!(i & 1));
+ }
}
term->disptop = 0;
seen_disp_event(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);
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);
&& (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);
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));
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:
if (term->ldisc)
ldisc_send(term->ldisc,
is_iconic(term->frontend) ?
- "\033[1t" : "\033[2t", 4, 0);
+ "\033[2t" : "\033[1t", 4, 0);
break;
case 13:
if (term->ldisc) {
case 14:
if (term->ldisc) {
get_window_pixels(term->frontend, &x, &y);
- len = sprintf(buf, "\033[4;%d;%dt", x, y);
+ len = sprintf(buf, "\033[4;%d;%dt", y, x);
ldisc_send(term->ldisc, buf, len, 0);
}
break;
break;
case 20:
if (term->ldisc &&
- !term->cfg.no_remote_qtitle) {
- p = get_window_title(term->frontend, TRUE);
+ 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;
len = strlen(p);
ldisc_send(term->ldisc, "\033]L", 3, 0);
ldisc_send(term->ldisc, p, len, 0);
break;
case 21:
if (term->ldisc &&
- !term->cfg.no_remote_qtitle) {
- p = get_window_title(term->frontend,FALSE);
+ 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;
len = strlen(p);
ldisc_send(term->ldisc, "\033]l", 3, 0);
ldisc_send(term->ldisc, p, len, 0);
*/
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;
*/
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;
* 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
* 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
}
term_print_flush(term);
- if (term->cfg.logflush)
+ if (term->logflush)
logflush(term->logctx);
}
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)) {
switch (uc & CSET_MASK) {
case CSET_LINEDRW:
- if (!term->cfg.rawcnp) {
+ if (!term->rawcnp) {
uc = term->ucsdata->unitab_xterm[uc & 0xFF];
break;
}
}
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; it<term->cols; 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) {
/* 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;
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;
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)
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
if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
do_cursor(ctx, start, i, ch, ccount, attr,
ldata->lattr);
-
- updated_line = 1;
}
start = j;
ccount = 0;
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) {
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;
}
if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
do_cursor(ctx, start, i, ch, ccount, attr,
ldata->lattr);
-
- updated_line = 1;
}
unlineptr(ldata);
}
/*
+ * 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 {
sprintf(cbuf, "<U+%04x>", (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) {
switch (uc & CSET_MASK) {
case CSET_LINEDRW:
- if (!term->cfg.rawcnp) {
+ if (!term->rawcnp) {
uc = term->ucsdata->unitab_xterm[uc & 0xFF];
break;
}
break;
}
- set = (uc & CSET_MASK);
c = (uc & ~CSET_MASK);
- cbuf[0] = uc;
- cbuf[1] = 0;
+#ifdef PLATFORM_IS_UTF16
+ if (uc > 0x10000 && uc < 0x110000) {
+ cbuf[0] = 0xD800 | ((uc - 0x10000) >> 10);
+ cbuf[1] = 0xDC00 | ((uc - 0x10000) & 0x3FF);
+ cbuf[2] = 0;
+ } else
+#endif
+ {
+ cbuf[0] = uc;
+ cbuf[1] = 0;
+ }
if (DIRECT_FONT(uc)) {
if (c >= ' ' && c != 0x7F) {
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) {
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)
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) {
selpoint.x = x;
unlineptr(ldata);
- if (raw_mouse) {
+ /*
+ * If we're in the middle of a selection operation, we ignore raw
+ * mouse mode until it's done (we must have been not in raw mouse
+ * mode when it started).
+ * This makes use of Shift for selection reliable, and avoids the
+ * host seeing mouse releases for which they never saw corresponding
+ * presses.
+ */
+ if (raw_mouse &&
+ (term->selstate != ABOUT_TO) && (term->selstate != DRAGGING)) {
int encstate = 0, r, c;
char abuf[16];
* 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;
term_update(term);
}
+int format_arrow_key(char *buf, Terminal *term, int xkey, int ctrl)
+{
+ 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
+ /*
+ * 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->app_keypad_keys)
+ app_flg = 0;
+#endif
+ /* Useful mapping of Ctrl-arrows */
+ if (ctrl)
+ app_flg = !app_flg;
+
+ if (app_flg)
+ p += sprintf((char *) p, "\x1BO%c", xkey);
+ else
+ p += sprintf((char *) p, "\x1B[%c", xkey);
+ }
+
+ return p - buf;
+}
+
void term_key(Terminal *term, Key_Sym keysym, wchar_t *text, size_t tlen,
unsigned int modifiers, unsigned int flags)
{
}
/* Nethack keypad */
- if (term->cfg.nethack_keypad) {
+ if (term->nethack_keypad) {
char c = 0;
switch (keysym) {
case PK_KP1: c = 'b'; break;
if (modifiers & PKM_CONTROL)
c &= 0x1f;
else if (modifiers & PKM_SHIFT)
- c = toupper(c);
+ c = toupper((unsigned char)c);
}
*p++ = c;
goto done;
* In VT400 mode, PFn always emits an escape sequence. In
* Linux and tilde modes, this only happens in app keypad mode.
*/
- 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)) {
+ if (term->funky_type == FUNKY_VT400 ||
+ ((term->funky_type == FUNKY_LINUX ||
+ term->funky_type == FUNKY_TILDE) &&
+ term->app_keypad_keys && !term->no_applic_k)) {
switch (keysym) {
case PK_PF1: xkey = 'P'; break;
case PK_PF2: xkey = 'Q'; break;
default: break; /* else gcc warns `enum value not used' */
}
}
- if (term->app_keypad_keys && !term->cfg.no_applic_k) {
+ if (term->app_keypad_keys && !term->no_applic_k) {
switch (keysym) {
case PK_KP0: xkey = 'p'; break;
case PK_KP1: xkey = 'q'; 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) {
+ if (term->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.
goto done;
case PK_BACKSPACE:
if (modifiers == 0)
- *p++ = (term->cfg.bksp_is_delete ? 0x7F : 0x08);
+ *p++ = (term->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);
+ *p++ = (term->bksp_is_delete ? 0x08 : 0x7F);
else break;
goto done;
case PK_TAB:
}
/* SCO function keys and editing keys */
- if (term->cfg.funky_type == FUNKY_SCO) {
+ if (term->funky_type == FUNKY_SCO) {
if (PK_ISFKEY(keysym) && keysym <= PK_F12) {
static char const codes[] =
"MNOPQRSTUVWX" "YZabcdefghij" "klmnopqrstuv" "wxyz@[\\]^_`{";
if (PK_ISEDITING(keysym) && (modifiers & PKM_SHIFT) == 0) {
int code;
- if (term->cfg.funky_type == FUNKY_XTERM) {
+ if (term->funky_type == FUNKY_XTERM) {
/* Xterm shuffles these keys, apparently. */
switch (keysym) {
case PK_HOME: keysym = PK_INSERT; break;
}
/* RXVT Home/End */
- if (term->cfg.rxvt_homeend &&
+ if (term->rxvt_homeend &&
(keysym == PK_HOME || keysym == PK_END)) {
p += sprintf((char *) p, keysym == PK_HOME ? "\x1B[H" : "\x1BOw");
goto done;
/* 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) &&
+ if ((term->vt52_mode || term->funky_type == FUNKY_VT100P) &&
keysym <= PK_F14) {
/* XXX This overrides the XTERM/VT52 mode below */
int offt = 0;
'P' + keysym - PK_F1 - offt);
goto done;
}
- if (term->cfg.funky_type == FUNKY_LINUX && keysym <= PK_F5) {
+ if (term->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->funky_type == FUNKY_XTERM && keysym <= PK_F4) {
if (term->vt52_mode)
p += sprintf((char *) p, "\x1B%c", 'P' + keysym - PK_F1);
else
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);
- }
+ p += format_arrow_key(p, term, xkey, modifiers == PKM_CONTROL);
goto done;
}
{
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);
}
*/
{
int i;
- for (i = 0; i < p->n_prompts; i++)
- memset(p->prompts[i]->result, 0, p->prompts[i]->result_len);
+ for (i = 0; i < (int)p->n_prompts; i++)
+ prompt_set_result(p->prompts[i], "");
}
}
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;
* 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);
~mdw / sgt / putty / blobdiff