X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=st.c;h=6f3831156ae6ecf18c6b858853b7e548144060b1;hp=bcf96e90d637e35173a2ed190c5bc0bb06478fbd;hb=b29cf7c0c7bab18dbb15025eb8587d7fdc4ccf26;hpb=f9fb620914f7b1e2580a890f23b66e18762788b7

diff --git a/st.c b/st.c
index bcf96e9..6f38311 100644
--- a/st.c
+++ b/st.c
@@ -1158,7 +1158,10 @@ execsh(void) {
 			die("who are you?\n");
 	}
 
-	sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
+	if (!(sh = getenv("SHELL"))) {
+		sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
+	}
+
 	if(opt_cmd)
 		prog = opt_cmd[0];
 	else if(utmp)
@@ -2576,7 +2579,10 @@ tputc(char *c, int len) {
 		unicodep = ascii = *c;
 	} else {
 		utf8decode(c, &unicodep, UTF_SIZ);
-		width = wcwidth(unicodep);
+		if ((width = wcwidth(unicodep)) == -1) {
+			c = "\357\277\275";	/* UTF_INVALID */
+			width = 1;
+		}
 		control = ISCONTROLC1(unicodep);
 		ascii = unicodep;
 	}
@@ -3136,8 +3142,8 @@ xinit(void) {
 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
 	xw.attrs.colormap = xw.cmap;
 
-	parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
-			XRootWindow(xw.dpy, xw.scr);
+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+		parent = XRootWindow(xw.dpy, xw.scr);
 	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
 			xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
@@ -3500,9 +3506,9 @@ xdrawcursor(void) {
 	if(xw.state & WIN_FOCUSED) {
 		if(IS_SET(MODE_REVERSE)) {
 			g.mode |= ATTR_REVERSE;
-			g.fg = defaultcs;
-			g.bg = defaultfg;
 		}
+		g.fg = term.line[term.c.y][curx].bg;
+		g.bg = term.line[term.c.y][curx].fg;
 
 		sl = utf8len(g.c);
 		width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\