X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/f211bc2eedaa8ea86dc66ad04ccd08938c73a93c..9703859e6c1e2280036dc7992cb4c54688f719f5:/st.c?ds=sidebyside

diff --git a/st.c b/st.c
index 1497dd2..bff500b 100644
--- a/st.c
+++ b/st.c
@@ -185,9 +185,9 @@ static char* kmap(KeySym);
 static void kpress(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
-static void brelease(XEvent *e);
-static void bpress(XEvent *e);
-static void bmotion(XEvent *e);
+static void brelease(XEvent *);
+static void bpress(XEvent *);
+static void bmotion(XEvent *);
 
 
 static void (*handler[LASTEvent])(XEvent *) = {
@@ -210,14 +210,21 @@ static int cmdfd;
 static pid_t pid;
 static Selection sel;
 
+void
+selinit(void) {
+	sel.mode = 0;
+	sel.bx = -1;
+	sel.clip = NULL;
+}
+
 static inline int selected(int x, int y) {
-	if ((sel.ey==y && sel.by==y)) {
+	if(sel.ey == y && sel.by == y) {
 		int bx = MIN(sel.bx, sel.ex);
 		int ex = MAX(sel.bx, sel.ex);
-		return (x>=bx && x<=ex);
+		return BETWEEN(x, bx, ex);
 	}
-	return (((y>sel.b[1] && y<sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) || \
-		(y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1])));
+	return ((sel.b[1] < y&&y < sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) 
+		|| (y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1]));
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -225,9 +232,9 @@ static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 		*b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
 	*x = e->xbutton.x/xw.cw;
 	*y = e->xbutton.y/xw.ch;
-	sel.b[0] = sel.by<sel.ey?sel.bx:sel.ex;
+	sel.b[0] = sel.by < sel.ey ? sel.bx : sel.ex;
 	sel.b[1] = MIN(sel.by, sel.ey);
-	sel.e[0] = sel.by<sel.ey?sel.ex:sel.bx;
+	sel.e[0] = sel.by < sel.ey ? sel.ex : sel.bx;
 	sel.e[1] = MAX(sel.by, sel.ey);
 }
 
@@ -240,33 +247,28 @@ static void bpress(XEvent *e) {
 static char *getseltext() {
 	char *str, *ptr;
 	int ls, x, y, sz;
-	if(sel.bx==-1)
+	if(sel.bx == -1)
 		return NULL;
-	sz = ((xw.w/xw.ch) * (sel.e[1]-sel.b[1]+2));
-	ptr = str = malloc (sz);
+	sz = (term.col+1) * (sel.e[1]-sel.b[1]+1);
+	ptr = str = malloc(sz);
 	for(y = 0; y < term.row; y++) {
-		for(x = 0; x < term.col; x++) {
-			if(term.line[y][x].state & GLYPH_SET && (ls=selected(x, y))) {
-				*ptr = term.line[y][x].c;
-				ptr++;
-			}
-		}
-		if (ls) {
-			*ptr = '\n';
-			ptr++;
-		}
+		for(x = 0; x < term.col; x++)
+			if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y)))
+				*ptr = term.line[y][x].c, ptr++;
+		if(ls)
+			*ptr = '\n', ptr++;
 	}
 	*ptr = 0;
 	return str;
 }
 
 /* TODO: use X11 clipboard */
-static void clipboard_copy(char *str) {
+static void selcopy(char *str) {
 	free(sel.clip);
 	sel.clip = str;
 }
 
-static void clipboard_paste() {
+static void selpaste() {
 	if(sel.clip)
 		ttywrite(sel.clip, strlen(sel.clip));
 }
@@ -276,19 +278,13 @@ static void brelease(XEvent *e) {
 	int b;
 	sel.mode = 0;
 	getbuttoninfo(e, &b, &sel.ex, &sel.ey);
-	if(b==4)
-		tscrollup(1);
-	else
-	if(b==5)
-		tscrolldown(1);
-	else
 	if(sel.bx==sel.ex && sel.by==sel.ey) {
 		sel.bx = -1;
 		if(b==2)
-			clipboard_paste();
+			selpaste();
 	} else {
 		if(b==1)
-			clipboard_copy(getseltext());
+			selcopy(getseltext());
 	}
 	draw(1);
 }
@@ -1404,7 +1400,7 @@ kpress(XEvent *ev) {
 			break;
 		case XK_Insert:
 			if(shift)
-				draw(1), puts("draw!")/* XXX: paste X clipboard */;
+				selpaste(), draw(1);
 			break;
 		default:
 			fprintf(stderr, "errkey: %d\n", (int)ksym);
@@ -1471,6 +1467,7 @@ main(int argc, char *argv[]) {
 	tnew(80, 24);
 	ttynew();
 	xinit();
+	selinit();
 	run();
 	return 0;
 }