X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/4a4ae19158a6d18d63b8e9fce92e6e5e45543746..c092bce366ce7469e92f59c889b31fa9037976b2:/st.c

diff --git a/st.c b/st.c
index 165d930..f3b0b08 100644
--- a/st.c
+++ b/st.c
@@ -551,7 +551,6 @@ bpress(XEvent *e) {
 		sel.mode = 1;
 		sel.ex = sel.bx = X2COL(e->xbutton.x);
 		sel.ey = sel.by = Y2ROW(e->xbutton.y);
-		draw();
 	}
 }
 
@@ -801,9 +800,15 @@ ttynew(void) {
 		close(s);
 		cmdfd = m;
 		signal(SIGCHLD, sigchld);
-		if(opt_io && !(fileio = fopen(opt_io, "w"))) {
-			fprintf(stderr, "Error opening %s:%s\n",
-				opt_io, strerror(errno));
+		if(opt_io) {
+			if(!strcmp(opt_io, "-")) {
+				fileio = stdout;
+			} else {
+				if(!(fileio = fopen(opt_io, "w"))) {
+					fprintf(stderr, "Error opening %s:%s\n",
+						opt_io, strerror(errno));
+				}
+			}
 		}
 	}
 }
@@ -1127,7 +1132,8 @@ tsetattr(int *attr, int l) {
 	for(i = 0; i < l; i++) {
 		switch(attr[i]) {
 		case 0:
-			term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+			term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
+					| ATTR_ITALIC);
 			term.c.attr.fg = DefaultFG;
 			term.c.attr.bg = DefaultBG;
 			break;
@@ -1503,6 +1509,9 @@ strhandle(void) {
 			break;
 		}
 		break;
+	case 'k': /* old title set compatibility */
+		XStoreName(xw.dpy, xw.win, strescseq.buf);
+		break;
 	case 'P': /* DSC -- Device Control String */
 	case '_': /* APC -- Application Program Command */
 	case '^': /* PM -- Privacy Message */
@@ -1565,8 +1574,10 @@ void
 tputc(char *c) {
 	char ascii = *c;
 
-	if(fileio)
+	if(fileio) {
 		putc(ascii, fileio);
+		fflush(fileio);
+	}
 
 	if(term.esc & ESC_START) {
 		if(term.esc & ESC_CSI) {
@@ -1616,6 +1627,7 @@ tputc(char *c) {
 			case '_': /* APC -- Application Program Command */
 			case '^': /* PM -- Privacy Message */
 			case ']': /* OSC -- Operating System Command */
+			case 'k': /* old title set compatibility */
 				strreset();
 				strescseq.type = ascii;
 				term.esc |= ESC_STR;
@@ -1925,6 +1937,17 @@ xinit(void) {
 		die("Can't open display\n");
 	xw.scr = XDefaultScreen(xw.dpy);
 
+	/* font */
+	initfonts(FONT, BOLDFONT, ITALICFONT);
+
+	/* XXX: Assuming same size for bold font */
+	xw.cw = dc.font.rbearing - dc.font.lbearing;
+	xw.ch = dc.font.ascent + dc.font.descent;
+
+	/* colors */
+	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
+	xloadcols();
+
 	/* adjust fixed window geometry */
 	if(xw.isfixed) {
 		sw = DisplayWidth(xw.dpy, xw.scr);
@@ -1944,17 +1967,6 @@ xinit(void) {
 		xw.fy = 0;
 	}
 
-	/* font */
-	initfonts(FONT, BOLDFONT, ITALICFONT);
-
-	/* XXX: Assuming same size for bold font */
-	xw.cw = dc.font.rbearing - dc.font.lbearing;
-	xw.ch = dc.font.ascent + dc.font.descent;
-
-	/* colors */
-	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-	xloadcols();
-
 	attrs.background_pixel = dc.col[DefaultBG];
 	attrs.border_pixel = dc.col[DefaultBG];
 	attrs.bit_gravity = NorthWestGravity;