cursor swaps fg and bg colors

[st.git] / st.c

diff --git a/st.c b/st.c
index ad52280..6f38311 100644 (file)
--- 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)
@@ -3503,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)\