marco/st
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

external pipe eternal

Browse Source
This commit is contained in:
Luke Smith 2019-05-08 15:29:33 -04:00
parent ca12440fa9
commit da13ef1246
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
st.c
View File

@ -48,6 +48,8 @@
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)])
/* constants */ /* constants */
#define ISO14755CMD "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null" #define ISO14755CMD "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null"
@ -429,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)
{ {
@ -2059,16 +2075,19 @@ 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++) { /* modify externalpipe patch to pipe history too */
bp = term.line[n]; for (n = 0; n <= HISTSIZE + 2; n++) {
lastpos = MIN(tlinelen(n) + 1, term.col) - 1; bp = TLINE_HIST(n);
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;