2006-04-23 22:26:03 +04:00
|
|
|
/*
|
|
|
|
* Terminal emulator.
|
|
|
|
*/
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2000-10-24 14:47:49 +04:00
|
|
|
#include <ctype.h>
|
2015-10-08 01:54:39 +03:00
|
|
|
#include <limits.h>
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2001-01-07 21:24:59 +03:00
|
|
|
#include <time.h>
|
2001-04-28 19:32:25 +04:00
|
|
|
#include <assert.h>
|
1999-01-08 16:02:13 +03:00
|
|
|
#include "putty.h"
|
2002-10-22 20:11:33 +04:00
|
|
|
#include "terminal.h"
|
|
|
|
|
|
|
|
#define poslt(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x < (p2).x ) )
|
|
|
|
#define posle(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x <= (p2).x ) )
|
|
|
|
#define poseq(p1,p2) ( (p1).y == (p2).y && (p1).x == (p2).x )
|
|
|
|
#define posdiff(p1,p2) ( ((p1).y - (p2).y) * (term->cols+1) + (p1).x - (p2).x )
|
|
|
|
|
|
|
|
/* Product-order comparisons for rectangular block selection. */
|
|
|
|
#define posPlt(p1,p2) ( (p1).y <= (p2).y && (p1).x < (p2).x )
|
|
|
|
#define posPle(p1,p2) ( (p1).y <= (p2).y && (p1).x <= (p2).x )
|
|
|
|
|
|
|
|
#define incpos(p) ( (p).x == term->cols ? ((p).x = 0, (p).y++, 1) : ((p).x++, 0) )
|
|
|
|
#define decpos(p) ( (p).x == 0 ? ((p).x = term->cols, (p).y--, 1) : ((p).x--, 0) )
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
#define VT52_PLUS
|
|
|
|
|
2001-05-06 18:35:20 +04:00
|
|
|
#define CL_ANSIMIN 0x0001 /* Codes in all ANSI like terminals. */
|
|
|
|
#define CL_VT100 0x0002 /* VT100 */
|
|
|
|
#define CL_VT100AVO 0x0004 /* VT100 +AVO; 132x24 (not 132x14) & attrs */
|
|
|
|
#define CL_VT102 0x0008 /* VT102 */
|
|
|
|
#define CL_VT220 0x0010 /* VT220 */
|
|
|
|
#define CL_VT320 0x0020 /* VT320 */
|
|
|
|
#define CL_VT420 0x0040 /* VT420 */
|
|
|
|
#define CL_VT510 0x0080 /* VT510, NB VT510 includes ANSI */
|
|
|
|
#define CL_VT340TEXT 0x0100 /* VT340 extensions that appear in the VT420 */
|
|
|
|
#define CL_SCOANSI 0x1000 /* SCOANSI not in ANSIMIN. */
|
|
|
|
#define CL_ANSI 0x2000 /* ANSI ECMA-48 not in the VT100..VT420 */
|
|
|
|
#define CL_OTHER 0x4000 /* Others, Xterm, linux, putty, dunno, etc */
|
2000-03-17 13:39:05 +03:00
|
|
|
|
2000-07-26 16:13:51 +04:00
|
|
|
#define TM_VT100 (CL_ANSIMIN|CL_VT100)
|
|
|
|
#define TM_VT100AVO (TM_VT100|CL_VT100AVO)
|
|
|
|
#define TM_VT102 (TM_VT100AVO|CL_VT102)
|
|
|
|
#define TM_VT220 (TM_VT102|CL_VT220)
|
|
|
|
#define TM_VTXXX (TM_VT220|CL_VT340TEXT|CL_VT510|CL_VT420|CL_VT320)
|
|
|
|
#define TM_SCOANSI (CL_ANSIMIN|CL_SCOANSI)
|
|
|
|
|
|
|
|
#define TM_PUTTY (0xFFFF)
|
2000-03-17 13:39:05 +03:00
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
#define UPDATE_DELAY ((TICKSPERSEC+49)/50)/* ticks to defer window update */
|
|
|
|
#define TBLINK_DELAY ((TICKSPERSEC*9+19)/20)/* ticks between text blinks*/
|
|
|
|
#define CBLINK_DELAY (CURSORBLINK) /* ticks between cursor blinks */
|
|
|
|
#define VBELL_DELAY (VBELL_TIMEOUT) /* visual bell timeout in ticks */
|
|
|
|
|
2000-03-17 13:39:05 +03:00
|
|
|
#define compatibility(x) \
|
2002-10-22 20:11:33 +04:00
|
|
|
if ( ((CL_##x)&term->compatibility_level) == 0 ) { \
|
|
|
|
term->termstate=TOPLEVEL; \
|
2000-03-17 13:39:05 +03:00
|
|
|
break; \
|
|
|
|
}
|
2000-07-26 16:13:51 +04:00
|
|
|
#define compatibility2(x,y) \
|
2002-10-22 20:11:33 +04:00
|
|
|
if ( ((CL_##x|CL_##y)&term->compatibility_level) == 0 ) { \
|
|
|
|
term->termstate=TOPLEVEL; \
|
2000-07-26 16:13:51 +04:00
|
|
|
break; \
|
|
|
|
}
|
2000-03-17 13:39:05 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
#define has_compat(x) ( ((CL_##x)&term->compatibility_level) != 0 )
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2015-05-15 13:15:42 +03:00
|
|
|
const char *EMPTY_WINDOW_TITLE = "";
|
2006-12-31 18:33:33 +03:00
|
|
|
|
2003-06-16 02:05:05 +04:00
|
|
|
const char sco2ansicolour[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
|
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
#define sel_nl_sz (sizeof(sel_nl)/sizeof(wchar_t))
|
2002-10-22 20:11:33 +04:00
|
|
|
const wchar_t sel_nl[] = SEL_NL;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
/*
|
|
|
|
* Fetch the character at a particular position in a line array,
|
|
|
|
* for purposes of `wordtype'. The reason this isn't just a simple
|
|
|
|
* array reference is that if the character we find is UCSWIDE,
|
|
|
|
* then we must look one space further to the left.
|
|
|
|
*/
|
|
|
|
#define UCSGET(a, x) \
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
( (x)>0 && (a)[(x)].chr == UCSWIDE ? (a)[(x)-1].chr : (a)[(x)].chr )
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Detect the various aliases of U+0020 SPACE.
|
|
|
|
*/
|
|
|
|
#define IS_SPACE_CHR(chr) \
|
|
|
|
((chr) == 0x20 || (DIRECT_CHAR(chr) && ((chr) & 0xFF) == 0x20))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Spot magic CSETs.
|
|
|
|
*/
|
|
|
|
#define CSET_OF(chr) (DIRECT_CHAR(chr)||DIRECT_FONT(chr) ? (chr)&CSET_MASK : 0)
|
2003-01-02 19:20:29 +03:00
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Internal prototypes.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
static void resizeline(Terminal *, termline *, int);
|
|
|
|
static termline *lineptr(Terminal *, int, int, int);
|
|
|
|
static void unlineptr(termline *);
|
2014-07-24 01:48:02 +04:00
|
|
|
static void check_line_size(Terminal *, termline *);
|
2002-10-22 20:11:33 +04:00
|
|
|
static void do_paint(Terminal *, Context, int);
|
|
|
|
static void erase_lots(Terminal *, int, int, int);
|
2006-02-19 17:59:48 +03:00
|
|
|
static int find_last_nonempty_line(Terminal *, tree234 *);
|
2002-10-22 20:11:33 +04:00
|
|
|
static void swap_screen(Terminal *, int, int, int);
|
|
|
|
static void update_sbar(Terminal *);
|
|
|
|
static void deselect(Terminal *);
|
|
|
|
static void term_print_finish(Terminal *);
|
2006-02-19 17:59:48 +03:00
|
|
|
static void scroll(Terminal *, int, int, int, int);
|
2017-09-30 19:32:32 +03:00
|
|
|
static void parse_optionalrgb(optionalrgb *out, unsigned *values);
|
2002-11-23 16:07:29 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
static void scroll_display(Terminal *, int, int, int);
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
1999-01-08 16:02:13 +03:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
static termline *newline(Terminal *term, int cols, int bce)
|
|
|
|
{
|
|
|
|
termline *line;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
line = snew(termline);
|
|
|
|
line->chars = snewn(cols, termchar);
|
|
|
|
for (j = 0; j < cols; j++)
|
|
|
|
line->chars[j] = (bce ? term->erase_char : term->basic_erase_char);
|
2004-10-14 20:42:43 +04:00
|
|
|
line->cols = line->size = cols;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line->lattr = LATTR_NORM;
|
|
|
|
line->temporary = FALSE;
|
2004-10-14 20:42:43 +04:00
|
|
|
line->cc_free = 0;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void freeline(termline *line)
|
|
|
|
{
|
2004-10-13 17:35:29 +04:00
|
|
|
if (line) {
|
|
|
|
sfree(line->chars);
|
|
|
|
sfree(line);
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void unlineptr(termline *line)
|
|
|
|
{
|
|
|
|
if (line->temporary)
|
|
|
|
freeline(line);
|
|
|
|
}
|
|
|
|
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
2004-10-14 20:42:43 +04:00
|
|
|
/*
|
|
|
|
* Diagnostic function: verify that a termline has a correct
|
|
|
|
* combining character structure.
|
2004-10-15 12:22:49 +04:00
|
|
|
*
|
2005-04-01 17:25:13 +04:00
|
|
|
* This is a performance-intensive check, so it's no longer enabled
|
|
|
|
* by default.
|
2004-10-14 20:42:43 +04:00
|
|
|
*/
|
|
|
|
static void cc_check(termline *line)
|
|
|
|
{
|
|
|
|
unsigned char *flags;
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
assert(line->size >= line->cols);
|
|
|
|
|
|
|
|
flags = snewn(line->size, unsigned char);
|
|
|
|
|
|
|
|
for (i = 0; i < line->size; i++)
|
|
|
|
flags[i] = (i < line->cols);
|
|
|
|
|
|
|
|
for (i = 0; i < line->cols; i++) {
|
|
|
|
j = i;
|
|
|
|
while (line->chars[j].cc_next) {
|
|
|
|
j += line->chars[j].cc_next;
|
|
|
|
assert(j >= line->cols && j < line->size);
|
|
|
|
assert(!flags[j]);
|
|
|
|
flags[j] = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
j = line->cc_free;
|
|
|
|
if (j) {
|
|
|
|
while (1) {
|
|
|
|
assert(j >= line->cols && j < line->size);
|
|
|
|
assert(!flags[j]);
|
|
|
|
flags[j] = TRUE;
|
|
|
|
if (line->chars[j].cc_next)
|
|
|
|
j += line->chars[j].cc_next;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
j = 0;
|
|
|
|
for (i = 0; i < line->size; i++)
|
|
|
|
j += (flags[i] != 0);
|
|
|
|
|
|
|
|
assert(j == line->size);
|
2004-10-15 16:37:44 +04:00
|
|
|
|
|
|
|
sfree(flags);
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
2005-04-01 17:25:13 +04:00
|
|
|
#endif
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a combining character to a character cell.
|
|
|
|
*/
|
|
|
|
static void add_cc(termline *line, int col, unsigned long chr)
|
|
|
|
{
|
|
|
|
int newcc;
|
|
|
|
|
|
|
|
assert(col >= 0 && col < line->cols);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Start by extending the cols array if the free list is empty.
|
|
|
|
*/
|
|
|
|
if (!line->cc_free) {
|
|
|
|
int n = line->size;
|
|
|
|
line->size += 16 + (line->size - line->cols) / 2;
|
|
|
|
line->chars = sresize(line->chars, line->size, termchar);
|
|
|
|
line->cc_free = n;
|
|
|
|
while (n < line->size) {
|
|
|
|
if (n+1 < line->size)
|
|
|
|
line->chars[n].cc_next = 1;
|
|
|
|
else
|
|
|
|
line->chars[n].cc_next = 0;
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now walk the cc list of the cell in question.
|
|
|
|
*/
|
|
|
|
while (line->chars[col].cc_next)
|
|
|
|
col += line->chars[col].cc_next;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* `col' now points at the last cc currently in this cell; so
|
|
|
|
* we simply add another one.
|
|
|
|
*/
|
|
|
|
newcc = line->cc_free;
|
|
|
|
if (line->chars[newcc].cc_next)
|
|
|
|
line->cc_free = newcc + line->chars[newcc].cc_next;
|
|
|
|
else
|
|
|
|
line->cc_free = 0;
|
|
|
|
line->chars[newcc].cc_next = 0;
|
|
|
|
line->chars[newcc].chr = chr;
|
|
|
|
line->chars[col].cc_next = newcc - col;
|
|
|
|
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
|
|
|
cc_check(line);
|
|
|
|
#endif
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear the combining character list in a character cell.
|
|
|
|
*/
|
|
|
|
static void clear_cc(termline *line, int col)
|
|
|
|
{
|
|
|
|
int oldfree, origcol = col;
|
|
|
|
|
|
|
|
assert(col >= 0 && col < line->cols);
|
|
|
|
|
|
|
|
if (!line->chars[col].cc_next)
|
|
|
|
return; /* nothing needs doing */
|
|
|
|
|
|
|
|
oldfree = line->cc_free;
|
|
|
|
line->cc_free = col + line->chars[col].cc_next;
|
|
|
|
while (line->chars[col].cc_next)
|
|
|
|
col += line->chars[col].cc_next;
|
|
|
|
if (oldfree)
|
|
|
|
line->chars[col].cc_next = oldfree - col;
|
|
|
|
else
|
|
|
|
line->chars[col].cc_next = 0;
|
|
|
|
|
|
|
|
line->chars[origcol].cc_next = 0;
|
|
|
|
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
|
|
|
cc_check(line);
|
|
|
|
#endif
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Compare two character cells for equality. Special case required
|
|
|
|
* in do_paint() where we override what we expect the chr and attr
|
|
|
|
* fields to be.
|
|
|
|
*/
|
|
|
|
static int termchars_equal_override(termchar *a, termchar *b,
|
|
|
|
unsigned long bchr, unsigned long battr)
|
|
|
|
{
|
|
|
|
/* FULL-TERMCHAR */
|
2017-09-30 19:32:32 +03:00
|
|
|
if (!truecolour_equal(a->truecolour, b->truecolour))
|
|
|
|
return FALSE;
|
2004-10-14 20:42:43 +04:00
|
|
|
if (a->chr != bchr)
|
|
|
|
return FALSE;
|
2004-12-17 15:55:12 +03:00
|
|
|
if ((a->attr &~ DATTR_MASK) != (battr &~ DATTR_MASK))
|
2004-10-14 20:42:43 +04:00
|
|
|
return FALSE;
|
|
|
|
while (a->cc_next || b->cc_next) {
|
|
|
|
if (!a->cc_next || !b->cc_next)
|
|
|
|
return FALSE; /* one cc-list ends, other does not */
|
|
|
|
a += a->cc_next;
|
|
|
|
b += b->cc_next;
|
|
|
|
if (a->chr != b->chr)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int termchars_equal(termchar *a, termchar *b)
|
|
|
|
{
|
|
|
|
return termchars_equal_override(a, b, b->chr, b->attr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy a character cell. (Requires a pointer to the destination
|
|
|
|
* termline, so as to access its free list.)
|
|
|
|
*/
|
|
|
|
static void copy_termchar(termline *destline, int x, termchar *src)
|
|
|
|
{
|
|
|
|
clear_cc(destline, x);
|
|
|
|
|
|
|
|
destline->chars[x] = *src; /* copy everything except cc-list */
|
|
|
|
destline->chars[x].cc_next = 0; /* and make sure this is zero */
|
|
|
|
|
|
|
|
while (src->cc_next) {
|
|
|
|
src += src->cc_next;
|
|
|
|
add_cc(destline, x, src->chr);
|
|
|
|
}
|
2004-10-15 12:22:49 +04:00
|
|
|
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
|
|
|
cc_check(destline);
|
|
|
|
#endif
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Move a character cell within its termline.
|
|
|
|
*/
|
|
|
|
static void move_termchar(termline *line, termchar *dest, termchar *src)
|
|
|
|
{
|
|
|
|
/* First clear the cc list from the original char, just in case. */
|
|
|
|
clear_cc(line, dest - line->chars);
|
|
|
|
|
|
|
|
/* Move the character cell and adjust its cc_next. */
|
|
|
|
*dest = *src; /* copy everything except cc-list */
|
|
|
|
if (src->cc_next)
|
|
|
|
dest->cc_next = src->cc_next - (dest-src);
|
|
|
|
|
|
|
|
/* Ensure the original cell doesn't have a cc list. */
|
|
|
|
src->cc_next = 0;
|
2004-10-15 12:22:49 +04:00
|
|
|
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
|
|
|
cc_check(line);
|
|
|
|
#endif
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
/*
|
|
|
|
* Compress and decompress a termline into an RLE-based format for
|
|
|
|
* storing in scrollback. (Since scrollback almost never needs to
|
|
|
|
* be modified and exists in huge quantities, this is a sensible
|
|
|
|
* tradeoff, particularly since it allows us to continue adding
|
|
|
|
* features to the main termchar structure without proportionally
|
|
|
|
* bloating the terminal emulator's memory footprint unless those
|
|
|
|
* features are in constant use.)
|
|
|
|
*/
|
|
|
|
struct buf {
|
|
|
|
unsigned char *data;
|
|
|
|
int len, size;
|
|
|
|
};
|
|
|
|
static void add(struct buf *b, unsigned char c)
|
|
|
|
{
|
|
|
|
if (b->len >= b->size) {
|
|
|
|
b->size = (b->len * 3 / 2) + 512;
|
|
|
|
b->data = sresize(b->data, b->size, unsigned char);
|
|
|
|
}
|
|
|
|
b->data[b->len++] = c;
|
|
|
|
}
|
|
|
|
static int get(struct buf *b)
|
|
|
|
{
|
|
|
|
return b->data[b->len++];
|
|
|
|
}
|
|
|
|
static void makerle(struct buf *b, termline *ldata,
|
|
|
|
void (*makeliteral)(struct buf *b, termchar *c,
|
|
|
|
unsigned long *state))
|
|
|
|
{
|
|
|
|
int hdrpos, hdrsize, n, prevlen, prevpos, thislen, thispos, prev2;
|
|
|
|
termchar *c = ldata->chars;
|
|
|
|
unsigned long state = 0, oldstate;
|
|
|
|
|
|
|
|
n = ldata->cols;
|
|
|
|
|
|
|
|
hdrpos = b->len;
|
|
|
|
hdrsize = 0;
|
|
|
|
add(b, 0);
|
|
|
|
prevlen = prevpos = 0;
|
|
|
|
prev2 = FALSE;
|
|
|
|
|
|
|
|
while (n-- > 0) {
|
|
|
|
thispos = b->len;
|
|
|
|
makeliteral(b, c++, &state);
|
|
|
|
thislen = b->len - thispos;
|
|
|
|
if (thislen == prevlen &&
|
|
|
|
!memcmp(b->data + prevpos, b->data + thispos, thislen)) {
|
|
|
|
/*
|
|
|
|
* This literal precisely matches the previous one.
|
|
|
|
* Turn it into a run if it's worthwhile.
|
|
|
|
*
|
|
|
|
* With one-byte literals, it costs us two bytes to
|
|
|
|
* encode a run, plus another byte to write the header
|
|
|
|
* to resume normal output; so a three-element run is
|
|
|
|
* neutral, and anything beyond that is unconditionally
|
|
|
|
* worthwhile. With two-byte literals or more, even a
|
|
|
|
* 2-run is a win.
|
|
|
|
*/
|
|
|
|
if (thislen > 1 || prev2) {
|
|
|
|
int runpos, runlen;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It's worth encoding a run. Start at prevpos,
|
|
|
|
* unless hdrsize==0 in which case we can back up
|
|
|
|
* another one and start by overwriting hdrpos.
|
|
|
|
*/
|
|
|
|
|
|
|
|
hdrsize--; /* remove the literal at prevpos */
|
|
|
|
if (prev2) {
|
|
|
|
assert(hdrsize > 0);
|
|
|
|
hdrsize--;
|
|
|
|
prevpos -= prevlen;/* and possibly another one */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hdrsize == 0) {
|
|
|
|
assert(prevpos == hdrpos + 1);
|
|
|
|
runpos = hdrpos;
|
|
|
|
b->len = prevpos+prevlen;
|
|
|
|
} else {
|
|
|
|
memmove(b->data + prevpos+1, b->data + prevpos, prevlen);
|
|
|
|
runpos = prevpos;
|
|
|
|
b->len = prevpos+prevlen+1;
|
|
|
|
/*
|
|
|
|
* Terminate the previous run of ordinary
|
|
|
|
* literals.
|
|
|
|
*/
|
|
|
|
assert(hdrsize >= 1 && hdrsize <= 128);
|
|
|
|
b->data[hdrpos] = hdrsize - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
runlen = prev2 ? 3 : 2;
|
|
|
|
|
|
|
|
while (n > 0 && runlen < 129) {
|
|
|
|
int tmppos, tmplen;
|
|
|
|
tmppos = b->len;
|
|
|
|
oldstate = state;
|
|
|
|
makeliteral(b, c, &state);
|
|
|
|
tmplen = b->len - tmppos;
|
|
|
|
b->len = tmppos;
|
|
|
|
if (tmplen != thislen ||
|
|
|
|
memcmp(b->data + runpos+1, b->data + tmppos, tmplen)) {
|
|
|
|
state = oldstate;
|
|
|
|
break; /* run over */
|
|
|
|
}
|
|
|
|
n--, c++, runlen++;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(runlen >= 2 && runlen <= 129);
|
|
|
|
b->data[runpos] = runlen + 0x80 - 2;
|
|
|
|
|
|
|
|
hdrpos = b->len;
|
|
|
|
hdrsize = 0;
|
|
|
|
add(b, 0);
|
2004-10-16 16:36:50 +04:00
|
|
|
/* And ensure this run doesn't interfere with the next. */
|
|
|
|
prevlen = prevpos = 0;
|
|
|
|
prev2 = FALSE;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Just flag that the previous two literals were
|
|
|
|
* identical, in case we find a third identical one
|
|
|
|
* we want to turn into a run.
|
|
|
|
*/
|
|
|
|
prev2 = TRUE;
|
|
|
|
prevlen = thislen;
|
|
|
|
prevpos = thispos;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
prev2 = FALSE;
|
|
|
|
prevlen = thislen;
|
|
|
|
prevpos = thispos;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This character isn't (yet) part of a run. Add it to
|
|
|
|
* hdrsize.
|
|
|
|
*/
|
|
|
|
hdrsize++;
|
|
|
|
if (hdrsize == 128) {
|
|
|
|
b->data[hdrpos] = hdrsize - 1;
|
|
|
|
hdrpos = b->len;
|
|
|
|
hdrsize = 0;
|
|
|
|
add(b, 0);
|
|
|
|
prevlen = prevpos = 0;
|
|
|
|
prev2 = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clean up.
|
|
|
|
*/
|
|
|
|
if (hdrsize > 0) {
|
|
|
|
assert(hdrsize <= 128);
|
|
|
|
b->data[hdrpos] = hdrsize - 1;
|
|
|
|
} else {
|
|
|
|
b->len = hdrpos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void makeliteral_chr(struct buf *b, termchar *c, unsigned long *state)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* My encoding for characters is UTF-8-like, in that it stores
|
|
|
|
* 7-bit ASCII in one byte and uses high-bit-set bytes as
|
|
|
|
* introducers to indicate a longer sequence. However, it's
|
|
|
|
* unlike UTF-8 in that it doesn't need to be able to
|
|
|
|
* resynchronise, and therefore I don't want to waste two bits
|
|
|
|
* per byte on having recognisable continuation characters.
|
|
|
|
* Also I don't want to rule out the possibility that I may one
|
|
|
|
* day use values 0x80000000-0xFFFFFFFF for interesting
|
|
|
|
* purposes, so unlike UTF-8 I need a full 32-bit range.
|
|
|
|
* Accordingly, here is my encoding:
|
|
|
|
*
|
|
|
|
* 00000000-0000007F: 0xxxxxxx (but see below)
|
|
|
|
* 00000080-00003FFF: 10xxxxxx xxxxxxxx
|
|
|
|
* 00004000-001FFFFF: 110xxxxx xxxxxxxx xxxxxxxx
|
|
|
|
* 00200000-0FFFFFFF: 1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx
|
|
|
|
* 10000000-FFFFFFFF: 11110ZZZ xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
|
|
|
|
*
|
|
|
|
* (`Z' is like `x' but is always going to be zero since the
|
|
|
|
* values I'm encoding don't go above 2^32. In principle the
|
|
|
|
* five-byte form of the encoding could extend to 2^35, and
|
|
|
|
* there could be six-, seven-, eight- and nine-byte forms as
|
|
|
|
* well to allow up to 64-bit values to be encoded. But that's
|
|
|
|
* completely unnecessary for these purposes!)
|
|
|
|
*
|
|
|
|
* The encoding as written above would be very simple, except
|
|
|
|
* that 7-bit ASCII can occur in several different ways in the
|
|
|
|
* terminal data; sometimes it crops up in the D800 page
|
|
|
|
* (CSET_ASCII) but at other times it's in the 0000 page (real
|
|
|
|
* Unicode). Therefore, this encoding is actually _stateful_:
|
|
|
|
* the one-byte encoding of 00-7F actually indicates `reuse the
|
|
|
|
* upper three bytes of the last character', and to encode an
|
|
|
|
* absolute value of 00-7F you need to use the two-byte form
|
|
|
|
* instead.
|
|
|
|
*/
|
|
|
|
if ((c->chr & ~0x7F) == *state) {
|
|
|
|
add(b, (unsigned char)(c->chr & 0x7F));
|
|
|
|
} else if (c->chr < 0x4000) {
|
|
|
|
add(b, (unsigned char)(((c->chr >> 8) & 0x3F) | 0x80));
|
|
|
|
add(b, (unsigned char)(c->chr & 0xFF));
|
|
|
|
} else if (c->chr < 0x200000) {
|
|
|
|
add(b, (unsigned char)(((c->chr >> 16) & 0x1F) | 0xC0));
|
|
|
|
add(b, (unsigned char)((c->chr >> 8) & 0xFF));
|
|
|
|
add(b, (unsigned char)(c->chr & 0xFF));
|
|
|
|
} else if (c->chr < 0x10000000) {
|
|
|
|
add(b, (unsigned char)(((c->chr >> 24) & 0x0F) | 0xE0));
|
|
|
|
add(b, (unsigned char)((c->chr >> 16) & 0xFF));
|
|
|
|
add(b, (unsigned char)((c->chr >> 8) & 0xFF));
|
|
|
|
add(b, (unsigned char)(c->chr & 0xFF));
|
|
|
|
} else {
|
|
|
|
add(b, 0xF0);
|
|
|
|
add(b, (unsigned char)((c->chr >> 24) & 0xFF));
|
|
|
|
add(b, (unsigned char)((c->chr >> 16) & 0xFF));
|
|
|
|
add(b, (unsigned char)((c->chr >> 8) & 0xFF));
|
|
|
|
add(b, (unsigned char)(c->chr & 0xFF));
|
|
|
|
}
|
|
|
|
*state = c->chr & ~0xFF;
|
|
|
|
}
|
|
|
|
static void makeliteral_attr(struct buf *b, termchar *c, unsigned long *state)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* My encoding for attributes is 16-bit-granular and assumes
|
|
|
|
* that the top bit of the word is never required. I either
|
|
|
|
* store a two-byte value with the top bit clear (indicating
|
|
|
|
* just that value), or a four-byte value with the top bit set
|
|
|
|
* (indicating the same value with its top bit clear).
|
2004-11-28 18:13:34 +03:00
|
|
|
*
|
|
|
|
* However, first I permute the bits of the attribute value, so
|
|
|
|
* that the eight bits of colour (four in each of fg and bg)
|
|
|
|
* which are never non-zero unless xterm 256-colour mode is in
|
|
|
|
* use are placed higher up the word than everything else. This
|
|
|
|
* ensures that attribute values remain 16-bit _unless_ the
|
|
|
|
* user uses extended colour.
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
*/
|
2004-11-28 18:13:34 +03:00
|
|
|
unsigned attr, colourbits;
|
|
|
|
|
|
|
|
attr = c->attr;
|
|
|
|
|
|
|
|
assert(ATTR_BGSHIFT > ATTR_FGSHIFT);
|
|
|
|
|
|
|
|
colourbits = (attr >> (ATTR_BGSHIFT + 4)) & 0xF;
|
|
|
|
colourbits <<= 4;
|
|
|
|
colourbits |= (attr >> (ATTR_FGSHIFT + 4)) & 0xF;
|
|
|
|
|
|
|
|
attr = (((attr >> (ATTR_BGSHIFT + 8)) << (ATTR_BGSHIFT + 4)) |
|
|
|
|
(attr & ((1 << (ATTR_BGSHIFT + 4))-1)));
|
|
|
|
attr = (((attr >> (ATTR_FGSHIFT + 8)) << (ATTR_FGSHIFT + 4)) |
|
|
|
|
(attr & ((1 << (ATTR_FGSHIFT + 4))-1)));
|
|
|
|
|
|
|
|
attr |= (colourbits << (32-9));
|
|
|
|
|
|
|
|
if (attr < 0x8000) {
|
|
|
|
add(b, (unsigned char)((attr >> 8) & 0xFF));
|
|
|
|
add(b, (unsigned char)(attr & 0xFF));
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
} else {
|
2004-11-28 18:13:34 +03:00
|
|
|
add(b, (unsigned char)(((attr >> 24) & 0x7F) | 0x80));
|
|
|
|
add(b, (unsigned char)((attr >> 16) & 0xFF));
|
|
|
|
add(b, (unsigned char)((attr >> 8) & 0xFF));
|
|
|
|
add(b, (unsigned char)(attr & 0xFF));
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
|
|
|
}
|
2017-09-30 19:32:32 +03:00
|
|
|
static void makeliteral_truecolour(struct buf *b, termchar *c, unsigned long *state)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Put the used parts of the colour info into the buffer.
|
|
|
|
*/
|
|
|
|
add(b, ((c->truecolour.fg.enabled ? 1 : 0) |
|
|
|
|
(c->truecolour.bg.enabled ? 2 : 0)));
|
|
|
|
if (c->truecolour.fg.enabled) {
|
|
|
|
add(b, c->truecolour.fg.r);
|
|
|
|
add(b, c->truecolour.fg.g);
|
|
|
|
add(b, c->truecolour.fg.b);
|
|
|
|
}
|
|
|
|
if (c->truecolour.bg.enabled) {
|
|
|
|
add(b, c->truecolour.bg.r);
|
|
|
|
add(b, c->truecolour.bg.g);
|
|
|
|
add(b, c->truecolour.bg.b);
|
|
|
|
}
|
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
static void makeliteral_cc(struct buf *b, termchar *c, unsigned long *state)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* For combining characters, I just encode a bunch of ordinary
|
|
|
|
* chars using makeliteral_chr, and terminate with a \0
|
|
|
|
* character (which I know won't come up as a combining char
|
|
|
|
* itself).
|
|
|
|
*
|
|
|
|
* I don't use the stateful encoding in makeliteral_chr.
|
|
|
|
*/
|
|
|
|
unsigned long zstate;
|
|
|
|
termchar z;
|
|
|
|
|
|
|
|
while (c->cc_next) {
|
|
|
|
c += c->cc_next;
|
|
|
|
|
|
|
|
assert(c->chr != 0);
|
|
|
|
|
|
|
|
zstate = 0;
|
|
|
|
makeliteral_chr(b, c, &zstate);
|
|
|
|
}
|
|
|
|
|
|
|
|
z.chr = 0;
|
|
|
|
zstate = 0;
|
|
|
|
makeliteral_chr(b, &z, &zstate);
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
static termline *decompressline(unsigned char *data, int *bytes_used);
|
|
|
|
|
|
|
|
static unsigned char *compressline(termline *ldata)
|
|
|
|
{
|
|
|
|
struct buf buffer = { NULL, 0, 0 }, *b = &buffer;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First, store the column count, 7 bits at a time, least
|
|
|
|
* significant `digit' first, with the high bit set on all but
|
|
|
|
* the last.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
int n = ldata->cols;
|
|
|
|
while (n >= 128) {
|
|
|
|
add(b, (unsigned char)((n & 0x7F) | 0x80));
|
|
|
|
n >>= 7;
|
|
|
|
}
|
|
|
|
add(b, (unsigned char)(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Next store the lattrs; same principle.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
int n = ldata->lattr;
|
|
|
|
while (n >= 128) {
|
|
|
|
add(b, (unsigned char)((n & 0x7F) | 0x80));
|
|
|
|
n >>= 7;
|
|
|
|
}
|
|
|
|
add(b, (unsigned char)(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now we store a sequence of separate run-length encoded
|
|
|
|
* fragments, each containing exactly as many symbols as there
|
|
|
|
* are columns in the ldata.
|
|
|
|
*
|
|
|
|
* All of these have a common basic format:
|
|
|
|
*
|
|
|
|
* - a byte 00-7F indicates that X+1 literals follow it
|
|
|
|
* - a byte 80-FF indicates that a single literal follows it
|
|
|
|
* and expects to be repeated (X-0x80)+2 times.
|
|
|
|
*
|
|
|
|
* The format of the `literals' varies between the fragments.
|
|
|
|
*/
|
|
|
|
makerle(b, ldata, makeliteral_chr);
|
|
|
|
makerle(b, ldata, makeliteral_attr);
|
2017-09-30 19:32:32 +03:00
|
|
|
makerle(b, ldata, makeliteral_truecolour);
|
2004-10-14 20:42:43 +04:00
|
|
|
makerle(b, ldata, makeliteral_cc);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Diagnostics: ensure that the compressed data really does
|
|
|
|
* decompress to the right thing.
|
2004-10-15 15:29:02 +04:00
|
|
|
*
|
2005-04-01 17:25:13 +04:00
|
|
|
* This is a bit performance-heavy for production code.
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
*/
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
#ifndef CHECK_SB_COMPRESSION
|
|
|
|
{
|
|
|
|
int dused;
|
|
|
|
termline *dcl;
|
2004-10-14 20:42:43 +04:00
|
|
|
int i;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
#ifdef DIAGNOSTIC_SB_COMPRESSION
|
|
|
|
for (i = 0; i < b->len; i++) {
|
|
|
|
printf(" %02x ", b->data[i]);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
dcl = decompressline(b->data, &dused);
|
|
|
|
assert(b->len == dused);
|
|
|
|
assert(ldata->cols == dcl->cols);
|
|
|
|
assert(ldata->lattr == dcl->lattr);
|
2004-10-14 20:42:43 +04:00
|
|
|
for (i = 0; i < ldata->cols; i++)
|
|
|
|
assert(termchars_equal(&ldata->chars[i], &dcl->chars[i]));
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
#ifdef DIAGNOSTIC_SB_COMPRESSION
|
|
|
|
printf("%d cols (%d bytes) -> %d bytes (factor of %g)\n",
|
|
|
|
ldata->cols, 4 * ldata->cols, dused,
|
|
|
|
(double)dused / (4 * ldata->cols));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
freeline(dcl);
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-01 17:25:13 +04:00
|
|
|
#endif /* TERM_CC_DIAGS */
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Trim the allocated memory so we don't waste any, and return.
|
|
|
|
*/
|
|
|
|
return sresize(b->data, b->len, unsigned char);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void readrle(struct buf *b, termline *ldata,
|
|
|
|
void (*readliteral)(struct buf *b, termchar *c,
|
2004-10-14 20:42:43 +04:00
|
|
|
termline *ldata, unsigned long *state))
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
unsigned long state = 0;
|
|
|
|
|
|
|
|
while (n < ldata->cols) {
|
|
|
|
int hdr = get(b);
|
|
|
|
|
|
|
|
if (hdr >= 0x80) {
|
|
|
|
/* A run. */
|
|
|
|
|
|
|
|
int pos = b->len, count = hdr + 2 - 0x80;
|
|
|
|
while (count--) {
|
|
|
|
assert(n < ldata->cols);
|
|
|
|
b->len = pos;
|
2004-10-14 20:42:43 +04:00
|
|
|
readliteral(b, ldata->chars + n, ldata, &state);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
n++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Just a sequence of consecutive literals. */
|
|
|
|
|
|
|
|
int count = hdr + 1;
|
|
|
|
while (count--) {
|
|
|
|
assert(n < ldata->cols);
|
2004-10-14 20:42:43 +04:00
|
|
|
readliteral(b, ldata->chars + n, ldata, &state);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(n == ldata->cols);
|
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
static void readliteral_chr(struct buf *b, termchar *c, termline *ldata,
|
|
|
|
unsigned long *state)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
{
|
|
|
|
int byte;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 00000000-0000007F: 0xxxxxxx
|
|
|
|
* 00000080-00003FFF: 10xxxxxx xxxxxxxx
|
|
|
|
* 00004000-001FFFFF: 110xxxxx xxxxxxxx xxxxxxxx
|
|
|
|
* 00200000-0FFFFFFF: 1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx
|
|
|
|
* 10000000-FFFFFFFF: 11110ZZZ xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
|
|
|
|
*/
|
|
|
|
|
|
|
|
byte = get(b);
|
|
|
|
if (byte < 0x80) {
|
|
|
|
c->chr = byte | *state;
|
|
|
|
} else if (byte < 0xC0) {
|
|
|
|
c->chr = (byte &~ 0xC0) << 8;
|
|
|
|
c->chr |= get(b);
|
|
|
|
} else if (byte < 0xE0) {
|
|
|
|
c->chr = (byte &~ 0xE0) << 16;
|
|
|
|
c->chr |= get(b) << 8;
|
|
|
|
c->chr |= get(b);
|
|
|
|
} else if (byte < 0xF0) {
|
|
|
|
c->chr = (byte &~ 0xF0) << 24;
|
|
|
|
c->chr |= get(b) << 16;
|
|
|
|
c->chr |= get(b) << 8;
|
|
|
|
c->chr |= get(b);
|
|
|
|
} else {
|
|
|
|
assert(byte == 0xF0);
|
|
|
|
c->chr = get(b) << 24;
|
|
|
|
c->chr |= get(b) << 16;
|
|
|
|
c->chr |= get(b) << 8;
|
|
|
|
c->chr |= get(b);
|
|
|
|
}
|
|
|
|
*state = c->chr & ~0xFF;
|
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
static void readliteral_attr(struct buf *b, termchar *c, termline *ldata,
|
|
|
|
unsigned long *state)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
{
|
2004-11-28 18:13:34 +03:00
|
|
|
unsigned val, attr, colourbits;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
val = get(b) << 8;
|
|
|
|
val |= get(b);
|
|
|
|
|
|
|
|
if (val >= 0x8000) {
|
2004-11-28 18:13:34 +03:00
|
|
|
val &= ~0x8000;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
val <<= 16;
|
|
|
|
val |= get(b) << 8;
|
|
|
|
val |= get(b);
|
|
|
|
}
|
|
|
|
|
2004-11-28 18:13:34 +03:00
|
|
|
colourbits = (val >> (32-9)) & 0xFF;
|
|
|
|
attr = (val & ((1<<(32-9))-1));
|
|
|
|
|
|
|
|
attr = (((attr >> (ATTR_FGSHIFT + 4)) << (ATTR_FGSHIFT + 8)) |
|
|
|
|
(attr & ((1 << (ATTR_FGSHIFT + 4))-1)));
|
|
|
|
attr = (((attr >> (ATTR_BGSHIFT + 4)) << (ATTR_BGSHIFT + 8)) |
|
|
|
|
(attr & ((1 << (ATTR_BGSHIFT + 4))-1)));
|
|
|
|
|
|
|
|
attr |= (colourbits >> 4) << (ATTR_BGSHIFT + 4);
|
|
|
|
attr |= (colourbits & 0xF) << (ATTR_FGSHIFT + 4);
|
|
|
|
|
|
|
|
c->attr = attr;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
2017-09-30 19:32:32 +03:00
|
|
|
static void readliteral_truecolour(struct buf *b, termchar *c, termline *ldata,
|
|
|
|
unsigned long *state)
|
|
|
|
{
|
|
|
|
int flags = get(b);
|
|
|
|
|
|
|
|
if (flags & 1) {
|
|
|
|
c->truecolour.fg.enabled = TRUE;
|
|
|
|
c->truecolour.fg.r = get(b);
|
|
|
|
c->truecolour.fg.g = get(b);
|
|
|
|
c->truecolour.fg.b = get(b);
|
|
|
|
} else {
|
|
|
|
c->truecolour.fg = optionalrgb_none;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & 2) {
|
|
|
|
c->truecolour.bg.enabled = TRUE;
|
|
|
|
c->truecolour.bg.r = get(b);
|
|
|
|
c->truecolour.bg.g = get(b);
|
|
|
|
c->truecolour.bg.b = get(b);
|
|
|
|
} else {
|
|
|
|
c->truecolour.bg = optionalrgb_none;
|
|
|
|
}
|
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
static void readliteral_cc(struct buf *b, termchar *c, termline *ldata,
|
|
|
|
unsigned long *state)
|
|
|
|
{
|
|
|
|
termchar n;
|
|
|
|
unsigned long zstate;
|
|
|
|
int x = c - ldata->chars;
|
|
|
|
|
|
|
|
c->cc_next = 0;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
zstate = 0;
|
|
|
|
readliteral_chr(b, &n, ldata, &zstate);
|
|
|
|
if (!n.chr)
|
|
|
|
break;
|
|
|
|
add_cc(ldata, x, n.chr);
|
|
|
|
}
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
static termline *decompressline(unsigned char *data, int *bytes_used)
|
|
|
|
{
|
|
|
|
int ncols, byte, shift;
|
|
|
|
struct buf buffer, *b = &buffer;
|
|
|
|
termline *ldata;
|
|
|
|
|
|
|
|
b->data = data;
|
|
|
|
b->len = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First read in the column count.
|
|
|
|
*/
|
|
|
|
ncols = shift = 0;
|
|
|
|
do {
|
|
|
|
byte = get(b);
|
|
|
|
ncols |= (byte & 0x7F) << shift;
|
|
|
|
shift += 7;
|
|
|
|
} while (byte & 0x80);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now create the output termline.
|
|
|
|
*/
|
|
|
|
ldata = snew(termline);
|
|
|
|
ldata->chars = snewn(ncols, termchar);
|
2004-10-14 20:42:43 +04:00
|
|
|
ldata->cols = ldata->size = ncols;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata->temporary = TRUE;
|
2004-10-14 20:42:43 +04:00
|
|
|
ldata->cc_free = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We must set all the cc pointers in ldata->chars to 0 right
|
|
|
|
* now, so that cc diagnostics that verify the integrity of the
|
|
|
|
* whole line will make sense while we're in the middle of
|
|
|
|
* building it up.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < ldata->cols; i++)
|
|
|
|
ldata->chars[i].cc_next = 0;
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Now read in the lattr.
|
|
|
|
*/
|
|
|
|
ldata->lattr = shift = 0;
|
|
|
|
do {
|
|
|
|
byte = get(b);
|
|
|
|
ldata->lattr |= (byte & 0x7F) << shift;
|
|
|
|
shift += 7;
|
|
|
|
} while (byte & 0x80);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now we read in each of the RLE streams in turn.
|
|
|
|
*/
|
|
|
|
readrle(b, ldata, readliteral_chr);
|
|
|
|
readrle(b, ldata, readliteral_attr);
|
2017-09-30 19:32:32 +03:00
|
|
|
readrle(b, ldata, readliteral_truecolour);
|
2004-10-14 20:42:43 +04:00
|
|
|
readrle(b, ldata, readliteral_cc);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
/* Return the number of bytes read, for diagnostic purposes. */
|
|
|
|
if (bytes_used)
|
|
|
|
*bytes_used = b->len;
|
|
|
|
|
|
|
|
return ldata;
|
|
|
|
}
|
|
|
|
|
2001-05-17 12:53:13 +04:00
|
|
|
/*
|
|
|
|
* Resize a line to make it `cols' columns wide.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
static void resizeline(Terminal *term, termline *line, int cols)
|
2001-05-17 12:53:13 +04:00
|
|
|
{
|
2004-10-15 14:48:27 +04:00
|
|
|
int i, oldcols;
|
2001-05-17 12:53:13 +04:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (line->cols != cols) {
|
2004-10-15 14:48:27 +04:00
|
|
|
|
|
|
|
oldcols = line->cols;
|
|
|
|
|
2001-05-17 12:53:13 +04:00
|
|
|
/*
|
|
|
|
* This line is the wrong length, which probably means it
|
|
|
|
* hasn't been accessed since a resize. Resize it now.
|
2004-10-14 20:42:43 +04:00
|
|
|
*
|
|
|
|
* First, go through all the characters that will be thrown
|
|
|
|
* out in the resize (if we're shrinking the line) and
|
|
|
|
* return their cc lists to the cc free list.
|
|
|
|
*/
|
2004-10-15 14:48:27 +04:00
|
|
|
for (i = cols; i < oldcols; i++)
|
2004-10-14 20:42:43 +04:00
|
|
|
clear_cc(line, i);
|
|
|
|
|
2004-10-15 14:48:27 +04:00
|
|
|
/*
|
|
|
|
* If we're shrinking the line, we now bodily move the
|
|
|
|
* entire cc section from where it started to where it now
|
|
|
|
* needs to be. (We have to do this before the resize, so
|
|
|
|
* that the data we're copying is still there. However, if
|
|
|
|
* we're expanding, we have to wait until _after_ the
|
|
|
|
* resize so that the space we're copying into is there.)
|
|
|
|
*/
|
|
|
|
if (cols < oldcols)
|
|
|
|
memmove(line->chars + cols, line->chars + oldcols,
|
|
|
|
(line->size - line->cols) * TSIZE);
|
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
/*
|
|
|
|
* Now do the actual resize, leaving the _same_ amount of
|
|
|
|
* cc space as there was to begin with.
|
2001-05-17 12:53:13 +04:00
|
|
|
*/
|
2004-10-15 14:48:27 +04:00
|
|
|
line->size += cols - oldcols;
|
2004-10-14 20:42:43 +04:00
|
|
|
line->chars = sresize(line->chars, line->size, TTYPE);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line->cols = cols;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/*
|
2004-10-15 14:48:27 +04:00
|
|
|
* If we're expanding the line, _now_ we move the cc
|
|
|
|
* section.
|
2004-10-14 20:42:43 +04:00
|
|
|
*/
|
2004-10-15 14:48:27 +04:00
|
|
|
if (cols > oldcols)
|
|
|
|
memmove(line->chars + cols, line->chars + oldcols,
|
|
|
|
(line->size - line->cols) * TSIZE);
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Go through what's left of the original line, and adjust
|
|
|
|
* the first cc_next pointer in each list. (All the
|
|
|
|
* subsequent ones are still valid because they are
|
|
|
|
* relative offsets within the cc block.) Also do the same
|
|
|
|
* to the head of the cc_free list.
|
|
|
|
*/
|
2004-10-15 14:48:27 +04:00
|
|
|
for (i = 0; i < oldcols && i < cols; i++)
|
2004-10-14 20:42:43 +04:00
|
|
|
if (line->chars[i].cc_next)
|
2004-10-15 14:48:27 +04:00
|
|
|
line->chars[i].cc_next += cols - oldcols;
|
2004-10-14 20:42:43 +04:00
|
|
|
if (line->cc_free)
|
2004-10-15 14:48:27 +04:00
|
|
|
line->cc_free += cols - oldcols;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* And finally fill in the new space with erase chars. (We
|
|
|
|
* don't have to worry about cc lists here, because we
|
|
|
|
* _know_ the erase char doesn't have one.)
|
|
|
|
*/
|
2004-10-15 14:48:27 +04:00
|
|
|
for (i = oldcols; i < cols; i++)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line->chars[i] = term->basic_erase_char;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
|
|
|
cc_check(line);
|
|
|
|
#endif
|
2001-05-17 12:53:13 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-03-06 15:51:12 +03:00
|
|
|
/*
|
|
|
|
* Get the number of lines in the scrollback.
|
|
|
|
*/
|
|
|
|
static int sblines(Terminal *term)
|
|
|
|
{
|
|
|
|
int sblines = count234(term->scrollback);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->erase_to_scrollback &&
|
2003-03-06 15:51:12 +03:00
|
|
|
term->alt_which && term->alt_screen) {
|
|
|
|
sblines += term->alt_sblines;
|
|
|
|
}
|
|
|
|
return sblines;
|
|
|
|
}
|
|
|
|
|
2001-04-28 19:32:25 +04:00
|
|
|
/*
|
|
|
|
* Retrieve a line of the screen or of the scrollback, according to
|
|
|
|
* whether the y coordinate is non-negative or negative
|
|
|
|
* (respectively).
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
static termline *lineptr(Terminal *term, int y, int lineno, int screen)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *line;
|
2001-04-28 19:32:25 +04:00
|
|
|
tree234 *whichtree;
|
2001-05-17 12:53:13 +04:00
|
|
|
int treeindex;
|
2001-04-28 19:32:25 +04:00
|
|
|
|
|
|
|
if (y >= 0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
whichtree = term->screen;
|
2001-04-28 19:32:25 +04:00
|
|
|
treeindex = y;
|
|
|
|
} else {
|
2003-03-06 15:51:12 +03:00
|
|
|
int altlines = 0;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
assert(!screen);
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->erase_to_scrollback &&
|
2003-03-06 15:51:12 +03:00
|
|
|
term->alt_which && term->alt_screen) {
|
|
|
|
altlines = term->alt_sblines;
|
|
|
|
}
|
|
|
|
if (y < -altlines) {
|
|
|
|
whichtree = term->scrollback;
|
|
|
|
treeindex = y + altlines + count234(term->scrollback);
|
|
|
|
} else {
|
|
|
|
whichtree = term->alt_screen;
|
|
|
|
treeindex = y + term->alt_sblines;
|
|
|
|
/* treeindex = y + count234(term->alt_screen); */
|
|
|
|
}
|
2001-04-28 19:32:25 +04:00
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (whichtree == term->scrollback) {
|
|
|
|
unsigned char *cline = index234(whichtree, treeindex);
|
|
|
|
line = decompressline(cline, NULL);
|
|
|
|
} else {
|
|
|
|
line = index234(whichtree, treeindex);
|
|
|
|
}
|
2001-04-28 19:32:25 +04:00
|
|
|
|
|
|
|
/* We assume that we don't screw up and retrieve something out of range. */
|
2005-03-06 18:00:45 +03:00
|
|
|
if (line == NULL) {
|
2017-11-26 20:43:02 +03:00
|
|
|
modalfatalbox("line==NULL in terminal.c\n"
|
|
|
|
"lineno=%d y=%d w=%d h=%d\n"
|
|
|
|
"count(scrollback=%p)=%d\n"
|
|
|
|
"count(screen=%p)=%d\n"
|
|
|
|
"count(alt=%p)=%d alt_sblines=%d\n"
|
|
|
|
"whichtree=%p treeindex=%d\n\n"
|
|
|
|
"Please contact <putty@projects.tartarus.org> "
|
|
|
|
"and pass on the above information.",
|
|
|
|
lineno, y, term->cols, term->rows,
|
|
|
|
term->scrollback, count234(term->scrollback),
|
|
|
|
term->screen, count234(term->screen),
|
|
|
|
term->alt_screen, count234(term->alt_screen),
|
|
|
|
term->alt_sblines, whichtree, treeindex);
|
2005-03-06 17:48:22 +03:00
|
|
|
}
|
2001-04-28 19:32:25 +04:00
|
|
|
assert(line != NULL);
|
|
|
|
|
2014-07-24 01:48:02 +04:00
|
|
|
/*
|
|
|
|
* Here we resize lines to _at least_ the right length, but we
|
|
|
|
* don't truncate them. Truncation is done as a side effect of
|
|
|
|
* modifying the line.
|
|
|
|
*
|
|
|
|
* The point of this policy is to try to arrange that resizing the
|
|
|
|
* terminal window repeatedly - e.g. successive steps in an X11
|
|
|
|
* opaque window-resize drag, or resizing as a side effect of
|
|
|
|
* retiling by tiling WMs such as xmonad - does not throw away
|
|
|
|
* data gratuitously. Specifically, we want a sequence of resize
|
|
|
|
* operations with no terminal output between them to have the
|
|
|
|
* same effect as a single resize to the ultimate terminal size,
|
|
|
|
* and also (for the case in which xmonad narrows a window that's
|
|
|
|
* scrolling things) we want scrolling up new text at the bottom
|
|
|
|
* of a narrowed window to avoid truncating lines further up when
|
|
|
|
* the window is re-widened.
|
|
|
|
*/
|
|
|
|
if (term->cols > line->cols)
|
|
|
|
resizeline(term, line, term->cols);
|
2001-04-28 19:32:25 +04:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
return line;
|
2001-04-28 19:32:25 +04:00
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
#define lineptr(x) (lineptr)(term,x,__LINE__,FALSE)
|
|
|
|
#define scrlineptr(x) (lineptr)(term,x,__LINE__,TRUE)
|
2002-10-22 20:11:33 +04:00
|
|
|
|
2014-07-24 01:48:02 +04:00
|
|
|
/*
|
|
|
|
* Coerce a termline to the terminal's current width. Unlike the
|
|
|
|
* optional resize in lineptr() above, this is potentially destructive
|
|
|
|
* of text, since it can shrink as well as grow the line.
|
|
|
|
*
|
|
|
|
* We call this whenever a termline is actually going to be modified.
|
|
|
|
* Helpfully, putting a single call to this function in check_boundary
|
|
|
|
* deals with _nearly_ all such cases, leaving only a few things like
|
|
|
|
* bulk erase and ESC#8 to handle separately.
|
|
|
|
*/
|
|
|
|
static void check_line_size(Terminal *term, termline *line)
|
|
|
|
{
|
|
|
|
if (term->cols != line->cols) /* trivial optimisation */
|
|
|
|
resizeline(term, line, term->cols);
|
|
|
|
}
|
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
static void term_schedule_tblink(Terminal *term);
|
|
|
|
static void term_schedule_cblink(Terminal *term);
|
|
|
|
|
2012-09-19 01:42:48 +04:00
|
|
|
static void term_timer(void *ctx, unsigned long now)
|
2004-11-27 16:20:21 +03:00
|
|
|
{
|
|
|
|
Terminal *term = (Terminal *)ctx;
|
|
|
|
int update = FALSE;
|
|
|
|
|
2012-09-19 01:42:48 +04:00
|
|
|
if (term->tblink_pending && now == term->next_tblink) {
|
2004-11-27 16:20:21 +03:00
|
|
|
term->tblinker = !term->tblinker;
|
|
|
|
term->tblink_pending = FALSE;
|
|
|
|
term_schedule_tblink(term);
|
|
|
|
update = TRUE;
|
|
|
|
}
|
|
|
|
|
2012-09-19 01:42:48 +04:00
|
|
|
if (term->cblink_pending && now == term->next_cblink) {
|
2004-11-27 16:20:21 +03:00
|
|
|
term->cblinker = !term->cblinker;
|
|
|
|
term->cblink_pending = FALSE;
|
|
|
|
term_schedule_cblink(term);
|
|
|
|
update = TRUE;
|
|
|
|
}
|
|
|
|
|
2012-09-19 01:42:48 +04:00
|
|
|
if (term->in_vbell && now == term->vbell_end) {
|
2004-11-27 16:20:21 +03:00
|
|
|
term->in_vbell = FALSE;
|
|
|
|
update = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (update ||
|
2012-09-19 01:42:48 +04:00
|
|
|
(term->window_update_pending && now == term->next_update))
|
2004-11-27 16:20:21 +03:00
|
|
|
term_update(term);
|
|
|
|
}
|
|
|
|
|
2004-11-28 18:13:34 +03:00
|
|
|
static void term_schedule_update(Terminal *term)
|
|
|
|
{
|
|
|
|
if (!term->window_update_pending) {
|
|
|
|
term->window_update_pending = TRUE;
|
|
|
|
term->next_update = schedule_timer(UPDATE_DELAY, term_timer, term);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
/*
|
|
|
|
* Call this whenever the terminal window state changes, to queue
|
|
|
|
* an update.
|
|
|
|
*/
|
|
|
|
static void seen_disp_event(Terminal *term)
|
|
|
|
{
|
|
|
|
term->seen_disp_event = TRUE; /* for scrollback-reset-on-activity */
|
2004-11-28 18:13:34 +03:00
|
|
|
term_schedule_update(term);
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Call when the terminal's blinking-text settings change, or when
|
|
|
|
* a text blink has just occurred.
|
|
|
|
*/
|
|
|
|
static void term_schedule_tblink(Terminal *term)
|
|
|
|
{
|
|
|
|
if (term->blink_is_real) {
|
2004-11-27 22:34:45 +03:00
|
|
|
if (!term->tblink_pending)
|
|
|
|
term->next_tblink = schedule_timer(TBLINK_DELAY, term_timer, term);
|
2004-11-27 16:20:21 +03:00
|
|
|
term->tblink_pending = TRUE;
|
|
|
|
} else {
|
|
|
|
term->tblinker = 1; /* reset when not in use */
|
|
|
|
term->tblink_pending = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Likewise with cursor blinks.
|
|
|
|
*/
|
|
|
|
static void term_schedule_cblink(Terminal *term)
|
|
|
|
{
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->blink_cur && term->has_focus) {
|
2004-11-27 22:34:45 +03:00
|
|
|
if (!term->cblink_pending)
|
|
|
|
term->next_cblink = schedule_timer(CBLINK_DELAY, term_timer, term);
|
2004-11-27 16:20:21 +03:00
|
|
|
term->cblink_pending = TRUE;
|
|
|
|
} else {
|
|
|
|
term->cblinker = 1; /* reset when not in use */
|
|
|
|
term->cblink_pending = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Call to reset cursor blinking on new output.
|
|
|
|
*/
|
|
|
|
static void term_reset_cblink(Terminal *term)
|
|
|
|
{
|
|
|
|
seen_disp_event(term);
|
|
|
|
term->cblinker = 1;
|
|
|
|
term->cblink_pending = FALSE;
|
|
|
|
term_schedule_cblink(term);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Call to begin a visual bell.
|
|
|
|
*/
|
|
|
|
static void term_schedule_vbell(Terminal *term, int already_started,
|
|
|
|
long startpoint)
|
|
|
|
{
|
|
|
|
long ticks_already_gone;
|
|
|
|
|
|
|
|
if (already_started)
|
|
|
|
ticks_already_gone = GETTICKCOUNT() - startpoint;
|
|
|
|
else
|
|
|
|
ticks_already_gone = 0;
|
|
|
|
|
|
|
|
if (ticks_already_gone < VBELL_DELAY) {
|
|
|
|
term->in_vbell = TRUE;
|
|
|
|
term->vbell_end = schedule_timer(VBELL_DELAY - ticks_already_gone,
|
|
|
|
term_timer, term);
|
|
|
|
} else {
|
|
|
|
term->in_vbell = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Set up power-on settings for the terminal.
|
2006-02-19 17:59:48 +03:00
|
|
|
* If 'clear' is false, don't actually clear the primary screen, and
|
|
|
|
* position the cursor below the last non-blank line (scrolling if
|
|
|
|
* necessary).
|
1999-01-08 16:02:13 +03:00
|
|
|
*/
|
2006-02-19 17:59:48 +03:00
|
|
|
static void power_on(Terminal *term, int clear)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_x = term->alt_y = 0;
|
|
|
|
term->savecurs.x = term->savecurs.y = 0;
|
2006-08-15 16:45:21 +04:00
|
|
|
term->alt_savecurs.x = term->alt_savecurs.y = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_t = term->marg_t = 0;
|
|
|
|
if (term->rows != -1)
|
|
|
|
term->alt_b = term->marg_b = term->rows - 1;
|
1999-01-08 16:02:13 +03:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_b = term->marg_b = 0;
|
|
|
|
if (term->cols != -1) {
|
1999-01-08 16:02:13 +03:00
|
|
|
int i;
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->cols; i++)
|
|
|
|
term->tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->alt_om = term->dec_om = conf_get_int(term->conf, CONF_dec_om);
|
2002-10-23 16:41:35 +04:00
|
|
|
term->alt_ins = term->insert = FALSE;
|
2006-08-15 16:45:21 +04:00
|
|
|
term->alt_wnext = term->wrapnext =
|
|
|
|
term->save_wnext = term->alt_save_wnext = FALSE;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->alt_wrap = term->wrap = conf_get_int(term->conf, CONF_wrap_mode);
|
2006-08-15 16:45:21 +04:00
|
|
|
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;
|
2002-10-23 16:41:35 +04:00
|
|
|
term->utf_state = 0;
|
2006-08-15 16:45:21 +04:00
|
|
|
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;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->rvideo = 0;
|
|
|
|
term->in_vbell = FALSE;
|
|
|
|
term->cursor_on = 1;
|
|
|
|
term->big_cursor = 0;
|
2006-08-16 02:48:01 +04:00
|
|
|
term->default_attr = term->save_attr =
|
|
|
|
term->alt_save_attr = term->curr_attr = ATTR_DEFAULT;
|
2017-10-01 22:59:00 +03:00
|
|
|
term->curr_truecolour.fg = term->curr_truecolour.bg = optionalrgb_none;
|
2017-10-08 15:45:08 +03:00
|
|
|
term->save_truecolour = term->alt_save_truecolour = term->curr_truecolour;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->term_editing = term->term_echoing = FALSE;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
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);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->erase_char = term->basic_erase_char;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_which = 0;
|
|
|
|
term_print_finish(term);
|
2008-12-20 21:52:09 +03:00
|
|
|
term->xterm_mouse = 0;
|
2013-01-24 02:59:17 +04:00
|
|
|
term->xterm_extended_mouse = 0;
|
|
|
|
term->urxvt_extended_mouse = 0;
|
2007-10-27 20:05:02 +04:00
|
|
|
set_raw_mouse_mode(term->frontend, FALSE);
|
2012-02-19 14:27:18 +04:00
|
|
|
term->bracketed_paste = FALSE;
|
1999-01-08 16:02:13 +03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < 256; i++)
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->wordness[i] = conf_get_int_int(term->conf, CONF_wordness, i);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->screen) {
|
|
|
|
swap_screen(term, 1, FALSE, FALSE);
|
|
|
|
erase_lots(term, FALSE, TRUE, TRUE);
|
|
|
|
swap_screen(term, 0, FALSE, FALSE);
|
2006-02-19 17:59:48 +03:00
|
|
|
if (clear)
|
|
|
|
erase_lots(term, FALSE, TRUE, TRUE);
|
|
|
|
term->curs.y = find_last_nonempty_line(term, term->screen) + 1;
|
|
|
|
if (term->curs.y == term->rows) {
|
|
|
|
term->curs.y--;
|
|
|
|
scroll(term, 0, term->rows - 1, 1, TRUE);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
term->curs.y = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2006-02-19 17:59:48 +03:00
|
|
|
term->curs.x = 0;
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
|
|
|
term_schedule_cblink(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Force a screen update.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_update(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
1999-01-08 16:02:13 +03:00
|
|
|
Context ctx;
|
2004-11-27 16:20:21 +03:00
|
|
|
|
|
|
|
term->window_update_pending = FALSE;
|
|
|
|
|
2002-10-26 16:58:13 +04:00
|
|
|
ctx = get_ctx(term->frontend);
|
1999-01-08 16:02:13 +03:00
|
|
|
if (ctx) {
|
2002-10-22 20:11:33 +04:00
|
|
|
int need_sbar_update = term->seen_disp_event;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->seen_disp_event && term->scroll_on_disp) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->disptop = 0; /* return to main screen */
|
|
|
|
term->seen_disp_event = 0;
|
2001-09-18 23:04:21 +04:00
|
|
|
need_sbar_update = TRUE;
|
1999-11-30 13:52:07 +03:00
|
|
|
}
|
2004-05-22 14:36:50 +04:00
|
|
|
|
2001-09-18 23:04:21 +04:00
|
|
|
if (need_sbar_update)
|
2002-10-22 20:11:33 +04:00
|
|
|
update_sbar(term);
|
|
|
|
do_paint(term, ctx, TRUE);
|
2002-10-26 16:58:13 +04:00
|
|
|
sys_cursor(term->frontend, term->curs.x, term->curs.y - term->disptop);
|
2001-05-06 18:35:20 +04:00
|
|
|
free_ctx(ctx);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-10-20 17:23:30 +04:00
|
|
|
/*
|
|
|
|
* Called from front end when a keypress occurs, to trigger
|
|
|
|
* anything magical that needs to happen in that situation.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_seen_key_event(Terminal *term)
|
2002-10-20 17:23:30 +04:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* On any keypress, clear the bell overload mechanism
|
|
|
|
* completely, on the grounds that large numbers of
|
|
|
|
* beeps coming from deliberate key action are likely
|
|
|
|
* to be intended (e.g. beeps from filename completion
|
|
|
|
* blocking repeatedly).
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->beep_overloaded = FALSE;
|
|
|
|
while (term->beephead) {
|
|
|
|
struct beeptime *tmp = term->beephead;
|
|
|
|
term->beephead = tmp->next;
|
2002-10-20 17:23:30 +04:00
|
|
|
sfree(tmp);
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->beeptail = NULL;
|
|
|
|
term->nbeeps = 0;
|
2002-10-20 17:23:30 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Reset the scrollback on keypress, if we're doing that.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->scroll_on_key) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->disptop = 0; /* return to main screen */
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2002-10-20 17:23:30 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Same as power_on(), but an external function.
|
|
|
|
*/
|
2006-02-19 17:59:48 +03:00
|
|
|
void term_pwron(Terminal *term, int clear)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2006-02-19 17:59:48 +03:00
|
|
|
power_on(term, clear);
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) /* cause ldisc to notice changes */
|
Move echo/edit state change functionality out of ldisc_send.
I'm not actually sure why we've always had back ends notify ldisc of
changes to echo/edit settings by giving ldisc_send(ldisc,NULL,0,0) a
special meaning, instead of by having a separate dedicated notify
function with its own prototype and parameter set. Coverity's recent
observation that the two kinds of call don't even have the same
requirements on the ldisc (particularly, whether ldisc->term can be
NULL) makes me realise that it's really high time I separated the two
conceptually different operations into actually different functions.
While I'm here, I've renamed the confusing ldisc_update() function
which that special operation ends up feeding to, because it's not
actually a function applying to an ldisc - it applies to a front end.
So ldisc_send(ldisc,NULL,0,0) is now ldisc_echoedit_update(ldisc), and
that in turn figures out the current echo/edit settings before passing
them on to frontend_echoedit_update(). I think that should be clearer.
2014-11-22 19:12:47 +03:00
|
|
|
ldisc_echoedit_update(term->ldisc);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->disptop = 0;
|
|
|
|
deselect(term);
|
|
|
|
term_update(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
static void set_erase_char(Terminal *term)
|
|
|
|
{
|
|
|
|
term->erase_char = term->basic_erase_char;
|
2017-10-08 15:43:27 +03:00
|
|
|
if (term->use_bce) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->erase_char.attr = (term->curr_attr &
|
|
|
|
(ATTR_FGMASK | ATTR_BGMASK));
|
2017-10-08 15:43:27 +03:00
|
|
|
term->erase_char.truecolour.bg = term->curr_truecolour.bg;
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
/*
|
|
|
|
* 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);
|
2016-11-17 23:25:27 +03:00
|
|
|
term->no_remote_clearscroll = conf_get_int(term->conf, CONF_no_remote_clearscroll);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
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);
|
2017-10-05 22:27:27 +03:00
|
|
|
term->true_colour = conf_get_int(term->conf, CONF_true_colour);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-07 02:04:20 +03:00
|
|
|
/*
|
|
|
|
* When the user reconfigures us, we need to check the forbidden-
|
2002-03-09 20:59:15 +03:00
|
|
|
* 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.
|
2002-03-07 02:04:20 +03:00
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
void term_reconfig(Terminal *term, Conf *conf)
|
2002-03-07 02:04:20 +03:00
|
|
|
{
|
2003-01-12 17:30:02 +03:00
|
|
|
/*
|
|
|
|
* Before adopting the new config, check all those terminal
|
|
|
|
* settings which control power-on defaults; and if they've
|
|
|
|
* changed, we will modify the current state as well as the
|
|
|
|
* default one. The full list is: Auto wrap mode, DEC Origin
|
|
|
|
* Mode, BCE, blinking text, character classes.
|
|
|
|
*/
|
2004-11-27 16:20:21 +03:00
|
|
|
int reset_wrap, reset_decom, reset_bce, reset_tblink, reset_charclass;
|
2003-01-12 17:30:02 +03:00
|
|
|
int i;
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
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));
|
2003-01-12 17:30:02 +03:00
|
|
|
reset_charclass = 0;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
if (conf_get_int_int(term->conf, CONF_wordness, i) !=
|
|
|
|
conf_get_int_int(conf, CONF_wordness, i))
|
2003-01-12 17:30:02 +03:00
|
|
|
reset_charclass = 1;
|
|
|
|
|
2004-10-15 15:14:42 +04:00
|
|
|
/*
|
|
|
|
* If the bidi or shaping settings have changed, flush the bidi
|
|
|
|
* cache completely.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
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)) {
|
2004-10-15 15:14:42 +04:00
|
|
|
for (i = 0; i < term->bidi_cache_size; i++) {
|
|
|
|
sfree(term->pre_bidi_cache[i].chars);
|
|
|
|
sfree(term->post_bidi_cache[i].chars);
|
|
|
|
term->pre_bidi_cache[i].width = -1;
|
|
|
|
term->pre_bidi_cache[i].chars = NULL;
|
|
|
|
term->post_bidi_cache[i].width = -1;
|
|
|
|
term->post_bidi_cache[i].chars = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
conf_free(term->conf);
|
|
|
|
term->conf = conf_copy(conf);
|
2003-01-12 17:30:02 +03:00
|
|
|
|
|
|
|
if (reset_wrap)
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->alt_wrap = term->wrap = conf_get_int(term->conf, CONF_wrap_mode);
|
2003-01-12 17:30:02 +03:00
|
|
|
if (reset_decom)
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->alt_om = term->dec_om = conf_get_int(term->conf, CONF_dec_om);
|
2003-04-12 13:05:28 +04:00
|
|
|
if (reset_bce) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->use_bce = conf_get_int(term->conf, CONF_bce);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
2003-04-12 13:05:28 +04:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
if (reset_tblink) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->blink_is_real = conf_get_int(term->conf, CONF_blinktext);
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
2003-01-12 17:30:02 +03:00
|
|
|
if (reset_charclass)
|
|
|
|
for (i = 0; i < 256; i++)
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->wordness[i] = conf_get_int_int(term->conf, CONF_wordness, i);
|
2003-01-12 17:30:02 +03:00
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (conf_get_int(term->conf, CONF_no_alt_screen))
|
2002-10-22 20:11:33 +04:00
|
|
|
swap_screen(term, 0, FALSE, FALSE);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (conf_get_int(term->conf, CONF_no_mouse_rep)) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->xterm_mouse = 0;
|
2002-10-26 16:58:13 +04:00
|
|
|
set_raw_mouse_mode(term->frontend, 0);
|
2002-03-09 14:47:39 +03:00
|
|
|
}
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (conf_get_int(term->conf, CONF_no_remote_charset)) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[0] = term->cset_attr[1] = CSET_ASCII;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->sco_acs = term->alt_sco_acs = 0;
|
|
|
|
term->utf = 0;
|
2002-03-07 02:04:20 +03:00
|
|
|
}
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!conf_get_str(term->conf, CONF_printer)) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term_print_finish(term);
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
|
|
|
term_schedule_cblink(term);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term_copy_stuff_from_conf(term);
|
2002-03-07 02:04:20 +03:00
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Clear the scrollback.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_clrsb(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2006-02-19 01:30:10 +03:00
|
|
|
unsigned char *line;
|
2014-07-24 22:13:16 +04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scroll forward to the current screen, if we were back in the
|
|
|
|
* scrollback somewhere until now.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->disptop = 0;
|
2014-07-24 22:13:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear the actual scrollback.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
while ((line = delpos234(term->scrollback, 0)) != NULL) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
sfree(line); /* this is compressed data, not a termline */
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2014-07-24 22:13:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* When clearing the scrollback, we also truncate any termlines on
|
|
|
|
* the current screen which have remembered data from a previous
|
|
|
|
* larger window size. Rationale: clearing the scrollback is
|
|
|
|
* sometimes done to protect privacy, so the user intention is
|
|
|
|
* specifically that we should not retain evidence of what
|
|
|
|
* previously happened in the terminal, and that ought to include
|
|
|
|
* evidence to the right as well as evidence above.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < term->rows; i++)
|
|
|
|
check_line_size(term, scrlineptr(i));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* There are now no lines of real scrollback which can be pulled
|
|
|
|
* back into the screen by a resize, and no lines of the alternate
|
|
|
|
* screen which should be displayed as if part of the scrollback.
|
|
|
|
*/
|
2003-03-07 21:18:38 +03:00
|
|
|
term->tempsblines = 0;
|
2003-03-06 15:51:12 +03:00
|
|
|
term->alt_sblines = 0;
|
2014-07-24 22:13:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Update the scrollbar to reflect the new state of the world.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
update_sbar(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2017-09-30 19:32:32 +03:00
|
|
|
const optionalrgb optionalrgb_none = {0, 0, 0, 0};
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Initialise the terminal.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
|
2003-01-14 21:28:23 +03:00
|
|
|
void *frontend)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
Terminal *term;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate a new Terminal structure and initialise the fields
|
|
|
|
* that need it.
|
|
|
|
*/
|
2003-03-29 19:14:26 +03:00
|
|
|
term = snew(Terminal);
|
2002-10-26 16:58:13 +04:00
|
|
|
term->frontend = frontend;
|
2003-01-14 21:28:23 +03:00
|
|
|
term->ucsdata = ucsdata;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->conf = conf_copy(myconf);
|
2002-10-26 16:58:13 +04:00
|
|
|
term->logctx = NULL;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level = TM_PUTTY;
|
|
|
|
strcpy(term->id_string, "\033[?6c");
|
2004-11-27 16:20:21 +03:00
|
|
|
term->cblink_pending = term->tblink_pending = FALSE;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->paste_buffer = NULL;
|
2003-01-08 12:15:56 +03:00
|
|
|
term->paste_len = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
bufchain_init(&term->inbuf);
|
|
|
|
bufchain_init(&term->printer_buf);
|
2002-10-23 16:41:35 +04:00
|
|
|
term->printing = term->only_printing = FALSE;
|
|
|
|
term->print_job = NULL;
|
|
|
|
term->vt52_mode = FALSE;
|
|
|
|
term->cr_lf_return = FALSE;
|
|
|
|
term->seen_disp_event = FALSE;
|
2007-10-27 20:05:02 +04:00
|
|
|
term->mouse_is_down = FALSE;
|
2002-10-23 16:41:35 +04:00
|
|
|
term->reset_132 = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
term->cblinker = term->tblinker = 0;
|
2002-10-23 16:41:35 +04:00
|
|
|
term->has_focus = 1;
|
|
|
|
term->repeat_off = FALSE;
|
|
|
|
term->termstate = TOPLEVEL;
|
|
|
|
term->selstate = NO_SELECTION;
|
2002-10-28 20:30:47 +03:00
|
|
|
term->curstype = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
|
2011-09-13 14:27:00 +04:00
|
|
|
term_copy_stuff_from_conf(term);
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
term->screen = term->alt_screen = term->scrollback = NULL;
|
2003-03-07 21:18:38 +03:00
|
|
|
term->tempsblines = 0;
|
2003-03-06 15:51:12 +03:00
|
|
|
term->alt_sblines = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->disptop = 0;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->disptext = NULL;
|
|
|
|
term->dispcursx = term->dispcursy = -1;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->tabs = NULL;
|
|
|
|
deselect(term);
|
|
|
|
term->rows = term->cols = -1;
|
2006-02-19 17:59:48 +03:00
|
|
|
power_on(term, TRUE);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->beephead = term->beeptail = NULL;
|
2003-02-01 15:26:33 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
term->scrollhead = term->scrolltail = NULL;
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->nbeeps = 0;
|
|
|
|
term->lastbeep = FALSE;
|
|
|
|
term->beep_overloaded = FALSE;
|
2002-11-29 03:32:03 +03:00
|
|
|
term->attr_mask = 0xffffffff;
|
2002-10-25 15:30:33 +04:00
|
|
|
term->resize_fn = NULL;
|
|
|
|
term->resize_ctx = NULL;
|
2003-03-29 21:30:14 +03:00
|
|
|
term->in_term_out = FALSE;
|
2004-05-22 14:36:50 +04:00
|
|
|
term->ltemp = NULL;
|
2004-10-14 20:42:43 +04:00
|
|
|
term->ltemp_size = 0;
|
2004-05-22 14:36:50 +04:00
|
|
|
term->wcFrom = NULL;
|
|
|
|
term->wcTo = NULL;
|
2004-10-14 20:42:43 +04:00
|
|
|
term->wcFromTo_size = 0;
|
2004-05-22 14:36:50 +04:00
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
term->window_update_pending = FALSE;
|
|
|
|
|
2004-05-22 14:36:50 +04:00
|
|
|
term->bidi_cache_size = 0;
|
|
|
|
term->pre_bidi_cache = term->post_bidi_cache = NULL;
|
2002-10-22 20:11:33 +04:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
/* FULL-TERMCHAR */
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->basic_erase_char.chr = CSET_ASCII | ' ';
|
|
|
|
term->basic_erase_char.attr = ATTR_DEFAULT;
|
2004-10-14 20:42:43 +04:00
|
|
|
term->basic_erase_char.cc_next = 0;
|
2017-09-30 19:32:32 +03:00
|
|
|
term->basic_erase_char.truecolour.fg = optionalrgb_none;
|
|
|
|
term->basic_erase_char.truecolour.bg = optionalrgb_none;
|
2004-10-14 20:42:43 +04:00
|
|
|
term->erase_char = term->basic_erase_char;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
2017-12-10 17:53:55 +03:00
|
|
|
term->last_selected_text = NULL;
|
|
|
|
term->last_selected_attr = NULL;
|
|
|
|
term->last_selected_tc = NULL;
|
|
|
|
term->last_selected_len = 0;
|
2017-12-10 18:45:45 +03:00
|
|
|
/* frontends will typically extend these with clipboard ids they
|
2017-12-09 15:00:13 +03:00
|
|
|
* know about */
|
2017-12-10 18:45:45 +03:00
|
|
|
term->mouse_select_clipboards[0] = CLIP_LOCAL;
|
|
|
|
term->n_mouse_select_clipboards = 1;
|
2017-12-09 15:00:13 +03:00
|
|
|
term->mouse_paste_clipboard = CLIP_NULL;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
return term;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2003-01-16 02:30:21 +03:00
|
|
|
void term_free(Terminal *term)
|
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *line;
|
2003-01-16 02:30:21 +03:00
|
|
|
struct beeptime *beep;
|
2004-05-22 14:36:50 +04:00
|
|
|
int i;
|
2003-01-16 02:30:21 +03:00
|
|
|
|
|
|
|
while ((line = delpos234(term->scrollback, 0)) != NULL)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
sfree(line); /* compressed data, not a termline */
|
2003-01-16 02:30:21 +03:00
|
|
|
freetree234(term->scrollback);
|
|
|
|
while ((line = delpos234(term->screen, 0)) != NULL)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
freeline(line);
|
2003-01-16 02:30:21 +03:00
|
|
|
freetree234(term->screen);
|
|
|
|
while ((line = delpos234(term->alt_screen, 0)) != NULL)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
freeline(line);
|
2003-01-16 02:30:21 +03:00
|
|
|
freetree234(term->alt_screen);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (term->disptext) {
|
|
|
|
for (i = 0; i < term->rows; i++)
|
|
|
|
freeline(term->disptext[i]);
|
|
|
|
}
|
2003-01-16 02:30:21 +03:00
|
|
|
sfree(term->disptext);
|
|
|
|
while (term->beephead) {
|
|
|
|
beep = term->beephead;
|
|
|
|
term->beephead = beep->next;
|
|
|
|
sfree(beep);
|
|
|
|
}
|
|
|
|
bufchain_clear(&term->inbuf);
|
|
|
|
if(term->print_job)
|
|
|
|
printer_finish_job(term->print_job);
|
|
|
|
bufchain_clear(&term->printer_buf);
|
|
|
|
sfree(term->paste_buffer);
|
2004-05-22 14:36:50 +04:00
|
|
|
sfree(term->ltemp);
|
|
|
|
sfree(term->wcFrom);
|
|
|
|
sfree(term->wcTo);
|
2017-11-26 11:45:37 +03:00
|
|
|
sfree(term->answerback);
|
2004-05-22 14:36:50 +04:00
|
|
|
|
|
|
|
for (i = 0; i < term->bidi_cache_size; i++) {
|
2004-10-15 15:11:19 +04:00
|
|
|
sfree(term->pre_bidi_cache[i].chars);
|
|
|
|
sfree(term->post_bidi_cache[i].chars);
|
2012-08-30 22:48:08 +04:00
|
|
|
sfree(term->post_bidi_cache[i].forward);
|
|
|
|
sfree(term->post_bidi_cache[i].backward);
|
2004-05-22 14:36:50 +04:00
|
|
|
}
|
|
|
|
sfree(term->pre_bidi_cache);
|
|
|
|
sfree(term->post_bidi_cache);
|
|
|
|
|
2012-08-30 22:48:08 +04:00
|
|
|
sfree(term->tabs);
|
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
expire_timer_context(term);
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
conf_free(term->conf);
|
|
|
|
|
2003-01-16 02:30:21 +03:00
|
|
|
sfree(term);
|
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Set up the terminal for a given size.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_size(Terminal *term, int newrows, int newcols, int newsavelines)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2001-05-13 18:02:28 +04:00
|
|
|
tree234 *newalt;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline **newdisp, *line;
|
2004-10-13 17:35:29 +04:00
|
|
|
int i, j, oldrows = term->rows;
|
2001-04-28 19:32:25 +04:00
|
|
|
int sblen;
|
2002-10-22 20:11:33 +04:00
|
|
|
int save_alt_which = term->alt_which;
|
2000-03-11 17:10:10 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (newrows == term->rows && newcols == term->cols &&
|
|
|
|
newsavelines == term->savelines)
|
1999-01-08 16:02:13 +03:00
|
|
|
return; /* nothing to do */
|
|
|
|
|
2006-01-10 23:02:22 +03:00
|
|
|
/* Behave sensibly if we're given zero (or negative) rows/cols */
|
|
|
|
|
|
|
|
if (newrows < 1) newrows = 1;
|
|
|
|
if (newcols < 1) newcols = 1;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
|
|
|
swap_screen(term, 0, FALSE, FALSE);
|
2000-03-11 17:10:10 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_t = term->marg_t = 0;
|
|
|
|
term->alt_b = term->marg_b = newrows - 1;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->rows == -1) {
|
|
|
|
term->scrollback = newtree234(NULL);
|
|
|
|
term->screen = newtree234(NULL);
|
2003-03-07 21:18:38 +03:00
|
|
|
term->tempsblines = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->rows = 0;
|
2001-04-28 19:32:25 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Resize the screen and scrollback. We only need to shift
|
|
|
|
* lines around within our data structures, because lineptr()
|
|
|
|
* will take care of resizing each individual line if
|
|
|
|
* necessary. So:
|
|
|
|
*
|
2003-03-07 21:18:38 +03:00
|
|
|
* - If the new screen is longer, we shunt lines in from temporary
|
|
|
|
* scrollback if possible, otherwise we add new blank lines at
|
|
|
|
* the bottom.
|
|
|
|
*
|
|
|
|
* - If the new screen is shorter, we remove any blank lines at
|
|
|
|
* the bottom if possible, otherwise shunt lines above the cursor
|
|
|
|
* to scrollback if possible, otherwise delete lines below the
|
|
|
|
* cursor.
|
2001-04-28 19:32:25 +04:00
|
|
|
*
|
|
|
|
* - Then, if the new scrollback length is less than the
|
|
|
|
* amount of scrollback we actually have, we must throw some
|
|
|
|
* away.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
sblen = count234(term->scrollback);
|
2001-05-03 14:10:53 +04:00
|
|
|
/* Do this loop to expand the screen if newrows > rows */
|
2003-03-07 21:18:38 +03:00
|
|
|
assert(term->rows == count234(term->screen));
|
|
|
|
while (term->rows < newrows) {
|
|
|
|
if (term->tempsblines > 0) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unsigned char *cline;
|
2003-03-07 21:18:38 +03:00
|
|
|
/* Insert a line from the scrollback at the top of the screen. */
|
|
|
|
assert(sblen >= term->tempsblines);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
cline = delpos234(term->scrollback, --sblen);
|
|
|
|
line = decompressline(cline, NULL);
|
|
|
|
sfree(cline);
|
|
|
|
line->temporary = FALSE; /* reconstituted line is now real */
|
2003-03-07 21:18:38 +03:00
|
|
|
term->tempsblines -= 1;
|
|
|
|
addpos234(term->screen, line, 0);
|
|
|
|
term->curs.y += 1;
|
|
|
|
term->savecurs.y += 1;
|
Fix a cursor positioning infelicity.
The scenario: I start a small, say 80x24, pterm. I do some work in
it, generating plenty of scrollback, and eventually I `less' a file.
`less' switches to the alt screen. Then I want more vertical space
to look at the file, so I enlarge the window to more like 80x60.
When I quit `less' and switch back to the primary screen, some
scrollback has been pulled down into the screen, as expected - but
the saved _cursor position_ is still at line 24, not at the bottom
of the new terminal where the prompt it goes with has moved to.
Solution: term_size() should adjust the alt-screen saved cursor
positions as well as the normal cursor position.
(Curiously, the problem doesn't happen on my home Debian box, even
without this fix. It happens on my RH9 box at work, though.)
[originally from svn r7911]
2008-03-07 21:30:37 +03:00
|
|
|
term->alt_y += 1;
|
|
|
|
term->alt_savecurs.y += 1;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else {
|
2003-03-07 21:18:38 +03:00
|
|
|
/* Add a new blank line at the bottom of the screen. */
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line = newline(term, newcols, FALSE);
|
2003-03-07 21:18:38 +03:00
|
|
|
addpos234(term->screen, line, count234(term->screen));
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2003-03-07 21:18:38 +03:00
|
|
|
term->rows += 1;
|
2001-05-03 14:10:53 +04:00
|
|
|
}
|
|
|
|
/* Do this loop to shrink the screen if newrows < rows */
|
2003-03-07 21:18:38 +03:00
|
|
|
while (term->rows > newrows) {
|
|
|
|
if (term->curs.y < term->rows - 1) {
|
|
|
|
/* delete bottom row, unless it contains the cursor */
|
2012-08-30 22:48:08 +04:00
|
|
|
line = delpos234(term->screen, term->rows - 1);
|
|
|
|
freeline(line);
|
2003-03-07 21:18:38 +03:00
|
|
|
} else {
|
|
|
|
/* push top row to scrollback */
|
|
|
|
line = delpos234(term->screen, 0);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
addpos234(term->scrollback, compressline(line), sblen++);
|
|
|
|
freeline(line);
|
2003-03-07 21:18:38 +03:00
|
|
|
term->tempsblines += 1;
|
|
|
|
term->curs.y -= 1;
|
|
|
|
term->savecurs.y -= 1;
|
Fix a cursor positioning infelicity.
The scenario: I start a small, say 80x24, pterm. I do some work in
it, generating plenty of scrollback, and eventually I `less' a file.
`less' switches to the alt screen. Then I want more vertical space
to look at the file, so I enlarge the window to more like 80x60.
When I quit `less' and switch back to the primary screen, some
scrollback has been pulled down into the screen, as expected - but
the saved _cursor position_ is still at line 24, not at the bottom
of the new terminal where the prompt it goes with has moved to.
Solution: term_size() should adjust the alt-screen saved cursor
positions as well as the normal cursor position.
(Curiously, the problem doesn't happen on my home Debian box, even
without this fix. It happens on my RH9 box at work, though.)
[originally from svn r7911]
2008-03-07 21:30:37 +03:00
|
|
|
term->alt_y -= 1;
|
|
|
|
term->alt_savecurs.y -= 1;
|
2003-03-07 21:18:38 +03:00
|
|
|
}
|
|
|
|
term->rows -= 1;
|
2001-04-28 19:32:25 +04:00
|
|
|
}
|
2003-03-07 21:18:38 +03:00
|
|
|
assert(term->rows == newrows);
|
2002-10-22 20:11:33 +04:00
|
|
|
assert(count234(term->screen) == newrows);
|
2003-03-07 21:18:38 +03:00
|
|
|
|
|
|
|
/* Delete any excess lines from the scrollback. */
|
2001-04-28 19:32:25 +04:00
|
|
|
while (sblen > newsavelines) {
|
2002-10-22 20:11:33 +04:00
|
|
|
line = delpos234(term->scrollback, 0);
|
2001-04-28 19:32:25 +04:00
|
|
|
sfree(line);
|
|
|
|
sblen--;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
2003-03-07 21:18:38 +03:00
|
|
|
if (sblen < term->tempsblines)
|
|
|
|
term->tempsblines = sblen;
|
2002-10-22 20:11:33 +04:00
|
|
|
assert(count234(term->scrollback) <= newsavelines);
|
2003-03-07 21:18:38 +03:00
|
|
|
assert(count234(term->scrollback) >= term->tempsblines);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->disptop = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2003-03-07 21:18:38 +03:00
|
|
|
/* Make a new displayed text buffer. */
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
newdisp = snewn(newrows, termline *);
|
|
|
|
for (i = 0; i < newrows; i++) {
|
|
|
|
newdisp[i] = newline(term, newcols, FALSE);
|
|
|
|
for (j = 0; j < newcols; j++)
|
2004-11-22 16:49:12 +03:00
|
|
|
newdisp[i]->chars[j].attr = ATTR_INVALID;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
|
|
|
if (term->disptext) {
|
2004-10-13 17:35:29 +04:00
|
|
|
for (i = 0; i < oldrows; i++)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
freeline(term->disptext[i]);
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
sfree(term->disptext);
|
|
|
|
term->disptext = newdisp;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->dispcursx = term->dispcursy = -1;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2003-03-07 21:18:38 +03:00
|
|
|
/* Make a new alternate screen. */
|
2001-04-17 01:25:13 +04:00
|
|
|
newalt = newtree234(NULL);
|
2001-05-06 18:35:20 +04:00
|
|
|
for (i = 0; i < newrows; i++) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line = newline(term, newcols, TRUE);
|
2001-04-17 01:25:13 +04:00
|
|
|
addpos234(newalt, line, i);
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->alt_screen) {
|
|
|
|
while (NULL != (line = delpos234(term->alt_screen, 0)))
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
freeline(line);
|
2002-10-22 20:11:33 +04:00
|
|
|
freetree234(term->alt_screen);
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_screen = newalt;
|
2003-03-06 15:51:12 +03:00
|
|
|
term->alt_sblines = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2003-03-29 19:14:26 +03:00
|
|
|
term->tabs = sresize(term->tabs, newcols, unsigned char);
|
1999-01-08 16:02:13 +03:00
|
|
|
{
|
|
|
|
int i;
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = (term->cols > 0 ? term->cols : 0); i < newcols; i++)
|
|
|
|
term->tabs[i] = (i % 8 == 0 ? TRUE : FALSE);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2003-03-07 21:18:38 +03:00
|
|
|
/* Check that the cursor positions are still valid. */
|
|
|
|
if (term->savecurs.y < 0)
|
|
|
|
term->savecurs.y = 0;
|
|
|
|
if (term->savecurs.y >= newrows)
|
|
|
|
term->savecurs.y = newrows - 1;
|
Fix a cursor positioning infelicity.
The scenario: I start a small, say 80x24, pterm. I do some work in
it, generating plenty of scrollback, and eventually I `less' a file.
`less' switches to the alt screen. Then I want more vertical space
to look at the file, so I enlarge the window to more like 80x60.
When I quit `less' and switch back to the primary screen, some
scrollback has been pulled down into the screen, as expected - but
the saved _cursor position_ is still at line 24, not at the bottom
of the new terminal where the prompt it goes with has moved to.
Solution: term_size() should adjust the alt-screen saved cursor
positions as well as the normal cursor position.
(Curiously, the problem doesn't happen on my home Debian box, even
without this fix. It happens on my RH9 box at work, though.)
[originally from svn r7911]
2008-03-07 21:30:37 +03:00
|
|
|
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;
|
2002-10-22 20:11:33 +04:00
|
|
|
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;
|
Fix a cursor positioning infelicity.
The scenario: I start a small, say 80x24, pterm. I do some work in
it, generating plenty of scrollback, and eventually I `less' a file.
`less' switches to the alt screen. Then I want more vertical space
to look at the file, so I enlarge the window to more like 80x60.
When I quit `less' and switch back to the primary screen, some
scrollback has been pulled down into the screen, as expected - but
the saved _cursor position_ is still at line 24, not at the bottom
of the new terminal where the prompt it goes with has moved to.
Solution: term_size() should adjust the alt-screen saved cursor
positions as well as the normal cursor position.
(Curiously, the problem doesn't happen on my home Debian box, even
without this fix. It happens on my RH9 box at work, though.)
[originally from svn r7911]
2008-03-07 21:30:37 +03:00
|
|
|
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;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->alt_x = term->alt_y = 0;
|
|
|
|
term->wrapnext = term->alt_wnext = FALSE;
|
|
|
|
|
|
|
|
term->rows = newrows;
|
|
|
|
term->cols = newcols;
|
|
|
|
term->savelines = newsavelines;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
swap_screen(term, save_alt_which, FALSE, FALSE);
|
2000-03-11 17:10:10 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
update_sbar(term);
|
|
|
|
term_update(term);
|
2002-10-25 15:30:33 +04:00
|
|
|
if (term->resize_fn)
|
|
|
|
term->resize_fn(term->resize_ctx, term->cols, term->rows);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Hand a function and context pointer to the terminal which it can
|
|
|
|
* use to notify a back end of resizes.
|
|
|
|
*/
|
|
|
|
void term_provide_resize_fn(Terminal *term,
|
|
|
|
void (*resize_fn)(void *, int, int),
|
|
|
|
void *resize_ctx)
|
|
|
|
{
|
|
|
|
term->resize_fn = resize_fn;
|
|
|
|
term->resize_ctx = resize_ctx;
|
2007-01-24 16:53:28 +03:00
|
|
|
if (resize_fn && term->cols > 0 && term->rows > 0)
|
2002-10-25 15:30:33 +04:00
|
|
|
resize_fn(resize_ctx, term->cols, term->rows);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2003-03-06 15:51:12 +03:00
|
|
|
/* Find the bottom line on the screen that has any content.
|
|
|
|
* If only the top line has content, returns 0.
|
|
|
|
* If no lines have content, return -1.
|
|
|
|
*/
|
|
|
|
static int find_last_nonempty_line(Terminal * term, tree234 * screen)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = count234(screen) - 1; i >= 0; i--) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *line = index234(screen, i);
|
2003-03-06 15:51:12 +03:00
|
|
|
int j;
|
2004-10-14 20:42:43 +04:00
|
|
|
for (j = 0; j < line->cols; j++)
|
|
|
|
if (!termchars_equal(&line->chars[j], &term->erase_char))
|
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (j != line->cols) break;
|
2003-03-06 15:51:12 +03:00
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
2002-10-22 14:31:23 +04:00
|
|
|
* Swap screens. If `reset' is TRUE and we have been asked to
|
|
|
|
* switch to the alternate screen, we must bring most of its
|
|
|
|
* configuration from the main screen and erase the contents of the
|
|
|
|
* alternate screen completely. (This is even true if we're already
|
|
|
|
* on it! Blame xterm.)
|
1999-01-08 16:02:13 +03:00
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
1999-01-08 16:02:13 +03:00
|
|
|
int t;
|
2006-08-15 16:45:21 +04:00
|
|
|
pos tp;
|
2017-10-08 15:45:08 +03:00
|
|
|
truecolour ttc;
|
2001-04-17 01:25:13 +04:00
|
|
|
tree234 *ttr;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2002-10-22 14:31:23 +04:00
|
|
|
if (!which)
|
|
|
|
reset = FALSE; /* do no weird resetting if which==0 */
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (which != term->alt_which) {
|
|
|
|
term->alt_which = which;
|
2002-10-22 14:31:23 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
ttr = term->alt_screen;
|
|
|
|
term->alt_screen = term->screen;
|
|
|
|
term->screen = ttr;
|
2003-03-06 15:51:12 +03:00
|
|
|
term->alt_sblines = find_last_nonempty_line(term, term->alt_screen) + 1;
|
2002-10-22 20:11:33 +04:00
|
|
|
t = term->curs.x;
|
2002-10-22 14:31:23 +04:00
|
|
|
if (!reset && !keep_cur_pos)
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x = term->alt_x;
|
|
|
|
term->alt_x = t;
|
|
|
|
t = term->curs.y;
|
2002-10-22 14:31:23 +04:00
|
|
|
if (!reset && !keep_cur_pos)
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.y = term->alt_y;
|
|
|
|
term->alt_y = t;
|
|
|
|
t = term->marg_t;
|
|
|
|
if (!reset) term->marg_t = term->alt_t;
|
|
|
|
term->alt_t = t;
|
|
|
|
t = term->marg_b;
|
|
|
|
if (!reset) term->marg_b = term->alt_b;
|
|
|
|
term->alt_b = t;
|
|
|
|
t = term->dec_om;
|
|
|
|
if (!reset) term->dec_om = term->alt_om;
|
|
|
|
term->alt_om = t;
|
|
|
|
t = term->wrap;
|
|
|
|
if (!reset) term->wrap = term->alt_wrap;
|
|
|
|
term->alt_wrap = t;
|
|
|
|
t = term->wrapnext;
|
|
|
|
if (!reset) term->wrapnext = term->alt_wnext;
|
|
|
|
term->alt_wnext = t;
|
|
|
|
t = term->insert;
|
|
|
|
if (!reset) term->insert = term->alt_ins;
|
|
|
|
term->alt_ins = t;
|
|
|
|
t = term->cset;
|
|
|
|
if (!reset) term->cset = term->alt_cset;
|
|
|
|
term->alt_cset = t;
|
|
|
|
t = term->utf;
|
|
|
|
if (!reset) term->utf = term->alt_utf;
|
|
|
|
term->alt_utf = t;
|
|
|
|
t = term->sco_acs;
|
|
|
|
if (!reset) term->sco_acs = term->alt_sco_acs;
|
|
|
|
term->alt_sco_acs = t;
|
2006-08-15 16:45:21 +04:00
|
|
|
|
|
|
|
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;
|
2006-08-16 02:48:01 +04:00
|
|
|
t = term->save_attr;
|
|
|
|
if (!reset && !keep_cur_pos)
|
|
|
|
term->save_attr = term->alt_save_attr;
|
|
|
|
term->alt_save_attr = t;
|
2017-10-08 15:45:08 +03:00
|
|
|
ttc = term->save_truecolour;
|
|
|
|
if (!reset && !keep_cur_pos)
|
|
|
|
term->save_truecolour = term->alt_save_truecolour;
|
|
|
|
term->alt_save_truecolour = ttc;
|
2006-08-15 16:45:21 +04:00
|
|
|
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;
|
2002-10-22 14:31:23 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (reset && term->screen) {
|
2002-10-22 14:31:23 +04:00
|
|
|
/*
|
|
|
|
* Yes, this _is_ supposed to honour background-colour-erase.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, FALSE, TRUE, TRUE);
|
2002-10-22 14:31:23 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update the scroll bar.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void update_sbar(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2003-03-06 15:51:12 +03:00
|
|
|
int nscroll = sblines(term);
|
2002-10-26 16:58:13 +04:00
|
|
|
set_sbar(term->frontend, nscroll + term->rows,
|
|
|
|
nscroll + term->disptop, term->rows);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check whether the region bounded by the two pointers intersects
|
|
|
|
* the scroll region, and de-select the on-screen selection if so.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void check_selection(Terminal *term, pos from, pos to)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
if (poslt(from, term->selend) && poslt(term->selstart, to))
|
|
|
|
deselect(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scroll the screen. (`lines' is +ve for scrolling forward, -ve
|
|
|
|
* for backward.) `sb' is TRUE if the scrolling is permitted to
|
|
|
|
* affect the scrollback buffer.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *line;
|
2012-09-23 19:36:54 +04:00
|
|
|
int i, seltop, scrollwinsize;
|
2011-03-02 02:10:16 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
int olddisptop, shift;
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
2000-07-26 16:13:51 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (topline != 0 || term->alt_which != 0)
|
2001-04-17 01:25:13 +04:00
|
|
|
sb = FALSE;
|
|
|
|
|
2011-03-02 02:10:16 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
2002-11-24 00:42:46 +03:00
|
|
|
olddisptop = term->disptop;
|
|
|
|
shift = lines;
|
2011-03-02 02:10:16 +03:00
|
|
|
#endif /* OPTIMISE_SCROLL */
|
2012-09-23 19:36:54 +04:00
|
|
|
|
|
|
|
scrollwinsize = botline - topline + 1;
|
|
|
|
|
2001-04-17 01:25:13 +04:00
|
|
|
if (lines < 0) {
|
2012-09-23 19:36:54 +04:00
|
|
|
lines = -lines;
|
|
|
|
if (lines > scrollwinsize)
|
|
|
|
lines = scrollwinsize;
|
|
|
|
while (lines-- > 0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
line = delpos234(term->screen, botline);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
resizeline(term, line, term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->cols; i++)
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(line, i, &term->erase_char);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line->lattr = LATTR_NORM;
|
2002-10-22 20:11:33 +04:00
|
|
|
addpos234(term->screen, line, topline);
|
|
|
|
|
|
|
|
if (term->selstart.y >= topline && term->selstart.y <= botline) {
|
|
|
|
term->selstart.y++;
|
|
|
|
if (term->selstart.y > botline) {
|
2003-03-29 16:54:11 +03:00
|
|
|
term->selstart.y = botline + 1;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstart.x = 0;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->selend.y >= topline && term->selend.y <= botline) {
|
|
|
|
term->selend.y++;
|
|
|
|
if (term->selend.y > botline) {
|
2003-03-29 16:54:11 +03:00
|
|
|
term->selend.y = botline + 1;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selend.x = 0;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2012-09-23 19:36:54 +04:00
|
|
|
if (lines > scrollwinsize)
|
|
|
|
lines = scrollwinsize;
|
|
|
|
while (lines-- > 0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
line = delpos234(term->screen, topline);
|
2005-04-01 17:25:13 +04:00
|
|
|
#ifdef TERM_CC_DIAGS
|
|
|
|
cc_check(line);
|
|
|
|
#endif
|
2002-10-22 20:11:33 +04:00
|
|
|
if (sb && term->savelines > 0) {
|
2003-03-07 21:18:38 +03:00
|
|
|
int sblen = count234(term->scrollback);
|
2001-04-17 01:25:13 +04:00
|
|
|
/*
|
|
|
|
* We must add this line to the scrollback. We'll
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
* remove a line from the top of the scrollback if
|
|
|
|
* the scrollback is full.
|
2001-04-17 01:25:13 +04:00
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (sblen == term->savelines) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unsigned char *cline;
|
|
|
|
|
|
|
|
sblen--;
|
|
|
|
cline = delpos234(term->scrollback, 0);
|
|
|
|
sfree(cline);
|
|
|
|
} else
|
2003-03-07 21:18:38 +03:00
|
|
|
term->tempsblines += 1;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
addpos234(term->scrollback, compressline(line), sblen);
|
|
|
|
|
2004-10-15 16:37:44 +04:00
|
|
|
/* now `line' itself can be reused as the bottom line */
|
2001-09-13 00:38:40 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the user is currently looking at part of the
|
|
|
|
* scrollback, and they haven't enabled any options
|
|
|
|
* that are going to reset the scrollback as a
|
|
|
|
* result of this movement, then the chances are
|
|
|
|
* they'd like to keep looking at the same line. So
|
|
|
|
* we move their viewpoint at the same rate as the
|
|
|
|
* scroll, at least until their viewpoint hits the
|
|
|
|
* top end of the scrollback buffer, at which point
|
|
|
|
* we don't have the choice any more.
|
|
|
|
*
|
|
|
|
* Thanks to Jan Holmen Holsten for the idea and
|
|
|
|
* initial implementation.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->disptop > -term->savelines && term->disptop < 0)
|
|
|
|
term->disptop--;
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
resizeline(term, line, term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->cols; i++)
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(line, i, &term->erase_char);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
line->lattr = LATTR_NORM;
|
2002-10-22 20:11:33 +04:00
|
|
|
addpos234(term->screen, line, botline);
|
2001-04-17 01:25:13 +04:00
|
|
|
|
2001-09-13 00:38:40 +04:00
|
|
|
/*
|
|
|
|
* If the selection endpoints move into the scrollback,
|
|
|
|
* we keep them moving until they hit the top. However,
|
|
|
|
* of course, if the line _hasn't_ moved into the
|
|
|
|
* scrollback then we don't do this, and cut them off
|
|
|
|
* at the top of the scroll region.
|
2001-09-18 22:59:37 +04:00
|
|
|
*
|
|
|
|
* This applies to selstart and selend (for an existing
|
|
|
|
* selection), and also selanchor (for one being
|
|
|
|
* selected as we speak).
|
2001-09-13 00:38:40 +04:00
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
seltop = sb ? -term->savelines : topline;
|
|
|
|
|
2004-01-17 17:25:36 +03:00
|
|
|
if (term->selstate != NO_SELECTION) {
|
|
|
|
if (term->selstart.y >= seltop &&
|
|
|
|
term->selstart.y <= botline) {
|
|
|
|
term->selstart.y--;
|
|
|
|
if (term->selstart.y < seltop) {
|
|
|
|
term->selstart.y = seltop;
|
|
|
|
term->selstart.x = 0;
|
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2004-01-17 17:25:36 +03:00
|
|
|
if (term->selend.y >= seltop && term->selend.y <= botline) {
|
|
|
|
term->selend.y--;
|
|
|
|
if (term->selend.y < seltop) {
|
|
|
|
term->selend.y = seltop;
|
|
|
|
term->selend.x = 0;
|
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2004-01-17 17:25:36 +03:00
|
|
|
if (term->selanchor.y >= seltop &&
|
|
|
|
term->selanchor.y <= botline) {
|
|
|
|
term->selanchor.y--;
|
|
|
|
if (term->selanchor.y < seltop) {
|
|
|
|
term->selanchor.y = seltop;
|
|
|
|
term->selanchor.x = 0;
|
|
|
|
}
|
2001-09-18 22:59:37 +04:00
|
|
|
}
|
|
|
|
}
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2002-11-24 00:42:46 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
shift += term->disptop - olddisptop;
|
|
|
|
if (shift < term->rows && shift > -term->rows && shift != 0)
|
|
|
|
scroll_display(term, topline, botline, shift);
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2002-11-23 16:07:29 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
2003-02-01 15:26:33 +03:00
|
|
|
/*
|
|
|
|
* Add a scroll of a region on the screen into the pending scroll list.
|
|
|
|
* `lines' is +ve for scrolling forward, -ve for backward.
|
|
|
|
*
|
|
|
|
* If the scroll is on the same area as the last scroll in the list,
|
|
|
|
* merge them.
|
|
|
|
*/
|
2003-02-01 18:42:01 +03:00
|
|
|
static void save_scroll(Terminal *term, int topline, int botline, int lines)
|
2003-02-01 15:26:33 +03:00
|
|
|
{
|
|
|
|
struct scrollregion *newscroll;
|
|
|
|
if (term->scrolltail &&
|
|
|
|
term->scrolltail->topline == topline &&
|
|
|
|
term->scrolltail->botline == botline) {
|
|
|
|
term->scrolltail->lines += lines;
|
|
|
|
} else {
|
2003-03-29 19:14:26 +03:00
|
|
|
newscroll = snew(struct scrollregion);
|
2003-02-01 15:26:33 +03:00
|
|
|
newscroll->topline = topline;
|
|
|
|
newscroll->botline = botline;
|
|
|
|
newscroll->lines = lines;
|
|
|
|
newscroll->next = NULL;
|
|
|
|
|
|
|
|
if (!term->scrollhead)
|
|
|
|
term->scrollhead = newscroll;
|
|
|
|
else
|
|
|
|
term->scrolltail->next = newscroll;
|
|
|
|
term->scrolltail = newscroll;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-11-23 16:07:29 +03:00
|
|
|
/*
|
|
|
|
* Scroll the physical display, and our conception of it in disptext.
|
|
|
|
*/
|
|
|
|
static void scroll_display(Terminal *term, int topline, int botline, int lines)
|
|
|
|
{
|
2004-10-14 20:42:43 +04:00
|
|
|
int distance, nlines, i, j;
|
2002-11-23 16:07:29 +03:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
distance = lines > 0 ? lines : -lines;
|
|
|
|
nlines = botline - topline + 1 - distance;
|
2002-11-23 16:07:29 +03:00
|
|
|
if (lines > 0) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (i = 0; i < nlines; i++)
|
2004-10-14 20:42:43 +04:00
|
|
|
for (j = 0; j < term->cols; j++)
|
2005-01-18 22:04:59 +03:00
|
|
|
copy_termchar(term->disptext[i], j,
|
|
|
|
term->disptext[i+distance]->chars+j);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (term->dispcursy >= 0 &&
|
|
|
|
term->dispcursy >= topline + distance &&
|
|
|
|
term->dispcursy < topline + distance + nlines)
|
|
|
|
term->dispcursy -= distance;
|
2002-11-23 16:07:29 +03:00
|
|
|
for (i = 0; i < distance; i++)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (j = 0; j < term->cols; j++)
|
2005-01-18 22:04:59 +03:00
|
|
|
term->disptext[nlines+i]->chars[j].attr |= ATTR_INVALID;
|
2002-11-23 16:07:29 +03:00
|
|
|
} else {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (i = nlines; i-- ;)
|
2004-10-14 20:42:43 +04:00
|
|
|
for (j = 0; j < term->cols; j++)
|
2005-01-18 22:04:59 +03:00
|
|
|
copy_termchar(term->disptext[i+distance], j,
|
|
|
|
term->disptext[i]->chars+j);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (term->dispcursy >= 0 &&
|
|
|
|
term->dispcursy >= topline &&
|
|
|
|
term->dispcursy < topline + nlines)
|
|
|
|
term->dispcursy += distance;
|
2002-11-23 16:07:29 +03:00
|
|
|
for (i = 0; i < distance; i++)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (j = 0; j < term->cols; j++)
|
2005-01-18 22:04:59 +03:00
|
|
|
term->disptext[i]->chars[j].attr |= ATTR_INVALID;
|
2002-11-23 16:07:29 +03:00
|
|
|
}
|
2003-02-01 15:26:33 +03:00
|
|
|
save_scroll(term, topline, botline, lines);
|
2002-11-23 16:07:29 +03:00
|
|
|
}
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Move the cursor to a given position, clipping at boundaries. We
|
|
|
|
* may or may not want to clip at the scroll margin: marg_clip is 0
|
|
|
|
* not to, 1 to disallow _passing_ the margins, and 2 to disallow
|
|
|
|
* even _being_ outside the margins.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void move(Terminal *term, int x, int y, int marg_clip)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
1999-01-08 16:02:13 +03:00
|
|
|
if (x < 0)
|
|
|
|
x = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
if (x >= term->cols)
|
|
|
|
x = term->cols - 1;
|
1999-01-08 16:02:13 +03:00
|
|
|
if (marg_clip) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if ((term->curs.y >= term->marg_t || marg_clip == 2) &&
|
|
|
|
y < term->marg_t)
|
|
|
|
y = term->marg_t;
|
|
|
|
if ((term->curs.y <= term->marg_b || marg_clip == 2) &&
|
|
|
|
y > term->marg_b)
|
|
|
|
y = term->marg_b;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
if (y < 0)
|
|
|
|
y = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
if (y >= term->rows)
|
|
|
|
y = term->rows - 1;
|
|
|
|
term->curs.x = x;
|
|
|
|
term->curs.y = y;
|
|
|
|
term->wrapnext = FALSE;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Save or restore the cursor and SGR mode.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void save_cursor(Terminal *term, int save)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
1999-01-08 16:02:13 +03:00
|
|
|
if (save) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->savecurs = term->curs;
|
|
|
|
term->save_attr = term->curr_attr;
|
2017-10-08 15:45:08 +03:00
|
|
|
term->save_truecolour = term->curr_truecolour;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->save_cset = term->cset;
|
|
|
|
term->save_utf = term->utf;
|
|
|
|
term->save_wnext = term->wrapnext;
|
|
|
|
term->save_csattr = term->cset_attr[term->cset];
|
|
|
|
term->save_sco_acs = term->sco_acs;
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs = term->savecurs;
|
2000-07-26 16:13:51 +04:00
|
|
|
/* Make sure the window hasn't shrunk since the save */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.x >= term->cols)
|
|
|
|
term->curs.x = term->cols - 1;
|
|
|
|
if (term->curs.y >= term->rows)
|
|
|
|
term->curs.y = term->rows - 1;
|
|
|
|
|
|
|
|
term->curr_attr = term->save_attr;
|
2017-10-08 15:45:08 +03:00
|
|
|
term->curr_truecolour = term->save_truecolour;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cset = term->save_cset;
|
|
|
|
term->utf = term->save_utf;
|
|
|
|
term->wrapnext = term->save_wnext;
|
2002-03-02 20:37:48 +03:00
|
|
|
/*
|
|
|
|
* wrapnext might reset to False if the x position is no
|
|
|
|
* longer at the rightmost edge.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->wrapnext && term->curs.x < term->cols-1)
|
|
|
|
term->wrapnext = FALSE;
|
|
|
|
term->cset_attr[term->cset] = term->save_csattr;
|
|
|
|
term->sco_acs = term->save_sco_acs;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
/*
|
|
|
|
* This function is called before doing _anything_ which affects
|
|
|
|
* only part of a line of text. It is used to mark the boundary
|
|
|
|
* between two character positions, and it indicates that some sort
|
|
|
|
* of effect is going to happen on only one side of that boundary.
|
|
|
|
*
|
|
|
|
* The effect of this function is to check whether a CJK
|
|
|
|
* double-width character is straddling the boundary, and to remove
|
|
|
|
* it and replace it with two spaces if so. (Of course, one or
|
|
|
|
* other of those spaces is then likely to be replaced with
|
|
|
|
* something else again, as a result of whatever happens next.)
|
|
|
|
*
|
|
|
|
* Also, if the boundary is at the right-hand _edge_ of the screen,
|
|
|
|
* it implies something deliberate is being done to the rightmost
|
|
|
|
* column position; hence we must clear LATTR_WRAPPED2.
|
|
|
|
*
|
|
|
|
* The input to the function is the coordinates of the _second_
|
|
|
|
* character of the pair.
|
|
|
|
*/
|
|
|
|
static void check_boundary(Terminal *term, int x, int y)
|
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata;
|
2003-01-02 19:20:29 +03:00
|
|
|
|
|
|
|
/* Validate input coordinates, just in case. */
|
2015-10-13 22:33:12 +03:00
|
|
|
if (x <= 0 || x > term->cols)
|
2003-01-02 19:20:29 +03:00
|
|
|
return;
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata = scrlineptr(y);
|
2014-07-24 01:48:02 +04:00
|
|
|
check_line_size(term, ldata);
|
2003-01-02 19:20:29 +03:00
|
|
|
if (x == term->cols) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata->lattr &= ~LATTR_WRAPPED2;
|
2003-01-02 19:20:29 +03:00
|
|
|
} else {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (ldata->chars[x].chr == UCSWIDE) {
|
2004-10-14 20:42:43 +04:00
|
|
|
clear_cc(ldata, x-1);
|
|
|
|
clear_cc(ldata, x);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata->chars[x-1].chr = ' ' | CSET_ASCII;
|
|
|
|
ldata->chars[x] = ldata->chars[x-1];
|
2003-01-02 19:20:29 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Erase a large portion of the screen: the whole screen, or the
|
|
|
|
* whole line, or parts thereof.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void erase_lots(Terminal *term,
|
|
|
|
int line_only, int from_begin, int to_end)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2001-04-17 12:24:29 +04:00
|
|
|
pos start, end;
|
2001-04-17 01:25:13 +04:00
|
|
|
int erase_lattr;
|
2003-03-07 21:18:38 +03:00
|
|
|
int erasing_lines_from_top = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
|
|
|
if (line_only) {
|
2002-10-22 20:11:33 +04:00
|
|
|
start.y = term->curs.y;
|
2001-04-17 01:25:13 +04:00
|
|
|
start.x = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
end.y = term->curs.y + 1;
|
2001-04-17 01:25:13 +04:00
|
|
|
end.x = 0;
|
|
|
|
erase_lattr = FALSE;
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2001-04-17 01:25:13 +04:00
|
|
|
start.y = 0;
|
|
|
|
start.x = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
end.y = term->rows;
|
2001-04-17 01:25:13 +04:00
|
|
|
end.x = 0;
|
|
|
|
erase_lattr = TRUE;
|
|
|
|
}
|
|
|
|
if (!from_begin) {
|
2002-10-22 20:11:33 +04:00
|
|
|
start = term->curs;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
if (!to_end) {
|
2002-10-22 20:11:33 +04:00
|
|
|
end = term->curs;
|
2001-05-19 15:32:38 +04:00
|
|
|
incpos(end);
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2003-01-02 19:20:29 +03:00
|
|
|
if (!from_begin || !to_end)
|
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
2002-10-22 20:11:33 +04:00
|
|
|
check_selection(term, start, end);
|
2000-03-17 13:39:05 +03:00
|
|
|
|
|
|
|
/* Clear screen also forces a full window redraw, just in case. */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (start.y == 0 && start.x == 0 && end.y == term->rows)
|
|
|
|
term_invalidate(term);
|
2000-03-17 13:39:05 +03:00
|
|
|
|
2003-03-07 21:18:38 +03:00
|
|
|
/* Lines scrolled away shouldn't be brought back on if the terminal
|
|
|
|
* resizes. */
|
|
|
|
if (start.y == 0 && start.x == 0 && end.x == 0 && erase_lattr)
|
|
|
|
erasing_lines_from_top = 1;
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->erase_to_scrollback && erasing_lines_from_top) {
|
2003-03-06 15:51:12 +03:00
|
|
|
/* 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. */
|
|
|
|
int scrolllines = end.y;
|
|
|
|
if (end.y == term->rows) {
|
|
|
|
/* Shrink until we find a non-empty row.*/
|
|
|
|
scrolllines = find_last_nonempty_line(term, term->screen) + 1;
|
|
|
|
}
|
|
|
|
if (scrolllines > 0)
|
|
|
|
scroll(term, 0, scrolllines - 1, scrolllines, TRUE);
|
|
|
|
} else {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata = scrlineptr(start.y);
|
2003-03-06 15:51:12 +03:00
|
|
|
while (poslt(start, end)) {
|
2014-07-24 01:48:02 +04:00
|
|
|
check_line_size(term, ldata);
|
2003-03-06 15:51:12 +03:00
|
|
|
if (start.x == term->cols) {
|
|
|
|
if (!erase_lattr)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata->lattr &= ~(LATTR_WRAPPED | LATTR_WRAPPED2);
|
2003-03-06 15:51:12 +03:00
|
|
|
else
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata->lattr = LATTR_NORM;
|
2003-03-06 15:51:12 +03:00
|
|
|
} else {
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(ldata, start.x, &term->erase_char);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
|
|
|
if (incpos(start) && start.y < term->rows) {
|
|
|
|
ldata = scrlineptr(start.y);
|
2003-03-06 15:51:12 +03:00
|
|
|
}
|
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2003-03-07 21:18:38 +03:00
|
|
|
|
|
|
|
/* After an erase of lines from the top of the screen, we shouldn't
|
|
|
|
* bring the lines back again if the terminal enlarges (since the user or
|
2017-04-15 11:06:22 +03:00
|
|
|
* application has explicitly thrown them away). */
|
2003-03-07 21:18:38 +03:00
|
|
|
if (erasing_lines_from_top && !(term->alt_which))
|
|
|
|
term->tempsblines = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Insert or delete characters within the current line. n is +ve if
|
|
|
|
* insertion is desired, and -ve for deletion.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void insch(Terminal *term, int n)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
1999-01-08 16:02:13 +03:00
|
|
|
int dir = (n < 0 ? -1 : +1);
|
2004-10-14 20:42:43 +04:00
|
|
|
int m, j;
|
2013-11-25 23:46:05 +04:00
|
|
|
pos eol;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
|
|
|
n = (n < 0 ? -n : n);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (n > term->cols - term->curs.x)
|
|
|
|
n = term->cols - term->curs.x;
|
|
|
|
m = term->cols - term->curs.x - n;
|
2013-11-25 23:46:05 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We must de-highlight the selection if it overlaps any part of
|
|
|
|
* the region affected by this operation, i.e. the region from the
|
|
|
|
* current cursor position to end-of-line, _unless_ the entirety
|
|
|
|
* of the selection is going to be moved to the left or right by
|
|
|
|
* this operation but otherwise unchanged, in which case we can
|
|
|
|
* simply move the highlight with the text.
|
|
|
|
*/
|
|
|
|
eol.y = term->curs.y;
|
|
|
|
eol.x = term->cols;
|
|
|
|
if (poslt(term->curs, term->selend) && poslt(term->selstart, eol)) {
|
|
|
|
pos okstart = term->curs;
|
|
|
|
pos okend = eol;
|
|
|
|
if (dir > 0) {
|
|
|
|
/* Insertion: n characters at EOL will be splatted. */
|
|
|
|
okend.x -= n;
|
|
|
|
} else {
|
|
|
|
/* Deletion: n characters at cursor position will be splatted. */
|
|
|
|
okstart.x += n;
|
|
|
|
}
|
|
|
|
if (posle(okstart, term->selstart) && posle(term->selend, okend)) {
|
|
|
|
/* Selection is contained entirely in the interval
|
|
|
|
* [okstart,okend), so we need only adjust the selection
|
|
|
|
* bounds. */
|
|
|
|
term->selstart.x += dir * n;
|
|
|
|
term->selend.x += dir * n;
|
|
|
|
assert(term->selstart.x >= term->curs.x);
|
|
|
|
assert(term->selstart.x < term->cols);
|
|
|
|
assert(term->selend.x > term->curs.x);
|
|
|
|
assert(term->selend.x <= term->cols);
|
|
|
|
} else {
|
|
|
|
/* Selection is not wholly contained in that interval, so
|
|
|
|
* we must unhighlight it. */
|
|
|
|
deselect(term);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
|
|
|
if (dir < 0)
|
|
|
|
check_boundary(term, term->curs.x + n, term->curs.y);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata = scrlineptr(term->curs.y);
|
1999-01-08 16:02:13 +03:00
|
|
|
if (dir < 0) {
|
2004-10-14 20:42:43 +04:00
|
|
|
for (j = 0; j < m; j++)
|
|
|
|
move_termchar(ldata,
|
|
|
|
ldata->chars + term->curs.x + j,
|
|
|
|
ldata->chars + term->curs.x + j + n);
|
1999-01-08 16:02:13 +03:00
|
|
|
while (n--)
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(ldata, term->curs.x + m++, &term->erase_char);
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2004-10-14 20:42:43 +04:00
|
|
|
for (j = m; j-- ;)
|
|
|
|
move_termchar(ldata,
|
|
|
|
ldata->chars + term->curs.x + j + n,
|
|
|
|
ldata->chars + term->curs.x + j);
|
1999-01-08 16:02:13 +03:00
|
|
|
while (n--)
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(ldata, term->curs.x + n, &term->erase_char);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Toggle terminal mode `mode' to state `state'. (`query' indicates
|
|
|
|
* whether the mode is a DEC private one or a normal one.)
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void toggle_mode(Terminal *term, int mode, int query, int state)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
|
|
|
if (query)
|
|
|
|
switch (mode) {
|
2003-06-21 23:38:56 +04:00
|
|
|
case 1: /* DECCKM: application cursor keys */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->app_cursor_keys = state;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 2: /* DECANM: VT52 mode */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->vt52_mode = !state;
|
|
|
|
if (term->vt52_mode) {
|
|
|
|
term->blink_is_real = FALSE;
|
|
|
|
term->vt52_bold = FALSE;
|
2001-05-10 12:34:20 +04:00
|
|
|
} else {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->blink_is_real = term->blinktext;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 3: /* DECCOLM: 80/132 columns */
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
request_resize(term->frontend, state ? 132 : 80, term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->reset_132 = state;
|
2003-03-27 03:22:59 +03:00
|
|
|
term->alt_t = term->marg_t = 0;
|
|
|
|
term->alt_b = term->marg_b = term->rows - 1;
|
|
|
|
move(term, 0, 0, 0);
|
|
|
|
erase_lots(term, FALSE, TRUE, TRUE);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 5: /* DECSCNM: reverse video */
|
2001-05-06 18:35:20 +04:00
|
|
|
/*
|
|
|
|
* Toggle reverse video. If we receive an OFF within the
|
|
|
|
* visual bell timeout period after an ON, we trigger an
|
|
|
|
* effective visual bell, so that ESC[?5hESC[?5l will
|
|
|
|
* always be an actually _visible_ visual bell.
|
|
|
|
*/
|
2004-11-27 16:20:21 +03:00
|
|
|
if (term->rvideo && !state) {
|
|
|
|
/* This is an OFF, so set up a vbell */
|
|
|
|
term_schedule_vbell(term, TRUE, term->rvbell_startpoint);
|
2002-10-22 20:11:33 +04:00
|
|
|
} else if (!term->rvideo && state) {
|
2001-05-06 18:35:20 +04:00
|
|
|
/* This is an ON, so we notice the time and save it. */
|
2004-11-27 16:20:21 +03:00
|
|
|
term->rvbell_startpoint = GETTICKCOUNT();
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->rvideo = state;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 6: /* DECOM: DEC origin mode */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->dec_om = state;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 7: /* DECAWM: auto wrap */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->wrap = state;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 8: /* DECARM: auto key repeat */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->repeat_off = !state;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 10: /* DECEDM: set local edit mode */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->term_editing = state;
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) /* cause ldisc to notice changes */
|
Move echo/edit state change functionality out of ldisc_send.
I'm not actually sure why we've always had back ends notify ldisc of
changes to echo/edit settings by giving ldisc_send(ldisc,NULL,0,0) a
special meaning, instead of by having a separate dedicated notify
function with its own prototype and parameter set. Coverity's recent
observation that the two kinds of call don't even have the same
requirements on the ldisc (particularly, whether ldisc->term can be
NULL) makes me realise that it's really high time I separated the two
conceptually different operations into actually different functions.
While I'm here, I've renamed the confusing ldisc_update() function
which that special operation ends up feeding to, because it's not
actually a function applying to an ldisc - it applies to a front end.
So ldisc_send(ldisc,NULL,0,0) is now ldisc_echoedit_update(ldisc), and
that in turn figures out the current echo/edit settings before passing
them on to frontend_echoedit_update(). I think that should be clearer.
2014-11-22 19:12:47 +03:00
|
|
|
ldisc_echoedit_update(term->ldisc);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 25: /* DECTCEM: enable/disable cursor */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility2(OTHER, VT220);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cursor_on = state;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 47: /* alternate screen */
|
|
|
|
compatibility(OTHER);
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
swap_screen(term, term->no_alt_screen ? 0 : state, FALSE, FALSE);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2008-12-20 21:52:09 +03:00
|
|
|
case 1000: /* xterm mouse 1 (normal) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->xterm_mouse = state ? 1 : 0;
|
2002-10-26 16:58:13 +04:00
|
|
|
set_raw_mouse_mode(term->frontend, state);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2008-12-20 21:52:09 +03:00
|
|
|
case 1002: /* xterm mouse 2 (inc. button drags) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->xterm_mouse = state ? 2 : 0;
|
2002-10-26 16:58:13 +04:00
|
|
|
set_raw_mouse_mode(term->frontend, state);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2013-01-24 02:59:17 +04:00
|
|
|
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;
|
2002-10-22 14:31:23 +04:00
|
|
|
case 1047: /* alternate screen */
|
|
|
|
compatibility(OTHER);
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
swap_screen(term, term->no_alt_screen ? 0 : state, TRUE, TRUE);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2002-10-22 14:31:23 +04:00
|
|
|
break;
|
|
|
|
case 1048: /* save/restore cursor */
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_alt_screen)
|
2003-05-27 13:43:14 +04:00
|
|
|
save_cursor(term, state);
|
2004-11-27 16:20:21 +03:00
|
|
|
if (!state) seen_disp_event(term);
|
2002-10-22 14:31:23 +04:00
|
|
|
break;
|
|
|
|
case 1049: /* cursor & alternate screen */
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (state && !term->no_alt_screen)
|
2002-10-22 20:11:33 +04:00
|
|
|
save_cursor(term, state);
|
2004-11-27 16:20:21 +03:00
|
|
|
if (!state) seen_disp_event(term);
|
2002-10-22 14:31:23 +04:00
|
|
|
compatibility(OTHER);
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
swap_screen(term, term->no_alt_screen ? 0 : state, TRUE, FALSE);
|
|
|
|
if (!state && !term->no_alt_screen)
|
2002-10-22 20:11:33 +04:00
|
|
|
save_cursor(term, state);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2002-10-22 14:31:23 +04:00
|
|
|
break;
|
2012-02-19 14:27:18 +04:00
|
|
|
case 2004: /* xterm bracketed paste */
|
|
|
|
term->bracketed_paste = state ? TRUE : FALSE;
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else
|
|
|
|
switch (mode) {
|
2003-06-21 23:38:56 +04:00
|
|
|
case 4: /* IRM: set insert mode */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT102);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->insert = state;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 12: /* SRM: set echo mode */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->term_echoing = !state;
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) /* cause ldisc to notice changes */
|
Move echo/edit state change functionality out of ldisc_send.
I'm not actually sure why we've always had back ends notify ldisc of
changes to echo/edit settings by giving ldisc_send(ldisc,NULL,0,0) a
special meaning, instead of by having a separate dedicated notify
function with its own prototype and parameter set. Coverity's recent
observation that the two kinds of call don't even have the same
requirements on the ldisc (particularly, whether ldisc->term can be
NULL) makes me realise that it's really high time I separated the two
conceptually different operations into actually different functions.
While I'm here, I've renamed the confusing ldisc_update() function
which that special operation ends up feeding to, because it's not
actually a function applying to an ldisc - it applies to a front end.
So ldisc_send(ldisc,NULL,0,0) is now ldisc_echoedit_update(ldisc), and
that in turn figures out the current echo/edit settings before passing
them on to frontend_echoedit_update(). I think that should be clearer.
2014-11-22 19:12:47 +03:00
|
|
|
ldisc_echoedit_update(term->ldisc);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 20: /* LNM: Return sends ... */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cr_lf_return = state;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 34: /* WYULCURM: Make cursor BIG */
|
2001-05-10 12:34:20 +04:00
|
|
|
compatibility2(OTHER, VT220);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->big_cursor = !state;
|
2001-04-28 18:39:16 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Process an OSC sequence: set window title or icon name.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void do_osc(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->osc_w) {
|
|
|
|
while (term->osc_strlen--)
|
|
|
|
term->wordness[(unsigned char)
|
|
|
|
term->osc_string[term->osc_strlen]] = term->esc_args[0];
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->osc_string[term->osc_strlen] = '\0';
|
|
|
|
switch (term->esc_args[0]) {
|
1999-01-08 16:02:13 +03:00
|
|
|
case 0:
|
|
|
|
case 1:
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_wintitle)
|
2002-10-26 16:58:13 +04:00
|
|
|
set_icon(term->frontend, term->osc_string);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_args[0] == 1)
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
|
|
|
/* fall through: parameter 0 means set both */
|
|
|
|
case 2:
|
|
|
|
case 21:
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_wintitle)
|
2002-10-26 16:58:13 +04:00
|
|
|
set_title(term->frontend, term->osc_string);
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2017-10-05 22:43:02 +03:00
|
|
|
case 4:
|
|
|
|
if (term->ldisc && !strcmp(term->osc_string, "?")) {
|
|
|
|
int r, g, b;
|
|
|
|
if (palette_get(term->frontend, toint(term->esc_args[1]),
|
|
|
|
&r, &g, &b)) {
|
|
|
|
char *reply_buf = dupprintf(
|
|
|
|
"\033]4;%u;rgb:%04x/%04x/%04x\007",
|
|
|
|
term->esc_args[1],
|
|
|
|
(unsigned)r * 0x0101,
|
|
|
|
(unsigned)g * 0x0101,
|
|
|
|
(unsigned)b * 0x0101);
|
|
|
|
ldisc_send(term->ldisc, reply_buf, strlen(reply_buf), 0);
|
|
|
|
sfree(reply_buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-09 20:59:15 +03:00
|
|
|
/*
|
|
|
|
* ANSI printing routines.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
static void term_print_setup(Terminal *term, char *printer)
|
2002-03-09 20:59:15 +03:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
bufchain_clear(&term->printer_buf);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->print_job = printer_start_job(printer);
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
static void term_print_flush(Terminal *term)
|
2002-03-09 20:59:15 +03:00
|
|
|
{
|
|
|
|
void *data;
|
|
|
|
int len;
|
|
|
|
int size;
|
2002-10-22 20:11:33 +04:00
|
|
|
while ((size = bufchain_size(&term->printer_buf)) > 5) {
|
|
|
|
bufchain_prefix(&term->printer_buf, &data, &len);
|
2002-03-09 20:59:15 +03:00
|
|
|
if (len > size-5)
|
|
|
|
len = size-5;
|
2002-10-22 20:11:33 +04:00
|
|
|
printer_job_data(term->print_job, data, len);
|
|
|
|
bufchain_consume(&term->printer_buf, len);
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
static void term_print_finish(Terminal *term)
|
2002-03-09 20:59:15 +03:00
|
|
|
{
|
|
|
|
void *data;
|
|
|
|
int len, size;
|
|
|
|
char c;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (!term->printing && !term->only_printing)
|
2002-10-09 22:09:42 +04:00
|
|
|
return; /* we need do nothing */
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
term_print_flush(term);
|
|
|
|
while ((size = bufchain_size(&term->printer_buf)) > 0) {
|
|
|
|
bufchain_prefix(&term->printer_buf, &data, &len);
|
2002-03-09 20:59:15 +03:00
|
|
|
c = *(char *)data;
|
|
|
|
if (c == '\033' || c == '\233') {
|
2002-10-22 20:11:33 +04:00
|
|
|
bufchain_consume(&term->printer_buf, size);
|
2002-03-09 20:59:15 +03:00
|
|
|
break;
|
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
printer_job_data(term->print_job, &c, 1);
|
|
|
|
bufchain_consume(&term->printer_buf, 1);
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
printer_finish_job(term->print_job);
|
|
|
|
term->print_job = NULL;
|
|
|
|
term->printing = term->only_printing = FALSE;
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Remove everything currently in `inbuf' and stick it up on the
|
|
|
|
* in-memory display. There's a big state machine in here to
|
|
|
|
* process escape sequences...
|
|
|
|
*/
|
2004-11-27 16:20:21 +03:00
|
|
|
static void term_out(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unsigned long c;
|
|
|
|
int unget;
|
2001-09-18 23:41:07 +04:00
|
|
|
unsigned char localbuf[256], *chars;
|
|
|
|
int nchars = 0;
|
|
|
|
|
|
|
|
unget = -1;
|
|
|
|
|
2002-10-09 22:09:42 +04:00
|
|
|
chars = NULL; /* placate compiler warnings */
|
2005-10-03 15:38:30 +04:00
|
|
|
while (nchars > 0 || unget != -1 || bufchain_size(&term->inbuf) > 0) {
|
2001-09-18 23:41:07 +04:00
|
|
|
if (unget == -1) {
|
|
|
|
if (nchars == 0) {
|
|
|
|
void *ret;
|
2002-10-22 20:11:33 +04:00
|
|
|
bufchain_prefix(&term->inbuf, &ret, &nchars);
|
2001-09-18 23:41:07 +04:00
|
|
|
if (nchars > sizeof(localbuf))
|
|
|
|
nchars = sizeof(localbuf);
|
|
|
|
memcpy(localbuf, ret, nchars);
|
2002-10-22 20:11:33 +04:00
|
|
|
bufchain_consume(&term->inbuf, nchars);
|
2001-09-18 23:41:07 +04:00
|
|
|
chars = localbuf;
|
|
|
|
assert(chars != NULL);
|
|
|
|
}
|
|
|
|
c = *chars++;
|
|
|
|
nchars--;
|
2000-07-26 16:13:51 +04:00
|
|
|
|
2001-09-18 23:41:07 +04:00
|
|
|
/*
|
|
|
|
* Optionally log the session traffic to a file. Useful for
|
|
|
|
* debugging and possibly also useful for actual logging.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->logtype == LGTYP_DEBUG && term->logctx)
|
2002-10-26 16:58:13 +04:00
|
|
|
logtraffic(term->logctx, (unsigned char) c, LGTYP_DEBUG);
|
2001-09-18 23:41:07 +04:00
|
|
|
} else {
|
|
|
|
c = unget;
|
|
|
|
unget = -1;
|
2001-09-08 02:51:52 +04:00
|
|
|
}
|
|
|
|
|
2000-03-17 13:39:05 +03:00
|
|
|
/* Note only VT220+ are 8-bit VT102 is seven bit, it shouldn't even
|
|
|
|
* be able to display 8-bit characters, but I'll let that go 'cause
|
|
|
|
* of i18n.
|
|
|
|
*/
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2002-03-09 20:59:15 +03:00
|
|
|
/*
|
|
|
|
* If we're printing, add the character to the printer
|
|
|
|
* buffer.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->printing) {
|
|
|
|
bufchain_add(&term->printer_buf, &c, 1);
|
2002-03-09 20:59:15 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If we're in print-only mode, we use a much simpler
|
|
|
|
* state machine designed only to recognise the ESC[4i
|
|
|
|
* termination sequence.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->only_printing) {
|
2002-03-09 20:59:15 +03:00
|
|
|
if (c == '\033')
|
2002-10-22 20:11:33 +04:00
|
|
|
term->print_state = 1;
|
2002-03-09 20:59:15 +03:00
|
|
|
else if (c == (unsigned char)'\233')
|
2002-10-22 20:11:33 +04:00
|
|
|
term->print_state = 2;
|
|
|
|
else if (c == '[' && term->print_state == 1)
|
|
|
|
term->print_state = 2;
|
|
|
|
else if (c == '4' && term->print_state == 2)
|
|
|
|
term->print_state = 3;
|
|
|
|
else if (c == 'i' && term->print_state == 3)
|
|
|
|
term->print_state = 4;
|
2002-03-09 20:59:15 +03:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->print_state = 0;
|
|
|
|
if (term->print_state == 4) {
|
|
|
|
term_print_finish(term);
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
/* First see about all those translations. */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->termstate == TOPLEVEL) {
|
|
|
|
if (in_utf(term))
|
|
|
|
switch (term->utf_state) {
|
2001-05-10 12:34:20 +04:00
|
|
|
case 0:
|
|
|
|
if (c < 0x80) {
|
2001-05-19 19:21:05 +04:00
|
|
|
/* UTF-8 must be stateless so we ignore iso2022. */
|
2003-01-14 21:28:23 +03:00
|
|
|
if (term->ucsdata->unitab_ctrl[c] != 0xFF)
|
|
|
|
c = term->ucsdata->unitab_ctrl[c];
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
else c = ((unsigned char)c) | CSET_ASCII;
|
2001-05-19 19:21:05 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
} else if ((c & 0xe0) == 0xc0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_size = term->utf_state = 1;
|
|
|
|
term->utf_char = (c & 0x1f);
|
2001-05-10 12:34:20 +04:00
|
|
|
} else if ((c & 0xf0) == 0xe0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_size = term->utf_state = 2;
|
|
|
|
term->utf_char = (c & 0x0f);
|
2001-05-10 12:34:20 +04:00
|
|
|
} else if ((c & 0xf8) == 0xf0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_size = term->utf_state = 3;
|
|
|
|
term->utf_char = (c & 0x07);
|
2001-05-10 12:34:20 +04:00
|
|
|
} else if ((c & 0xfc) == 0xf8) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_size = term->utf_state = 4;
|
|
|
|
term->utf_char = (c & 0x03);
|
2001-05-10 12:34:20 +04:00
|
|
|
} else if ((c & 0xfe) == 0xfc) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_size = term->utf_state = 5;
|
|
|
|
term->utf_char = (c & 0x01);
|
2001-05-10 12:34:20 +04:00
|
|
|
} else {
|
|
|
|
c = UCSERR;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
case 1:
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
case 4:
|
|
|
|
case 5:
|
|
|
|
if ((c & 0xC0) != 0x80) {
|
2001-09-18 23:41:07 +04:00
|
|
|
unget = c;
|
2001-09-08 02:51:52 +04:00
|
|
|
c = UCSERR;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_state = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf_char = (term->utf_char << 6) | (c & 0x3f);
|
|
|
|
if (--term->utf_state)
|
2001-05-10 12:34:20 +04:00
|
|
|
continue;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
c = term->utf_char;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
/* Is somebody trying to be evil! */
|
|
|
|
if (c < 0x80 ||
|
2002-10-22 20:11:33 +04:00
|
|
|
(c < 0x800 && term->utf_size >= 2) ||
|
|
|
|
(c < 0x10000 && term->utf_size >= 3) ||
|
|
|
|
(c < 0x200000 && term->utf_size >= 4) ||
|
|
|
|
(c < 0x4000000 && term->utf_size >= 5))
|
2001-05-10 12:34:20 +04:00
|
|
|
c = UCSERR;
|
|
|
|
|
|
|
|
/* Unicode line separator and paragraph separator are CR-LF */
|
|
|
|
if (c == 0x2028 || c == 0x2029)
|
|
|
|
c = 0x85;
|
|
|
|
|
|
|
|
/* High controls are probably a Baaad idea too. */
|
|
|
|
if (c < 0xA0)
|
|
|
|
c = 0xFFFD;
|
|
|
|
|
|
|
|
/* The UTF-16 surrogates are not nice either. */
|
|
|
|
/* The standard give the option of decoding these:
|
|
|
|
* I don't want to! */
|
|
|
|
if (c >= 0xD800 && c < 0xE000)
|
|
|
|
c = UCSERR;
|
|
|
|
|
|
|
|
/* ISO 10646 characters now limited to UTF-16 range. */
|
|
|
|
if (c > 0x10FFFF)
|
|
|
|
c = UCSERR;
|
|
|
|
|
|
|
|
/* This is currently a TagPhobic application.. */
|
|
|
|
if (c >= 0xE0000 && c <= 0xE007F)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* U+FEFF is best seen as a null. */
|
|
|
|
if (c == 0xFEFF)
|
|
|
|
continue;
|
|
|
|
/* But U+FFFE is an error. */
|
|
|
|
if (c == 0xFFFE || c == 0xFFFF)
|
|
|
|
c = UCSERR;
|
|
|
|
|
|
|
|
break;
|
2001-05-19 18:12:41 +04:00
|
|
|
}
|
|
|
|
/* Are we in the nasty ACS mode? Note: no sco in utf mode. */
|
2002-10-22 20:11:33 +04:00
|
|
|
else if(term->sco_acs &&
|
2002-11-19 02:49:30 +03:00
|
|
|
(c!='\033' && c!='\012' && c!='\015' && c!='\b'))
|
2001-05-19 18:12:41 +04:00
|
|
|
{
|
2002-12-31 14:03:23 +03:00
|
|
|
if (term->sco_acs == 2) c |= 0x80;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
c |= CSET_SCOACS;
|
2001-05-10 12:34:20 +04:00
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (term->cset_attr[term->cset]) {
|
2001-05-10 12:34:20 +04:00
|
|
|
/*
|
|
|
|
* Linedraw characters are different from 'ESC ( B'
|
|
|
|
* only for a small range. For ones outside that
|
|
|
|
* range, make sure we use the same font as well as
|
|
|
|
* the same encoding.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_LINEDRW:
|
2003-01-14 21:28:23 +03:00
|
|
|
if (term->ucsdata->unitab_ctrl[c] != 0xFF)
|
|
|
|
c = term->ucsdata->unitab_ctrl[c];
|
2001-05-10 12:34:20 +04:00
|
|
|
else
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
c = ((unsigned char) c) | CSET_LINEDRW;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_GBCHR:
|
2001-05-10 12:34:20 +04:00
|
|
|
/* If UK-ASCII, make the '#' a LineDraw Pound */
|
|
|
|
if (c == '#') {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
c = '}' | CSET_LINEDRW;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
/*FALLTHROUGH*/ case CSET_ASCII:
|
2003-01-14 21:28:23 +03:00
|
|
|
if (term->ucsdata->unitab_ctrl[c] != 0xFF)
|
|
|
|
c = term->ucsdata->unitab_ctrl[c];
|
2001-05-10 12:34:20 +04:00
|
|
|
else
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
c = ((unsigned char) c) | CSET_ASCII;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_SCOACS:
|
|
|
|
if (c>=' ') c = ((unsigned char)c) | CSET_SCOACS;
|
2001-05-19 18:12:41 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-01-22 17:01:01 +03:00
|
|
|
/*
|
|
|
|
* How about C1 controls?
|
|
|
|
* Explicitly ignore SCI (0x9a), which we don't translate to DECID.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if ((c & -32) == 0x80 && term->termstate < DO_CTRLS &&
|
|
|
|
!term->vt52_mode && has_compat(VT220)) {
|
2005-01-22 17:01:01 +03:00
|
|
|
if (c == 0x9a)
|
|
|
|
c = 0;
|
|
|
|
else {
|
|
|
|
term->termstate = SEEN_ESC;
|
|
|
|
term->esc_query = FALSE;
|
|
|
|
c = '@' + (c & 0x1F);
|
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Or the GL control. */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (c == '\177' && term->termstate < DO_CTRLS && has_compat(OTHER)) {
|
|
|
|
if (term->curs.x && !term->wrapnext)
|
|
|
|
term->curs.x--;
|
|
|
|
term->wrapnext = FALSE;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
/* destructive backspace might be disabled */
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_dbackspace) {
|
2004-10-15 15:51:26 +04:00
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
|
|
|
check_boundary(term, term->curs.x+1, term->curs.y);
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(scrlineptr(term->curs.y),
|
|
|
|
term->curs.x, &term->erase_char);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
} else
|
|
|
|
/* Or normal C0 controls. */
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if ((c & ~0x1F) == 0 && term->termstate < DO_CTRLS) {
|
1999-01-08 16:02:13 +03:00
|
|
|
switch (c) {
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\005': /* ENQ: terminal type query */
|
2005-02-20 00:56:25 +03:00
|
|
|
/*
|
|
|
|
* Strictly speaking this is VT100 but a VT100 defaults to
|
2000-03-17 13:39:05 +03:00
|
|
|
* no response. Other terminals respond at their option.
|
|
|
|
*
|
|
|
|
* Don't put a CR in the default string as this tends to
|
|
|
|
* upset some weird software.
|
|
|
|
*/
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSIMIN);
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
|
|
|
lpage_send(term->ldisc, DEFAULT_CODEPAGE,
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->answerback, term->answerbacklen, 0);
|
2001-04-09 16:43:46 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\007': /* BEL: Bell */
|
2001-04-13 14:52:36 +04:00
|
|
|
{
|
|
|
|
struct beeptime *newbeep;
|
2001-10-23 23:51:23 +04:00
|
|
|
unsigned long ticks;
|
2001-04-13 14:52:36 +04:00
|
|
|
|
2002-10-07 20:45:23 +04:00
|
|
|
ticks = GETTICKCOUNT();
|
2001-04-13 14:52:36 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (!term->beep_overloaded) {
|
2003-03-29 19:14:26 +03:00
|
|
|
newbeep = snew(struct beeptime);
|
2001-04-13 14:52:36 +04:00
|
|
|
newbeep->ticks = ticks;
|
|
|
|
newbeep->next = NULL;
|
2002-10-22 20:11:33 +04:00
|
|
|
if (!term->beephead)
|
|
|
|
term->beephead = newbeep;
|
2001-04-13 14:52:36 +04:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->beeptail->next = newbeep;
|
|
|
|
term->beeptail = newbeep;
|
|
|
|
term->nbeeps++;
|
2001-04-13 14:52:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Throw out any beeps that happened more than
|
|
|
|
* t seconds ago.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
while (term->beephead &&
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->beephead->ticks < ticks - term->bellovl_t) {
|
2002-10-22 20:11:33 +04:00
|
|
|
struct beeptime *tmp = term->beephead;
|
|
|
|
term->beephead = tmp->next;
|
2001-04-13 14:52:36 +04:00
|
|
|
sfree(tmp);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (!term->beephead)
|
|
|
|
term->beeptail = NULL;
|
|
|
|
term->nbeeps--;
|
2001-04-13 14:52:36 +04:00
|
|
|
}
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->bellovl && term->beep_overloaded &&
|
|
|
|
ticks - term->lastbeep >= (unsigned)term->bellovl_s) {
|
2001-04-13 14:52:36 +04:00
|
|
|
/*
|
|
|
|
* If we're currently overloaded and the
|
|
|
|
* last beep was more than s seconds ago,
|
|
|
|
* leave overload mode.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->beep_overloaded = FALSE;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
} else if (term->bellovl && !term->beep_overloaded &&
|
|
|
|
term->nbeeps >= term->bellovl_n) {
|
2001-04-13 14:52:36 +04:00
|
|
|
/*
|
|
|
|
* Now, if we have n or more beeps
|
|
|
|
* remaining in the queue, go into overload
|
|
|
|
* mode.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->beep_overloaded = TRUE;
|
2001-04-13 14:52:36 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->lastbeep = ticks;
|
2001-04-13 14:52:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform an actual beep if we're not overloaded.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->bellovl || !term->beep_overloaded) {
|
|
|
|
do_beep(term->frontend, term->beep);
|
2004-11-27 16:20:21 +03:00
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->beep == BELL_VISUAL) {
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_vbell(term, FALSE, 0);
|
2002-10-29 00:58:07 +03:00
|
|
|
}
|
2001-04-13 14:52:36 +04:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-04-13 14:52:36 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\b': /* BS: Back space */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.x == 0 &&
|
|
|
|
(term->curs.y == 0 || term->wrap == 0))
|
|
|
|
/* do nothing */ ;
|
|
|
|
else if (term->curs.x == 0 && term->curs.y > 0)
|
|
|
|
term->curs.x = term->cols - 1, term->curs.y--;
|
|
|
|
else if (term->wrapnext)
|
|
|
|
term->wrapnext = FALSE;
|
1999-01-08 16:02:13 +03:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x--;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\016': /* LS1: Locking-shift one */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cset = 1;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\017': /* LS0: Locking-shift zero */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cset = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\033': /* ESC: Escape */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->vt52_mode)
|
|
|
|
term->termstate = VT52_ESC;
|
2000-03-17 13:39:05 +03:00
|
|
|
else {
|
|
|
|
compatibility(ANSIMIN);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_ESC;
|
|
|
|
term->esc_query = FALSE;
|
2000-03-17 13:39:05 +03:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\015': /* CR: Carriage return */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x = 0;
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2007-08-04 23:16:46 +04:00
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
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++;
|
|
|
|
}
|
2002-10-26 16:58:13 +04:00
|
|
|
if (term->logctx)
|
|
|
|
logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII);
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\014': /* FF: Form feed */
|
2001-05-09 17:35:08 +04:00
|
|
|
if (has_compat(SCOANSI)) {
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, 0, 0, 0);
|
|
|
|
erase_lots(term, FALSE, FALSE, TRUE);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-09 17:35:08 +04:00
|
|
|
break;
|
|
|
|
}
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\013': /* VT: Line tabulation */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\012': /* LF: Line feed */
|
2002-10-22 20:11:33 +04:00
|
|
|
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++;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->lfhascr)
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x = 0;
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2002-10-26 16:58:13 +04:00
|
|
|
if (term->logctx)
|
|
|
|
logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII);
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '\t': /* HT: Character tabulation */
|
1999-01-08 16:02:13 +03:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
pos old_curs = term->curs;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata = scrlineptr(term->curs.y);
|
2000-07-26 16:13:51 +04:00
|
|
|
|
|
|
|
do {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x++;
|
|
|
|
} while (term->curs.x < term->cols - 1 &&
|
|
|
|
!term->tabs[term->curs.x]);
|
2000-07-26 16:13:51 +04:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if ((ldata->lattr & LATTR_MODE) != LATTR_NORM) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.x >= term->cols / 2)
|
|
|
|
term->curs.x = term->cols / 2 - 1;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.x >= term->cols)
|
|
|
|
term->curs.x = term->cols - 1;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
check_selection(term, old_curs, term->curs);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
1999-11-30 13:52:07 +03:00
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
} else
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (term->termstate) {
|
2001-05-06 18:35:20 +04:00
|
|
|
case TOPLEVEL:
|
2002-10-22 20:11:33 +04:00
|
|
|
/* Only graphic characters get this far;
|
|
|
|
* ctrls are stripped above */
|
2001-05-10 12:34:20 +04:00
|
|
|
{
|
2004-10-14 20:42:43 +04:00
|
|
|
termline *cline = scrlineptr(term->curs.y);
|
2001-05-10 12:34:20 +04:00
|
|
|
int width = 0;
|
|
|
|
if (DIRECT_CHAR(c))
|
|
|
|
width = 1;
|
|
|
|
if (!width)
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
width = (term->cjk_ambig_wide ?
|
2012-02-17 23:28:55 +04:00
|
|
|
mk_wcwidth_cjk((unsigned int) c) :
|
|
|
|
mk_wcwidth((unsigned int) c));
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
if (term->wrapnext && term->wrap && width > 0) {
|
|
|
|
cline->lattr |= LATTR_WRAPPED;
|
|
|
|
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++;
|
|
|
|
term->curs.x = 0;
|
|
|
|
term->wrapnext = FALSE;
|
2004-10-15 13:06:45 +04:00
|
|
|
cline = scrlineptr(term->curs.y);
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
|
|
|
if (term->insert && width > 0)
|
|
|
|
insch(term, width);
|
|
|
|
if (term->selstate != NO_SELECTION) {
|
|
|
|
pos cursplus = term->curs;
|
|
|
|
incpos(cursplus);
|
|
|
|
check_selection(term, term->curs, cursplus);
|
|
|
|
}
|
|
|
|
if (((c & CSET_MASK) == CSET_ASCII ||
|
|
|
|
(c & CSET_MASK) == 0) &&
|
|
|
|
term->logctx)
|
|
|
|
logtraffic(term->logctx, (unsigned char) c,
|
|
|
|
LGTYP_ASCII);
|
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
switch (width) {
|
|
|
|
case 2:
|
2003-01-02 19:20:29 +03:00
|
|
|
/*
|
|
|
|
* If we're about to display a double-width
|
|
|
|
* character starting in the rightmost
|
|
|
|
* column, then we do something special
|
|
|
|
* instead. We must print a space in the
|
|
|
|
* last column of the screen, then wrap;
|
|
|
|
* and we also set LATTR_WRAPPED2 which
|
|
|
|
* instructs subsequent cut-and-pasting not
|
|
|
|
* only to splice this line to the one
|
|
|
|
* after it, but to ignore the space in the
|
|
|
|
* last character position as well.
|
|
|
|
* (Because what was actually output to the
|
|
|
|
* terminal was presumably just a sequence
|
|
|
|
* of CJK characters, and we don't want a
|
|
|
|
* space to be pasted in the middle of
|
|
|
|
* those just because they had the
|
|
|
|
* misfortune to start in the wrong parity
|
|
|
|
* column. xterm concurs.)
|
|
|
|
*/
|
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
|
|
|
check_boundary(term, term->curs.x+2, term->curs.y);
|
|
|
|
if (term->curs.x == term->cols-1) {
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(cline, term->curs.x,
|
|
|
|
&term->erase_char);
|
|
|
|
cline->lattr |= LATTR_WRAPPED | LATTR_WRAPPED2;
|
2002-10-22 20:11:33 +04:00
|
|
|
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++;
|
|
|
|
term->curs.x = 0;
|
2004-12-17 14:24:25 +03:00
|
|
|
cline = scrlineptr(term->curs.y);
|
2003-01-02 19:20:29 +03:00
|
|
|
/* Now we must check_boundary again, of course. */
|
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
|
|
|
check_boundary(term, term->curs.x+2, term->curs.y);
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/* FULL-TERMCHAR */
|
|
|
|
clear_cc(cline, term->curs.x);
|
|
|
|
cline->chars[term->curs.x].chr = c;
|
|
|
|
cline->chars[term->curs.x].attr = term->curr_attr;
|
2017-09-30 19:32:32 +03:00
|
|
|
cline->chars[term->curs.x].truecolour =
|
|
|
|
term->curr_truecolour;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
term->curs.x++;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/* FULL-TERMCHAR */
|
|
|
|
clear_cc(cline, term->curs.x);
|
|
|
|
cline->chars[term->curs.x].chr = UCSWIDE;
|
|
|
|
cline->chars[term->curs.x].attr = term->curr_attr;
|
2017-09-30 19:32:32 +03:00
|
|
|
cline->chars[term->curs.x].truecolour =
|
|
|
|
term->curr_truecolour;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
2001-09-15 19:54:24 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
case 1:
|
2003-01-02 19:20:29 +03:00
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
|
|
|
check_boundary(term, term->curs.x+1, term->curs.y);
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
/* FULL-TERMCHAR */
|
|
|
|
clear_cc(cline, term->curs.x);
|
|
|
|
cline->chars[term->curs.x].chr = c;
|
|
|
|
cline->chars[term->curs.x].attr = term->curr_attr;
|
2017-09-30 19:32:32 +03:00
|
|
|
cline->chars[term->curs.x].truecolour =
|
|
|
|
term->curr_truecolour;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2004-10-14 20:42:43 +04:00
|
|
|
case 0:
|
2004-10-15 13:28:46 +04:00
|
|
|
if (term->curs.x > 0) {
|
|
|
|
int x = term->curs.x - 1;
|
|
|
|
|
|
|
|
/* If we're in wrapnext state, the character
|
|
|
|
* to combine with is _here_, not to our left. */
|
|
|
|
if (term->wrapnext)
|
|
|
|
x++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the previous character is
|
|
|
|
* UCSWIDE, back up another one.
|
|
|
|
*/
|
|
|
|
if (cline->chars[x].chr == UCSWIDE) {
|
|
|
|
assert(x > 0);
|
|
|
|
x--;
|
|
|
|
}
|
|
|
|
|
|
|
|
add_cc(cline, x, c);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2004-10-15 13:28:46 +04:00
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
continue;
|
2001-05-10 12:34:20 +04:00
|
|
|
default:
|
|
|
|
continue;
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
term->curs.x++;
|
|
|
|
if (term->curs.x == term->cols) {
|
|
|
|
term->curs.x--;
|
|
|
|
term->wrapnext = TRUE;
|
|
|
|
if (term->wrap && term->vt52_mode) {
|
|
|
|
cline->lattr |= LATTR_WRAPPED;
|
|
|
|
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++;
|
|
|
|
term->curs.x = 0;
|
|
|
|
term->wrapnext = FALSE;
|
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2000-03-17 13:39:05 +03:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
|
|
|
|
case OSC_MAYBE_ST:
|
|
|
|
/*
|
|
|
|
* This state is virtually identical to SEEN_ESC, with the
|
|
|
|
* exception that we have an OSC sequence in the pipeline,
|
|
|
|
* and _if_ we see a backslash, we process it.
|
|
|
|
*/
|
|
|
|
if (c == '\\') {
|
2002-10-22 20:11:33 +04:00
|
|
|
do_osc(term);
|
|
|
|
term->termstate = TOPLEVEL;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2000-03-17 13:39:05 +03:00
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
/* else fall through */
|
|
|
|
case SEEN_ESC:
|
2001-05-10 12:34:20 +04:00
|
|
|
if (c >= ' ' && c <= '/') {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_query)
|
|
|
|
term->esc_query = -1;
|
2001-05-10 12:34:20 +04:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->esc_query = c;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
|
|
|
switch (ANSI(c, term->esc_query)) {
|
2003-06-21 23:38:56 +04:00
|
|
|
case '[': /* enter CSI mode */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_CSI;
|
|
|
|
term->esc_nargs = 1;
|
|
|
|
term->esc_args[0] = ARG_DEFAULT;
|
|
|
|
term->esc_query = FALSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ']': /* OSC: xterm escape sequences */
|
2001-05-06 18:35:20 +04:00
|
|
|
/* Compatibility is nasty here, xterm, linux, decterm yuk! */
|
|
|
|
compatibility(OTHER);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_OSC;
|
|
|
|
term->esc_args[0] = 0;
|
2017-10-05 22:43:02 +03:00
|
|
|
term->esc_nargs = 1;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '7': /* DECSC: save cursor */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
save_cursor(term, TRUE);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '8': /* DECRC: restore cursor */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
save_cursor(term, FALSE);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '=': /* DECKPAM: Keypad application mode */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->app_keypad_keys = TRUE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '>': /* DECKPNM: Keypad numeric mode */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->app_keypad_keys = FALSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'D': /* IND: exactly equivalent to LF */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
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++;
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'E': /* NEL: exactly equivalent to CR-LF */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x = 0;
|
|
|
|
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++;
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'M': /* RI: reverse index - backwards LF */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.y == term->marg_t)
|
|
|
|
scroll(term, term->marg_t, term->marg_b, -1, TRUE);
|
|
|
|
else if (term->curs.y > 0)
|
|
|
|
term->curs.y--;
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'Z': /* DECID: terminal type query */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2017-09-05 22:14:33 +03:00
|
|
|
if (term->ldisc && term->id_string[0])
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, term->id_string,
|
|
|
|
strlen(term->id_string), 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'c': /* RIS: restore power-on settings */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2006-02-19 17:59:48 +03:00
|
|
|
power_on(term, TRUE);
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) /* cause ldisc to notice changes */
|
Move echo/edit state change functionality out of ldisc_send.
I'm not actually sure why we've always had back ends notify ldisc of
changes to echo/edit settings by giving ldisc_send(ldisc,NULL,0,0) a
special meaning, instead of by having a separate dedicated notify
function with its own prototype and parameter set. Coverity's recent
observation that the two kinds of call don't even have the same
requirements on the ldisc (particularly, whether ldisc->term can be
NULL) makes me realise that it's really high time I separated the two
conceptually different operations into actually different functions.
While I'm here, I've renamed the confusing ldisc_update() function
which that special operation ends up feeding to, because it's not
actually a function applying to an ldisc - it applies to a front end.
So ldisc_send(ldisc,NULL,0,0) is now ldisc_echoedit_update(ldisc), and
that in turn figures out the current echo/edit settings before passing
them on to frontend_echoedit_update(). I think that should be clearer.
2014-11-22 19:12:47 +03:00
|
|
|
ldisc_echoedit_update(term->ldisc);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->reset_132) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
request_resize(term->frontend, 80, term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->reset_132 = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'H': /* HTS: set a tab */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->tabs[term->curs.x] = TRUE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('8', '#'): /* DECALN: fills screen with Es :-) */
|
2001-05-10 12:34:20 +04:00
|
|
|
compatibility(VT100);
|
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata;
|
2001-05-10 12:34:20 +04:00
|
|
|
int i, j;
|
|
|
|
pos scrtop, scrbot;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->rows; i++) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata = scrlineptr(i);
|
2014-07-24 01:48:02 +04:00
|
|
|
check_line_size(term, ldata);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (j = 0; j < term->cols; j++) {
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(ldata, j,
|
|
|
|
&term->basic_erase_char);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ldata->chars[j].chr = 'E';
|
|
|
|
}
|
|
|
|
ldata->lattr = LATTR_NORM;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-10 12:34:20 +04:00
|
|
|
scrtop.x = scrtop.y = 0;
|
|
|
|
scrbot.x = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
scrbot.y = term->rows;
|
|
|
|
check_selection(term, scrtop, scrbot);
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ANSI('3', '#'):
|
|
|
|
case ANSI('4', '#'):
|
|
|
|
case ANSI('5', '#'):
|
|
|
|
case ANSI('6', '#'):
|
|
|
|
compatibility(VT100);
|
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
int nlattr;
|
2014-07-24 01:48:02 +04:00
|
|
|
termline *ldata;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (ANSI(c, term->esc_query)) {
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('3', '#'): /* DECDHL: 2*height, top */
|
2001-05-10 12:34:20 +04:00
|
|
|
nlattr = LATTR_TOP;
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('4', '#'): /* DECDHL: 2*height, bottom */
|
2001-05-10 12:34:20 +04:00
|
|
|
nlattr = LATTR_BOT;
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('5', '#'): /* DECSWL: normal */
|
2001-05-10 12:34:20 +04:00
|
|
|
nlattr = LATTR_NORM;
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
default: /* case ANSI('6', '#'): DECDWL: 2*width */
|
2001-05-10 12:34:20 +04:00
|
|
|
nlattr = LATTR_WIDE;
|
|
|
|
break;
|
|
|
|
}
|
2014-07-24 01:48:02 +04:00
|
|
|
ldata = scrlineptr(term->curs.y);
|
|
|
|
check_line_size(term, ldata);
|
|
|
|
ldata->lattr = nlattr;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
/* GZD4: G0 designate 94-set */
|
2001-05-10 12:34:20 +04:00
|
|
|
case ANSI('A', '('):
|
|
|
|
compatibility(VT100);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[0] = CSET_GBCHR;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case ANSI('B', '('):
|
|
|
|
compatibility(VT100);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[0] = CSET_ASCII;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case ANSI('0', '('):
|
|
|
|
compatibility(VT100);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[0] = CSET_LINEDRW;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
2001-05-19 18:12:41 +04:00
|
|
|
case ANSI('U', '('):
|
|
|
|
compatibility(OTHER);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[0] = CSET_SCOACS;
|
2001-05-19 18:12:41 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
/* G1D4: G1-designate 94-set */
|
2001-05-10 12:34:20 +04:00
|
|
|
case ANSI('A', ')'):
|
|
|
|
compatibility(VT100);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[1] = CSET_GBCHR;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case ANSI('B', ')'):
|
|
|
|
compatibility(VT100);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[1] = CSET_ASCII;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case ANSI('0', ')'):
|
|
|
|
compatibility(VT100);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[1] = CSET_LINEDRW;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
2001-05-19 18:12:41 +04:00
|
|
|
case ANSI('U', ')'):
|
|
|
|
compatibility(OTHER);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[1] = CSET_SCOACS;
|
2001-05-19 18:12:41 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
/* DOCS: Designate other coding system */
|
2001-05-10 12:34:20 +04:00
|
|
|
case ANSI('8', '%'): /* Old Linux code */
|
|
|
|
case ANSI('G', '%'):
|
|
|
|
compatibility(OTHER);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf = 1;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case ANSI('@', '%'):
|
|
|
|
compatibility(OTHER);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_charset)
|
2002-10-22 20:11:33 +04:00
|
|
|
term->utf = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case SEEN_CSI:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL; /* default */
|
2001-05-06 18:35:20 +04:00
|
|
|
if (isdigit(c)) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs <= ARGS_MAX) {
|
|
|
|
if (term->esc_args[term->esc_nargs - 1] == ARG_DEFAULT)
|
|
|
|
term->esc_args[term->esc_nargs - 1] = 0;
|
2015-10-08 01:54:39 +03:00
|
|
|
if (term->esc_args[term->esc_nargs - 1] <=
|
|
|
|
UINT_MAX / 10 &&
|
|
|
|
term->esc_args[term->esc_nargs - 1] * 10 <=
|
|
|
|
UINT_MAX - c - '0')
|
|
|
|
term->esc_args[term->esc_nargs - 1] =
|
|
|
|
10 * term->esc_args[term->esc_nargs - 1] +
|
|
|
|
c - '0';
|
|
|
|
else
|
|
|
|
term->esc_args[term->esc_nargs - 1] = UINT_MAX;
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_CSI;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else if (c == ';') {
|
2010-12-07 03:21:42 +03:00
|
|
|
if (term->esc_nargs < ARGS_MAX)
|
|
|
|
term->esc_args[term->esc_nargs++] = ARG_DEFAULT;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_CSI;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else if (c < '@') {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_query)
|
|
|
|
term->esc_query = -1;
|
2001-05-06 18:35:20 +04:00
|
|
|
else if (c == '?')
|
2002-10-22 20:11:33 +04:00
|
|
|
term->esc_query = TRUE;
|
2001-05-06 18:35:20 +04:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->esc_query = c;
|
|
|
|
term->termstate = SEEN_CSI;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else
|
2015-10-08 01:54:39 +03:00
|
|
|
#define CLAMP(arg, lim) ((arg) = ((arg) > (lim)) ? (lim) : (arg))
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (ANSI(c, term->esc_query)) {
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'A': /* CUU: move up N lines */
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x,
|
|
|
|
term->curs.y - def(term->esc_args[0], 1), 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'e': /* VPR: move down N lines */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSI);
|
2001-05-19 15:34:20 +04:00
|
|
|
/* FALLTHROUGH */
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'B': /* CUD: Cursor down */
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x,
|
|
|
|
term->curs.y + def(term->esc_args[0], 1), 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('c', '>'): /* DA: report xterm version */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(OTHER);
|
|
|
|
/* this reports xterm version 136 so that VIM can
|
|
|
|
use the drag messages from the mouse reporting */
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc)
|
|
|
|
ldisc_send(term->ldisc, "\033[>0;136;0c", 11, 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'a': /* HPR: move right N cols */
|
2001-05-19 15:34:20 +04:00
|
|
|
compatibility(ANSI);
|
|
|
|
/* FALLTHROUGH */
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'C': /* CUF: Cursor right */
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x + def(term->esc_args[0], 1),
|
|
|
|
term->curs.y, 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'D': /* CUB: move left N cols */
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x - def(term->esc_args[0], 1),
|
|
|
|
term->curs.y, 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'E': /* CNL: move down N lines and CR */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSI);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, 0,
|
|
|
|
term->curs.y + def(term->esc_args[0], 1), 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'F': /* CPL: move up N lines and CR */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSI);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, 0,
|
|
|
|
term->curs.y - def(term->esc_args[0], 1), 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'G': /* CHA */
|
|
|
|
case '`': /* HPA: set horizontal posn */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSI);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, def(term->esc_args[0], 1) - 1,
|
|
|
|
term->curs.y, 0);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'd': /* VPA: set vertical posn */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSI);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x,
|
|
|
|
((term->dec_om ? term->marg_t : 0) +
|
|
|
|
def(term->esc_args[0], 1) - 1),
|
|
|
|
(term->dec_om ? 2 : 0));
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'H': /* CUP */
|
|
|
|
case 'f': /* HVP: set horz and vert posns at once */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs < 2)
|
|
|
|
term->esc_args[1] = ARG_DEFAULT;
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
|
|
|
CLAMP(term->esc_args[1], term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, def(term->esc_args[1], 1) - 1,
|
|
|
|
((term->dec_om ? term->marg_t : 0) +
|
|
|
|
def(term->esc_args[0], 1) - 1),
|
|
|
|
(term->dec_om ? 2 : 0));
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'J': /* ED: erase screen or parts of it */
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2006-09-06 02:08:00 +04:00
|
|
|
unsigned int i = def(term->esc_args[0], 0);
|
|
|
|
if (i == 3) {
|
|
|
|
/* Erase Saved Lines (xterm)
|
|
|
|
* This follows Thomas Dickey's xterm. */
|
2016-11-17 23:25:27 +03:00
|
|
|
if (!term->no_remote_clearscroll)
|
|
|
|
term_clrsb(term);
|
2006-09-06 02:08:00 +04:00
|
|
|
} else {
|
|
|
|
i++;
|
|
|
|
if (i > 3)
|
|
|
|
i = 0;
|
|
|
|
erase_lots(term, FALSE, !!(i & 2), !!(i & 1));
|
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'K': /* EL: erase line or parts of it */
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
unsigned int i = def(term->esc_args[0], 0) + 1;
|
2001-05-06 18:35:20 +04:00
|
|
|
if (i > 3)
|
|
|
|
i = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, TRUE, !!(i & 2), !!(i & 1));
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'L': /* IL: insert lines */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT102);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.y <= term->marg_b)
|
|
|
|
scroll(term, term->curs.y, term->marg_b,
|
|
|
|
-def(term->esc_args[0], 1), FALSE);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'M': /* DL: delete lines */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT102);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.y <= term->marg_b)
|
|
|
|
scroll(term, term->curs.y, term->marg_b,
|
|
|
|
def(term->esc_args[0], 1),
|
2001-05-06 18:35:20 +04:00
|
|
|
TRUE);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case '@': /* ICH: insert chars */
|
2001-05-06 18:35:20 +04:00
|
|
|
/* XXX VTTEST says this is vt220, vt510 manual says vt102 */
|
|
|
|
compatibility(VT102);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
insch(term, def(term->esc_args[0], 1));
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'P': /* DCH: delete chars */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT102);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2002-10-22 20:11:33 +04:00
|
|
|
insch(term, -def(term->esc_args[0], 1));
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'c': /* DA: terminal type query */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
|
|
|
/* This is the response for a VT102 */
|
2017-09-05 22:14:33 +03:00
|
|
|
if (term->ldisc && term->id_string[0])
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, term->id_string,
|
|
|
|
strlen(term->id_string), 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'n': /* DSR: cursor position query */
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
|
|
|
if (term->esc_args[0] == 6) {
|
|
|
|
char buf[32];
|
|
|
|
sprintf(buf, "\033[%d;%dR", term->curs.y + 1,
|
|
|
|
term->curs.x + 1);
|
|
|
|
ldisc_send(term->ldisc, buf, strlen(buf), 0);
|
|
|
|
} else if (term->esc_args[0] == 5) {
|
|
|
|
ldisc_send(term->ldisc, "\033[0n", 4, 0);
|
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'h': /* SM: toggle modes to high */
|
2001-05-06 18:35:20 +04:00
|
|
|
case ANSI_QUE('h'):
|
|
|
|
compatibility(VT100);
|
|
|
|
{
|
|
|
|
int i;
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->esc_nargs; i++)
|
|
|
|
toggle_mode(term, term->esc_args[i],
|
|
|
|
term->esc_query, TRUE);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'i': /* MC: Media copy */
|
2002-03-09 20:59:15 +03:00
|
|
|
case ANSI_QUE('i'):
|
|
|
|
compatibility(VT100);
|
|
|
|
{
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
char *printer;
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs != 1) break;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->esc_args[0] == 5 &&
|
|
|
|
(printer = conf_get_str(term->conf,
|
|
|
|
CONF_printer))[0]) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->printing = TRUE;
|
|
|
|
term->only_printing = !term->esc_query;
|
|
|
|
term->print_state = 0;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term_print_setup(term, printer);
|
2002-10-22 20:11:33 +04:00
|
|
|
} else if (term->esc_args[0] == 4 &&
|
|
|
|
term->printing) {
|
|
|
|
term_print_finish(term);
|
2002-03-09 20:59:15 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'l': /* RM: toggle modes to low */
|
2001-05-06 18:35:20 +04:00
|
|
|
case ANSI_QUE('l'):
|
|
|
|
compatibility(VT100);
|
|
|
|
{
|
|
|
|
int i;
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->esc_nargs; i++)
|
|
|
|
toggle_mode(term, term->esc_args[i],
|
|
|
|
term->esc_query, FALSE);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'g': /* TBC: clear tabs */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs == 1) {
|
|
|
|
if (term->esc_args[0] == 0) {
|
|
|
|
term->tabs[term->curs.x] = FALSE;
|
|
|
|
} else if (term->esc_args[0] == 3) {
|
2001-05-06 18:35:20 +04:00
|
|
|
int i;
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->cols; i++)
|
|
|
|
term->tabs[i] = FALSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'r': /* DECSTBM: set scroll margins */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs <= 2) {
|
2001-05-06 18:35:20 +04:00
|
|
|
int top, bot;
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
|
|
|
CLAMP(term->esc_args[1], term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
top = def(term->esc_args[0], 1) - 1;
|
|
|
|
bot = (term->esc_nargs <= 1
|
|
|
|
|| term->esc_args[1] == 0 ?
|
|
|
|
term->rows :
|
|
|
|
def(term->esc_args[1], term->rows)) - 1;
|
|
|
|
if (bot >= term->rows)
|
|
|
|
bot = term->rows - 1;
|
2001-05-06 18:35:20 +04:00
|
|
|
/* VTTEST Bug 9 - if region is less than 2 lines
|
|
|
|
* don't change region.
|
|
|
|
*/
|
|
|
|
if (bot - top > 0) {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->marg_t = top;
|
|
|
|
term->marg_b = bot;
|
|
|
|
term->curs.x = 0;
|
2001-05-06 18:35:20 +04:00
|
|
|
/*
|
|
|
|
* I used to think the cursor should be
|
|
|
|
* placed at the top of the newly marginned
|
|
|
|
* area. Apparently not: VMS TPU falls over
|
|
|
|
* if so.
|
|
|
|
*
|
2002-10-22 20:11:33 +04:00
|
|
|
* Well actually it should for
|
|
|
|
* Origin mode - RDB
|
2001-05-06 18:35:20 +04:00
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.y = (term->dec_om ?
|
|
|
|
term->marg_t : 0);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'm': /* SGR: set graphics rendition */
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
|
|
|
/*
|
2002-10-22 20:11:33 +04:00
|
|
|
* A VT100 without the AVO only had one
|
|
|
|
* attribute, either underline or
|
|
|
|
* reverse video depending on the
|
|
|
|
* cursor type, this was selected by
|
|
|
|
* CSI 7m.
|
2001-05-06 18:35:20 +04:00
|
|
|
*
|
|
|
|
* case 2:
|
2002-10-22 20:11:33 +04:00
|
|
|
* This is sometimes DIM, eg on the
|
|
|
|
* GIGI and Linux
|
2001-05-06 18:35:20 +04:00
|
|
|
* case 8:
|
2001-05-10 12:34:20 +04:00
|
|
|
* This is sometimes INVIS various ANSI.
|
2001-05-06 18:35:20 +04:00
|
|
|
* case 21:
|
|
|
|
* This like 22 disables BOLD, DIM and INVIS
|
|
|
|
*
|
2002-10-22 20:11:33 +04:00
|
|
|
* The ANSI colours appear on any
|
|
|
|
* terminal that has colour (obviously)
|
|
|
|
* but the interaction between sgr0 and
|
|
|
|
* the colours varies but is usually
|
|
|
|
* related to the background colour
|
|
|
|
* erase item. The interaction between
|
|
|
|
* colour attributes and the mono ones
|
|
|
|
* is also very implementation
|
|
|
|
* dependent.
|
2001-05-06 18:35:20 +04:00
|
|
|
*
|
2002-10-22 20:11:33 +04:00
|
|
|
* The 39 and 49 attributes are likely
|
|
|
|
* to be unimplemented.
|
2001-05-06 18:35:20 +04:00
|
|
|
*/
|
|
|
|
int i;
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->esc_nargs; i++) {
|
|
|
|
switch (def(term->esc_args[i], 0)) {
|
2001-05-06 18:35:20 +04:00
|
|
|
case 0: /* restore defaults */
|
2003-06-22 02:40:42 +04:00
|
|
|
term->curr_attr = term->default_attr;
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour =
|
|
|
|
term->basic_erase_char.truecolour;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 1: /* enable bold */
|
|
|
|
compatibility(VT100AVO);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr |= ATTR_BOLD;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2017-10-05 23:02:56 +03:00
|
|
|
case 2: /* enable dim */
|
|
|
|
compatibility(OTHER);
|
|
|
|
term->curr_attr |= ATTR_DIM;
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 21: /* (enable double underline) */
|
|
|
|
compatibility(OTHER);
|
|
|
|
case 4: /* enable underline */
|
|
|
|
compatibility(VT100AVO);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr |= ATTR_UNDER;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 5: /* enable blink */
|
|
|
|
compatibility(VT100AVO);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr |= ATTR_BLINK;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-16 02:05:05 +04:00
|
|
|
case 6: /* SCO light bkgrd */
|
|
|
|
compatibility(SCOANSI);
|
|
|
|
term->blink_is_real = FALSE;
|
|
|
|
term->curr_attr |= ATTR_BLINK;
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
2003-06-16 02:05:05 +04:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 7: /* enable reverse video */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr |= ATTR_REVERSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2001-05-19 18:12:41 +04:00
|
|
|
case 10: /* SCO acs off */
|
|
|
|
compatibility(SCOANSI);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->no_remote_charset) break;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->sco_acs = 0; break;
|
2001-05-19 18:12:41 +04:00
|
|
|
case 11: /* SCO acs on */
|
|
|
|
compatibility(SCOANSI);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->no_remote_charset) break;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->sco_acs = 1; break;
|
2002-12-31 14:03:23 +03:00
|
|
|
case 12: /* SCO acs on, |0x80 */
|
2001-05-19 18:12:41 +04:00
|
|
|
compatibility(SCOANSI);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->no_remote_charset) break;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->sco_acs = 2; break;
|
2017-10-05 23:02:56 +03:00
|
|
|
case 22: /* disable bold and dim */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility2(OTHER, VT220);
|
2017-10-05 23:02:56 +03:00
|
|
|
term->curr_attr &= ~(ATTR_BOLD | ATTR_DIM);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 24: /* disable underline */
|
|
|
|
compatibility2(OTHER, VT220);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_UNDER;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 25: /* disable blink */
|
|
|
|
compatibility2(OTHER, VT220);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_BLINK;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 27: /* disable reverse video */
|
|
|
|
compatibility2(OTHER, VT220);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_REVERSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 30:
|
|
|
|
case 31:
|
|
|
|
case 32:
|
|
|
|
case 33:
|
|
|
|
case 34:
|
|
|
|
case 35:
|
|
|
|
case 36:
|
|
|
|
case 37:
|
|
|
|
/* foreground */
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour.fg.enabled = FALSE;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_FGMASK;
|
|
|
|
term->curr_attr |=
|
|
|
|
(term->esc_args[i] - 30)<<ATTR_FGSHIFT;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-01-28 02:03:31 +03:00
|
|
|
case 90:
|
|
|
|
case 91:
|
|
|
|
case 92:
|
|
|
|
case 93:
|
|
|
|
case 94:
|
|
|
|
case 95:
|
|
|
|
case 96:
|
|
|
|
case 97:
|
2005-02-20 00:56:25 +03:00
|
|
|
/* aixterm-style bright foreground */
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour.fg.enabled = FALSE;
|
2003-01-28 02:03:31 +03:00
|
|
|
term->curr_attr &= ~ATTR_FGMASK;
|
|
|
|
term->curr_attr |=
|
2004-11-28 18:13:34 +03:00
|
|
|
((term->esc_args[i] - 90 + 8)
|
2003-01-28 02:03:31 +03:00
|
|
|
<< ATTR_FGSHIFT);
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 39: /* default-foreground */
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour.fg.enabled = FALSE;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_FGMASK;
|
|
|
|
term->curr_attr |= ATTR_DEFFG;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 40:
|
|
|
|
case 41:
|
|
|
|
case 42:
|
|
|
|
case 43:
|
|
|
|
case 44:
|
|
|
|
case 45:
|
|
|
|
case 46:
|
|
|
|
case 47:
|
|
|
|
/* background */
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour.bg.enabled = FALSE;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_BGMASK;
|
|
|
|
term->curr_attr |=
|
|
|
|
(term->esc_args[i] - 40)<<ATTR_BGSHIFT;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-01-28 02:03:31 +03:00
|
|
|
case 100:
|
|
|
|
case 101:
|
|
|
|
case 102:
|
|
|
|
case 103:
|
|
|
|
case 104:
|
|
|
|
case 105:
|
|
|
|
case 106:
|
|
|
|
case 107:
|
2005-02-20 00:56:25 +03:00
|
|
|
/* aixterm-style bright background */
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour.bg.enabled = FALSE;
|
2003-01-28 02:03:31 +03:00
|
|
|
term->curr_attr &= ~ATTR_BGMASK;
|
|
|
|
term->curr_attr |=
|
2004-11-28 18:13:34 +03:00
|
|
|
((term->esc_args[i] - 100 + 8)
|
2003-01-28 02:03:31 +03:00
|
|
|
<< ATTR_BGSHIFT);
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 49: /* default-background */
|
2017-09-30 19:32:32 +03:00
|
|
|
term->curr_truecolour.bg.enabled = FALSE;
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_BGMASK;
|
|
|
|
term->curr_attr |= ATTR_DEFBG;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2017-09-30 19:32:32 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 256-colour and true-colour
|
|
|
|
* sequences. A 256-colour
|
|
|
|
* foreground is selected by a
|
|
|
|
* sequence of 3 arguments in the
|
|
|
|
* form 38;5;n, where n is in the
|
|
|
|
* range 0-255. A true-colour RGB
|
|
|
|
* triple is selected by 5 args of
|
|
|
|
* the form 38;2;r;g;b. Replacing
|
|
|
|
* the initial 38 with 48 in both
|
|
|
|
* cases selects the same colour
|
|
|
|
* as the background.
|
|
|
|
*/
|
|
|
|
case 38:
|
2004-11-28 18:13:34 +03:00
|
|
|
if (i+2 < term->esc_nargs &&
|
|
|
|
term->esc_args[i+1] == 5) {
|
|
|
|
term->curr_attr &= ~ATTR_FGMASK;
|
|
|
|
term->curr_attr |=
|
|
|
|
((term->esc_args[i+2] & 0xFF)
|
|
|
|
<< ATTR_FGSHIFT);
|
2017-10-14 06:49:25 +03:00
|
|
|
term->curr_truecolour.fg =
|
|
|
|
optionalrgb_none;
|
2004-11-28 18:13:34 +03:00
|
|
|
i += 2;
|
2017-09-30 19:32:32 +03:00
|
|
|
}
|
|
|
|
if (i + 4 < term->esc_nargs &&
|
|
|
|
term->esc_args[i + 1] == 2) {
|
|
|
|
parse_optionalrgb(
|
|
|
|
&term->curr_truecolour.fg,
|
|
|
|
term->esc_args + (i+2));
|
|
|
|
i += 4;
|
2004-11-28 18:13:34 +03:00
|
|
|
}
|
|
|
|
break;
|
2017-09-30 19:32:32 +03:00
|
|
|
case 48:
|
2004-11-28 18:13:34 +03:00
|
|
|
if (i+2 < term->esc_nargs &&
|
|
|
|
term->esc_args[i+1] == 5) {
|
|
|
|
term->curr_attr &= ~ATTR_BGMASK;
|
|
|
|
term->curr_attr |=
|
|
|
|
((term->esc_args[i+2] & 0xFF)
|
|
|
|
<< ATTR_BGSHIFT);
|
2017-10-14 06:49:25 +03:00
|
|
|
term->curr_truecolour.bg =
|
|
|
|
optionalrgb_none;
|
2004-11-28 18:13:34 +03:00
|
|
|
i += 2;
|
|
|
|
}
|
2017-09-30 19:32:32 +03:00
|
|
|
if (i + 4 < term->esc_nargs &&
|
|
|
|
term->esc_args[i+1] == 2) {
|
|
|
|
parse_optionalrgb(
|
|
|
|
&term->curr_truecolour.bg,
|
|
|
|
term->esc_args + (i+2));
|
|
|
|
i += 4;
|
|
|
|
}
|
2004-11-28 18:13:34 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 's': /* save cursor */
|
2002-10-22 20:11:33 +04:00
|
|
|
save_cursor(term, TRUE);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'u': /* restore cursor */
|
2002-10-22 20:11:33 +04:00
|
|
|
save_cursor(term, FALSE);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 't': /* DECSLPP: set page size - ie window height */
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
2001-05-06 18:35:20 +04:00
|
|
|
* VT340/VT420 sequence DECSLPP, DEC only allows values
|
|
|
|
* 24/25/36/48/72/144 other emulators (eg dtterm) use
|
|
|
|
* illegal values (eg first arg 1..9) for window changing
|
|
|
|
* and reports.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs <= 1
|
|
|
|
&& (term->esc_args[0] < 1 ||
|
|
|
|
term->esc_args[0] >= 24)) {
|
2001-11-25 18:21:25 +03:00
|
|
|
compatibility(VT340TEXT);
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
request_resize(term->frontend, term->cols,
|
2002-10-22 20:11:33 +04:00
|
|
|
def(term->esc_args[0], 24));
|
|
|
|
deselect(term);
|
|
|
|
} else if (term->esc_nargs >= 1 &&
|
|
|
|
term->esc_args[0] >= 1 &&
|
|
|
|
term->esc_args[0] < 24) {
|
2001-11-25 18:21:25 +03:00
|
|
|
compatibility(OTHER);
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (term->esc_args[0]) {
|
2001-11-25 18:21:25 +03:00
|
|
|
int x, y, len;
|
2015-05-15 13:15:42 +03:00
|
|
|
char buf[80];
|
|
|
|
const char *p;
|
2001-11-25 18:21:25 +03:00
|
|
|
case 1:
|
2002-10-26 16:58:13 +04:00
|
|
|
set_iconic(term->frontend, FALSE);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 2:
|
2002-10-26 16:58:13 +04:00
|
|
|
set_iconic(term->frontend, TRUE);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 3:
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs >= 3) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
move_window(term->frontend,
|
|
|
|
def(term->esc_args[1], 0),
|
2002-10-22 20:11:33 +04:00
|
|
|
def(term->esc_args[2], 0));
|
2001-11-25 18:21:25 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
/* We should resize the window to a given
|
|
|
|
* size in pixels here, but currently our
|
|
|
|
* resizing code isn't healthy enough to
|
|
|
|
* manage it. */
|
|
|
|
break;
|
|
|
|
case 5:
|
2002-10-26 16:58:13 +04:00
|
|
|
/* move to top */
|
|
|
|
set_zorder(term->frontend, TRUE);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 6:
|
2002-10-26 16:58:13 +04:00
|
|
|
/* move to bottom */
|
|
|
|
set_zorder(term->frontend, FALSE);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 7:
|
2002-10-26 16:58:13 +04:00
|
|
|
refresh_window(term->frontend);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 8:
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs >= 3) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
request_resize(term->frontend,
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
def(term->esc_args[2], term->conf_width),
|
|
|
|
def(term->esc_args[1], term->conf_height));
|
2001-11-25 18:21:25 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 9:
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs >= 2)
|
2002-10-26 16:58:13 +04:00
|
|
|
set_zoomed(term->frontend,
|
|
|
|
term->esc_args[1] ?
|
2002-10-22 20:11:33 +04:00
|
|
|
TRUE : FALSE);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 11:
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc)
|
|
|
|
ldisc_send(term->ldisc,
|
2002-10-26 16:58:13 +04:00
|
|
|
is_iconic(term->frontend) ?
|
2008-12-20 22:43:20 +03:00
|
|
|
"\033[2t" : "\033[1t", 4, 0);
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 13:
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
2002-10-26 16:58:13 +04:00
|
|
|
get_window_pos(term->frontend, &x, &y);
|
2015-03-07 23:57:26 +03:00
|
|
|
len = sprintf(buf, "\033[3;%u;%ut",
|
|
|
|
(unsigned)x,
|
|
|
|
(unsigned)y);
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, buf, len, 0);
|
|
|
|
}
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 14:
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
2002-10-26 16:58:13 +04:00
|
|
|
get_window_pixels(term->frontend, &x, &y);
|
2008-12-20 22:43:20 +03:00
|
|
|
len = sprintf(buf, "\033[4;%d;%dt", y, x);
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, buf, len, 0);
|
|
|
|
}
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 18:
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
|
|
|
len = sprintf(buf, "\033[8;%d;%dt",
|
|
|
|
term->rows, term->cols);
|
|
|
|
ldisc_send(term->ldisc, buf, len, 0);
|
|
|
|
}
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 19:
|
|
|
|
/*
|
|
|
|
* Hmmm. Strictly speaking we
|
|
|
|
* should return `the size of the
|
|
|
|
* screen in characters', but
|
|
|
|
* that's not easy: (a) window
|
|
|
|
* furniture being what it is it's
|
|
|
|
* hard to compute, and (b) in
|
|
|
|
* resize-font mode maximising the
|
|
|
|
* window wouldn't change the
|
|
|
|
* number of characters. *shrug*. I
|
|
|
|
* think we'll ignore it for the
|
|
|
|
* moment and see if anyone
|
|
|
|
* complains, and then ask them
|
|
|
|
* what they would like it to do.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case 20:
|
2003-04-12 12:59:06 +04:00
|
|
|
if (term->ldisc &&
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->remote_qtitle_action != TITLE_NONE) {
|
|
|
|
if(term->remote_qtitle_action == TITLE_REAL)
|
2006-12-31 18:33:33 +03:00
|
|
|
p = get_window_title(term->frontend, TRUE);
|
|
|
|
else
|
|
|
|
p = EMPTY_WINDOW_TITLE;
|
2002-10-26 14:16:19 +04:00
|
|
|
len = strlen(p);
|
|
|
|
ldisc_send(term->ldisc, "\033]L", 3, 0);
|
2017-09-05 22:14:33 +03:00
|
|
|
if (len > 0)
|
|
|
|
ldisc_send(term->ldisc, p, len, 0);
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, "\033\\", 2, 0);
|
|
|
|
}
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
case 21:
|
2003-04-12 12:59:06 +04:00
|
|
|
if (term->ldisc &&
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->remote_qtitle_action != TITLE_NONE) {
|
|
|
|
if(term->remote_qtitle_action == TITLE_REAL)
|
2006-12-31 18:33:33 +03:00
|
|
|
p = get_window_title(term->frontend, FALSE);
|
|
|
|
else
|
|
|
|
p = EMPTY_WINDOW_TITLE;
|
2002-10-26 14:16:19 +04:00
|
|
|
len = strlen(p);
|
|
|
|
ldisc_send(term->ldisc, "\033]l", 3, 0);
|
2017-09-05 22:14:33 +03:00
|
|
|
if (len > 0)
|
|
|
|
ldisc_send(term->ldisc, p, len, 0);
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, "\033\\", 2, 0);
|
|
|
|
}
|
2001-11-25 18:21:25 +03:00
|
|
|
break;
|
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'S': /* SU: Scroll up */
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2001-05-09 17:35:08 +04:00
|
|
|
compatibility(SCOANSI);
|
2002-10-22 20:11:33 +04:00
|
|
|
scroll(term, term->marg_t, term->marg_b,
|
|
|
|
def(term->esc_args[0], 1), TRUE);
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-09 17:35:08 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'T': /* SD: Scroll down */
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->rows);
|
2001-05-09 17:35:08 +04:00
|
|
|
compatibility(SCOANSI);
|
2002-10-22 20:11:33 +04:00
|
|
|
scroll(term, term->marg_t, term->marg_b,
|
|
|
|
-def(term->esc_args[0], 1), TRUE);
|
|
|
|
term->wrapnext = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-09 17:35:08 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('|', '*'): /* DECSNLS */
|
|
|
|
/*
|
2001-05-06 18:35:20 +04:00
|
|
|
* Set number of lines on screen
|
2003-06-21 23:38:56 +04:00
|
|
|
* VT420 uses VGA like hardware and can
|
|
|
|
* support any size in reasonable range
|
|
|
|
* (24..49 AIUI) with no default specified.
|
2001-05-06 18:35:20 +04:00
|
|
|
*/
|
|
|
|
compatibility(VT420);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs == 1 && term->esc_args[0] > 0) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
request_resize(term->frontend, term->cols,
|
2002-10-22 20:11:33 +04:00
|
|
|
def(term->esc_args[0],
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->conf_height));
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('|', '$'): /* DECSCPP */
|
|
|
|
/*
|
2001-05-06 18:35:20 +04:00
|
|
|
* Set number of columns per page
|
2003-06-21 23:38:56 +04:00
|
|
|
* Docs imply range is only 80 or 132, but
|
|
|
|
* I'll allow any.
|
2001-05-06 18:35:20 +04:00
|
|
|
*/
|
|
|
|
compatibility(VT340TEXT);
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_nargs <= 1) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize)
|
2002-10-26 16:58:13 +04:00
|
|
|
request_resize(term->frontend,
|
|
|
|
def(term->esc_args[0],
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->conf_width),
|
|
|
|
term->rows);
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'X': /* ECH: write N spaces w/o moving cursor */
|
|
|
|
/* XXX VTTEST says this is vt220, vt510 manual
|
|
|
|
* says vt100 */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(ANSIMIN);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
int n = def(term->esc_args[0], 1);
|
2001-05-06 18:35:20 +04:00
|
|
|
pos cursplus;
|
2004-10-14 20:42:43 +04:00
|
|
|
int p = term->curs.x;
|
|
|
|
termline *cline = scrlineptr(term->curs.y);
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (n > term->cols - term->curs.x)
|
|
|
|
n = term->cols - term->curs.x;
|
|
|
|
cursplus = term->curs;
|
2001-05-06 18:35:20 +04:00
|
|
|
cursplus.x += n;
|
2003-01-02 19:20:29 +03:00
|
|
|
check_boundary(term, term->curs.x, term->curs.y);
|
|
|
|
check_boundary(term, term->curs.x+n, term->curs.y);
|
2002-10-22 20:11:33 +04:00
|
|
|
check_selection(term, term->curs, cursplus);
|
2001-05-06 18:35:20 +04:00
|
|
|
while (n--)
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(cline, p++,
|
|
|
|
&term->erase_char);
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case 'x': /* DECREQTPARM: report terminal characteristics */
|
2001-05-06 18:35:20 +04:00
|
|
|
compatibility(VT100);
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
2001-05-06 18:35:20 +04:00
|
|
|
char buf[32];
|
2002-10-22 20:11:33 +04:00
|
|
|
int i = def(term->esc_args[0], 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
if (i == 0 || i == 1) {
|
|
|
|
strcpy(buf, "\033[2;1;1;112;112;1;0x");
|
|
|
|
buf[2] += i;
|
2002-10-26 14:16:19 +04:00
|
|
|
ldisc_send(term->ldisc, buf, 20, 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2005-02-20 00:56:25 +03:00
|
|
|
case 'Z': /* CBT */
|
2001-06-23 20:59:00 +04:00
|
|
|
compatibility(OTHER);
|
2015-10-08 01:54:39 +03:00
|
|
|
CLAMP(term->esc_args[0], term->cols);
|
2001-06-23 20:59:00 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
int i = def(term->esc_args[0], 1);
|
|
|
|
pos old_curs = term->curs;
|
2001-06-23 20:59:00 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
for(;i>0 && term->curs.x>0; i--) {
|
2001-06-23 20:59:00 +04:00
|
|
|
do {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curs.x--;
|
|
|
|
} while (term->curs.x >0 &&
|
|
|
|
!term->tabs[term->curs.x]);
|
2001-06-23 20:59:00 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
check_selection(term, old_curs, term->curs);
|
2001-06-23 20:59:00 +04:00
|
|
|
}
|
|
|
|
break;
|
2003-06-16 02:05:05 +04:00
|
|
|
case ANSI('c', '='): /* Hide or Show Cursor */
|
|
|
|
compatibility(SCOANSI);
|
|
|
|
switch(term->esc_args[0]) {
|
|
|
|
case 0: /* hide cursor */
|
|
|
|
term->cursor_on = FALSE;
|
|
|
|
break;
|
|
|
|
case 1: /* restore cursor */
|
|
|
|
term->big_cursor = FALSE;
|
|
|
|
term->cursor_on = TRUE;
|
|
|
|
break;
|
|
|
|
case 2: /* block cursor */
|
|
|
|
term->big_cursor = TRUE;
|
|
|
|
term->cursor_on = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ANSI('C', '='):
|
|
|
|
/*
|
|
|
|
* set cursor start on scanline esc_args[0] and
|
|
|
|
* end on scanline esc_args[1].If you set
|
|
|
|
* the bottom scan line to a value less than
|
|
|
|
* the top scan line, the cursor will disappear.
|
|
|
|
*/
|
|
|
|
compatibility(SCOANSI);
|
|
|
|
if (term->esc_nargs >= 2) {
|
|
|
|
if (term->esc_args[0] > term->esc_args[1])
|
|
|
|
term->cursor_on = FALSE;
|
|
|
|
else
|
|
|
|
term->cursor_on = TRUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ANSI('D', '='):
|
|
|
|
compatibility(SCOANSI);
|
|
|
|
term->blink_is_real = FALSE;
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
2003-06-16 02:05:05 +04:00
|
|
|
if (term->esc_args[0]>=1)
|
|
|
|
term->curr_attr |= ATTR_BLINK;
|
|
|
|
else
|
|
|
|
term->curr_attr &= ~ATTR_BLINK;
|
|
|
|
break;
|
|
|
|
case ANSI('E', '='):
|
|
|
|
compatibility(SCOANSI);
|
|
|
|
term->blink_is_real = (term->esc_args[0] >= 1);
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
2003-06-16 02:05:05 +04:00
|
|
|
break;
|
|
|
|
case ANSI('F', '='): /* set normal foreground */
|
|
|
|
compatibility(SCOANSI);
|
2015-10-08 01:54:39 +03:00
|
|
|
if (term->esc_args[0] < 16) {
|
2003-06-22 02:40:42 +04:00
|
|
|
long colour =
|
|
|
|
(sco2ansicolour[term->esc_args[0] & 0x7] |
|
2004-11-28 18:13:34 +03:00
|
|
|
(term->esc_args[0] & 0x8)) <<
|
2003-06-16 02:05:05 +04:00
|
|
|
ATTR_FGSHIFT;
|
2003-06-22 02:40:42 +04:00
|
|
|
term->curr_attr &= ~ATTR_FGMASK;
|
|
|
|
term->curr_attr |= colour;
|
2017-10-08 15:47:39 +03:00
|
|
|
term->curr_truecolour.fg = optionalrgb_none;
|
2003-06-22 02:40:42 +04:00
|
|
|
term->default_attr &= ~ATTR_FGMASK;
|
|
|
|
term->default_attr |= colour;
|
2005-10-08 13:09:50 +04:00
|
|
|
set_erase_char(term);
|
2003-06-16 02:05:05 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ANSI('G', '='): /* set normal background */
|
|
|
|
compatibility(SCOANSI);
|
2015-10-08 01:54:39 +03:00
|
|
|
if (term->esc_args[0] < 16) {
|
2003-06-22 02:40:42 +04:00
|
|
|
long colour =
|
|
|
|
(sco2ansicolour[term->esc_args[0] & 0x7] |
|
2004-11-28 18:13:34 +03:00
|
|
|
(term->esc_args[0] & 0x8)) <<
|
2003-06-16 02:05:05 +04:00
|
|
|
ATTR_BGSHIFT;
|
2003-06-22 02:40:42 +04:00
|
|
|
term->curr_attr &= ~ATTR_BGMASK;
|
|
|
|
term->curr_attr |= colour;
|
2017-10-08 15:47:39 +03:00
|
|
|
term->curr_truecolour.bg = optionalrgb_none;
|
2003-06-22 02:40:42 +04:00
|
|
|
term->default_attr &= ~ATTR_BGMASK;
|
|
|
|
term->default_attr |= colour;
|
2005-10-08 13:09:50 +04:00
|
|
|
set_erase_char(term);
|
2003-06-16 02:05:05 +04:00
|
|
|
}
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case ANSI('L', '='):
|
2003-06-16 02:05:05 +04:00
|
|
|
compatibility(SCOANSI);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->use_bce = (term->esc_args[0] <= 0);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2003-06-21 23:38:56 +04:00
|
|
|
case ANSI('p', '"'): /* DECSCL: set compat level */
|
2002-10-22 20:11:33 +04:00
|
|
|
/*
|
|
|
|
* Allow the host to make this emulator a
|
|
|
|
* 'perfect' VT102. This first appeared in
|
|
|
|
* the VT220, but we do need to get back to
|
|
|
|
* PuTTY mode so I won't check it.
|
2000-03-17 13:39:05 +03:00
|
|
|
*
|
2001-05-10 12:34:20 +04:00
|
|
|
* The arg in 40..42,50 are a PuTTY extension.
|
2001-05-06 18:35:20 +04:00
|
|
|
* The 2nd arg, 8bit vs 7bit is not checked.
|
|
|
|
*
|
2002-10-22 20:11:33 +04:00
|
|
|
* Setting VT102 mode should also change
|
|
|
|
* the Fkeys to generate PF* codes as a
|
|
|
|
* real VT102 has no Fkeys. The VT220 does
|
|
|
|
* this, F11..F13 become ESC,BS,LF other
|
|
|
|
* Fkeys send nothing.
|
2001-05-06 18:35:20 +04:00
|
|
|
*
|
|
|
|
* Note ESC c will NOT change this!
|
1999-01-08 16:02:13 +03:00
|
|
|
*/
|
2001-05-06 18:35:20 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (term->esc_args[0]) {
|
2001-05-06 18:35:20 +04:00
|
|
|
case 61:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level &= ~TM_VTXXX;
|
|
|
|
term->compatibility_level |= TM_VT102;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 62:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level &= ~TM_VTXXX;
|
|
|
|
term->compatibility_level |= TM_VT220;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_args[0] > 60 &&
|
|
|
|
term->esc_args[0] < 70)
|
|
|
|
term->compatibility_level |= TM_VTXXX;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 40:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level &= TM_VTXXX;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 41:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level = TM_PUTTY;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 42:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level = TM_SCOANSI;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
|
|
|
|
case ARG_DEFAULT:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->compatibility_level = TM_PUTTY;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 50:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Change the response to CSI c */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->esc_args[0] == 50) {
|
2001-05-06 18:35:20 +04:00
|
|
|
int i;
|
|
|
|
char lbuf[64];
|
2002-10-22 20:11:33 +04:00
|
|
|
strcpy(term->id_string, "\033[?");
|
|
|
|
for (i = 1; i < term->esc_nargs; i++) {
|
2001-05-06 18:35:20 +04:00
|
|
|
if (i != 1)
|
2002-10-22 20:11:33 +04:00
|
|
|
strcat(term->id_string, ";");
|
2017-06-20 09:05:39 +03:00
|
|
|
sprintf(lbuf, "%u", term->esc_args[i]);
|
2002-10-22 20:11:33 +04:00
|
|
|
strcat(term->id_string, lbuf);
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
strcat(term->id_string, "c");
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
/* Is this a good idea ?
|
|
|
|
* Well we should do a soft reset at this point ...
|
|
|
|
*/
|
|
|
|
if (!has_compat(VT420) && has_compat(VT100)) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->no_remote_resize) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->reset_132)
|
2002-03-07 02:04:20 +03:00
|
|
|
request_resize(132, 24);
|
|
|
|
else
|
|
|
|
request_resize(80, 24);
|
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
#endif
|
|
|
|
break;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case SEEN_OSC:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->osc_w = FALSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
switch (c) {
|
|
|
|
case 'P': /* Linux palette sequence */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_OSC_P;
|
|
|
|
term->osc_strlen = 0;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'R': /* Linux palette reset */
|
2002-10-26 16:58:13 +04:00
|
|
|
palette_reset(term->frontend);
|
2002-10-22 20:11:33 +04:00
|
|
|
term_invalidate(term);
|
|
|
|
term->termstate = TOPLEVEL;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'W': /* word-set */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = SEEN_OSC_W;
|
|
|
|
term->osc_w = TRUE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case '0':
|
|
|
|
case '1':
|
|
|
|
case '2':
|
|
|
|
case '3':
|
|
|
|
case '4':
|
|
|
|
case '5':
|
|
|
|
case '6':
|
|
|
|
case '7':
|
|
|
|
case '8':
|
|
|
|
case '9':
|
2017-10-05 22:43:02 +03:00
|
|
|
if (term->esc_args[term->esc_nargs-1] <= UINT_MAX / 10 &&
|
|
|
|
term->esc_args[term->esc_nargs-1] * 10 <= UINT_MAX - c - '0')
|
|
|
|
term->esc_args[term->esc_nargs-1] =
|
|
|
|
10 * term->esc_args[term->esc_nargs-1] + c - '0';
|
2015-10-08 01:54:39 +03:00
|
|
|
else
|
2017-10-05 22:43:02 +03:00
|
|
|
term->esc_args[term->esc_nargs-1] = UINT_MAX;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2017-10-05 22:43:02 +03:00
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* _Most_ other characters here terminate the
|
|
|
|
* immediate parsing of the OSC sequence and go
|
|
|
|
* into OSC_STRING state, but we deal with a
|
|
|
|
* couple of exceptions first.
|
|
|
|
*/
|
|
|
|
if (c == 'L' && term->esc_args[0] == 2) {
|
|
|
|
/*
|
|
|
|
* Grotty hack to support xterm and DECterm title
|
|
|
|
* sequences concurrently.
|
|
|
|
*/
|
|
|
|
term->esc_args[0] = 1;
|
|
|
|
} else if (c == ';' && term->esc_nargs == 1 &&
|
|
|
|
term->esc_args[0] == 4) {
|
|
|
|
/*
|
|
|
|
* xterm's OSC 4 sequence to query the current
|
|
|
|
* RGB value of a colour takes a second
|
|
|
|
* numeric argument which is easiest to parse
|
|
|
|
* using the existing system rather than in
|
|
|
|
* do_osc.
|
|
|
|
*/
|
|
|
|
term->esc_args[term->esc_nargs++] = 0;
|
|
|
|
} else {
|
|
|
|
term->termstate = OSC_STRING;
|
|
|
|
term->osc_strlen = 0;
|
|
|
|
}
|
2000-03-17 13:39:05 +03:00
|
|
|
}
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case OSC_STRING:
|
|
|
|
/*
|
|
|
|
* This OSC stuff is EVIL. It takes just one character to get into
|
|
|
|
* sysline mode and it's not initially obvious how to get out.
|
|
|
|
* So I've added CR and LF as string aborts.
|
|
|
|
* This shouldn't effect compatibility as I believe embedded
|
|
|
|
* control characters are supposed to be interpreted (maybe?)
|
|
|
|
* and they don't display anything useful anyway.
|
|
|
|
*
|
|
|
|
* -- RDB
|
2000-03-17 13:39:05 +03:00
|
|
|
*/
|
2002-11-19 02:49:30 +03:00
|
|
|
if (c == '\012' || c == '\015') {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else if (c == 0234 || c == '\007') {
|
|
|
|
/*
|
|
|
|
* These characters terminate the string; ST and BEL
|
|
|
|
* terminate the sequence and trigger instant
|
|
|
|
* processing of it, whereas ESC goes back to SEEN_ESC
|
|
|
|
* mode unless it is followed by \, in which case it is
|
|
|
|
* synonymous with ST in the first place.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
do_osc(term);
|
|
|
|
term->termstate = TOPLEVEL;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else if (c == '\033')
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = OSC_MAYBE_ST;
|
|
|
|
else if (term->osc_strlen < OSC_STR_MAX)
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->osc_string[term->osc_strlen++] = (char)c;
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case SEEN_OSC_P:
|
1999-01-08 16:02:13 +03:00
|
|
|
{
|
2006-02-20 22:54:17 +03:00
|
|
|
int max = (term->osc_strlen == 0 ? 21 : 15);
|
2001-05-06 18:35:20 +04:00
|
|
|
int val;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if ((int)c >= '0' && (int)c <= '9')
|
2001-05-06 18:35:20 +04:00
|
|
|
val = c - '0';
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
else if ((int)c >= 'A' && (int)c <= 'A' + max - 10)
|
2001-05-06 18:35:20 +04:00
|
|
|
val = c - 'A' + 10;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
else if ((int)c >= 'a' && (int)c <= 'a' + max - 10)
|
2001-05-06 18:35:20 +04:00
|
|
|
val = c - 'a' + 10;
|
2001-05-13 18:02:28 +04:00
|
|
|
else {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
2001-05-13 18:02:28 +04:00
|
|
|
break;
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->osc_string[term->osc_strlen++] = val;
|
|
|
|
if (term->osc_strlen >= 7) {
|
2002-10-26 16:58:13 +04:00
|
|
|
palette_set(term->frontend, term->osc_string[0],
|
2002-10-22 20:11:33 +04:00
|
|
|
term->osc_string[1] * 16 + term->osc_string[2],
|
|
|
|
term->osc_string[3] * 16 + term->osc_string[4],
|
|
|
|
term->osc_string[5] * 16 + term->osc_string[6]);
|
|
|
|
term_invalidate(term);
|
|
|
|
term->termstate = TOPLEVEL;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case SEEN_OSC_W:
|
|
|
|
switch (c) {
|
|
|
|
case '0':
|
|
|
|
case '1':
|
|
|
|
case '2':
|
|
|
|
case '3':
|
|
|
|
case '4':
|
|
|
|
case '5':
|
|
|
|
case '6':
|
|
|
|
case '7':
|
|
|
|
case '8':
|
|
|
|
case '9':
|
2015-10-08 01:54:39 +03:00
|
|
|
if (term->esc_args[0] <= UINT_MAX / 10 &&
|
|
|
|
term->esc_args[0] * 10 <= UINT_MAX - c - '0')
|
|
|
|
term->esc_args[0] = 10 * term->esc_args[0] + c - '0';
|
|
|
|
else
|
|
|
|
term->esc_args[0] = UINT_MAX;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
default:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = OSC_STRING;
|
|
|
|
term->osc_strlen = 0;
|
2000-10-09 16:53:32 +04:00
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case VT52_ESC:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
2004-11-27 16:20:21 +03:00
|
|
|
seen_disp_event(term);
|
2000-07-26 16:13:51 +04:00
|
|
|
switch (c) {
|
2001-05-06 18:35:20 +04:00
|
|
|
case 'A':
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x, term->curs.y - 1, 1);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'B':
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x, term->curs.y + 1, 1);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'C':
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x + 1, term->curs.y, 1);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'D':
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, term->curs.x - 1, term->curs.y, 1);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
/*
|
|
|
|
* From the VT100 Manual
|
|
|
|
* NOTE: The special graphics characters in the VT100
|
|
|
|
* are different from those in the VT52
|
|
|
|
*
|
|
|
|
* From VT102 manual:
|
|
|
|
* 137 _ Blank - Same
|
|
|
|
* 140 ` Reserved - Humm.
|
|
|
|
* 141 a Solid rectangle - Similar
|
|
|
|
* 142 b 1/ - Top half of fraction for the
|
|
|
|
* 143 c 3/ - subscript numbers below.
|
|
|
|
* 144 d 5/
|
|
|
|
* 145 e 7/
|
|
|
|
* 146 f Degrees - Same
|
|
|
|
* 147 g Plus or minus - Same
|
|
|
|
* 150 h Right arrow
|
|
|
|
* 151 i Ellipsis (dots)
|
|
|
|
* 152 j Divide by
|
|
|
|
* 153 k Down arrow
|
|
|
|
* 154 l Bar at scan 0
|
|
|
|
* 155 m Bar at scan 1
|
|
|
|
* 156 n Bar at scan 2
|
|
|
|
* 157 o Bar at scan 3 - Similar
|
|
|
|
* 160 p Bar at scan 4 - Similar
|
|
|
|
* 161 q Bar at scan 5 - Similar
|
|
|
|
* 162 r Bar at scan 6 - Same
|
|
|
|
* 163 s Bar at scan 7 - Similar
|
|
|
|
* 164 t Subscript 0
|
|
|
|
* 165 u Subscript 1
|
|
|
|
* 166 v Subscript 2
|
|
|
|
* 167 w Subscript 3
|
|
|
|
* 170 x Subscript 4
|
|
|
|
* 171 y Subscript 5
|
|
|
|
* 172 z Subscript 6
|
|
|
|
* 173 { Subscript 7
|
|
|
|
* 174 | Subscript 8
|
|
|
|
* 175 } Subscript 9
|
|
|
|
* 176 ~ Paragraph
|
|
|
|
*
|
|
|
|
*/
|
2001-05-06 18:35:20 +04:00
|
|
|
case 'F':
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[term->cset = 0] = CSET_LINEDRW;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'G':
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->cset_attr[term->cset = 0] = CSET_ASCII;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'H':
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, 0, 0, 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'I':
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.y == 0)
|
|
|
|
scroll(term, 0, term->rows - 1, -1, TRUE);
|
|
|
|
else if (term->curs.y > 0)
|
|
|
|
term->curs.y--;
|
|
|
|
term->wrapnext = FALSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'J':
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, FALSE, FALSE, TRUE);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2000-07-26 16:13:51 +04:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case 'K':
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, TRUE, FALSE, TRUE);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
#if 0
|
2001-05-06 18:35:20 +04:00
|
|
|
case 'V':
|
|
|
|
/* XXX Print cursor line */
|
|
|
|
break;
|
|
|
|
case 'W':
|
|
|
|
/* XXX Start controller mode */
|
|
|
|
break;
|
|
|
|
case 'X':
|
|
|
|
/* XXX Stop controller mode */
|
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
#endif
|
2001-05-06 18:35:20 +04:00
|
|
|
case 'Y':
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = VT52_Y1;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case 'Z':
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc)
|
|
|
|
ldisc_send(term->ldisc, "\033/Z", 3, 0);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case '=':
|
2002-10-22 20:11:33 +04:00
|
|
|
term->app_keypad_keys = TRUE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case '>':
|
2002-10-22 20:11:33 +04:00
|
|
|
term->app_keypad_keys = FALSE;
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
|
|
|
case '<':
|
|
|
|
/* XXX This should switch to VT100 mode not current or default
|
|
|
|
* VT mode. But this will only have effect in a VT220+
|
|
|
|
* emulation.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->vt52_mode = FALSE;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
term->blink_is_real = term->blinktext;
|
2004-11-27 16:20:21 +03:00
|
|
|
term_schedule_tblink(term);
|
2001-05-06 18:35:20 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
#if 0
|
2001-05-06 18:35:20 +04:00
|
|
|
case '^':
|
|
|
|
/* XXX Enter auto print mode */
|
|
|
|
break;
|
|
|
|
case '_':
|
|
|
|
/* XXX Exit auto print mode */
|
|
|
|
break;
|
|
|
|
case ']':
|
|
|
|
/* XXX Print screen */
|
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef VT52_PLUS
|
|
|
|
case 'E':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
move(term, 0, 0, 0);
|
|
|
|
erase_lots(term, FALSE, FALSE, TRUE);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'L':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.y <= term->marg_b)
|
|
|
|
scroll(term, term->curs.y, term->marg_b, -1, FALSE);
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'M':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->curs.y <= term->marg_b)
|
|
|
|
scroll(term, term->curs.y, term->marg_b, 1, TRUE);
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = VT52_FG;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = VT52_BG;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, FALSE, TRUE, FALSE);
|
2014-01-25 22:38:38 +04:00
|
|
|
if (term->scroll_on_disp)
|
|
|
|
term->disptop = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cursor_on = TRUE;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->cursor_on = FALSE;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
/* case 'j': Save cursor position - broken on ST */
|
|
|
|
/* case 'k': Restore cursor position */
|
|
|
|
case 'l':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, TRUE, TRUE, TRUE);
|
|
|
|
term->curs.x = 0;
|
|
|
|
term->wrapnext = FALSE;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'o':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
erase_lots(term, TRUE, TRUE, FALSE);
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr |= ATTR_REVERSE;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'q':
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_REVERSE;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'v': /* wrap Autowrap on - Wyse style */
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->wrap = 1;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'w': /* Autowrap off */
|
|
|
|
/* compatibility(ATARI) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->wrap = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'R':
|
|
|
|
/* compatibility(OTHER) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->vt52_bold = FALSE;
|
|
|
|
term->curr_attr = ATTR_DEFAULT;
|
2017-10-08 15:47:39 +03:00
|
|
|
term->curr_truecolour.fg = optionalrgb_none;
|
|
|
|
term->curr_truecolour.bg = optionalrgb_none;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'S':
|
|
|
|
/* compatibility(VI50) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr |= ATTR_UNDER;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'W':
|
|
|
|
/* compatibility(VI50) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curr_attr &= ~ATTR_UNDER;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'U':
|
|
|
|
/* compatibility(VI50) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->vt52_bold = TRUE;
|
|
|
|
term->curr_attr |= ATTR_BOLD;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case 'T':
|
|
|
|
/* compatibility(VI50) */
|
2002-10-22 20:11:33 +04:00
|
|
|
term->vt52_bold = FALSE;
|
|
|
|
term->curr_attr &= ~ATTR_BOLD;
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
#endif
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
2000-03-17 13:39:05 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case VT52_Y1:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = VT52_Y2;
|
|
|
|
move(term, term->curs.x, c - ' ', 0);
|
2000-03-17 13:39:05 +03:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
case VT52_Y2:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
|
|
|
move(term, c - ' ', term->curs.y, 0);
|
2000-03-17 13:39:05 +03:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
#ifdef VT52_PLUS
|
|
|
|
case VT52_FG:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
|
|
|
term->curr_attr &= ~ATTR_FGMASK;
|
|
|
|
term->curr_attr &= ~ATTR_BOLD;
|
2004-11-28 18:13:34 +03:00
|
|
|
term->curr_attr |= (c & 0xF) << ATTR_FGSHIFT;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
case VT52_BG:
|
2002-10-22 20:11:33 +04:00
|
|
|
term->termstate = TOPLEVEL;
|
|
|
|
term->curr_attr &= ~ATTR_BGMASK;
|
|
|
|
term->curr_attr &= ~ATTR_BLINK;
|
2004-11-28 18:13:34 +03:00
|
|
|
term->curr_attr |= (c & 0xF) << ATTR_BGSHIFT;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
set_erase_char(term);
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
#endif
|
2001-05-13 18:02:28 +04:00
|
|
|
default: break; /* placate gcc warning about enum use */
|
2000-03-17 13:39:05 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->selstate != NO_SELECTION) {
|
|
|
|
pos cursplus = term->curs;
|
2001-04-17 01:25:13 +04:00
|
|
|
incpos(cursplus);
|
2002-10-22 20:11:33 +04:00
|
|
|
check_selection(term, term->curs, cursplus);
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2002-03-09 20:59:15 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
term_print_flush(term);
|
2015-10-06 13:02:52 +03:00
|
|
|
if (term->logflush && term->logctx)
|
2004-12-16 18:22:36 +03:00
|
|
|
logflush(term->logctx);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2017-09-30 19:32:32 +03:00
|
|
|
/*
|
|
|
|
* Small subroutine to parse three consecutive escape-sequence
|
|
|
|
* arguments representing a true-colour RGB triple into an
|
|
|
|
* optionalrgb.
|
|
|
|
*/
|
|
|
|
static void parse_optionalrgb(optionalrgb *out, unsigned *values)
|
|
|
|
{
|
|
|
|
out->enabled = TRUE;
|
|
|
|
out->r = values[0] < 256 ? values[0] : 0;
|
|
|
|
out->g = values[1] < 256 ? values[1] : 0;
|
|
|
|
out->b = values[2] < 256 ? values[2] : 0;
|
|
|
|
}
|
|
|
|
|
2004-05-22 14:36:50 +04:00
|
|
|
/*
|
|
|
|
* To prevent having to run the reasonably tricky bidi algorithm
|
|
|
|
* too many times, we maintain a cache of the last lineful of data
|
|
|
|
* fed to the algorithm on each line of the display.
|
|
|
|
*/
|
|
|
|
static int term_bidi_cache_hit(Terminal *term, int line,
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termchar *lbefore, int width)
|
2004-05-22 14:36:50 +04:00
|
|
|
{
|
2004-10-14 20:42:43 +04:00
|
|
|
int i;
|
|
|
|
|
2004-05-22 14:36:50 +04:00
|
|
|
if (!term->pre_bidi_cache)
|
|
|
|
return FALSE; /* cache doesn't even exist yet! */
|
|
|
|
|
|
|
|
if (line >= term->bidi_cache_size)
|
|
|
|
return FALSE; /* cache doesn't have this many lines */
|
|
|
|
|
2004-10-15 15:11:19 +04:00
|
|
|
if (!term->pre_bidi_cache[line].chars)
|
2004-05-22 14:36:50 +04:00
|
|
|
return FALSE; /* cache doesn't contain _this_ line */
|
|
|
|
|
2004-10-15 15:11:19 +04:00
|
|
|
if (term->pre_bidi_cache[line].width != width)
|
|
|
|
return FALSE; /* line is wrong width */
|
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
for (i = 0; i < width; i++)
|
2004-10-15 15:11:19 +04:00
|
|
|
if (!termchars_equal(term->pre_bidi_cache[line].chars+i, lbefore+i))
|
2004-10-14 20:42:43 +04:00
|
|
|
return FALSE; /* line doesn't match cache */
|
2004-05-22 14:36:50 +04:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
return TRUE; /* it didn't match. */
|
2004-05-22 14:36:50 +04:00
|
|
|
}
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
static void term_bidi_cache_store(Terminal *term, int line, termchar *lbefore,
|
2004-11-28 12:24:57 +03:00
|
|
|
termchar *lafter, bidi_char *wcTo,
|
2004-12-01 12:25:20 +03:00
|
|
|
int width, int size)
|
2004-05-22 14:36:50 +04:00
|
|
|
{
|
2004-11-28 12:24:57 +03:00
|
|
|
int i;
|
|
|
|
|
2004-05-22 14:36:50 +04:00
|
|
|
if (!term->pre_bidi_cache || term->bidi_cache_size <= line) {
|
|
|
|
int j = term->bidi_cache_size;
|
|
|
|
term->bidi_cache_size = line+1;
|
|
|
|
term->pre_bidi_cache = sresize(term->pre_bidi_cache,
|
|
|
|
term->bidi_cache_size,
|
2004-10-15 15:11:19 +04:00
|
|
|
struct bidi_cache_entry);
|
2004-05-22 14:36:50 +04:00
|
|
|
term->post_bidi_cache = sresize(term->post_bidi_cache,
|
|
|
|
term->bidi_cache_size,
|
2004-10-15 15:11:19 +04:00
|
|
|
struct bidi_cache_entry);
|
2004-05-22 14:36:50 +04:00
|
|
|
while (j < term->bidi_cache_size) {
|
2004-10-15 15:11:19 +04:00
|
|
|
term->pre_bidi_cache[j].chars =
|
|
|
|
term->post_bidi_cache[j].chars = NULL;
|
|
|
|
term->pre_bidi_cache[j].width =
|
|
|
|
term->post_bidi_cache[j].width = -1;
|
2004-11-30 16:39:58 +03:00
|
|
|
term->pre_bidi_cache[j].forward =
|
|
|
|
term->post_bidi_cache[j].forward = NULL;
|
|
|
|
term->pre_bidi_cache[j].backward =
|
|
|
|
term->post_bidi_cache[j].backward = NULL;
|
2004-05-22 14:36:50 +04:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-15 15:11:19 +04:00
|
|
|
sfree(term->pre_bidi_cache[line].chars);
|
|
|
|
sfree(term->post_bidi_cache[line].chars);
|
2004-11-30 16:39:58 +03:00
|
|
|
sfree(term->post_bidi_cache[line].forward);
|
|
|
|
sfree(term->post_bidi_cache[line].backward);
|
2004-05-22 14:36:50 +04:00
|
|
|
|
2004-10-15 15:11:19 +04:00
|
|
|
term->pre_bidi_cache[line].width = width;
|
2004-12-01 12:25:20 +03:00
|
|
|
term->pre_bidi_cache[line].chars = snewn(size, termchar);
|
2004-10-15 15:11:19 +04:00
|
|
|
term->post_bidi_cache[line].width = width;
|
2004-12-01 12:25:20 +03:00
|
|
|
term->post_bidi_cache[line].chars = snewn(size, termchar);
|
2004-11-28 12:24:57 +03:00
|
|
|
term->post_bidi_cache[line].forward = snewn(width, int);
|
|
|
|
term->post_bidi_cache[line].backward = snewn(width, int);
|
2004-05-22 14:36:50 +04:00
|
|
|
|
2004-12-01 12:25:20 +03:00
|
|
|
memcpy(term->pre_bidi_cache[line].chars, lbefore, size * TSIZE);
|
|
|
|
memcpy(term->post_bidi_cache[line].chars, lafter, size * TSIZE);
|
2004-11-28 12:24:57 +03:00
|
|
|
memset(term->post_bidi_cache[line].forward, 0, width * sizeof(int));
|
|
|
|
memset(term->post_bidi_cache[line].backward, 0, width * sizeof(int));
|
|
|
|
|
|
|
|
for (i = 0; i < width; i++) {
|
|
|
|
int p = wcTo[i].index;
|
|
|
|
|
|
|
|
assert(0 <= p && p < width);
|
|
|
|
|
|
|
|
term->post_bidi_cache[line].backward[i] = p;
|
|
|
|
term->post_bidi_cache[line].forward[p] = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Prepare the bidi information for a screen line. Returns the
|
|
|
|
* transformed list of termchars, or NULL if no transformation at
|
|
|
|
* all took place (because bidi is disabled). If return was
|
|
|
|
* non-NULL, auxiliary information such as the forward and reverse
|
|
|
|
* mappings of permutation position are available in
|
|
|
|
* term->post_bidi_cache[scr_y].*.
|
|
|
|
*/
|
|
|
|
static termchar *term_bidi_line(Terminal *term, struct termline *ldata,
|
|
|
|
int scr_y)
|
|
|
|
{
|
|
|
|
termchar *lchars;
|
|
|
|
int it;
|
|
|
|
|
|
|
|
/* Do Arabic shaping and bidi. */
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if(!term->bidi || !term->arabicshaping) {
|
2004-11-28 12:24:57 +03:00
|
|
|
|
|
|
|
if (!term_bidi_cache_hit(term, scr_y, ldata->chars, term->cols)) {
|
|
|
|
|
|
|
|
if (term->wcFromTo_size < term->cols) {
|
|
|
|
term->wcFromTo_size = term->cols;
|
|
|
|
term->wcFrom = sresize(term->wcFrom, term->wcFromTo_size,
|
|
|
|
bidi_char);
|
|
|
|
term->wcTo = sresize(term->wcTo, term->wcFromTo_size,
|
|
|
|
bidi_char);
|
|
|
|
}
|
|
|
|
|
|
|
|
for(it=0; it<term->cols ; it++)
|
|
|
|
{
|
|
|
|
unsigned long uc = (ldata->chars[it].chr);
|
|
|
|
|
|
|
|
switch (uc & CSET_MASK) {
|
|
|
|
case CSET_LINEDRW:
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->rawcnp) {
|
2004-11-28 12:24:57 +03:00
|
|
|
uc = term->ucsdata->unitab_xterm[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case CSET_ASCII:
|
|
|
|
uc = term->ucsdata->unitab_line[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
case CSET_SCOACS:
|
|
|
|
uc = term->ucsdata->unitab_scoacs[uc&0xFF];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (uc & CSET_MASK) {
|
|
|
|
case CSET_ACP:
|
|
|
|
uc = term->ucsdata->unitab_font[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
case CSET_OEMCP:
|
|
|
|
uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
term->wcFrom[it].origwc = term->wcFrom[it].wc =
|
2012-02-17 23:28:55 +04:00
|
|
|
(unsigned int)uc;
|
2004-11-28 12:24:57 +03:00
|
|
|
term->wcFrom[it].index = it;
|
|
|
|
}
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if(!term->bidi)
|
2004-11-28 12:24:57 +03:00
|
|
|
do_bidi(term->wcFrom, term->cols);
|
|
|
|
|
|
|
|
/* this is saved iff done from inside the shaping */
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if(!term->bidi && term->arabicshaping)
|
2004-11-28 12:24:57 +03:00
|
|
|
for(it=0; it<term->cols; it++)
|
|
|
|
term->wcTo[it] = term->wcFrom[it];
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if(!term->arabicshaping)
|
2004-11-28 12:24:57 +03:00
|
|
|
do_shape(term->wcFrom, term->wcTo, term->cols);
|
|
|
|
|
|
|
|
if (term->ltemp_size < ldata->size) {
|
|
|
|
term->ltemp_size = ldata->size;
|
|
|
|
term->ltemp = sresize(term->ltemp, term->ltemp_size,
|
|
|
|
termchar);
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(term->ltemp, ldata->chars, ldata->size * TSIZE);
|
|
|
|
|
|
|
|
for(it=0; it<term->cols ; it++)
|
|
|
|
{
|
|
|
|
term->ltemp[it] = ldata->chars[term->wcTo[it].index];
|
|
|
|
if (term->ltemp[it].cc_next)
|
|
|
|
term->ltemp[it].cc_next -=
|
|
|
|
it - term->wcTo[it].index;
|
|
|
|
|
|
|
|
if (term->wcTo[it].origwc != term->wcTo[it].wc)
|
|
|
|
term->ltemp[it].chr = term->wcTo[it].wc;
|
|
|
|
}
|
|
|
|
term_bidi_cache_store(term, scr_y, ldata->chars,
|
2004-12-01 12:25:20 +03:00
|
|
|
term->ltemp, term->wcTo,
|
|
|
|
term->cols, ldata->size);
|
2004-11-28 12:24:57 +03:00
|
|
|
|
|
|
|
lchars = term->ltemp;
|
|
|
|
} else {
|
|
|
|
lchars = term->post_bidi_cache[scr_y].chars;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
lchars = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return lchars;
|
2004-05-22 14:36:50 +04:00
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Given a context, update the window. Out of paranoia, we don't
|
|
|
|
* allow WM_PAINT responses to do scrolling optimisations.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static void do_paint(Terminal *term, Context ctx, int may_optimise)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2004-11-28 12:24:57 +03:00
|
|
|
int i, j, our_curs_y, our_curs_x;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
int rv, cursor;
|
2001-04-17 01:25:13 +04:00
|
|
|
pos scrpos;
|
2004-10-14 20:42:43 +04:00
|
|
|
wchar_t *ch;
|
|
|
|
int chlen;
|
2003-02-01 15:26:33 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
struct scrollregion *sr;
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
2004-12-17 14:37:16 +03:00
|
|
|
termchar *newline;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
chlen = 1024;
|
|
|
|
ch = snewn(chlen, wchar_t);
|
|
|
|
|
2004-12-17 14:37:16 +03:00
|
|
|
newline = snewn(term->cols, termchar);
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
rv = (!term->rvideo ^ !term->in_vbell ? ATTR_REVERSE : 0);
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2001-04-13 14:52:36 +04:00
|
|
|
/* Depends on:
|
|
|
|
* screen array, disptop, scrtop,
|
|
|
|
* selection, rv,
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
* blinkpc, blink_is_real, tblinker,
|
|
|
|
* curs.y, curs.x, cblinker, blink_cur, cursor_on, has_focus, wrapnext
|
2001-04-13 14:52:36 +04:00
|
|
|
*/
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
/* Has the cursor position or type changed ? */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->cursor_on) {
|
|
|
|
if (term->has_focus) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (term->cblinker || !term->blink_cur)
|
2001-05-10 12:34:20 +04:00
|
|
|
cursor = TATTR_ACTCURS;
|
2001-05-06 18:35:20 +04:00
|
|
|
else
|
|
|
|
cursor = 0;
|
|
|
|
} else
|
2001-05-10 12:34:20 +04:00
|
|
|
cursor = TATTR_PASCURS;
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->wrapnext)
|
2001-05-10 12:34:20 +04:00
|
|
|
cursor |= TATTR_RIGHTCURS;
|
2001-05-06 18:35:20 +04:00
|
|
|
} else
|
2001-04-13 14:52:36 +04:00
|
|
|
cursor = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
our_curs_y = term->curs.y - term->disptop;
|
2003-01-02 19:20:29 +03:00
|
|
|
{
|
|
|
|
/*
|
2004-11-28 12:24:57 +03:00
|
|
|
* Adjust the cursor position:
|
|
|
|
* - for bidi
|
|
|
|
* - in the case where it's resting on the right-hand half
|
|
|
|
* of a CJK wide character. xterm's behaviour here,
|
|
|
|
* which seems adequate to me, is to display the cursor
|
|
|
|
* covering the _whole_ character, exactly as if it were
|
|
|
|
* one space to the left.
|
2003-01-02 19:20:29 +03:00
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata = lineptr(term->curs.y);
|
2004-11-28 12:24:57 +03:00
|
|
|
termchar *lchars;
|
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
our_curs_x = term->curs.x;
|
2004-11-28 12:24:57 +03:00
|
|
|
|
|
|
|
if ( (lchars = term_bidi_line(term, ldata, our_curs_y)) != NULL) {
|
|
|
|
our_curs_x = term->post_bidi_cache[our_curs_y].forward[our_curs_x];
|
|
|
|
} else
|
|
|
|
lchars = ldata->chars;
|
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
if (our_curs_x > 0 &&
|
2004-11-28 12:24:57 +03:00
|
|
|
lchars[our_curs_x].chr == UCSWIDE)
|
2003-01-02 19:20:29 +03:00
|
|
|
our_curs_x--;
|
2004-11-28 12:24:57 +03:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unlineptr(ldata);
|
2003-01-02 19:20:29 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
/*
|
|
|
|
* If the cursor is not where it was last time we painted, and
|
|
|
|
* its previous position is visible on screen, invalidate its
|
|
|
|
* previous position.
|
|
|
|
*/
|
|
|
|
if (term->dispcursy >= 0 &&
|
|
|
|
(term->curstype != cursor ||
|
|
|
|
term->dispcursy != our_curs_y ||
|
|
|
|
term->dispcursx != our_curs_x)) {
|
|
|
|
termchar *dispcurs = term->disptext[term->dispcursy]->chars +
|
|
|
|
term->dispcursx;
|
|
|
|
|
|
|
|
if (term->dispcursx > 0 && dispcurs->chr == UCSWIDE)
|
|
|
|
dispcurs[-1].attr |= ATTR_INVALID;
|
|
|
|
if (term->dispcursx < term->cols-1 && dispcurs[1].chr == UCSWIDE)
|
|
|
|
dispcurs[1].attr |= ATTR_INVALID;
|
|
|
|
dispcurs->attr |= ATTR_INVALID;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
term->curstype = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->dispcursx = term->dispcursy = -1;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2003-02-01 15:26:33 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
/* Do scrolls */
|
|
|
|
sr = term->scrollhead;
|
|
|
|
while (sr) {
|
|
|
|
struct scrollregion *next = sr->next;
|
|
|
|
do_scroll(ctx, sr->topline, sr->botline, sr->lines);
|
|
|
|
sfree(sr);
|
|
|
|
sr = next;
|
|
|
|
}
|
|
|
|
term->scrollhead = term->scrolltail = NULL;
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
/* The normal screen data */
|
2002-10-22 20:11:33 +04:00
|
|
|
for (i = 0; i < term->rows; i++) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata;
|
|
|
|
termchar *lchars;
|
|
|
|
int dirty_line, dirty_run, selected;
|
|
|
|
unsigned long attr = 0, cset = 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
int start = 0;
|
|
|
|
int ccount = 0;
|
|
|
|
int last_run_dirty = 0;
|
2004-12-17 15:55:12 +03:00
|
|
|
int laststart, dirtyrect;
|
2004-11-28 12:24:57 +03:00
|
|
|
int *backward;
|
2017-09-30 19:32:32 +03:00
|
|
|
truecolour tc;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
scrpos.y = i + term->disptop;
|
2001-04-17 01:25:13 +04:00
|
|
|
ldata = lineptr(scrpos.y);
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2004-05-22 14:36:50 +04:00
|
|
|
/* Do Arabic shaping and bidi. */
|
2004-11-28 12:24:57 +03:00
|
|
|
lchars = term_bidi_line(term, ldata, i);
|
|
|
|
if (lchars) {
|
|
|
|
backward = term->post_bidi_cache[i].backward;
|
|
|
|
} else {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
lchars = ldata->chars;
|
2004-11-28 12:24:57 +03:00
|
|
|
backward = NULL;
|
|
|
|
}
|
2004-05-22 14:36:50 +04:00
|
|
|
|
2004-12-17 14:37:16 +03:00
|
|
|
/*
|
|
|
|
* First loop: work along the line deciding what we want
|
|
|
|
* each character cell to look like.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (j = 0; j < term->cols; j++) {
|
2001-05-10 12:34:20 +04:00
|
|
|
unsigned long tattr, tchar;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termchar *d = lchars + j;
|
2004-11-28 12:24:57 +03:00
|
|
|
scrpos.x = backward ? backward[j] : j;
|
2001-05-06 18:35:20 +04:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
tchar = d->chr;
|
|
|
|
tattr = d->attr;
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->ansi_colour)
|
2004-11-09 20:57:32 +03:00
|
|
|
tattr = (tattr & ~(ATTR_FGMASK | ATTR_BGMASK)) |
|
|
|
|
ATTR_DEFFG | ATTR_DEFBG;
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->xterm_256_colour) {
|
2004-11-28 18:13:34 +03:00
|
|
|
int colour;
|
|
|
|
colour = (tattr & ATTR_FGMASK) >> ATTR_FGSHIFT;
|
|
|
|
if (colour >= 16 && colour < 256)
|
|
|
|
tattr = (tattr &~ ATTR_FGMASK) | ATTR_DEFFG;
|
|
|
|
colour = (tattr & ATTR_BGMASK) >> ATTR_BGSHIFT;
|
|
|
|
if (colour >= 16 && colour < 256)
|
|
|
|
tattr = (tattr &~ ATTR_BGMASK) | ATTR_DEFBG;
|
|
|
|
}
|
|
|
|
|
2017-10-05 22:27:27 +03:00
|
|
|
if (term->true_colour) {
|
|
|
|
tc = d->truecolour;
|
|
|
|
} else {
|
|
|
|
tc.fg = tc.bg = optionalrgb_none;
|
|
|
|
}
|
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
switch (tchar & CSET_MASK) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_ASCII:
|
2003-01-14 21:28:23 +03:00
|
|
|
tchar = term->ucsdata->unitab_line[tchar & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_LINEDRW:
|
2003-01-14 21:28:23 +03:00
|
|
|
tchar = term->ucsdata->unitab_xterm[tchar & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_SCOACS:
|
2003-01-14 21:28:23 +03:00
|
|
|
tchar = term->ucsdata->unitab_scoacs[tchar&0xFF];
|
2001-05-19 18:12:41 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (j < term->cols-1 && d[1].chr == UCSWIDE)
|
2004-07-21 00:13:25 +04:00
|
|
|
tattr |= ATTR_WIDE;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
/* Video reversing things */
|
2002-10-23 16:41:35 +04:00
|
|
|
if (term->selstate == DRAGGING || term->selstate == SELECTED) {
|
|
|
|
if (term->seltype == LEXICOGRAPHIC)
|
|
|
|
selected = (posle(term->selstart, scrpos) &&
|
|
|
|
poslt(scrpos, term->selend));
|
|
|
|
else
|
|
|
|
selected = (posPle(term->selstart, scrpos) &&
|
|
|
|
posPlt(scrpos, term->selend));
|
|
|
|
} else
|
|
|
|
selected = FALSE;
|
2001-05-10 12:34:20 +04:00
|
|
|
tattr = (tattr ^ rv
|
2001-10-31 21:50:09 +03:00
|
|
|
^ (selected ? ATTR_REVERSE : 0));
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
/* 'Real' blinking ? */
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->blink_is_real && (tattr & ATTR_BLINK)) {
|
|
|
|
if (term->has_focus && term->tblinker) {
|
2003-01-27 18:44:48 +03:00
|
|
|
tchar = term->ucsdata->unitab_line[(unsigned char)' '];
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
tattr &= ~ATTR_BLINK;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2001-09-15 19:54:24 +04:00
|
|
|
/*
|
|
|
|
* Check the font we'll _probably_ be using to see if
|
|
|
|
* the character is wide when we don't want it to be.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (tchar != term->disptext[i]->chars[j].chr ||
|
|
|
|
tattr != (term->disptext[i]->chars[j].attr &~
|
2004-12-17 15:55:12 +03:00
|
|
|
(ATTR_NARROW | DATTR_MASK))) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if ((tattr & ATTR_WIDE) == 0 && char_width(ctx, tchar) == 2)
|
2001-09-15 19:54:24 +04:00
|
|
|
tattr |= ATTR_NARROW;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
} else if (term->disptext[i]->chars[j].attr & ATTR_NARROW)
|
2001-09-15 19:54:24 +04:00
|
|
|
tattr |= ATTR_NARROW;
|
|
|
|
|
2003-01-02 19:20:29 +03:00
|
|
|
if (i == our_curs_y && j == our_curs_x) {
|
2004-12-17 15:55:12 +03:00
|
|
|
tattr |= cursor;
|
|
|
|
term->curstype = cursor;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
term->dispcursx = j;
|
|
|
|
term->dispcursy = i;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2004-12-17 14:37:16 +03:00
|
|
|
/* FULL-TERMCHAR */
|
|
|
|
newline[j].attr = tattr;
|
|
|
|
newline[j].chr = tchar;
|
2017-09-30 19:32:32 +03:00
|
|
|
newline[j].truecolour = tc;
|
2004-12-17 14:37:16 +03:00
|
|
|
/* Combining characters are still read from lchars */
|
|
|
|
newline[j].cc_next = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now loop over the line again, noting where things have
|
|
|
|
* changed.
|
2004-12-17 15:55:12 +03:00
|
|
|
*
|
|
|
|
* During this loop, we keep track of where we last saw
|
|
|
|
* DATTR_STARTRUN. Any mismatch automatically invalidates
|
|
|
|
* _all_ of the containing run that was last printed: that
|
|
|
|
* is, any rectangle that was drawn in one go in the
|
|
|
|
* previous update should be either left completely alone
|
|
|
|
* or overwritten in its entirety. This, along with the
|
|
|
|
* expectation that front ends clip all text runs to their
|
|
|
|
* bounding rectangle, should solve any possible problems
|
|
|
|
* with fonts that overflow their character cells.
|
2004-12-17 14:37:16 +03:00
|
|
|
*/
|
2004-12-17 15:55:12 +03:00
|
|
|
laststart = 0;
|
|
|
|
dirtyrect = FALSE;
|
2004-12-17 14:37:16 +03:00
|
|
|
for (j = 0; j < term->cols; j++) {
|
2004-12-17 15:55:12 +03:00
|
|
|
if (term->disptext[i]->chars[j].attr & DATTR_STARTRUN) {
|
|
|
|
laststart = j;
|
|
|
|
dirtyrect = FALSE;
|
|
|
|
}
|
|
|
|
|
2004-12-17 14:37:16 +03:00
|
|
|
if (term->disptext[i]->chars[j].chr != newline[j].chr ||
|
2004-12-17 15:55:12 +03:00
|
|
|
(term->disptext[i]->chars[j].attr &~ DATTR_MASK)
|
|
|
|
!= newline[j].attr) {
|
|
|
|
int k;
|
|
|
|
|
2006-03-12 17:53:18 +03:00
|
|
|
if (!dirtyrect) {
|
|
|
|
for (k = laststart; k < j; k++)
|
|
|
|
term->disptext[i]->chars[k].attr |= ATTR_INVALID;
|
2004-12-17 15:55:12 +03:00
|
|
|
|
2006-03-12 17:53:18 +03:00
|
|
|
dirtyrect = TRUE;
|
|
|
|
}
|
2004-12-17 14:37:16 +03:00
|
|
|
}
|
2004-12-17 15:55:12 +03:00
|
|
|
|
|
|
|
if (dirtyrect)
|
|
|
|
term->disptext[i]->chars[j].attr |= ATTR_INVALID;
|
2004-12-17 14:37:16 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally, loop once more and actually do the drawing.
|
|
|
|
*/
|
|
|
|
dirty_run = dirty_line = (ldata->lattr !=
|
|
|
|
term->disptext[i]->lattr);
|
|
|
|
term->disptext[i]->lattr = ldata->lattr;
|
|
|
|
|
2017-09-30 19:32:32 +03:00
|
|
|
tc = term->erase_char.truecolour;
|
2004-12-17 14:37:16 +03:00
|
|
|
for (j = 0; j < term->cols; j++) {
|
|
|
|
unsigned long tattr, tchar;
|
|
|
|
int break_run, do_copy;
|
|
|
|
termchar *d = lchars + j;
|
|
|
|
|
|
|
|
tattr = newline[j].attr;
|
|
|
|
tchar = newline[j].chr;
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if ((term->disptext[i]->chars[j].attr ^ tattr) & ATTR_WIDE)
|
2001-05-10 12:34:20 +04:00
|
|
|
dirty_line = TRUE;
|
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
break_run = ((tattr ^ attr) & term->attr_mask) != 0;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2017-09-30 19:32:32 +03:00
|
|
|
if (!truecolour_equal(newline[j].truecolour, tc))
|
|
|
|
break_run = TRUE;
|
|
|
|
|
2012-04-22 18:22:10 +04:00
|
|
|
#ifdef USES_VTLINE_HACK
|
2001-05-10 12:34:20 +04:00
|
|
|
/* Special hack for VT100 Linedraw glyphs */
|
2011-07-16 15:13:00 +04:00
|
|
|
if ((tchar >= 0x23BA && tchar <= 0x23BD) ||
|
|
|
|
(j > 0 && (newline[j-1].chr >= 0x23BA &&
|
|
|
|
newline[j-1].chr <= 0x23BD)))
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
break_run = TRUE;
|
2012-04-22 18:22:10 +04:00
|
|
|
#endif
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Separate out sequences of characters that have the
|
|
|
|
* same CSET, if that CSET is a magic one.
|
|
|
|
*/
|
|
|
|
if (CSET_OF(tchar) != cset)
|
|
|
|
break_run = TRUE;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
/*
|
|
|
|
* Break on both sides of any combined-character cell.
|
|
|
|
*/
|
|
|
|
if (d->cc_next != 0 ||
|
|
|
|
(j > 0 && d[-1].cc_next != 0))
|
|
|
|
break_run = TRUE;
|
|
|
|
|
2003-01-14 21:28:23 +03:00
|
|
|
if (!term->ucsdata->dbcs_screenfont && !dirty_line) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (term->disptext[i]->chars[j].chr == tchar &&
|
2004-12-17 15:55:12 +03:00
|
|
|
(term->disptext[i]->chars[j].attr &~ DATTR_MASK) == tattr)
|
2001-05-10 12:34:20 +04:00
|
|
|
break_run = TRUE;
|
|
|
|
else if (!dirty_run && ccount == 1)
|
|
|
|
break_run = TRUE;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
if (break_run) {
|
|
|
|
if ((dirty_run || last_run_dirty) && ccount > 0) {
|
2017-09-30 19:32:32 +03:00
|
|
|
do_text(ctx, start, i, ch, ccount, attr, ldata->lattr, tc);
|
2004-12-17 15:55:12 +03:00
|
|
|
if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
|
2004-12-22 13:21:50 +03:00
|
|
|
do_cursor(ctx, start, i, ch, ccount, attr,
|
2017-09-30 19:32:32 +03:00
|
|
|
ldata->lattr, tc);
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
start = j;
|
|
|
|
ccount = 0;
|
|
|
|
attr = tattr;
|
2017-09-30 19:32:32 +03:00
|
|
|
tc = newline[j].truecolour;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
cset = CSET_OF(tchar);
|
2003-01-14 21:28:23 +03:00
|
|
|
if (term->ucsdata->dbcs_screenfont)
|
2001-05-10 12:34:20 +04:00
|
|
|
last_run_dirty = dirty_run;
|
|
|
|
dirty_run = dirty_line;
|
|
|
|
}
|
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
do_copy = FALSE;
|
|
|
|
if (!termchars_equal_override(&term->disptext[i]->chars[j],
|
|
|
|
d, tchar, tattr)) {
|
|
|
|
do_copy = TRUE;
|
2001-05-10 12:34:20 +04:00
|
|
|
dirty_run = TRUE;
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
|
|
|
|
2012-02-17 23:28:55 +04:00
|
|
|
if (ccount+2 > chlen) {
|
2004-10-14 20:42:43 +04:00
|
|
|
chlen = ccount + 256;
|
|
|
|
ch = sresize(ch, chlen, wchar_t);
|
|
|
|
}
|
2012-02-17 23:28:55 +04:00
|
|
|
|
|
|
|
#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 */
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
ch[ccount++] = (wchar_t) tchar;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
if (d->cc_next) {
|
|
|
|
termchar *dd = d;
|
|
|
|
|
|
|
|
while (dd->cc_next) {
|
|
|
|
unsigned long schar;
|
|
|
|
|
|
|
|
dd += dd->cc_next;
|
|
|
|
|
|
|
|
schar = dd->chr;
|
|
|
|
switch (schar & CSET_MASK) {
|
|
|
|
case CSET_ASCII:
|
|
|
|
schar = term->ucsdata->unitab_line[schar & 0xFF];
|
|
|
|
break;
|
|
|
|
case CSET_LINEDRW:
|
|
|
|
schar = term->ucsdata->unitab_xterm[schar & 0xFF];
|
|
|
|
break;
|
|
|
|
case CSET_SCOACS:
|
|
|
|
schar = term->ucsdata->unitab_scoacs[schar&0xFF];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-02-17 23:28:55 +04:00
|
|
|
if (ccount+2 > chlen) {
|
2004-10-14 20:42:43 +04:00
|
|
|
chlen = ccount + 256;
|
|
|
|
ch = sresize(ch, chlen, wchar_t);
|
|
|
|
}
|
2012-02-17 23:28:55 +04:00
|
|
|
|
|
|
|
#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 */
|
2004-10-14 20:42:43 +04:00
|
|
|
ch[ccount++] = (wchar_t) schar;
|
|
|
|
}
|
|
|
|
|
|
|
|
attr |= TATTR_COMBINING;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (do_copy) {
|
|
|
|
copy_termchar(term->disptext[i], j, d);
|
|
|
|
term->disptext[i]->chars[j].chr = tchar;
|
|
|
|
term->disptext[i]->chars[j].attr = tattr;
|
2017-09-30 19:32:32 +03:00
|
|
|
term->disptext[i]->chars[j].truecolour = tc;
|
2004-12-17 15:55:12 +03:00
|
|
|
if (start == j)
|
|
|
|
term->disptext[i]->chars[j].attr |= DATTR_STARTRUN;
|
2004-10-14 20:42:43 +04:00
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
/* If it's a wide char step along to the next one. */
|
|
|
|
if (tattr & ATTR_WIDE) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (++j < term->cols) {
|
2001-05-10 12:34:20 +04:00
|
|
|
d++;
|
2003-01-02 19:20:29 +03:00
|
|
|
/*
|
|
|
|
* By construction above, the cursor should not
|
|
|
|
* be on the right-hand half of this character.
|
|
|
|
* Ever.
|
|
|
|
*/
|
|
|
|
assert(!(i == our_curs_y && j == our_curs_x));
|
2004-10-14 20:42:43 +04:00
|
|
|
if (!termchars_equal(&term->disptext[i]->chars[j], d))
|
2001-05-10 12:34:20 +04:00
|
|
|
dirty_run = TRUE;
|
2004-10-14 20:42:43 +04:00
|
|
|
copy_termchar(term->disptext[i], j, d);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
if (dirty_run && ccount > 0) {
|
2017-09-30 19:32:32 +03:00
|
|
|
do_text(ctx, start, i, ch, ccount, attr, ldata->lattr, tc);
|
2004-12-17 15:55:12 +03:00
|
|
|
if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
|
2017-09-30 19:32:32 +03:00
|
|
|
do_cursor(ctx, start, i, ch, ccount, attr, ldata->lattr, tc);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
unlineptr(ldata);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
|
2004-12-17 14:37:16 +03:00
|
|
|
sfree(newline);
|
2004-10-14 20:42:43 +04:00
|
|
|
sfree(ch);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Invalidate the whole screen so it will be repainted in full.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_invalidate(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
int i, j;
|
1999-01-08 16:02:13 +03:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
for (i = 0; i < term->rows; i++)
|
|
|
|
for (j = 0; j < term->cols; j++)
|
2004-12-17 14:37:16 +03:00
|
|
|
term->disptext[i]->chars[j].attr |= ATTR_INVALID;
|
2004-11-28 18:13:34 +03:00
|
|
|
|
|
|
|
term_schedule_update(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Paint the window in response to a WM_PAINT message.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_paint(Terminal *term, Context ctx,
|
2002-10-26 18:06:52 +04:00
|
|
|
int left, int top, int right, int bottom, int immediately)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2001-09-15 19:54:24 +04:00
|
|
|
int i, j;
|
|
|
|
if (left < 0) left = 0;
|
|
|
|
if (top < 0) top = 0;
|
2002-10-22 20:11:33 +04:00
|
|
|
if (right >= term->cols) right = term->cols-1;
|
|
|
|
if (bottom >= term->rows) bottom = term->rows-1;
|
|
|
|
|
|
|
|
for (i = top; i <= bottom && i < term->rows; i++) {
|
2004-10-15 13:16:58 +04:00
|
|
|
if ((term->disptext[i]->lattr & LATTR_MODE) == LATTR_NORM)
|
2002-10-22 20:11:33 +04:00
|
|
|
for (j = left; j <= right && j < term->cols; j++)
|
2004-12-17 14:37:16 +03:00
|
|
|
term->disptext[i]->chars[j].attr |= ATTR_INVALID;
|
2000-07-26 16:13:51 +04:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
for (j = left / 2; j <= right / 2 + 1 && j < term->cols; j++)
|
2004-12-17 14:37:16 +03:00
|
|
|
term->disptext[i]->chars[j].attr |= ATTR_INVALID;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
if (immediately) {
|
2002-10-22 20:11:33 +04:00
|
|
|
do_paint (term, ctx, FALSE);
|
2004-11-27 16:20:21 +03:00
|
|
|
} else {
|
2004-11-28 18:13:34 +03:00
|
|
|
term_schedule_update(term);
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Attempt to scroll the scrollback. The second parameter gives the
|
|
|
|
* position we want to scroll to; the first is +1 to denote that
|
|
|
|
* this position is relative to the beginning of the scrollback, -1
|
|
|
|
* to denote it is relative to the end, and 0 to denote that it is
|
|
|
|
* relative to the current position.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_scroll(Terminal *term, int rel, int where)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2003-03-06 15:51:12 +03:00
|
|
|
int sbtop = -sblines(term);
|
2002-11-23 16:07:29 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
int olddisptop = term->disptop;
|
|
|
|
int shift;
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
2002-10-22 20:11:33 +04:00
|
|
|
|
|
|
|
term->disptop = (rel < 0 ? 0 : rel > 0 ? sbtop : term->disptop) + where;
|
|
|
|
if (term->disptop < sbtop)
|
|
|
|
term->disptop = sbtop;
|
|
|
|
if (term->disptop > 0)
|
|
|
|
term->disptop = 0;
|
|
|
|
update_sbar(term);
|
2002-11-23 16:07:29 +03:00
|
|
|
#ifdef OPTIMISE_SCROLL
|
|
|
|
shift = (term->disptop - olddisptop);
|
|
|
|
if (shift < term->rows && shift > -term->rows)
|
|
|
|
scroll_display(term, 0, term->rows - 1, shift);
|
|
|
|
#endif /* OPTIMISE_SCROLL */
|
2002-10-22 20:11:33 +04:00
|
|
|
term_update(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2010-04-23 22:32:15 +04:00
|
|
|
/*
|
|
|
|
* 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);
|
|
|
|
}
|
|
|
|
|
2006-02-19 04:37:45 +03:00
|
|
|
/*
|
|
|
|
* Helper routine for clipme(): growing buffer.
|
|
|
|
*/
|
|
|
|
typedef struct {
|
|
|
|
int buflen; /* amount of allocated space in textbuf/attrbuf */
|
|
|
|
int bufpos; /* amount of actual data */
|
|
|
|
wchar_t *textbuf; /* buffer for copied text */
|
|
|
|
wchar_t *textptr; /* = textbuf + bufpos (current insertion point) */
|
|
|
|
int *attrbuf; /* buffer for copied attributes */
|
|
|
|
int *attrptr; /* = attrbuf + bufpos */
|
2017-06-14 16:11:05 +03:00
|
|
|
truecolour *tcbuf; /* buffer for copied colours */
|
|
|
|
truecolour *tcptr; /* = tcbuf + bufpos */
|
2006-02-19 04:37:45 +03:00
|
|
|
} clip_workbuf;
|
|
|
|
|
2017-06-14 16:11:05 +03:00
|
|
|
static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr, truecolour tc)
|
2006-02-19 04:37:45 +03:00
|
|
|
{
|
|
|
|
if (b->bufpos >= b->buflen) {
|
2016-06-27 17:58:16 +03:00
|
|
|
b->buflen *= 2;
|
2006-02-19 04:37:45 +03:00
|
|
|
b->textbuf = sresize(b->textbuf, b->buflen, wchar_t);
|
|
|
|
b->textptr = b->textbuf + b->bufpos;
|
|
|
|
b->attrbuf = sresize(b->attrbuf, b->buflen, int);
|
|
|
|
b->attrptr = b->attrbuf + b->bufpos;
|
2017-06-14 16:11:05 +03:00
|
|
|
b->tcbuf = sresize(b->tcbuf, b->buflen, truecolour);
|
|
|
|
b->tcptr = b->tcbuf + b->bufpos;
|
2006-02-19 04:37:45 +03:00
|
|
|
}
|
|
|
|
*b->textptr++ = chr;
|
|
|
|
*b->attrptr++ = attr;
|
2017-06-14 16:11:05 +03:00
|
|
|
*b->tcptr++ = tc;
|
2006-02-19 04:37:45 +03:00
|
|
|
b->bufpos++;
|
|
|
|
}
|
|
|
|
|
2017-12-09 15:00:13 +03:00
|
|
|
static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel,
|
2017-12-10 18:45:45 +03:00
|
|
|
const int *clipboards, int n_clipboards)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2006-02-19 04:37:45 +03:00
|
|
|
clip_workbuf buf;
|
2001-10-31 21:50:09 +03:00
|
|
|
int old_top_x;
|
2006-02-14 01:18:17 +03:00
|
|
|
int attr;
|
2017-06-14 16:11:05 +03:00
|
|
|
truecolour tc;
|
2000-11-21 22:28:25 +03:00
|
|
|
|
2006-02-19 04:37:45 +03:00
|
|
|
buf.buflen = 5120;
|
|
|
|
buf.bufpos = 0;
|
|
|
|
buf.textptr = buf.textbuf = snewn(buf.buflen, wchar_t);
|
|
|
|
buf.attrptr = buf.attrbuf = snewn(buf.buflen, int);
|
2017-06-14 16:11:05 +03:00
|
|
|
buf.tcptr = buf.tcbuf = snewn(buf.buflen, truecolour);
|
2006-02-19 04:37:45 +03:00
|
|
|
|
2001-10-31 21:50:09 +03:00
|
|
|
old_top_x = top.x; /* needed for rect==1 */
|
2000-11-21 22:28:25 +03:00
|
|
|
|
2001-04-17 01:25:13 +04:00
|
|
|
while (poslt(top, bottom)) {
|
2000-11-21 22:28:25 +03:00
|
|
|
int nl = FALSE;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata = lineptr(top.y);
|
2001-04-17 12:24:29 +04:00
|
|
|
pos nlpos;
|
2001-04-17 01:25:13 +04:00
|
|
|
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* nlpos will point at the maximum position on this line we
|
|
|
|
* should copy up to. So we start it at the end of the
|
|
|
|
* line...
|
|
|
|
*/
|
2001-04-17 01:25:13 +04:00
|
|
|
nlpos.y = top.y;
|
2002-10-22 20:11:33 +04:00
|
|
|
nlpos.x = term->cols;
|
2000-11-21 22:28:25 +03:00
|
|
|
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* ... move it backwards if there's unused space at the end
|
|
|
|
* of the line (and also set `nl' if this is the case,
|
|
|
|
* because in normal selection mode this means we need a
|
|
|
|
* newline at the end)...
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (!(ldata->lattr & LATTR_WRAPPED)) {
|
2006-02-19 04:37:45 +03:00
|
|
|
while (nlpos.x &&
|
|
|
|
IS_SPACE_CHR(ldata->chars[nlpos.x - 1].chr) &&
|
2004-10-15 15:42:02 +04:00
|
|
|
!ldata->chars[nlpos.x - 1].cc_next &&
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
poslt(top, nlpos))
|
2001-05-10 12:34:20 +04:00
|
|
|
decpos(nlpos);
|
2001-04-17 01:25:13 +04:00
|
|
|
if (poslt(nlpos, bottom))
|
2000-11-21 22:28:25 +03:00
|
|
|
nl = TRUE;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
} else if (ldata->lattr & LATTR_WRAPPED2) {
|
2003-01-02 19:20:29 +03:00
|
|
|
/* Ignore the last char on the line in a WRAPPED2 line. */
|
|
|
|
decpos(nlpos);
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
2001-10-31 21:50:09 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ... and then clip it to the terminal x coordinate if
|
|
|
|
* we're doing rectangular selection. (In this case we
|
|
|
|
* still did the above, so that copying e.g. the right-hand
|
|
|
|
* column from a table doesn't fill with spaces on the
|
|
|
|
* right.)
|
|
|
|
*/
|
|
|
|
if (rect) {
|
|
|
|
if (nlpos.x > bottom.x)
|
|
|
|
nlpos.x = bottom.x;
|
|
|
|
nl = (top.y < bottom.y);
|
|
|
|
}
|
|
|
|
|
2001-04-17 01:25:13 +04:00
|
|
|
while (poslt(top, bottom) && poslt(top, nlpos)) {
|
2001-05-10 12:34:20 +04:00
|
|
|
#if 0
|
|
|
|
char cbuf[16], *p;
|
|
|
|
sprintf(cbuf, "<U+%04x>", (ldata[top.x] & 0xFFFF));
|
|
|
|
#else
|
|
|
|
wchar_t cbuf[16], *p;
|
2011-05-07 14:57:19 +04:00
|
|
|
int c;
|
2004-10-14 20:42:43 +04:00
|
|
|
int x = top.x;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
if (ldata->chars[x].chr == UCSWIDE) {
|
2001-05-10 12:34:20 +04:00
|
|
|
top.x++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
while (1) {
|
|
|
|
int uc = ldata->chars[x].chr;
|
2006-02-14 01:18:17 +03:00
|
|
|
attr = ldata->chars[x].attr;
|
2017-06-14 16:11:05 +03:00
|
|
|
tc = ldata->chars[x].truecolour;
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
switch (uc & CSET_MASK) {
|
|
|
|
case CSET_LINEDRW:
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!term->rawcnp) {
|
2004-10-14 20:42:43 +04:00
|
|
|
uc = term->ucsdata->unitab_xterm[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case CSET_ASCII:
|
|
|
|
uc = term->ucsdata->unitab_line[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
case CSET_SCOACS:
|
|
|
|
uc = term->ucsdata->unitab_scoacs[uc&0xFF];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (uc & CSET_MASK) {
|
|
|
|
case CSET_ACP:
|
|
|
|
uc = term->ucsdata->unitab_font[uc & 0xFF];
|
|
|
|
break;
|
|
|
|
case CSET_OEMCP:
|
|
|
|
uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
c = (uc & ~CSET_MASK);
|
2009-03-25 01:24:31 +03:00
|
|
|
#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;
|
|
|
|
}
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
if (DIRECT_FONT(uc)) {
|
|
|
|
if (c >= ' ' && c != 0x7F) {
|
|
|
|
char buf[4];
|
|
|
|
WCHAR wbuf[4];
|
|
|
|
int rv;
|
|
|
|
if (is_dbcs_leadbyte(term->ucsdata->font_codepage, (BYTE) c)) {
|
|
|
|
buf[0] = c;
|
|
|
|
buf[1] = (char) (0xFF & ldata->chars[top.x + 1].chr);
|
|
|
|
rv = mb_to_wc(term->ucsdata->font_codepage, 0, buf, 2, wbuf, 4);
|
|
|
|
top.x++;
|
|
|
|
} else {
|
|
|
|
buf[0] = c;
|
|
|
|
rv = mb_to_wc(term->ucsdata->font_codepage, 0, buf, 1, wbuf, 4);
|
|
|
|
}
|
2000-11-21 22:28:25 +03:00
|
|
|
|
2004-10-14 20:42:43 +04:00
|
|
|
if (rv > 0) {
|
|
|
|
memcpy(cbuf, wbuf, rv * sizeof(wchar_t));
|
|
|
|
cbuf[rv] = 0;
|
|
|
|
}
|
2001-04-09 15:59:35 +04:00
|
|
|
}
|
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
#endif
|
|
|
|
|
2006-02-19 04:37:45 +03:00
|
|
|
for (p = cbuf; *p; p++)
|
2017-06-14 16:11:05 +03:00
|
|
|
clip_addchar(&buf, *p, attr, tc);
|
2004-10-14 20:42:43 +04:00
|
|
|
|
|
|
|
if (ldata->chars[x].cc_next)
|
|
|
|
x += ldata->chars[x].cc_next;
|
|
|
|
else
|
|
|
|
break;
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
top.x++;
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
|
|
|
if (nl) {
|
|
|
|
int i;
|
2006-02-19 04:37:45 +03:00
|
|
|
for (i = 0; i < sel_nl_sz; i++)
|
2017-06-14 16:11:05 +03:00
|
|
|
clip_addchar(&buf, sel_nl[i], 0, term->basic_erase_char.truecolour);
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
top.y++;
|
2001-10-31 21:50:09 +03:00
|
|
|
top.x = rect ? old_top_x : 0;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
unlineptr(ldata);
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
2002-10-13 15:24:25 +04:00
|
|
|
#if SELECTION_NUL_TERMINATED
|
2017-06-14 16:11:05 +03:00
|
|
|
clip_addchar(&buf, 0, 0, term->basic_erase_char.truecolour);
|
2002-10-13 15:24:25 +04:00
|
|
|
#endif
|
2017-12-10 18:45:45 +03:00
|
|
|
/* Finally, transfer all that to the clipboard(s). */
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int clip_local = FALSE;
|
|
|
|
for (i = 0; i < n_clipboards; i++) {
|
|
|
|
if (clipboards[i] == CLIP_LOCAL) {
|
|
|
|
clip_local = TRUE;
|
|
|
|
} else if (clipboards[i] != CLIP_NULL) {
|
|
|
|
write_clip(term->frontend, clipboards[i],
|
|
|
|
buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos,
|
|
|
|
desel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (clip_local) {
|
|
|
|
sfree(term->last_selected_text);
|
|
|
|
sfree(term->last_selected_attr);
|
|
|
|
sfree(term->last_selected_tc);
|
|
|
|
term->last_selected_text = buf.textbuf;
|
|
|
|
term->last_selected_attr = buf.attrbuf;
|
|
|
|
term->last_selected_tc = buf.tcbuf;
|
|
|
|
term->last_selected_len = buf.bufpos;
|
|
|
|
} else {
|
|
|
|
sfree(buf.textbuf);
|
|
|
|
sfree(buf.attrbuf);
|
|
|
|
sfree(buf.tcbuf);
|
|
|
|
}
|
|
|
|
}
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
|
2017-12-10 18:45:45 +03:00
|
|
|
void term_copyall(Terminal *term, const int *clipboards, int n_clipboards)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2001-04-17 01:25:13 +04:00
|
|
|
pos top;
|
2004-03-10 20:11:12 +03:00
|
|
|
pos bottom;
|
|
|
|
tree234 *screen = term->screen;
|
2003-03-06 15:51:12 +03:00
|
|
|
top.y = -sblines(term);
|
2001-04-17 01:25:13 +04:00
|
|
|
top.x = 0;
|
2004-03-10 20:11:12 +03:00
|
|
|
bottom.y = find_last_nonempty_line(term, screen);
|
|
|
|
bottom.x = term->cols;
|
2017-12-10 18:45:45 +03:00
|
|
|
clipme(term, top, bottom, 0, TRUE, clipboards, n_clipboards);
|
2017-12-09 15:00:13 +03:00
|
|
|
}
|
|
|
|
|
2017-12-10 17:53:55 +03:00
|
|
|
static void paste_from_clip_local(void *vterm)
|
|
|
|
{
|
|
|
|
Terminal *term = (Terminal *)vterm;
|
|
|
|
term_do_paste(term, term->last_selected_text, term->last_selected_len);
|
|
|
|
}
|
|
|
|
|
2017-12-10 18:45:45 +03:00
|
|
|
void term_request_copy(Terminal *term, const int *clipboards, int n_clipboards)
|
2017-12-10 17:53:55 +03:00
|
|
|
{
|
2017-12-10 18:45:45 +03:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < n_clipboards; i++) {
|
|
|
|
assert(clipboards[i] != CLIP_LOCAL);
|
|
|
|
if (clipboards[i] != CLIP_NULL) {
|
|
|
|
write_clip(term->frontend, clipboards[i],
|
|
|
|
term->last_selected_text,
|
|
|
|
term->last_selected_attr,
|
|
|
|
term->last_selected_tc,
|
|
|
|
term->last_selected_len,
|
|
|
|
FALSE);
|
|
|
|
}
|
2017-12-10 17:53:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-09 15:00:13 +03:00
|
|
|
void term_request_paste(Terminal *term, int clipboard)
|
|
|
|
{
|
2017-12-10 17:53:55 +03:00
|
|
|
switch (clipboard) {
|
|
|
|
case CLIP_NULL:
|
|
|
|
/* Do nothing: CLIP_NULL never has data in it. */
|
|
|
|
break;
|
|
|
|
case CLIP_LOCAL:
|
|
|
|
queue_toplevel_callback(paste_from_clip_local, term);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
frontend_request_paste(term->frontend, clipboard);
|
|
|
|
break;
|
|
|
|
}
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-10-22 20:11:33 +04:00
|
|
|
* The wordness array is mainly for deciding the disposition of the
|
|
|
|
* US-ASCII characters.
|
2001-05-10 12:34:20 +04:00
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static int wordtype(Terminal *term, int uc)
|
2001-05-10 12:34:20 +04:00
|
|
|
{
|
2002-10-26 14:16:19 +04:00
|
|
|
struct ucsword {
|
2001-05-10 12:34:20 +04:00
|
|
|
int start, end, ctype;
|
2002-10-26 14:16:19 +04:00
|
|
|
};
|
|
|
|
static const struct ucsword ucs_words[] = {
|
2001-05-10 12:34:20 +04:00
|
|
|
{
|
|
|
|
128, 160, 0}, {
|
|
|
|
161, 191, 1}, {
|
|
|
|
215, 215, 1}, {
|
|
|
|
247, 247, 1}, {
|
|
|
|
0x037e, 0x037e, 1}, /* Greek question mark */
|
|
|
|
{
|
|
|
|
0x0387, 0x0387, 1}, /* Greek ano teleia */
|
|
|
|
{
|
|
|
|
0x055a, 0x055f, 1}, /* Armenian punctuation */
|
|
|
|
{
|
|
|
|
0x0589, 0x0589, 1}, /* Armenian full stop */
|
|
|
|
{
|
|
|
|
0x0700, 0x070d, 1}, /* Syriac punctuation */
|
|
|
|
{
|
|
|
|
0x104a, 0x104f, 1}, /* Myanmar punctuation */
|
|
|
|
{
|
|
|
|
0x10fb, 0x10fb, 1}, /* Georgian punctuation */
|
|
|
|
{
|
|
|
|
0x1361, 0x1368, 1}, /* Ethiopic punctuation */
|
|
|
|
{
|
|
|
|
0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */
|
|
|
|
{
|
|
|
|
0x17d4, 0x17dc, 1}, /* Khmer punctuation */
|
|
|
|
{
|
|
|
|
0x1800, 0x180a, 1}, /* Mongolian punctuation */
|
|
|
|
{
|
|
|
|
0x2000, 0x200a, 0}, /* Various spaces */
|
|
|
|
{
|
|
|
|
0x2070, 0x207f, 2}, /* superscript */
|
|
|
|
{
|
|
|
|
0x2080, 0x208f, 2}, /* subscript */
|
|
|
|
{
|
|
|
|
0x200b, 0x27ff, 1}, /* punctuation and symbols */
|
|
|
|
{
|
|
|
|
0x3000, 0x3000, 0}, /* ideographic space */
|
|
|
|
{
|
|
|
|
0x3001, 0x3020, 1}, /* ideographic punctuation */
|
|
|
|
{
|
|
|
|
0x303f, 0x309f, 3}, /* Hiragana */
|
|
|
|
{
|
|
|
|
0x30a0, 0x30ff, 3}, /* Katakana */
|
|
|
|
{
|
|
|
|
0x3300, 0x9fff, 3}, /* CJK Ideographs */
|
|
|
|
{
|
|
|
|
0xac00, 0xd7a3, 3}, /* Hangul Syllables */
|
|
|
|
{
|
|
|
|
0xf900, 0xfaff, 3}, /* CJK Ideographs */
|
|
|
|
{
|
|
|
|
0xfe30, 0xfe6b, 1}, /* punctuation forms */
|
|
|
|
{
|
|
|
|
0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */
|
|
|
|
{
|
|
|
|
0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */
|
|
|
|
{
|
|
|
|
0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */
|
|
|
|
{
|
|
|
|
0xff5b, 0xff64, 1}, /* half/fullwidth ASCII */
|
|
|
|
{
|
|
|
|
0xfff0, 0xffff, 0}, /* half/fullwidth ASCII */
|
|
|
|
{
|
|
|
|
0, 0, 0}
|
|
|
|
};
|
2002-10-26 14:16:19 +04:00
|
|
|
const struct ucsword *wptr;
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
switch (uc & CSET_MASK) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_LINEDRW:
|
2003-01-14 21:28:23 +03:00
|
|
|
uc = term->ucsdata->unitab_xterm[uc & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_ASCII:
|
2003-01-14 21:28:23 +03:00
|
|
|
uc = term->ucsdata->unitab_line[uc & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_SCOACS:
|
2003-01-14 21:28:23 +03:00
|
|
|
uc = term->ucsdata->unitab_scoacs[uc&0xFF];
|
2001-05-19 18:12:41 +04:00
|
|
|
break;
|
2001-05-10 12:34:20 +04:00
|
|
|
}
|
|
|
|
switch (uc & CSET_MASK) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_ACP:
|
2003-01-14 21:28:23 +03:00
|
|
|
uc = term->ucsdata->unitab_font[uc & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
case CSET_OEMCP:
|
2003-01-14 21:28:23 +03:00
|
|
|
uc = term->ucsdata->unitab_oemcp[uc & 0xFF];
|
2001-05-10 12:34:20 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
/* For DBCS fonts I can't do anything useful. Even this will sometimes
|
2001-09-15 19:54:24 +04:00
|
|
|
* fail as there's such a thing as a double width space. :-(
|
|
|
|
*/
|
2003-01-14 21:28:23 +03:00
|
|
|
if (term->ucsdata->dbcs_screenfont &&
|
|
|
|
term->ucsdata->font_codepage == term->ucsdata->line_codepage)
|
2001-09-15 19:54:24 +04:00
|
|
|
return (uc != ' ');
|
|
|
|
|
2001-05-10 12:34:20 +04:00
|
|
|
if (uc < 0x80)
|
2002-10-22 20:11:33 +04:00
|
|
|
return term->wordness[uc];
|
2001-05-10 12:34:20 +04:00
|
|
|
|
|
|
|
for (wptr = ucs_words; wptr->start; wptr++) {
|
|
|
|
if (uc >= wptr->start && uc <= wptr->end)
|
|
|
|
return wptr->ctype;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 2;
|
2000-11-21 22:28:25 +03:00
|
|
|
}
|
|
|
|
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* Spread the selection outwards according to the selection mode.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
static pos sel_spread_half(Terminal *term, pos p, int dir)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata;
|
1999-01-08 16:02:13 +03:00
|
|
|
short wvalue;
|
2003-03-06 15:51:12 +03:00
|
|
|
int topy = -sblines(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2001-04-17 01:25:13 +04:00
|
|
|
ldata = lineptr(p.y);
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
switch (term->selmode) {
|
1999-01-08 16:02:13 +03:00
|
|
|
case SM_CHAR:
|
|
|
|
/*
|
|
|
|
* In this mode, every character is a separate unit, except
|
|
|
|
* for runs of spaces at the end of a non-wrapping line.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (!(ldata->lattr & LATTR_WRAPPED)) {
|
|
|
|
termchar *q = ldata->chars + term->cols;
|
2004-10-15 15:42:02 +04:00
|
|
|
while (q > ldata->chars &&
|
|
|
|
IS_SPACE_CHR(q[-1].chr) && !q[-1].cc_next)
|
1999-01-08 16:02:13 +03:00
|
|
|
q--;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (q == ldata->chars + term->cols)
|
1999-01-08 16:02:13 +03:00
|
|
|
q--;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (p.x >= q - ldata->chars)
|
|
|
|
p.x = (dir == -1 ? q - ldata->chars : term->cols - 1);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SM_WORD:
|
|
|
|
/*
|
|
|
|
* In this mode, the units are maximal runs of characters
|
|
|
|
* whose `wordness' has the same value.
|
|
|
|
*/
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
wvalue = wordtype(term, UCSGET(ldata->chars, p.x));
|
1999-01-08 16:02:13 +03:00
|
|
|
if (dir == +1) {
|
2001-10-31 01:02:15 +03:00
|
|
|
while (1) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
int maxcols = (ldata->lattr & LATTR_WRAPPED2 ?
|
2003-01-02 19:20:29 +03:00
|
|
|
term->cols-1 : term->cols);
|
|
|
|
if (p.x < maxcols-1) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (wordtype(term, UCSGET(ldata->chars, p.x+1)) == wvalue)
|
2001-10-31 01:02:15 +03:00
|
|
|
p.x++;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
} else {
|
2012-12-17 12:40:33 +04:00
|
|
|
if (p.y+1 < term->rows &&
|
|
|
|
(ldata->lattr & LATTR_WRAPPED)) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata2;
|
2001-10-31 01:02:15 +03:00
|
|
|
ldata2 = lineptr(p.y+1);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (wordtype(term, UCSGET(ldata2->chars, 0))
|
|
|
|
== wvalue) {
|
2001-10-31 01:02:15 +03:00
|
|
|
p.x = 0;
|
|
|
|
p.y++;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unlineptr(ldata);
|
2001-10-31 01:02:15 +03:00
|
|
|
ldata = ldata2;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
} else {
|
|
|
|
unlineptr(ldata2);
|
2001-10-31 01:02:15 +03:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
2001-10-31 01:02:15 +03:00
|
|
|
} else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2001-10-31 01:02:15 +03:00
|
|
|
while (1) {
|
|
|
|
if (p.x > 0) {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (wordtype(term, UCSGET(ldata->chars, p.x-1)) == wvalue)
|
2001-10-31 01:02:15 +03:00
|
|
|
p.x--;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
} else {
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata2;
|
2003-01-02 19:20:29 +03:00
|
|
|
int maxcols;
|
2001-10-31 01:02:15 +03:00
|
|
|
if (p.y <= topy)
|
|
|
|
break;
|
|
|
|
ldata2 = lineptr(p.y-1);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
maxcols = (ldata2->lattr & LATTR_WRAPPED2 ?
|
2003-01-02 19:20:29 +03:00
|
|
|
term->cols-1 : term->cols);
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if (ldata2->lattr & LATTR_WRAPPED) {
|
|
|
|
if (wordtype(term, UCSGET(ldata2->chars, maxcols-1))
|
2003-01-02 19:20:29 +03:00
|
|
|
== wvalue) {
|
|
|
|
p.x = maxcols-1;
|
|
|
|
p.y--;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unlineptr(ldata);
|
2003-01-02 19:20:29 +03:00
|
|
|
ldata = ldata2;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
} else {
|
|
|
|
unlineptr(ldata2);
|
2003-01-02 19:20:29 +03:00
|
|
|
break;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
}
|
2001-10-31 01:02:15 +03:00
|
|
|
} else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SM_LINE:
|
|
|
|
/*
|
|
|
|
* In this mode, every line is a unit.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
p.x = (dir == -1 ? 0 : term->cols - 1);
|
1999-01-08 16:02:13 +03:00
|
|
|
break;
|
|
|
|
}
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
|
|
|
|
unlineptr(ldata);
|
1999-01-08 16:02:13 +03:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
static void sel_spread(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->seltype == LEXICOGRAPHIC) {
|
|
|
|
term->selstart = sel_spread_half(term, term->selstart, -1);
|
|
|
|
decpos(term->selend);
|
|
|
|
term->selend = sel_spread_half(term, term->selend, +1);
|
|
|
|
incpos(term->selend);
|
2001-10-31 21:50:09 +03:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2013-08-17 20:06:12 +04:00
|
|
|
static void term_paste_callback(void *vterm)
|
|
|
|
{
|
|
|
|
Terminal *term = (Terminal *)vterm;
|
|
|
|
|
|
|
|
if (term->paste_len == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (term->paste_pos < term->paste_len) {
|
|
|
|
int n = 0;
|
|
|
|
while (n + term->paste_pos < term->paste_len) {
|
|
|
|
if (term->paste_buffer[term->paste_pos + n++] == '\015')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (term->ldisc)
|
|
|
|
luni_send(term->ldisc, term->paste_buffer + term->paste_pos, n, 0);
|
|
|
|
term->paste_pos += n;
|
|
|
|
|
|
|
|
if (term->paste_pos < term->paste_len) {
|
Remove the timed part of the terminal paste mechanism.
In r10020 I carefully reimplemented using timing.c and callback.c the
same policy for large pastes that the previous code appeared to be
implementing ad-hoc, which included a 450ms delay between sending
successive lines of pasted text if no visible acknowledgment of the
just-sent line (in the form of a \n or \r) came back from the
application.
However, it turns out that that *wasn't* what the old code was doing.
It *would* have done that, but for the bug that it never actually set
the 'last_paste' variable, and never has done since it was first
introduced way back in r516! So the policy I thought had been in force
forever has in fact only been in force since I unwittingly fixed that
bug in r10020 - and it turns out to be a bad idea, breaking pastes
into vi in particular.
So I've removed the timed paste code completely, on the basis that
it's never actually worked and nobody seems to have been unhappy about
that. Now we still break large pastes into separate lines and send
them in successive top-level callbacks, and the user can still press a
key to interrupt a paste if they manage to catch it still going on,
but there's no attempted *delay* any more.
(It's possible that what I *really* ought to be doing is calling
back->sendbuffer() to see whether the backend is consuming the data
pasted so far, and if not, deferring the rest of the paste until the
send buffer becomes smaller. Then we could have pasting be delayed by
back-pressure from the recipient, and still manually interruptible
during that delay, but not have it delayed by anything else. But what
we have here should at least manage to be equivalent to the *actual*
rather than the intended old policy.)
[originally from svn r10041]
[r516 == 0d5d39064a0d078af47e3158313dd2b82bfd167c]
[r10020 == 7be9af74ec8b97f948d6b3d67ebaf1a97138da33]
2013-09-15 18:05:38 +04:00
|
|
|
queue_toplevel_callback(term_paste_callback, term);
|
2013-08-17 20:06:12 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sfree(term->paste_buffer);
|
|
|
|
term->paste_buffer = NULL;
|
|
|
|
term->paste_len = 0;
|
|
|
|
}
|
|
|
|
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
void term_do_paste(Terminal *term, const wchar_t *data, int len)
|
2001-05-17 14:06:54 +04:00
|
|
|
{
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
const wchar_t *p, *q;
|
2002-10-20 17:23:30 +04:00
|
|
|
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
/*
|
|
|
|
* Pasting data into the terminal counts as a keyboard event (for
|
|
|
|
* purposes of the 'Reset scrollback on keypress' config option),
|
|
|
|
* unless the paste is zero-length.
|
|
|
|
*/
|
|
|
|
if (len == 0)
|
|
|
|
return;
|
|
|
|
term_seen_key_event(term);
|
|
|
|
|
|
|
|
if (term->paste_buffer)
|
|
|
|
sfree(term->paste_buffer);
|
|
|
|
term->paste_pos = term->paste_len = 0;
|
|
|
|
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;
|
|
|
|
}
|
2001-05-17 14:06:54 +04:00
|
|
|
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
p = q = data;
|
|
|
|
while (p < data + len) {
|
|
|
|
while (p < data + len &&
|
|
|
|
!(p <= data + len - sel_nl_sz &&
|
|
|
|
!memcmp(p, sel_nl, sizeof(sel_nl))))
|
|
|
|
p++;
|
|
|
|
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < p - q; i++) {
|
|
|
|
term->paste_buffer[term->paste_len++] = q[i];
|
2001-05-17 14:06:54 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
if (p <= data + len - sel_nl_sz &&
|
|
|
|
!memcmp(p, sel_nl, sizeof(sel_nl))) {
|
|
|
|
term->paste_buffer[term->paste_len++] = '\015';
|
|
|
|
p += sel_nl_sz;
|
2012-02-19 14:27:18 +04:00
|
|
|
}
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
q = p;
|
|
|
|
}
|
2012-02-19 14:27:18 +04:00
|
|
|
|
Stop front ends remembering the data of their last paste.
Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.
But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.
So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
2017-12-09 11:41:03 +03:00
|
|
|
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)
|
|
|
|
luni_send(term->ldisc, term->paste_buffer, term->paste_len, 0);
|
|
|
|
if (term->paste_buffer)
|
|
|
|
sfree(term->paste_buffer);
|
|
|
|
term->paste_buffer = 0;
|
|
|
|
term->paste_pos = term->paste_len = 0;
|
2001-05-17 14:06:54 +04:00
|
|
|
}
|
2013-08-17 20:06:12 +04:00
|
|
|
|
Remove the timed part of the terminal paste mechanism.
In r10020 I carefully reimplemented using timing.c and callback.c the
same policy for large pastes that the previous code appeared to be
implementing ad-hoc, which included a 450ms delay between sending
successive lines of pasted text if no visible acknowledgment of the
just-sent line (in the form of a \n or \r) came back from the
application.
However, it turns out that that *wasn't* what the old code was doing.
It *would* have done that, but for the bug that it never actually set
the 'last_paste' variable, and never has done since it was first
introduced way back in r516! So the policy I thought had been in force
forever has in fact only been in force since I unwittingly fixed that
bug in r10020 - and it turns out to be a bad idea, breaking pastes
into vi in particular.
So I've removed the timed paste code completely, on the basis that
it's never actually worked and nobody seems to have been unhappy about
that. Now we still break large pastes into separate lines and send
them in successive top-level callbacks, and the user can still press a
key to interrupt a paste if they manage to catch it still going on,
but there's no attempted *delay* any more.
(It's possible that what I *really* ought to be doing is calling
back->sendbuffer() to see whether the backend is consuming the data
pasted so far, and if not, deferring the rest of the paste until the
send buffer becomes smaller. Then we could have pasting be delayed by
back-pressure from the recipient, and still manually interruptible
during that delay, but not have it delayed by anything else. But what
we have here should at least manage to be equivalent to the *actual*
rather than the intended old policy.)
[originally from svn r10041]
[r516 == 0d5d39064a0d078af47e3158313dd2b82bfd167c]
[r10020 == 7be9af74ec8b97f948d6b3d67ebaf1a97138da33]
2013-09-15 18:05:38 +04:00
|
|
|
queue_toplevel_callback(term_paste_callback, term);
|
2001-05-17 14:06:54 +04:00
|
|
|
}
|
|
|
|
|
2003-01-25 19:16:45 +03:00
|
|
|
void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
|
|
|
|
Mouse_Action a, int x, int y, int shift, int ctrl, int alt)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2001-04-17 01:25:13 +04:00
|
|
|
pos selpoint;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
termline *ldata;
|
2002-10-22 20:11:33 +04:00
|
|
|
int raw_mouse = (term->xterm_mouse &&
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
!term->no_mouse_rep &&
|
|
|
|
!(term->mouse_override && shift));
|
2001-10-31 21:50:09 +03:00
|
|
|
int default_seltype;
|
2001-05-06 18:35:20 +04:00
|
|
|
|
2001-09-08 16:37:48 +04:00
|
|
|
if (y < 0) {
|
2001-05-06 18:35:20 +04:00
|
|
|
y = 0;
|
2001-09-08 16:37:48 +04:00
|
|
|
if (a == MA_DRAG && !raw_mouse)
|
2002-10-22 20:11:33 +04:00
|
|
|
term_scroll(term, 0, -1);
|
2001-09-08 16:37:48 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (y >= term->rows) {
|
|
|
|
y = term->rows - 1;
|
2001-09-08 16:37:48 +04:00
|
|
|
if (a == MA_DRAG && !raw_mouse)
|
2002-10-22 20:11:33 +04:00
|
|
|
term_scroll(term, 0, +1);
|
2001-09-08 16:37:48 +04:00
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
if (x < 0) {
|
2017-10-01 23:53:32 +03:00
|
|
|
if (y > 0 && !raw_mouse && term->seltype != RECTANGULAR) {
|
|
|
|
/*
|
|
|
|
* When we're using the mouse for normal raster-based
|
|
|
|
* selection, dragging off the left edge of a terminal row
|
|
|
|
* is treated the same as the right-hand end of the
|
|
|
|
* previous row, in that it's considered to identify a
|
|
|
|
* point _before_ the first character on row y.
|
|
|
|
*
|
|
|
|
* But if the mouse action is going to be used for
|
|
|
|
* anything else - rectangular selection, or xterm mouse
|
|
|
|
* tracking - then we disable this special treatment.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
x = term->cols - 1;
|
2001-05-06 18:35:20 +04:00
|
|
|
y--;
|
|
|
|
} else
|
|
|
|
x = 0;
|
1999-01-22 12:36:21 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (x >= term->cols)
|
|
|
|
x = term->cols - 1;
|
1999-01-08 16:10:19 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
selpoint.y = y + term->disptop;
|
2001-04-17 01:25:13 +04:00
|
|
|
ldata = lineptr(selpoint.y);
|
2004-11-28 12:24:57 +03:00
|
|
|
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
if ((ldata->lattr & LATTR_MODE) != LATTR_NORM)
|
2004-11-28 12:24:57 +03:00
|
|
|
x /= 2;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Transform x through the bidi algorithm to find the _logical_
|
|
|
|
* click point from the physical one.
|
|
|
|
*/
|
|
|
|
if (term_bidi_line(term, ldata, y) != NULL) {
|
|
|
|
x = term->post_bidi_cache[y].backward[x];
|
|
|
|
}
|
|
|
|
|
|
|
|
selpoint.x = x;
|
Re-engineering of terminal emulator, phase 1.
The active terminal screen is no longer an array of `unsigned long'
encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of
`termchar' structures, which currently have 32-bit Unicode and 32
attribute bits but which will probably expand further in future.
To prevent bloat of the memory footprint, I've introduced a mostly
RLE-like compression scheme for storing scrollback: each line is
compressed into a compact (but hard to modify) form when it moves
into the term->scrollback tree, and is temporarily decompressed when
the user wants to scroll back over it. My initial tests suggest that
this compression averages about 1/4 of the previous (32 bits per
character cell) data size in typical output, which means this is an
improvement even without counting the new ability to extend the
information stored in each character cell.
Another beneficial side effect is that the insane format in which
Unicode was passed to front ends through do_text() has now been
rendered sane.
Testing is incomplete; this _may_ still have instabilities. Windows
and Unix front ends both seem to work as far as I've looked, but I
haven't yet looked very hard. The Mac front end I've edited (it
seemed obvious how to change it) but I can't compile or test it.
As an immediate functional effect, the terminal emulator now
supports full 32-bit Unicode to whatever extent the host platform
allows it to. For example, if you output a 4-or-more-byte UTF-8
character in Unix pterm, it will not display it properly, but it
will correctly paste it back out in a UTF8_STRING selection. Windows
is more restricted, sadly.
[originally from svn r4609]
2004-10-13 15:50:16 +04:00
|
|
|
unlineptr(ldata);
|
1999-01-08 16:02:13 +03:00
|
|
|
|
2006-06-11 16:56:52 +04:00
|
|
|
/*
|
|
|
|
* 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)) {
|
2014-02-16 20:40:45 +04:00
|
|
|
int encstate = 0, r, c, wheel;
|
2013-01-24 02:59:17 +04:00
|
|
|
char abuf[32];
|
|
|
|
int len = 0;
|
2001-05-06 18:20:41 +04:00
|
|
|
|
2002-10-26 14:16:19 +04:00
|
|
|
if (term->ldisc) {
|
|
|
|
|
2003-01-25 19:16:45 +03:00
|
|
|
switch (braw) {
|
2002-10-26 14:16:19 +04:00
|
|
|
case MBT_LEFT:
|
2013-01-24 02:59:17 +04:00
|
|
|
encstate = 0x00; /* left button down */
|
2014-02-16 20:40:45 +04:00
|
|
|
wheel = FALSE;
|
2002-10-26 14:16:19 +04:00
|
|
|
break;
|
|
|
|
case MBT_MIDDLE:
|
2013-01-24 02:59:17 +04:00
|
|
|
encstate = 0x01;
|
2014-02-16 20:40:45 +04:00
|
|
|
wheel = FALSE;
|
2002-10-26 14:16:19 +04:00
|
|
|
break;
|
|
|
|
case MBT_RIGHT:
|
2013-01-24 02:59:17 +04:00
|
|
|
encstate = 0x02;
|
2014-02-16 20:40:45 +04:00
|
|
|
wheel = FALSE;
|
2002-10-26 14:16:19 +04:00
|
|
|
break;
|
|
|
|
case MBT_WHEEL_UP:
|
2013-01-24 02:59:17 +04:00
|
|
|
encstate = 0x40;
|
2014-02-16 20:40:45 +04:00
|
|
|
wheel = TRUE;
|
2002-10-26 14:16:19 +04:00
|
|
|
break;
|
|
|
|
case MBT_WHEEL_DOWN:
|
2013-01-24 02:59:17 +04:00
|
|
|
encstate = 0x41;
|
2014-02-16 20:40:45 +04:00
|
|
|
wheel = TRUE;
|
2002-10-26 14:16:19 +04:00
|
|
|
break;
|
2014-02-16 20:40:45 +04:00
|
|
|
default:
|
|
|
|
return;
|
2002-10-26 14:16:19 +04:00
|
|
|
}
|
2014-02-16 20:40:45 +04:00
|
|
|
if (wheel) {
|
|
|
|
/* For mouse wheel buttons, we only ever expect to see
|
|
|
|
* MA_CLICK actions, and we don't try to keep track of
|
|
|
|
* the buttons being 'pressed' (since without matching
|
|
|
|
* click/release pairs that's pointless). */
|
|
|
|
if (a != MA_CLICK)
|
|
|
|
return;
|
|
|
|
} else switch (a) {
|
2002-10-26 14:16:19 +04:00
|
|
|
case MA_DRAG:
|
|
|
|
if (term->xterm_mouse == 1)
|
|
|
|
return;
|
|
|
|
encstate += 0x20;
|
|
|
|
break;
|
|
|
|
case MA_RELEASE:
|
2013-01-24 02:59:17 +04:00
|
|
|
/* 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;
|
2002-10-26 14:16:19 +04:00
|
|
|
term->mouse_is_down = 0;
|
|
|
|
break;
|
|
|
|
case MA_CLICK:
|
2003-01-25 19:16:45 +03:00
|
|
|
if (term->mouse_is_down == braw)
|
2002-10-26 14:16:19 +04:00
|
|
|
return;
|
2003-01-25 19:16:45 +03:00
|
|
|
term->mouse_is_down = braw;
|
2002-10-26 14:16:19 +04:00
|
|
|
break;
|
2014-02-16 20:40:45 +04:00
|
|
|
default:
|
|
|
|
return;
|
2002-10-26 14:16:19 +04:00
|
|
|
}
|
|
|
|
if (shift)
|
|
|
|
encstate += 0x04;
|
|
|
|
if (ctrl)
|
|
|
|
encstate += 0x10;
|
2013-01-24 02:59:17 +04:00
|
|
|
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);
|
|
|
|
}
|
2015-09-02 20:56:20 +03:00
|
|
|
if (len > 0)
|
|
|
|
ldisc_send(term->ldisc, abuf, len, 0);
|
2001-05-06 18:20:41 +04:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* Set the selection type (rectangular or normal) at the start
|
|
|
|
* of a selection attempt, from the state of Alt.
|
|
|
|
*/
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
if (!alt ^ !term->rect_select)
|
2001-10-31 21:50:09 +03:00
|
|
|
default_seltype = RECTANGULAR;
|
|
|
|
else
|
|
|
|
default_seltype = LEXICOGRAPHIC;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->selstate == NO_SELECTION) {
|
|
|
|
term->seltype = default_seltype;
|
2001-10-31 21:50:09 +03:00
|
|
|
}
|
|
|
|
|
2003-01-25 19:16:45 +03:00
|
|
|
if (bcooked == MBT_SELECT && a == MA_CLICK) {
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
|
|
|
term->selstate = ABOUT_TO;
|
|
|
|
term->seltype = default_seltype;
|
|
|
|
term->selanchor = selpoint;
|
|
|
|
term->selmode = SM_CHAR;
|
2003-01-25 19:16:45 +03:00
|
|
|
} else if (bcooked == MBT_SELECT && (a == MA_2CLK || a == MA_3CLK)) {
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
|
|
|
term->selmode = (a == MA_2CLK ? SM_WORD : SM_LINE);
|
|
|
|
term->selstate = DRAGGING;
|
|
|
|
term->selstart = term->selanchor = selpoint;
|
|
|
|
term->selend = term->selstart;
|
|
|
|
incpos(term->selend);
|
|
|
|
sel_spread(term);
|
2003-01-25 19:16:45 +03:00
|
|
|
} else if ((bcooked == MBT_SELECT && a == MA_DRAG) ||
|
|
|
|
(bcooked == MBT_EXTEND && a != MA_RELEASE)) {
|
2015-09-28 22:18:58 +03:00
|
|
|
if (a == MA_DRAG &&
|
|
|
|
(term->selstate == NO_SELECTION || term->selstate == SELECTED)) {
|
2015-09-03 21:20:28 +03:00
|
|
|
/*
|
|
|
|
* This can happen if a front end has passed us a MA_DRAG
|
|
|
|
* without a prior MA_CLICK. OS X GTK does so, for
|
|
|
|
* example, if the initial button press was eaten by the
|
|
|
|
* WM when it activated the window in the first place. The
|
|
|
|
* nicest thing to do in this situation is to ignore
|
|
|
|
* further drags, and wait for the user to click in the
|
|
|
|
* window again properly if they want to select.
|
|
|
|
*/
|
|
|
|
return;
|
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->selstate == ABOUT_TO && poseq(term->selanchor, selpoint))
|
1999-01-08 16:02:13 +03:00
|
|
|
return;
|
2003-01-25 19:16:45 +03:00
|
|
|
if (bcooked == MBT_EXTEND && a != MA_DRAG &&
|
|
|
|
term->selstate == SELECTED) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->seltype == LEXICOGRAPHIC) {
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* For normal selection, we extend by moving
|
|
|
|
* whichever end of the current selection is closer
|
|
|
|
* to the mouse.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (posdiff(selpoint, term->selstart) <
|
|
|
|
posdiff(term->selend, term->selstart) / 2) {
|
|
|
|
term->selanchor = term->selend;
|
|
|
|
decpos(term->selanchor);
|
2001-10-31 21:50:09 +03:00
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selanchor = term->selstart;
|
2001-10-31 21:50:09 +03:00
|
|
|
}
|
2001-04-17 01:25:13 +04:00
|
|
|
} else {
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* For rectangular selection, we have a choice of
|
|
|
|
* _four_ places to put selanchor and selpoint: the
|
|
|
|
* four corners of the selection.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (2*selpoint.x < term->selstart.x + term->selend.x)
|
|
|
|
term->selanchor.x = term->selend.x-1;
|
2001-10-31 21:50:09 +03:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selanchor.x = term->selstart.x;
|
2001-10-31 21:50:09 +03:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
if (2*selpoint.y < term->selstart.y + term->selend.y)
|
|
|
|
term->selanchor.y = term->selend.y;
|
2001-10-31 21:50:09 +03:00
|
|
|
else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selanchor.y = term->selstart.y;
|
2001-04-17 01:25:13 +04:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstate = DRAGGING;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->selstate != ABOUT_TO && term->selstate != DRAGGING)
|
|
|
|
term->selanchor = selpoint;
|
|
|
|
term->selstate = DRAGGING;
|
|
|
|
if (term->seltype == LEXICOGRAPHIC) {
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* For normal selection, we set (selstart,selend) to
|
|
|
|
* (selpoint,selanchor) in some order.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
if (poslt(selpoint, term->selanchor)) {
|
|
|
|
term->selstart = selpoint;
|
|
|
|
term->selend = term->selanchor;
|
|
|
|
incpos(term->selend);
|
2001-10-31 21:50:09 +03:00
|
|
|
} else {
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstart = term->selanchor;
|
|
|
|
term->selend = selpoint;
|
|
|
|
incpos(term->selend);
|
2001-10-31 21:50:09 +03:00
|
|
|
}
|
1999-01-08 16:02:13 +03:00
|
|
|
} else {
|
2001-10-31 21:50:09 +03:00
|
|
|
/*
|
|
|
|
* For rectangular selection, we may need to
|
|
|
|
* interchange x and y coordinates (if the user has
|
|
|
|
* dragged in the -x and +y directions, or vice versa).
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstart.x = min(term->selanchor.x, selpoint.x);
|
|
|
|
term->selend.x = 1+max(term->selanchor.x, selpoint.x);
|
|
|
|
term->selstart.y = min(term->selanchor.y, selpoint.y);
|
|
|
|
term->selend.y = max(term->selanchor.y, selpoint.y);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2002-10-22 20:11:33 +04:00
|
|
|
sel_spread(term);
|
2003-01-25 19:16:45 +03:00
|
|
|
} else if ((bcooked == MBT_SELECT || bcooked == MBT_EXTEND) &&
|
|
|
|
a == MA_RELEASE) {
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->selstate == DRAGGING) {
|
1999-01-08 16:02:13 +03:00
|
|
|
/*
|
|
|
|
* We've completed a selection. We now transfer the
|
|
|
|
* data to the clipboard.
|
|
|
|
*/
|
2002-10-22 20:11:33 +04:00
|
|
|
clipme(term, term->selstart, term->selend,
|
2017-12-09 15:00:13 +03:00
|
|
|
(term->seltype == RECTANGULAR), FALSE,
|
2017-12-10 18:45:45 +03:00
|
|
|
term->mouse_select_clipboards,
|
|
|
|
term->n_mouse_select_clipboards);
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstate = SELECTED;
|
1999-01-08 16:02:13 +03:00
|
|
|
} else
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstate = NO_SELECTION;
|
2003-01-25 19:16:45 +03:00
|
|
|
} else if (bcooked == MBT_PASTE
|
2002-10-13 15:24:25 +04:00
|
|
|
&& (a == MA_CLICK
|
|
|
|
#if MULTICLICK_ONLY_EVENT
|
|
|
|
|| a == MA_2CLK || a == MA_3CLK
|
|
|
|
#endif
|
|
|
|
)) {
|
2017-12-09 15:00:13 +03:00
|
|
|
term_request_paste(term, term->mouse_paste_clipboard);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2013-03-10 15:04:07 +04:00
|
|
|
/*
|
|
|
|
* 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);
|
2002-10-22 20:11:33 +04:00
|
|
|
term_update(term);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2010-03-06 18:50:26 +03:00
|
|
|
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 {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
int app_flg = (term->app_cursor_keys && !term->no_applic_c);
|
2010-03-06 18:50:26 +03:00
|
|
|
#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;
|
|
|
|
}
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
void term_nopaste(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
if (term->paste_len == 0)
|
2001-05-06 18:35:20 +04:00
|
|
|
return;
|
2002-10-22 20:11:33 +04:00
|
|
|
sfree(term->paste_buffer);
|
|
|
|
term->paste_buffer = NULL;
|
|
|
|
term->paste_len = 0;
|
2000-07-26 16:13:51 +04:00
|
|
|
}
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
static void deselect(Terminal *term)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
term->selstate = NO_SELECTION;
|
|
|
|
term->selstart.x = term->selstart.y = term->selend.x = term->selend.y = 0;
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
|
|
|
|
2017-12-09 15:00:13 +03:00
|
|
|
void term_lost_clipboard_ownership(Terminal *term, int clipboard)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2017-12-10 18:45:45 +03:00
|
|
|
if (!(term->n_mouse_select_clipboards > 1 &&
|
|
|
|
clipboard == term->mouse_select_clipboards[1]))
|
2017-12-09 15:00:13 +03:00
|
|
|
return;
|
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
deselect(term);
|
|
|
|
term_update(term);
|
2013-03-10 15:04:07 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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);
|
1999-01-08 16:02:13 +03:00
|
|
|
}
|
2000-10-20 17:51:46 +04:00
|
|
|
|
2002-10-22 20:11:33 +04:00
|
|
|
int term_ldisc(Terminal *term, int option)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
|
|
|
if (option == LD_ECHO)
|
2002-10-22 20:11:33 +04:00
|
|
|
return term->term_echoing;
|
2001-05-06 18:35:20 +04:00
|
|
|
if (option == LD_EDIT)
|
2002-10-22 20:11:33 +04:00
|
|
|
return term->term_editing;
|
2001-01-24 17:08:20 +03:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
Rationalisation of the system of frontend handles. Most modular bits
of PuTTY (terminal, backend, logctx etc) take a `void *' handle
passed to them from the frontend, and used as a context for all
their callbacks. Most of these point at the frontend structure
itself (on platforms where this is meaningful), except that the
handle passed to the backend has always pointed at the terminal
because from_backend() was implemented in terminal.c. This has
finally bitten Unix PuTTY, because both backend and logctx have
been passing their respective and very different frontend handles to
logevent(), so I've fixed it.
from_backend() is now a function supplied by the _frontend_ itself,
in all cases, and the frontend handle passed to backends must be the
same as that passed to everything else. What was from_backend() in
terminal.c is now called term_data(), and the typical implementation
of from_backend() in a GUI frontend will just extract the terminal
handle from the frontend structure and delegate to that.
This appears to work on Unix and Windows, but has most likely broken
the Mac build.
[originally from svn r3100]
2003-04-11 22:36:27 +04:00
|
|
|
int term_data(Terminal *term, int is_stderr, const char *data, int len)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-22 20:11:33 +04:00
|
|
|
bufchain_add(&term->inbuf, data, len);
|
2001-08-25 21:09:23 +04:00
|
|
|
|
2003-03-29 21:30:14 +03:00
|
|
|
if (!term->in_term_out) {
|
|
|
|
term->in_term_out = TRUE;
|
2004-11-27 16:20:21 +03:00
|
|
|
term_reset_cblink(term);
|
|
|
|
/*
|
|
|
|
* During drag-selects, we do not process terminal input,
|
|
|
|
* because the user will want the screen to hold still to
|
|
|
|
* be selected.
|
|
|
|
*/
|
|
|
|
if (term->selstate != DRAGGING)
|
|
|
|
term_out(term);
|
2003-03-29 21:30:14 +03:00
|
|
|
term->in_term_out = FALSE;
|
|
|
|
}
|
|
|
|
|
2001-08-25 21:09:23 +04:00
|
|
|
/*
|
2001-09-18 23:41:07 +04:00
|
|
|
* term_out() always completely empties inbuf. Therefore,
|
|
|
|
* there's no reason at all to return anything other than zero
|
|
|
|
* from this function, because there _can't_ be a question of
|
|
|
|
* the remote side needing to wait until term_out() has cleared
|
|
|
|
* a backlog.
|
|
|
|
*
|
2005-03-10 19:36:05 +03:00
|
|
|
* This is a slightly suboptimal way to deal with SSH-2 - in
|
2001-08-25 21:09:23 +04:00
|
|
|
* principle, the window mechanism would allow us to continue
|
|
|
|
* to accept data on forwarded ports and X connections even
|
|
|
|
* while the terminal processing was going slowly - but we
|
|
|
|
* can't do the 100% right thing without moving the terminal
|
|
|
|
* processing into a separate thread, and that might hurt
|
2005-03-10 19:36:05 +03:00
|
|
|
* portability. So we manage stdout buffering the old SSH-1 way:
|
2001-08-25 21:09:23 +04:00
|
|
|
* if the terminal processing goes slowly, the whole SSH
|
|
|
|
* connection stops accepting data until it's ready.
|
2001-09-18 23:41:07 +04:00
|
|
|
*
|
2001-08-25 21:09:23 +04:00
|
|
|
* In practice, I can't imagine this causing serious trouble.
|
|
|
|
*/
|
|
|
|
return 0;
|
2000-10-20 17:51:46 +04:00
|
|
|
}
|
2002-10-26 16:58:13 +04:00
|
|
|
|
2005-10-30 23:24:09 +03:00
|
|
|
/*
|
|
|
|
* Write untrusted data to the terminal.
|
|
|
|
* The only control character that should be honoured is \n (which
|
|
|
|
* will behave as a CRLF).
|
|
|
|
*/
|
|
|
|
int term_data_untrusted(Terminal *term, const char *data, int len)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
/* FIXME: more sophisticated checking? */
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
if (data[i] == '\n')
|
|
|
|
term_data(term, 1, "\r\n", 2);
|
|
|
|
else if (data[i] & 0x60)
|
|
|
|
term_data(term, 1, data + i, 1);
|
|
|
|
}
|
|
|
|
return 0; /* assumes that term_data() always returns 0 */
|
|
|
|
}
|
|
|
|
|
2002-10-26 16:58:13 +04:00
|
|
|
void term_provide_logctx(Terminal *term, void *logctx)
|
|
|
|
{
|
|
|
|
term->logctx = logctx;
|
|
|
|
}
|
2004-11-27 22:34:45 +03:00
|
|
|
|
|
|
|
void term_set_focus(Terminal *term, int has_focus)
|
|
|
|
{
|
|
|
|
term->has_focus = has_focus;
|
|
|
|
term_schedule_cblink(term);
|
|
|
|
}
|
2005-04-21 17:57:08 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Provide "auto" settings for remote tty modes, suitable for an
|
|
|
|
* application with a terminal window.
|
|
|
|
*/
|
|
|
|
char *term_get_ttymode(Terminal *term, const char *mode)
|
|
|
|
{
|
2015-05-15 13:15:42 +03:00
|
|
|
const char *val = NULL;
|
2005-04-21 17:57:08 +04:00
|
|
|
if (strcmp(mode, "ERASE") == 0) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
val = term->bksp_is_delete ? "^?" : "^H";
|
2016-05-03 10:43:50 +03:00
|
|
|
} else if (strcmp(mode, "IUTF8") == 0) {
|
|
|
|
val = frontend_is_utf8(term->frontend) ? "yes" : "no";
|
2005-04-21 17:57:08 +04:00
|
|
|
}
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
/* FIXME: perhaps we should set ONLCR based on lfhascr as well? */
|
2007-09-04 00:33:40 +04:00
|
|
|
/* FIXME: or ECHO and friends based on local echo state? */
|
2005-04-21 17:57:08 +04:00
|
|
|
return dupstr(val);
|
|
|
|
}
|
2005-10-30 23:24:09 +03:00
|
|
|
|
|
|
|
struct term_userpass_state {
|
|
|
|
size_t curr_prompt;
|
|
|
|
int done_prompt; /* printed out prompt yet? */
|
|
|
|
size_t pos; /* cursor position */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Process some terminal data in the course of username/password
|
|
|
|
* input.
|
|
|
|
*/
|
|
|
|
int term_get_userpass_input(Terminal *term, prompts_t *p,
|
2015-05-15 13:15:42 +03:00
|
|
|
const unsigned char *in, int inlen)
|
2005-10-30 23:24:09 +03:00
|
|
|
{
|
|
|
|
struct term_userpass_state *s = (struct term_userpass_state *)p->data;
|
|
|
|
if (!s) {
|
|
|
|
/*
|
|
|
|
* First call. Set some stuff up.
|
|
|
|
*/
|
|
|
|
p->data = s = snew(struct term_userpass_state);
|
|
|
|
s->curr_prompt = 0;
|
|
|
|
s->done_prompt = 0;
|
|
|
|
/* We only print the `name' caption if we have to... */
|
|
|
|
if (p->name_reqd && p->name) {
|
|
|
|
size_t l = strlen(p->name);
|
|
|
|
term_data_untrusted(term, p->name, l);
|
|
|
|
if (p->name[l-1] != '\n')
|
|
|
|
term_data_untrusted(term, "\n", 1);
|
|
|
|
}
|
|
|
|
/* ...but we always print any `instruction'. */
|
|
|
|
if (p->instruction) {
|
|
|
|
size_t l = strlen(p->instruction);
|
|
|
|
term_data_untrusted(term, p->instruction, l);
|
|
|
|
if (p->instruction[l-1] != '\n')
|
|
|
|
term_data_untrusted(term, "\n", 1);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Zero all the results, in case we abort half-way through.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
int i;
|
2007-01-09 21:24:07 +03:00
|
|
|
for (i = 0; i < (int)p->n_prompts; i++)
|
2011-10-02 15:50:45 +04:00
|
|
|
prompt_set_result(p->prompts[i], "");
|
2005-10-30 23:24:09 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (s->curr_prompt < p->n_prompts) {
|
|
|
|
|
|
|
|
prompt_t *pr = p->prompts[s->curr_prompt];
|
|
|
|
int finished_prompt = 0;
|
|
|
|
|
|
|
|
if (!s->done_prompt) {
|
|
|
|
term_data_untrusted(term, pr->prompt, strlen(pr->prompt));
|
|
|
|
s->done_prompt = 1;
|
|
|
|
s->pos = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Breaking out here ensures that the prompt is printed even
|
|
|
|
* if we're now waiting for user data. */
|
|
|
|
if (!in || !inlen) break;
|
|
|
|
|
|
|
|
/* FIXME: should we be using local-line-editing code instead? */
|
|
|
|
while (!finished_prompt && inlen) {
|
|
|
|
char c = *in++;
|
|
|
|
inlen--;
|
|
|
|
switch (c) {
|
|
|
|
case 10:
|
|
|
|
case 13:
|
|
|
|
term_data(term, 0, "\r\n", 2);
|
2011-10-02 15:50:45 +04:00
|
|
|
prompt_ensure_result_size(pr, s->pos + 1);
|
2005-10-30 23:24:09 +03:00
|
|
|
pr->result[s->pos] = '\0';
|
|
|
|
/* go to next prompt, if any */
|
|
|
|
s->curr_prompt++;
|
|
|
|
s->done_prompt = 0;
|
|
|
|
finished_prompt = 1; /* break out */
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
case 127:
|
|
|
|
if (s->pos > 0) {
|
|
|
|
if (pr->echo)
|
|
|
|
term_data(term, 0, "\b \b", 3);
|
|
|
|
s->pos--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 21:
|
|
|
|
case 27:
|
|
|
|
while (s->pos > 0) {
|
|
|
|
if (pr->echo)
|
|
|
|
term_data(term, 0, "\b \b", 3);
|
|
|
|
s->pos--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
case 4:
|
|
|
|
/* Immediate abort. */
|
|
|
|
term_data(term, 0, "\r\n", 2);
|
|
|
|
sfree(s);
|
2005-11-03 02:15:43 +03:00
|
|
|
p->data = NULL;
|
2005-10-30 23:24:09 +03:00
|
|
|
return 0; /* user abort */
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* This simplistic check for printability is disabled
|
|
|
|
* when we're doing password input, because some people
|
|
|
|
* have control characters in their passwords.
|
|
|
|
*/
|
2011-10-02 15:50:45 +04:00
|
|
|
if (!pr->echo || (c >= ' ' && c <= '~') ||
|
|
|
|
((unsigned char) c >= 160)) {
|
|
|
|
prompt_ensure_result_size(pr, s->pos + 1);
|
2005-10-30 23:24:09 +03:00
|
|
|
pr->result[s->pos++] = c;
|
|
|
|
if (pr->echo)
|
|
|
|
term_data(term, 0, &c, 1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->curr_prompt < p->n_prompts) {
|
|
|
|
return -1; /* more data required */
|
|
|
|
} else {
|
|
|
|
sfree(s);
|
2005-11-03 02:15:43 +03:00
|
|
|
p->data = NULL;
|
2005-10-30 23:24:09 +03:00
|
|
|
return +1; /* all done */
|
|
|
|
}
|
|
|
|
}
|