externalpipe all scrollback history
This commit is contained in:
parent
4cd9bbae3e
commit
7e6e779130
1 changed files with 21 additions and 4 deletions
25
st.c
25
st.c
|
@ -46,6 +46,7 @@
|
||||||
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
||||||
term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
||||||
term.line[(y) - term.scr])
|
term.line[(y) - term.scr])
|
||||||
|
#define TLINE_HIST(y) ((y) <= HISTSIZE-term.row+2 ? term.hist[(y)] : term.line[(y-HISTSIZE+term.row-3)])
|
||||||
|
|
||||||
enum term_mode {
|
enum term_mode {
|
||||||
MODE_WRAP = 1 << 0,
|
MODE_WRAP = 1 << 0,
|
||||||
|
@ -430,6 +431,20 @@ tlinelen(int y)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
tlinehistlen(int y)
|
||||||
|
{
|
||||||
|
int i = term.col;
|
||||||
|
|
||||||
|
if (TLINE_HIST(y)[i - 1].mode & ATTR_WRAP)
|
||||||
|
return i;
|
||||||
|
|
||||||
|
while (i > 0 && TLINE_HIST(y)[i - 1].u == ' ')
|
||||||
|
--i;
|
||||||
|
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
selstart(int col, int row, int snap)
|
selstart(int col, int row, int snap)
|
||||||
{
|
{
|
||||||
|
@ -2030,16 +2045,18 @@ externalpipe(const Arg *arg)
|
||||||
/* ignore sigpipe for now, in case child exists early */
|
/* ignore sigpipe for now, in case child exists early */
|
||||||
oldsigpipe = signal(SIGPIPE, SIG_IGN);
|
oldsigpipe = signal(SIGPIPE, SIG_IGN);
|
||||||
newline = 0;
|
newline = 0;
|
||||||
for (n = 0; n < term.row; n++) {
|
for (n = 0; n <= HISTSIZE + 2; n++) {
|
||||||
bp = term.line[n];
|
bp = TLINE_HIST(n);
|
||||||
lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
|
lastpos = MIN(tlinehistlen(n) + 1, term.col) - 1;
|
||||||
if (lastpos < 0)
|
if (lastpos < 0)
|
||||||
break;
|
break;
|
||||||
|
if (lastpos == 0)
|
||||||
|
continue;
|
||||||
end = &bp[lastpos + 1];
|
end = &bp[lastpos + 1];
|
||||||
for (; bp < end; ++bp)
|
for (; bp < end; ++bp)
|
||||||
if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
|
if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
|
||||||
break;
|
break;
|
||||||
if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
|
if ((newline = TLINE_HIST(n)[lastpos].mode & ATTR_WRAP))
|
||||||
continue;
|
continue;
|
||||||
if (xwrite(to[1], "\n", 1) < 0)
|
if (xwrite(to[1], "\n", 1) < 0)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue