cursor swaps fg and bg colors

[st.git] / st.c

diff --git a/st.c b/st.c
index 22a1ce6..6f38311 100644 (file)
--- a/st.c
+++ b/st.c
@@ -27,6 +27,7 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
+#include <X11/XKBlib.h>
 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
@@ -1145,7 +1146,7 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-       char **args, *sh;
+       char **args, *sh, *prog;
        const struct passwd *pw;
        char buf[sizeof(long) * 8 + 1];
 
@@ -1157,13 +1158,18 @@ execsh(void) {
                        die("who are you?\n");
        }
 
-       if (utmp)
-               sh = utmp;
-       else if (pw->pw_shell[0])
-               sh = pw->pw_shell;
+       if (!(sh = getenv("SHELL"))) {
+               sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
+       }
+
+       if(opt_cmd)
+               prog = opt_cmd[0];
+       else if(utmp)
+               prog = utmp;
        else
-               sh = shell;
-       args = (opt_cmd) ? opt_cmd : (char *[]){sh, NULL};
+               prog = sh;
+       args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
+
        snprintf(buf, sizeof(buf), "%lu", xw.win);
 
        unsetenv("COLUMNS");
@@ -1171,7 +1177,7 @@ execsh(void) {
        unsetenv("TERMCAP");
        setenv("LOGNAME", pw->pw_name, 1);
        setenv("USER", pw->pw_name, 1);
-       setenv("SHELL", args[0], 1);
+       setenv("SHELL", sh, 1);
        setenv("HOME", pw->pw_dir, 1);
        setenv("TERM", termname, 1);
        setenv("WINDOWID", buf, 1);
@@ -1183,7 +1189,7 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
-       execvp(args[0], args);
+       execvp(prog, args);
        exit(EXIT_FAILURE);
 }
 
@@ -2423,7 +2429,7 @@ tcontrolcode(uchar ascii) {
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        if (bellvolume)
-                               XBell(xw.dpy, bellvolume);
+                               XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
                }
                break;
        case '\033': /* ESC */
@@ -2573,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;
        }
@@ -3133,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
@@ -3497,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)\