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

Have selected() check whether selection exists

Browse Source 
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly 2018-02-21 22:48:28 -06:00
parent d84f3f4bd1
commit 138caf294e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
st.c
View File

@ -419,7 +419,8 @@ selnormalize(void)
int int
selected(int x, int y) selected(int x, int y)
{ {
if (sel.mode == SEL_EMPTY) if (sel.mode == SEL_EMPTY || sel.ob.x == -1 ||
sel.alt != IS_SET(MODE_ALTSCREEN))
return 0; return 0;
if (sel.type == SEL_RECTANGULAR) if (sel.type == SEL_RECTANGULAR)

10
x.c
View File

@ -1418,7 +1418,6 @@ xdrawcursor(void)
static int oldx = 0, oldy = 0; static int oldx = 0, oldy = 0;
int curx; int curx;
Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og; Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
Color drawcol; Color drawcol;
LIMIT(oldx, 0, term.col-1); LIMIT(oldx, 0, term.col-1);
@ -1434,7 +1433,7 @@ xdrawcursor(void)
/* remove the old cursor */ /* remove the old cursor */
og = term.line[oldy][oldx]; og = term.line[oldy][oldx];
if (ena_sel && selected(oldx, oldy)) if (selected(oldx, oldy))
og.mode ^= ATTR_REVERSE; og.mode ^= ATTR_REVERSE;
xdrawglyph(og, oldx, oldy); xdrawglyph(og, oldx, oldy);
@ -1448,7 +1447,7 @@ xdrawcursor(void)
if (IS_SET(MODE_REVERSE)) { if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE; g.mode |= ATTR_REVERSE;
g.bg = defaultfg; g.bg = defaultfg;
if (ena_sel && selected(term.c.x, term.c.y)) { if (selected(term.c.x, term.c.y)) {
drawcol = dc.col[defaultcs]; drawcol = dc.col[defaultcs];
g.fg = defaultrcs; g.fg = defaultrcs;
} else { } else {
@ -1456,7 +1455,7 @@ xdrawcursor(void)
g.fg = defaultcs; g.fg = defaultcs;
} }
} else { } else {
if (ena_sel && selected(term.c.x, term.c.y)) { if (selected(term.c.x, term.c.y)) {
drawcol = dc.col[defaultrcs]; drawcol = dc.col[defaultrcs];
g.fg = defaultfg; g.fg = defaultfg;
g.bg = defaultrcs; g.bg = defaultrcs;
@ -1555,7 +1554,6 @@ drawregion(int x1, int y1, int x2, int y2)
int i, x, y, ox, numspecs; int i, x, y, ox, numspecs;
Glyph base, new; Glyph base, new;
XftGlyphFontSpec *specs; XftGlyphFontSpec *specs;
int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
if (!(win.state & WIN_VISIBLE)) if (!(win.state & WIN_VISIBLE))
return; return;
@ -1574,7 +1572,7 @@ drawregion(int x1, int y1, int x2, int y2)
new = term.line[y][x]; new = term.line[y][x];
if (new.mode == ATTR_WDUMMY) if (new.mode == ATTR_WDUMMY)
continue; continue;
if (ena_sel && selected(x, y)) if (selected(x, y))
new.mode ^= ATTR_REVERSE; new.mode ^= ATTR_REVERSE;
if (i > 0 && ATTRCMP(base, new)) { if (i > 0 && ATTRCMP(base, new)) {
xdrawglyphfontspecs(specs, base, i, ox, y); xdrawglyphfontspecs(specs, base, i, ox, y);