X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=c3d0888262ddc43d301ad4a29409e345cd182e13;hb=13a8eeb810ccfdaefd58c52328dd0ec867e3ae8d;hp=7ac02b9201d0db42fb3fa20d5c6a5925ee8d7a97;hpb=8e66b5cc16831583a1086f3ba9cd0eaa55f02230;p=st.git

diff --git a/st.c b/st.c
index 7ac02b9..c3d0888 100644
--- a/st.c
+++ b/st.c
@@ -34,7 +34,7 @@
 #endif
 
 #define USAGE \
-	"st-" VERSION ", (c) 2010-2011 st engineers\n" \
+	"st " VERSION " (c) 2010-2011 st engineers\n" \
 	"usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* XEMBED messages */
@@ -47,6 +47,8 @@
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4
+#define XK_NO_MOD     UINT_MAX
+#define XK_ANY_MOD    0
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -109,6 +111,7 @@ typedef struct {
 	int col;	/* nb col */
 	Line* line;	/* screen */
 	Line* alt;	/* alternate screen */
+	char* dirty; /* dirtyness of lines */
 	TCursor c;	/* cursor */
 	int top;	/* top    scroll limit */
 	int bot;	/* bottom scroll limit */
@@ -201,6 +204,7 @@ static void tsetattr(int*, int);
 static void tsetchar(char*);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
+static void tfulldirt(void);
 
 static void ttynew(void);
 static void ttyread(void);
@@ -235,6 +239,7 @@ static void selinit(void);
 static inline int selected(int, int);
 static void selcopy(void);
 static void selpaste();
+static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
@@ -458,6 +463,9 @@ bpress(XEvent *e) {
 	if(IS_SET(MODE_MOUSE))
 		mousereport(e);
 	else if(e->xbutton.button == Button1) {
+		if(sel.bx != -1)
+			for(int i=sel.b.y; i<=sel.e.y; i++)
+				term.dirty[i] = 1;
 		sel.mode = 1;
 		sel.ex = sel.bx = X2COL(e->xbutton.x);
 		sel.ey = sel.by = Y2ROW(e->xbutton.y);
@@ -539,7 +547,7 @@ selrequest(XEvent *e) {
 				XA_ATOM, 32, PropModeReplace,
 				(unsigned char *) &string, 1);
 		xev.property = xsre->property;
-	} else if(xsre->target == sel.xtarget) {
+	} else if(xsre->target == sel.xtarget && sel.clip != NULL) {
 		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
 				xsre->target, 8, PropModeReplace,
 				(unsigned char *) sel.clip, strlen(sel.clip));
@@ -578,6 +586,7 @@ brelease(XEvent *e) {
 	else if(e->xbutton.button == Button1) {
 		sel.mode = 0;
 		getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+		term.dirty[sel.ey] = 1;
 		if(sel.bx == sel.ex && sel.by == sel.ey) {
 			struct timeval now;
 			sel.bx = -1;
@@ -622,7 +631,9 @@ bmotion(XEvent *e) {
 		if(oldey != sel.ey || oldex != sel.ex) {
 			int starty = MIN(oldey, sel.ey);
 			int endy = MAX(oldey, sel.ey);
-			drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row));
+			for(int i=starty; i<=endy; i++)
+				term.dirty[i] = 1;
+			draw();
 		}
 	}
 }
@@ -745,6 +756,14 @@ ttyresize(int x, int y) {
 		fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
+void
+tfulldirt(void)
+{
+	int i;
+	for(i = 0; i < term.row; i++)
+		term.dirty[i] = 1;
+}
+
 void
 tcursor(int mode) {
 	static TCursor c;
@@ -774,9 +793,12 @@ tnew(int col, int row) {
 	term.row = row, term.col = col;
 	term.line = malloc(term.row * sizeof(Line));
 	term.alt  = malloc(term.row * sizeof(Line));
+	term.dirty = malloc(term.row * sizeof(*term.dirty));
+
 	for(row = 0; row < term.row; row++) {
 		term.line[row] = malloc(term.col * sizeof(Glyph));
 		term.alt [row] = malloc(term.col * sizeof(Glyph));
+		term.dirty[row] = 0;
 	}
 	/* setup screen */
 	treset();
@@ -788,6 +810,7 @@ tswapscreen(void) {
 	term.line = term.alt;
 	term.alt = tmp;
 	term.mode ^= MODE_ALTSCREEN;
+	tfulldirt();
 }
 
 void
@@ -803,7 +826,12 @@ tscrolldown(int orig, int n) {
 		temp = term.line[i];
 		term.line[i] = term.line[i-n];
 		term.line[i-n] = temp;
+
+		term.dirty[i] = 1;
+		term.dirty[i-n] = 1;
 	}
+
+	selscroll(orig, n);
 }
 
 void
@@ -818,6 +846,34 @@ tscrollup(int orig, int n) {
 		 temp = term.line[i];
 		 term.line[i] = term.line[i+n];
 		 term.line[i+n] = temp;
+
+		 term.dirty[i] = 1;
+		 term.dirty[i+n] = 1;
+	}
+
+	selscroll(orig, -n);
+}
+
+void
+selscroll(int orig, int n) {
+	if(sel.bx == -1)
+		return;
+	
+	if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
+		if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+			sel.bx = -1;
+			return;
+		}
+		if(sel.by < term.top) {
+			sel.by = term.top;
+			sel.bx = 0;
+		}
+		if(sel.ey > term.bot) {
+			sel.ey = term.bot;
+			sel.ex = term.col;
+		}
+		sel.b.y = sel.by, sel.b.x = sel.bx;
+		sel.e.y = sel.ey, sel.e.x = sel.ex;
 	}
 }
 
@@ -866,6 +922,7 @@ tmoveto(int x, int y) {
 
 void
 tsetchar(char *c) {
+	term.dirty[term.c.y] = 1;
 	term.line[term.c.y][term.c.x] = term.c.attr;
 	memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
 	term.line[term.c.y][term.c.x].state |= GLYPH_SET;
@@ -885,9 +942,11 @@ tclearregion(int x1, int y1, int x2, int y2) {
 	LIMIT(y1, 0, term.row-1);
 	LIMIT(y2, 0, term.row-1);
 
-	for(y = y1; y <= y2; y++)
+	for(y = y1; y <= y2; y++) {
+		term.dirty[y] = 1;
 		for(x = x1; x <= x2; x++)
 			term.line[y][x].state = 0;
+	}
 }
 
 void
@@ -895,6 +954,8 @@ tdeletechar(int n) {
 	int src = term.c.x + n;
 	int dst = term.c.x;
 	int size = term.col - src;
+	
+	term.dirty[term.c.y] = 1;
 
 	if(src >= term.col) {
 		tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
@@ -910,6 +971,8 @@ tinsertblank(int n) {
 	int dst = src + n;
 	int size = term.col - dst;
 
+	term.dirty[term.c.y] = 1;
+
 	if(dst >= term.col) {
 		tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
 		return;
@@ -1075,6 +1138,7 @@ csihandle(void) {
 		break;
 	/* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
 	case 'J': /* ED -- Clear screen */
+		sel.bx = -1;
 		switch(escseq.arg[0]) {
 		case 0: /* below */
 			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
@@ -1380,6 +1444,8 @@ tputc(char *c) {
 			}
 		}
 	} else {
+		if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+			sel.bx = -1;
 		switch(ascii) {
 		case '\t':
 			tputtab();
@@ -1447,9 +1513,11 @@ tresize(int col, int row) {
 	/* resize to new height */
 	term.line = realloc(term.line, row * sizeof(Line));
 	term.alt  = realloc(term.alt,  row * sizeof(Line));
+	term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));
 
 	/* resize each row to new width, zero-pad if needed */
 	for(i = 0; i < minrow; i++) {
+		term.dirty[i] = 1;
 		term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
 		term.alt[i]  = realloc(term.alt[i],  col * sizeof(Glyph));
 		for(x = mincol; x < col; x++) {
@@ -1460,6 +1528,7 @@ tresize(int col, int row) {
 
 	/* allocate any new rows */
 	for(/* i == minrow */; i < row; i++) {
+		term.dirty[i] = 1;
 		term.line[i] = calloc(col, sizeof(Glyph));
 		term.alt [i] = calloc(col, sizeof(Glyph));
 	}
@@ -1470,6 +1539,7 @@ tresize(int col, int row) {
 	tmoveto(term.c.x, term.c.y);
 	/* reset scrolling region */
 	tsetscroll(0, row-1);
+
 	return (slide > 0);
 }
 
@@ -1509,7 +1579,7 @@ xloadcols(void) {
 	XColor color;
 	unsigned long white = WhitePixel(xw.dpy, xw.scr);
 
-	for(i = 0; i < 16; i++) {
+	for(i = 0; i < LEN(colorname); i++) {
 		if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
 			dc.col[i] = white;
 			fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
@@ -1760,8 +1830,11 @@ drawregion(int x1, int y1, int x2, int y2) {
 	if(!(xw.state & WIN_VISIBLE))
 		return;
 
-	xclear(x1, y1, x2-1, y2-1);
 	for(y = y1; y < y2; y++) {
+		if(!term.dirty[y])
+			continue;
+		xclear(0, y, term.col, y);
+		term.dirty[y] = 0;
 		base = term.line[y][0];
 		ic = ib = ox = 0;
 		for(x = x1; x < x2; x++) {
@@ -1769,7 +1842,7 @@ drawregion(int x1, int y1, int x2, int y2) {
 			if(sel.bx != -1 && *(new.c) && selected(x, y))
 				new.mode ^= ATTR_REVERSE;
 			if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
-					ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+						  ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
 				xdraws(buf, base, ox, y, ic, ib);
 				ic = ib = 0;
 			}
@@ -1788,7 +1861,7 @@ drawregion(int x1, int y1, int x2, int y2) {
 			xdraws(buf, base, ox, y, ic, ib);
 	}
 	xdrawcursor();
-	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, x1*xw.cw, y1*xw.ch, x2*xw.cw, y2*xw.ch, BORDER, BORDER);
 }
 
 void
@@ -1840,9 +1913,12 @@ focus(XEvent *ev) {
 char*
 kmap(KeySym k, unsigned int state) {
 	int i;
-	for(i = 0; i < LEN(key); i++)
-		if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+	state &= ~Mod2Mask;
+	for(i = 0; i < LEN(key); i++) {
+		unsigned int mask = key[i].mask;
+		if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
 			return (char*)key[i].s;
+	}
 	return NULL;
 }