snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check alternative screen before drawing box selection

Browse source 
Some programs use the alternative screen (vi, less, ...), whose
content is different of the main screen. If you select text in one of
the screen, you don't wait the box selection is painted in the other
screen, so it is necessary check if the selection was done in the same
screen we are going to paint. Before to this commit, you could do
something like:

	$ LESS="" ls | less
	(select some code)
	q

and selection box remains drawing in the main screen, but the content
of selection keeps text of the alternate screen.
---
 st.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
This commit is contained in:
Roberto E. Vargas Caballero 2012-09-04 20:33:01 +02:00
parent 66669a5585
commit 98b6f84bfc
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
st.c
View file

@ -221,6 +221,7 @@ typedef struct {
struct {int x, y;} b, e; struct {int x, y;} b, e;
char *clip; char *clip;
Atom xtarget; Atom xtarget;
bool alt;
struct timeval tclick1; struct timeval tclick1;
struct timeval tclick2; struct timeval tclick2;
} Selection; } Selection;
@ -579,6 +580,7 @@ selcopy(void) {
} }
*ptr = 0; *ptr = 0;
} }
sel.alt = IS_SET(MODE_ALTSCREEN);
xsetsel(str); xsetsel(str);
} }
@ -2076,7 +2078,10 @@ drawregion(int x1, int y1, int x2, int y2) {
int ic, ib, x, y, ox, sl; int ic, ib, x, y, ox, sl;
Glyph base, new; Glyph base, new;
char buf[DRAW_BUF_SIZ]; char buf[DRAW_BUF_SIZ];
bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN);
if((sel.alt && !alt) || (!sel.alt && alt))
ena_sel = 0;
if(!(xw.state & WIN_VISIBLE)) if(!(xw.state & WIN_VISIBLE))
return; return;
@ -2089,7 +2094,7 @@ drawregion(int x1, int y1, int x2, int y2) {
ic = ib = ox = 0; ic = ib = ox = 0;
for(x = x1; x < x2; x++) { for(x = x1; x < x2; x++) {
new = term.line[y][x]; new = term.line[y][x];
if(sel.bx != -1 && *(new.c) && selected(x, y)) if(ena_sel && *(new.c) && selected(x, y))
new.mode ^= ATTR_REVERSE; new.mode ^= ATTR_REVERSE;
if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) || if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
ib >= DRAW_BUF_SIZ-UTF_SIZ)) { ib >= DRAW_BUF_SIZ-UTF_SIZ)) {