X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/6e88c7f60206275a5378521ef5d3dd96b0b09f36..122ed577027ccbb85b2fe6a0f9449035fe074a9e:/st.c?ds=inline

diff --git a/st.c b/st.c
index 11867b7..a4575f4 100644
--- a/st.c
+++ b/st.c
@@ -76,6 +76,7 @@ enum glyph_attribute {
 	ATTR_UNDERLINE = 2,
 	ATTR_BOLD      = 4,
 	ATTR_GFX       = 8,
+	ATTR_ITALIC    = 16,
 };
 
 enum cursor_movement {
@@ -238,7 +239,7 @@ typedef struct {
 		short lbearing;
 		short rbearing;
 		XFontSet set;
-	} font, bfont;
+	} font, bfont, ifont;
 } DC;
 
 static void die(const char*, ...);
@@ -290,7 +291,7 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
-static void xcopy();
+static void xcopy(void);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
@@ -310,12 +311,13 @@ static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void selnotify(XEvent *);
+static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
-static void selpaste();
+static void selpaste(void);
 static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
@@ -335,6 +337,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
 	[MotionNotify] = bmotion,
 	[ButtonPress] = bpress,
 	[ButtonRelease] = brelease,
+	[SelectionClear] = selclear,
 	[SelectionNotify] = selnotify,
 	[SelectionRequest] = selrequest,
 };
@@ -611,6 +614,14 @@ selpaste() {
 	XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
 }
 
+void selclear(XEvent *e) {
+	if(sel.bx == -1)
+		return;
+	sel.bx = -1;
+	tsetdirt(sel.b.y, sel.e.y);
+	draw();
+}
+
 void
 selrequest(XEvent *e) {
 	XSelectionRequestEvent *xsre;
@@ -739,6 +750,10 @@ execsh(void) {
 	char **args;
 	char *envshell = getenv("SHELL");
 
+	unsetenv("COLUMNS");
+	unsetenv("LINES");
+	unsetenv("TERMCAP");
+
 	DEFAULT(envshell, SHELL);
 	putenv("TERM="TNAME);
 	args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@ -785,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));
+				}
+			}
 		}
 	}
 }
@@ -841,7 +862,8 @@ ttyresize(int x, int y) {
 
 	w.ws_row = term.row;
 	w.ws_col = term.col;
-	w.ws_xpixel = w.ws_ypixel = 0;
+	w.ws_xpixel = xw.w;
+	w.ws_ypixel = xw.h;
 	if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
 		fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
@@ -1110,15 +1132,16 @@ 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;
 		case 1:
 			term.c.attr.mode |= ATTR_BOLD;
 			break;
-		case 3: /* enter standout (highlight) mode TODO: make it italic */
-			term.c.attr.mode |= ATTR_REVERSE;
+		case 3: /* enter standout (highlight) */
+			term.c.attr.mode |= ATTR_ITALIC;
 			break;
 		case 4:
 			term.c.attr.mode |= ATTR_UNDERLINE;
@@ -1129,8 +1152,8 @@ tsetattr(int *attr, int l) {
 		case 22:
 			term.c.attr.mode &= ~ATTR_BOLD;
 			break;
-		case 23: /* leave standout (highlight) mode TODO: make it italic */
-			term.c.attr.mode &= ~ATTR_REVERSE;
+		case 23: /* leave standout (highlight) mode */
+			term.c.attr.mode &= ~ATTR_ITALIC;
 			break;
 		case 24:
 			term.c.attr.mode &= ~ATTR_UNDERLINE;
@@ -1548,8 +1571,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) {
@@ -1881,14 +1906,20 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
 }
 
 void
-initfonts(char *fontstr, char *bfontstr) {
-	if((dc.font.set = xinitfont(fontstr)) == NULL ||
-	   (dc.bfont.set = xinitfont(bfontstr)) == NULL)
-		die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+	if((dc.font.set = xinitfont(fontstr)) == NULL)
+		die("Can't load font %s\n", fontstr);
+	if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
+		die("Can't load bfont %s\n", bfontstr);
+	if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
+		die("Can't load ifont %s\n", ifontstr);
+
 	xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
 	    &dc.font.lbearing, &dc.font.rbearing);
 	xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
 	    &dc.bfont.lbearing, &dc.bfont.rbearing);
+	xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
+	    &dc.ifont.lbearing, &dc.ifont.rbearing);
 }
 
 void
@@ -1910,16 +1941,19 @@ xinit(void) {
 			xw.fx = sw + xw.fx - xw.fw - 1;
 		if(xw.fy < 0)
 			xw.fy = sh + xw.fy - xw.fh - 1;
+
+		xw.h = xw.fh;
+		xw.w = xw.fw;
 	} else {
 		/* window - default size */
 		xw.h = 2*BORDER + term.row * xw.ch;
 		xw.w = 2*BORDER + term.col * xw.cw;
-		xw.fw = xw.w;
-		xw.fh = xw.h;
+		xw.fx = 0;
+		xw.fy = 0;
 	}
 
 	/* font */
-	initfonts(FONT, BOLDFONT);
+	initfonts(FONT, BOLDFONT, ITALICFONT);
 
 	/* XXX: Assuming same size for bold font */
 	xw.cw = dc.font.rbearing - dc.font.lbearing;
@@ -1934,13 +1968,12 @@ xinit(void) {
 	attrs.bit_gravity = NorthWestGravity;
 	attrs.event_mask = FocusChangeMask | KeyPressMask
 		| ExposureMask | VisibilityChangeMask | StructureNotifyMask
-		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
-		| EnterWindowMask | LeaveWindowMask;
+		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
 	attrs.colormap = xw.cmap;
 
 	parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
 	xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
-			xw.fw, xw.fh, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+			xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
 			XDefaultVisual(xw.dpy, xw.scr),
 			CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
 			| CWColormap,
@@ -1994,6 +2027,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 		fontset = dc.bfont.set;
 	}
 
+	if(base.mode & ATTR_ITALIC)
+		fontset = dc.ifont.set;
+
 	XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
 	XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
 
@@ -2018,7 +2054,6 @@ void
 xcopy() {
 	XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
 	XdbeSwapBuffers(xw.dpy, swpinfo, 1);
-
 }
 
 void
@@ -2041,7 +2076,7 @@ xdrawcursor(void) {
 	} else
 		xclear(oldx, oldy, oldx, oldy);
 
-	xcopy(oldx, oldy, 1, 1);
+	xcopy();
 
 	/* draw the new one */
 	if(!(term.c.state & CURSOR_HIDE)) {
@@ -2056,7 +2091,7 @@ xdrawcursor(void) {
 		oldx = term.c.x, oldy = term.c.y;
 	}
 
-	xcopy(term.c.x, term.c.y, 1, 1);
+	xcopy();
 }
 
 void
@@ -2254,8 +2289,8 @@ resize(XEvent *e) {
 		return;
 	if(tresize(col, row))
 		draw();
-	ttyresize(col, row);
 	xresize(col, row);
+	ttyresize(col, row);
 }
 
 bool
@@ -2310,6 +2345,7 @@ main(int argc, char *argv[]) {
 	unsigned int wr, hr;
 
 	xw.fw = xw.fh = xw.fx = xw.fy = 0;
+	xw.isfixed = False;
 
 	for(i = 1; i < argc; i++) {
 		switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {