Do not set SHELL to utmp ever

[st.git] / st.c

diff --git a/st.c b/st.c
index 2b4d52c..bcf96e9 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,15 @@ execsh(void) {
                        die("who are you?\n");
        }
 
-       if (utmp)
-               sh = utmp;
-       else if (pw->pw_shell[0])
-               sh = pw->pw_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 +1174,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 +1186,7 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
-       execvp(args[0], args);
+       execvp(prog, args);
        exit(EXIT_FAILURE);
 }
 
@@ -2423,7 +2426,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 */
@@ -2431,11 +2434,9 @@ tcontrolcode(uchar ascii) {
                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
                term.esc |= ESC_START;
                return;
-       case '\016': /* SO */
-               term.charset = 0;
-               return;
-       case '\017': /* SI */
-               term.charset = 1;
+       case '\016': /* SO (LS1 -- Locking shift 1) */
+       case '\017': /* SI (LS0 -- Locking shift 0) */
+               term.charset = 1 - (ascii - '\016');
                return;
        case '\032': /* SUB */
                tsetchar(question, &term.c.attr, term.c.x, term.c.y);
@@ -2499,6 +2500,10 @@ eschandle(uchar ascii) {
        case 'k': /* old title set compatibility */
                tstrsequence(ascii);
                return 0;
+       case 'n': /* LS2 -- Locking shift 2 */
+       case 'o': /* LS3 -- Locking shift 3 */
+               term.charset = 2 + (ascii - 'n');
+               break;
        case '(': /* GZD4 -- set primary charset G0 */
        case ')': /* G1D4 -- set secondary charset G1 */
        case '*': /* G2D4 -- set tertiary charset G2 */
@@ -3064,10 +3069,10 @@ xunloadfonts(void) {
        xunloadfont(&dc.ibfont);
 }
 
-
 void
 xzoom(const Arg *arg) {
        Arg larg;
+
        larg.i = usedfontsize + arg->i;
        xzoomabs(&larg);
 }
@@ -3084,6 +3089,7 @@ xzoomabs(const Arg *arg) {
 void
 xzoomreset(const Arg *arg) {
        Arg larg;
+
        if(defaultfontsize > 0) {
                larg.i = defaultfontsize;
                xzoomabs(&larg);