void
selsnap(int mode, int *x, int *y, int direction) {
+ int i;
+
switch(mode) {
case SNAP_WORD:
/*
}
}
- if(term.line[*y][*x + direction].c[0] == ' ')
+ if(strchr(worddelimiters,
+ term.line[*y][*x + direction].c[0])) {
break;
+ }
*x += direction;
}
}
break;
default:
+ /*
+ * Select the whole line when the end of line is reached.
+ */
+ if(direction > 0) {
+ i = term.col;
+ while(--i > 0 && term.line[*y][i].c[0] == ' ')
+ /* nothing */;
+ if(i > 0 && i < *x)
+ *x = term.col - 1;
+ }
break;
}
}
void
selcopy(void) {
char *str, *ptr;
- int x, y, bufsize, size;
+ int x, y, bufsize, size, i, ex;
Glyph *gp, *last;
if(sel.bx == -1) {
*/
if(y < sel.e.y && !((gp-1)->mode & ATTR_WRAP))
*ptr++ = '\n';
+
+ /*
+ * If the last selected line expands in the selection
+ * after the visible text '\n' is appended.
+ */
+ if(y == sel.e.y) {
+ i = term.col;
+ while(--i > 0 && term.line[y][i].c[0] == ' ')
+ /* nothing */;
+ ex = sel.e.x;
+ if(sel.b.y == sel.e.y && sel.e.x < sel.b.x)
+ ex = sel.b.x;
+ if(i < ex)
+ *ptr++ = '\n';
+ }
}
*ptr = 0;
}
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- switch(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
- case -1:
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
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(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;
}
+
+ if(FD_ISSET(xfd, &rfd))
+ xev = actionfps;
+
gettimeofday(&now, NULL);
drawtimeout.tv_sec = 0;
drawtimeout.tv_usec = (1000/xfps) * 1000;