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;
term->basic_erase_char.cc_next = 0;
term->erase_char = term->basic_erase_char;
- term_copy_stuff_from_conf(term);
-
return term;
}
break_run = ((tattr ^ attr) & term->attr_mask) != 0;
/* 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;
/*
{
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], "");
}
}
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);