X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/f211bc2eedaa8ea86dc66ad04ccd08938c73a93c..df5c5ed04547986ad2fd22226aaa3da430310374:/st.c

diff --git a/st.c b/st.c
index 1497dd2..0c876f5 100644
--- a/st.c
+++ b/st.c
@@ -125,11 +125,12 @@ typedef struct {
 	GC gc;
 } DC;
 
+/* TODO: use better name for vars... */
 typedef struct {
 	int mode;
 	int bx, by;
 	int ex, ey;
-	int b[2], e[2];
+	struct {int x, y;}  b, e;
 	char *clip;
 } Selection;
 
@@ -185,9 +186,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 +211,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.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x)) 
+		|| (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -225,10 +233,10 @@ 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[1] = MIN(sel.by, sel.ey);
-	sel.e[0] = sel.by<sel.ey?sel.ex:sel.bx;
-	sel.e[1] = MAX(sel.by, sel.ey);
+	sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
+	sel.b.y = MIN(sel.by, sel.ey);
+	sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
+	sel.e.y = MAX(sel.by, sel.ey);
 }
 
 static void bpress(XEvent *e) {
@@ -240,33 +248,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.y-sel.b.y+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 +279,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);
 }
@@ -390,10 +387,10 @@ dump(char c) {
 
 void
 ttyread(void) {
-	char buf[BUFSIZ] = {0};
+	char buf[BUFSIZ];
 	int ret;
 
-	if((ret = read(cmdfd, buf, BUFSIZ)) < 0)
+	if((ret = read(cmdfd, buf, LEN(buf))) < 0)
 		die("Couldn't read from shell: %s\n", SERRNO);
 	else
 		tputs(buf, ret);
@@ -468,8 +465,7 @@ tscrolldown (int n) {
 	
 	LIMIT(n, 0, term.bot-term.top+1);
 
-	for(i = 0; i < n; i++)
-		memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
+	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 	
 	for(i = term.bot; i >= term.top+n; i--) {
 		temp = term.line[i];
@@ -484,8 +480,7 @@ tscrollup (int n) {
 	Line temp;
 	LIMIT(n, 0, term.bot-term.top+1);
 	
-	for(i = 0; i < n; i++)
-		memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
+	tclearregion(0, term.top, term.col-1, term.top+n-1);
 	
 	for(i = term.top; i <= term.bot-n; i++) { 
 		 temp = term.line[i];
@@ -594,21 +589,16 @@ tinsertblankline(int n) {
 	Line blank;
 	int bot = term.bot;
 
-	if(term.c.y > term.bot)
-		bot = term.row - 1;
-	else if(term.c.y < term.top)
-		bot = term.top - 1;
-	if(term.c.y + n >= bot) {
-		tclearregion(0, term.c.y, term.col-1, bot);
+	if(term.c.y < term.top || term.c.y > term.bot)
 		return;
-	}
+
+	LIMIT(n, 0, bot-term.c.y+1);
+	tclearregion(0, bot-n+1, term.col-1, bot);
 	for(i = bot; i >= term.c.y+n; i--) {
 		/* swap deleted line <-> blanked line */
 		blank = term.line[i];
 		term.line[i] = term.line[i-n];
 		term.line[i-n] = blank;
-		/* blank it */
-		memset(blank, 0, term.col * sizeof(Glyph));
 	}
 }
 
@@ -618,21 +608,16 @@ tdeleteline(int n) {
 	Line blank;
 	int bot = term.bot;
 
-	if(term.c.y > term.bot)
-		bot = term.row - 1;
-	else if(term.c.y < term.top)
-		bot = term.top - 1;
-	if(term.c.y + n >= bot) {
-		tclearregion(0, term.c.y, term.col-1, bot);
+	if(term.c.y < term.top || term.c.y > term.bot)
 		return;
-	}
+
+	LIMIT(n, 0, bot-term.c.y+1);
+	tclearregion(0, term.c.y, term.col-1, term.c.y+n-1);
 	for(i = term.c.y; i <= bot-n; i++) {
 		/* swap deleted line <-> blanked line */
 		blank = term.line[i];
 		term.line[i] = term.line[i+n];
 		term.line[i+n] = blank;
-		/* blank it */
-		memset(blank, 0, term.col * sizeof(Glyph));
 	}
 }
 
@@ -960,7 +945,8 @@ tputc(char c) {
 				term.esc = 0;
 				csiparse(), csihandle();
 			}
-		} else if(term.esc & ESC_OSC) {
+			/* TODO: handle other OSC */
+		} else if(term.esc & ESC_OSC) { 
 			if(c == ';') {
 				term.titlelen = 0;
 				term.esc = ESC_START | ESC_TITLE;
@@ -1204,18 +1190,18 @@ xinit(void) {
 	xloadcols();
 
 	/* windows */
-	xw.h = term.row * xw.ch + 2*BORDER;
-	xw.w = term.col * xw.cw + 2*BORDER;
+	xw.bufh = term.row * xw.ch;
+	xw.bufw = term.col * xw.cw;
+	xw.h = xw.bufh + 2*BORDER;
+	xw.w = xw.bufw + 2*BORDER;
 	xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
 			xw.w, xw.h, 0,
 			dc.col[DefaultBG],
 			dc.col[DefaultBG]);
-	xw.bufw = xw.w - 2*BORDER;
-	xw.bufh = xw.h - 2*BORDER;
 	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
 	/* gc */
 	dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
-	
+
 	/* event mask */
 	XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
 		| StructureNotifyMask | FocusChangeMask | PointerMotionMask
@@ -1404,7 +1390,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 +1457,7 @@ main(int argc, char *argv[]) {
 	tnew(80, 24);
 	ttynew();
 	xinit();
+	selinit();
 	run();
 	return 0;
 }