X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=8065ebee9f1b517d3b0bb3bbc1a705c917ce0141;hb=1e09726518b84091e80dfaf96632c122f6f446a6;hp=92854b4a3bac9e677554de2cb2c20e7e11722acb;hpb=048c54fd5b275ac54d7819020485b77e99fcc469;p=st.git diff --git a/st.c b/st.c index 92854b4..8065ebe 100644 --- a/st.c +++ b/st.c @@ -116,6 +116,8 @@ enum term_mode { MODE_APPCURSOR = 2048, MODE_MOUSESGR = 4096, MODE_8BIT = 8192, + MODE_BLINK = 16384, + MODE_FBLINK = 32768, }; enum escape_state { @@ -313,6 +315,7 @@ static void strhandle(void); static void strparse(void); static void strreset(void); +static int tattrset(int); static void tclearregion(int, int, int, int); static void tcursor(int); static void tdeletechar(int); @@ -334,6 +337,7 @@ static void tsetchar(char *, Glyph *, int, int); static void tsetscroll(int, int); static void tswapscreen(void); static void tsetdirt(int, int); +static void tsetdirtattr(int); static void tsetmode(bool, bool, int *, int); static void tfulldirt(void); static void techo(char *, int); @@ -785,11 +789,8 @@ bpress(XEvent *e) { sel.ey = sel.by = y2row(e->xbutton.y); /* - * Snap handling. - * If user clicks are fasst enough (e.g. below timeouts), - * we ignore if his hand slipped left or down and accidentally - * selected more; we are just snapping to whatever we're - * snapping. + * If the user clicks below predefined timeouts specific + * snapping behaviour is exposed. */ if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) { sel.snap = SNAP_LINE; @@ -809,7 +810,8 @@ bpress(XEvent *e) { * Draw selection, unless it's regular and we don't want to * make clicks visible */ - if (sel.snap != 0) { + if(sel.snap != 0) { + sel.mode++; tsetdirt(sel.b.y, sel.e.y); draw(); } @@ -987,14 +989,14 @@ brelease(XEvent *e) { if(e->xbutton.button == Button2) { selpaste(NULL); } else if(e->xbutton.button == Button1) { - sel.mode = 0; - getbuttoninfo(e); - term.dirty[sel.ey] = 1; - if(sel.bx == sel.ex && sel.by == sel.ey) { + if(sel.mode < 2) { sel.bx = -1; } else { + getbuttoninfo(e); selcopy(); } + sel.mode = 0; + term.dirty[sel.ey] = 1; } } @@ -1010,6 +1012,7 @@ bmotion(XEvent *e) { if(!sel.mode) return; + sel.mode++; oldey = sel.ey; oldex = sel.ex; oldsby = sel.b.y; @@ -1176,6 +1179,20 @@ ttyresize(void) { fprintf(stderr, "Couldn't set window size: %s\n", SERRNO); } +int +tattrset(int attr) { + int i, j; + + for(i = 0; i < term.row-1; i++) { + for(j = 0; j < term.col-1; j++) { + if(term.line[i][j].mode & attr) + return 1; + } + } + + return 0; +} + void tsetdirt(int top, int bot) { int i; @@ -1188,6 +1205,20 @@ tsetdirt(int top, int bot) { } void +tsetdirtattr(int attr) { + int i, j; + + for(i = 0; i < term.row-1; i++) { + for(j = 0; j < term.col-1; j++) { + if(term.line[i][j].mode & attr) { + tsetdirt(i, i); + break; + } + } + } +} + +void tfulldirt(void) { tsetdirt(0, term.row-1); } @@ -1410,7 +1441,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) { void tclearregion(int x1, int y1, int x2, int y2) { - int x, y, temp, mask; + int x, y, temp; if(x1 > x2) temp = x1, x1 = x2, x2 = temp; @@ -1425,9 +1456,9 @@ tclearregion(int x1, int y1, int x2, int y2) { for(y = y1; y <= y2; y++) { term.dirty[y] = 1; for(x = x1; x <= x2; x++) { - mask = selected(x, y) ? ATTR_REVERSE : 0; + if(selected(x, y)) + selclear(NULL); term.line[y][x] = term.c.attr; - term.line[y][x].mode ^= mask; memcpy(term.line[y][x].c, " ", 2); } } @@ -2839,6 +2870,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { bg = temp; } + if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK) + fg = bg; + /* Intelligent cleaning up of the borders. */ if(x == 0) { xclear(0, (y == 0)? 0 : winy, borderpx, @@ -3096,7 +3130,7 @@ drawregion(int x1, int y1, int x2, int y2) { ic = ib = ox = 0; for(x = x1; x < x2; x++) { new = term.line[y][x]; - if(ena_sel && *(new.c) && selected(x, y)) + if(ena_sel && selected(x, y)) new.mode ^= ATTR_REVERSE; if(ib > 0 && (ATTRCMP(base, new) || ib >= DRAW_BUF_SIZ-UTF_SIZ)) { @@ -3346,34 +3380,55 @@ void run(void) { XEvent ev; fd_set rfd; - int xfd = XConnectionNumber(xw.dpy), xev; - struct timeval drawtimeout, *tv = NULL, now, last; + int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0; + struct timeval drawtimeout, *tv = NULL, now, last, lastblink; + gettimeofday(&lastblink, NULL); gettimeofday(&last, NULL); for(xev = actionfps;;) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); - if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) { + + switch(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) { + case -1: if(errno == EINTR) continue; die("select failed: %s\n", SERRNO); - } + default: + if(FD_ISSET(cmdfd, &rfd)) { + ttyread(); + if(blinktimeout) { + blinkset = tattrset(ATTR_BLINK); + if(!blinkset && term.mode & ATTR_BLINK) + term.mode &= ~(MODE_BLINK); + } + } + if(FD_ISSET(xfd, &rfd)) + xev = actionfps; + break; + } gettimeofday(&now, NULL); drawtimeout.tv_sec = 0; drawtimeout.tv_usec = (1000/xfps) * 1000; tv = &drawtimeout; - if(FD_ISSET(cmdfd, &rfd)) - ttyread(); - - if(FD_ISSET(xfd, &rfd)) - xev = actionfps; + dodraw = 0; + if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { + tsetdirtattr(ATTR_BLINK); + term.mode ^= MODE_BLINK; + gettimeofday(&lastblink, NULL); + dodraw = 1; + } + if(TIMEDIFF(now, last) \ + > (xev? (1000/xfps) : (1000/actionfps))) { + dodraw = 1; + last = now; + } - if(TIMEDIFF(now, last) > \ - (xev ? (1000/xfps) : (1000/actionfps))) { + if(dodraw) { while(XPending(xw.dpy)) { XNextEvent(xw.dpy, &ev); if(XFilterEvent(&ev, None)) @@ -3384,12 +3439,13 @@ run(void) { draw(); XFlush(xw.dpy); - last = now; if(xev && !FD_ISSET(xfd, &rfd)) xev--; - if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) + if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd) \ + && !blinkset) { tv = NULL; + } } } }