X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=1692f81af59e43ff376f0f54a8111e7c1c314961;hb=581ae58b4182c2d472b30d11dbbef813704642f1;hp=9b77a0b6fe0710d2f075bb20dda948e61af5430f;hpb=2181040594ae63f2821899caba0bef34257a6c2b;p=st.git

diff --git a/st.c b/st.c
index 9b77a0b..1692f81 100644
--- a/st.c
+++ b/st.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <pty.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
@@ -46,8 +47,8 @@
 
 /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
 enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };
-enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, 
-       CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE = 1, 
+       CURSOR_DRAW = 0, CURSOR_SAVE, CURSOR_LOAD };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
@@ -230,6 +231,7 @@ void
 xbell(void) {
 	XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
 	XFillRectangle(xw.dis, xw.win, dc.gc, BORDER, BORDER, xw.bufw, xw.bufh);
+	XFlush(xw.dis);
 	usleep(BellTime);
 	draw(SCREEN_REDRAW);
 }
@@ -372,11 +374,11 @@ tscrollup (int n) {
 	for(i = 0; i < n; i++)
 		memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
 	
-	 for(i = term.top; i <= term.bot-n; i++) { 
+	for(i = term.top; i <= term.bot-n; i++) { 
 		 temp = term.line[i];
 		 term.line[i] = term.line[i+n]; 
 		 term.line[i+n] = temp;
-	 }
+	}
 }
 
 void
@@ -710,7 +712,7 @@ csihandle(void) {
 			case 12: /* att610 -- Stop blinking cursor (IGNORED) */
 				break;
 			case 25:
-				term.c.hide = 1;
+				term.c.hide = CURSOR_HIDE;
 				break;
 			case 1048: /* XXX: no alt. screen to erase/save */
 			case 1049:
@@ -759,7 +761,7 @@ csihandle(void) {
 			case 12: /* att610 -- Start blinking cursor (IGNORED) */
 				break;
 			case 25:
-				term.c.hide = 0;
+				term.c.hide = CURSOR_DRAW;
 				break;
 			case 1048: 
 			case 1049: /* XXX: no alt. screen to erase/save */
@@ -1165,8 +1167,7 @@ draw(int dummy) {
 			if(term.line[y][x].state & GLYPH_SET)
 				xdrawc(x, y, term.line[y][x]);
 
-	if(!term.c.hide)
-		xcursor(CURSOR_DRAW);
+	xcursor(term.c.hide);
 	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 	XFlush(xw.dis);
 }
@@ -1180,25 +1181,29 @@ draw(int redraw_all) {
 	char buf[DRAW_BUF_SIZ];
 	
 	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
-	XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+	XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
 	for(y = 0; y < term.row; y++) {
 		base = term.line[y][0];
 		i = ox = 0;
 		for(x = 0; x < term.col; x++) {
 			new = term.line[y][x];
-			if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ)
-				buf[i++] = new.c;
-			else {
+			if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+						i >= DRAW_BUF_SIZ)) {
 				xdraws(buf, base, ox, y, i);
-				buf[0] = new.c;
-				i = 1;
-				ox = x;
-				base = new;
+				i = 0;
+			}
+			if(new.state & GLYPH_SET) {
+				if(i == 0) {
+					ox = x;
+					base = new;
+				}
+				buf[i++] = new.c;
 			}
 		}
-		xdraws(buf, base, ox, y, i);
+		if(i > 0)
+			xdraws(buf, base, ox, y, i);
 	}
-	xcursor(term.c.hide ? CURSOR_HIDE : CURSOR_DRAW);
+	xcursor(term.c.hide);
 	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 	XFlush(xw.dis);
 }
@@ -1293,7 +1298,7 @@ run(void) {
 		FD_ZERO(&rfd);
 		FD_SET(cmdfd, &rfd);
 		FD_SET(xfd, &rfd);
-		if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+		if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
 			if(errno == EINTR)
 				continue;
 			die("select failed: %s\n", SERRNO);