Add support for utmp in st

[st.git] / st.c

diff --git a/st.c b/st.c
index 497885b..ab3fa6e 100644 (file)
--- a/st.c
+++ b/st.c
@@ -662,7 +662,10 @@ y2row(int y) {
 static int tlinelen(int y) {
        int i = term.col;
 
-       while (i > 0 && term.line[y][i - 1].c[0] == ' ')
+       if(term.line[y][i - 1].mode & ATTR_WRAP)
+               return i;
+
+       while(i > 0 && term.line[y][i - 1].c[0] == ' ')
                --i;
 
        return i;
@@ -959,7 +962,7 @@ getsel(void) {
                 * st.
                 * FIXME: Fix the computer world.
                 */
-               if(sel.ne.y > y || lastx >= linelen)
+               if((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
                        *ptr++ = '\n';
        }
        *ptr = 0;
@@ -1150,16 +1153,22 @@ execsh(void) {
                else
                        die("who are you?\n");
        }
-       unsetenv("COLUMNS");
-       unsetenv("LINES");
-       unsetenv("TERMCAP");
 
-       sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
+       if (utmp)
+               sh = utmp;
+       else if (pw->pw_shell[0])
+               sh = pw->pw_shell;
+       else
+               sh = shell;
+       args = (opt_cmd) ? opt_cmd : (char *[]){sh, NULL};
        snprintf(buf, sizeof(buf), "%lu", xw.win);
 
+       unsetenv("COLUMNS");
+       unsetenv("LINES");
+       unsetenv("TERMCAP");
        setenv("LOGNAME", pw->pw_name, 1);
        setenv("USER", pw->pw_name, 1);
-       setenv("SHELL", sh, 1);
+       setenv("SHELL", args[0], 1);
        setenv("HOME", pw->pw_dir, 1);
        setenv("TERM", termname, 1);
        setenv("WINDOWID", buf, 1);
@@ -1171,7 +1180,6 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
-       args = opt_cmd ? opt_cmd : (char *[]){sh, "-i", NULL};
        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }
@@ -3456,39 +3464,40 @@ xdrawcursor(void) {
        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
                        oldy, width, sl);
 
+       if(IS_SET(MODE_HIDE))
+               return;
+
        /* draw the new one */
-       if(!(IS_SET(MODE_HIDE))) {
-               if(xw.state & WIN_FOCUSED) {
-                       if(IS_SET(MODE_REVERSE)) {
-                               g.mode |= ATTR_REVERSE;
-                               g.fg = defaultcs;
-                               g.bg = defaultfg;
-                       }
+       if(xw.state & WIN_FOCUSED) {
+               if(IS_SET(MODE_REVERSE)) {
+                       g.mode |= ATTR_REVERSE;
+                       g.fg = defaultcs;
+                       g.bg = defaultfg;
+               }
 
-                       sl = utf8len(g.c);
-                       width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
-                               ? 2 : 1;
-                       xdraws(g.c, g, term.c.x, term.c.y, width, sl);
-               } else {
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       xw.cw - 1, 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + (curx + 1) * xw.cw - 1,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + (term.c.y + 1) * xw.ch - 1,
-                                       xw.cw, 1);
-               }
-               oldx = curx, oldy = term.c.y;
-       }
+               sl = utf8len(g.c);
+               width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
+                       ? 2 : 1;
+               xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+       } else {
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               xw.cw - 1, 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + (curx + 1) * xw.cw - 1,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + (term.c.y + 1) * xw.ch - 1,
+                               xw.cw, 1);
+       }
+       oldx = curx, oldy = term.c.y;
 }