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

Fixing the nasty selection bug. Thanks p37sitdu@lavabit.com!

Browse Source
This commit is contained in:
Christoph Lohmann 2012-12-10 20:45:46 +01:00
parent fe3fb82d29
commit 78215c8ee0
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
st.c
View File

@ -73,7 +73,7 @@
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) #define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
#define IS_SET(flag) (term.mode & (flag)) #define IS_SET(flag) ((term.mode & (flag)) != 0)
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
#define VT102ID "\033[?6c" #define VT102ID "\033[?6c"
@ -624,6 +624,8 @@ selected(int x, int y) {
void void
getbuttoninfo(XEvent *e) { getbuttoninfo(XEvent *e) {
sel.alt = IS_SET(MODE_ALTSCREEN);
sel.ex = x2col(e->xbutton.x); sel.ex = x2col(e->xbutton.x);
sel.ey = y2row(e->xbutton.y); sel.ey = y2row(e->xbutton.y);
@ -722,7 +724,6 @@ selcopy(void) {
} }
*ptr = 0; *ptr = 0;
} }
sel.alt = IS_SET(MODE_ALTSCREEN);
xsetsel(str); xsetsel(str);
} }
@ -869,7 +870,9 @@ bmotion(XEvent *e) {
return; return;
} }
if(sel.mode) { if(!sel.mode)
return;
oldey = sel.ey; oldey = sel.ey;
oldex = sel.ex; oldex = sel.ex;
getbuttoninfo(e); getbuttoninfo(e);
@ -880,7 +883,6 @@ bmotion(XEvent *e) {
tsetdirt(starty, endy); tsetdirt(starty, endy);
} }
} }
}
void void
die(const char *errstr, ...) { die(const char *errstr, ...) {
@ -1510,7 +1512,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 1049: /* = 1047 and 1048 */ case 1049: /* = 1047 and 1048 */
case 47: case 47:
case 1047: { case 1047: {
alt = IS_SET(MODE_ALTSCREEN) != 0; alt = IS_SET(MODE_ALTSCREEN);
if(alt) if(alt)
tclearregion(0, 0, term.col-1, term.row-1); tclearregion(0, 0, term.col-1, term.row-1);
if(set ^ alt) /* set is always 1 or 0 */ if(set ^ alt) /* set is always 1 or 0 */
@ -2603,10 +2605,11 @@ 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) != 0; bool ena_sel = sel.bx != -1;
if((sel.alt != 0) ^ alt) if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
ena_sel = 0; ena_sel = 0;
if(!(xw.state & WIN_VISIBLE)) if(!(xw.state & WIN_VISIBLE))
return; return;