Do not set SHELL to utmp ever

[st.git] / st.c

diff --git a/st.c b/st.c
index 01ab962..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/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>

+#include <X11/XKBlib.h>

 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 


@@ -317,6 +318,8 @@ static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);

+static void xzoomabs(const Arg *);
+static void xzoomreset(const Arg *);

 static void printsel(const Arg *);
 static void printscreen(const Arg *) ;
 static void toggleprinter(const Arg *);
 static void printsel(const Arg *);
 static void printscreen(const Arg *) ;
 static void toggleprinter(const Arg *);


@@ -503,6 +506,7 @@ static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static double usedfontsize = 0;
 
 static char *usedfont = NULL;
 static double usedfontsize = 0;

+static double defaultfontsize = 0;

 
 static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 
 static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};


@@ -662,7 +666,10 @@ y2row(int y) {
 static int tlinelen(int y) {
        int i = term.col;
 
 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;
                --i;
 
        return i;


@@ -709,7 +716,8 @@ selected(int x, int y) {
 void
 selsnap(int mode, int *x, int *y, int direction) {
        int newx, newy, xt, yt;
 void
 selsnap(int mode, int *x, int *y, int direction) {
        int newx, newy, xt, yt;

-       Glyph *gp;
+       bool delim, prevdelim;
+       Glyph *gp, *prevgp;

 
        switch(mode) {
        case SNAP_WORD:
 
        switch(mode) {
        case SNAP_WORD:


@@ -717,6 +725,8 @@ selsnap(int mode, int *x, int *y, int direction) {
                 * Snap around if the word wraps around at the end or
                 * beginning of a line.
                 */
                 * Snap around if the word wraps around at the end or
                 * beginning of a line.
                 */

+               prevgp = &term.line[*y][*x];
+               prevdelim = strchr(worddelimiters, prevgp->c[0]) != NULL;

                for(;;) {
                        newx = *x + direction;
                        newy = *y;
                for(;;) {
                        newx = *x + direction;
                        newy = *y;


@@ -738,11 +748,15 @@ selsnap(int mode, int *x, int *y, int direction) {
                                break;
 
                        gp = &term.line[newy][newx];
                                break;
 
                        gp = &term.line[newy][newx];

-                       if (!(gp->mode & ATTR_WDUMMY) && strchr(worddelimiters, gp->c[0]))
+                       delim = strchr(worddelimiters, gp->c[0]) != NULL;
+                       if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+                                       || (delim && gp->c[0] != prevgp->c[0])))

                                break;
 
                        *x = newx;
                        *y = newy;
                                break;
 
                        *x = newx;
                        *y = newy;

+                       prevgp = gp;
+                       prevdelim = delim;

                }
                break;
        case SNAP_LINE:
                }
                break;
        case SNAP_LINE:


@@ -952,7 +966,7 @@ getsel(void) {
                 * st.
                 * FIXME: Fix the computer world.
                 */
                 * 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;
                        *ptr++ = '\n';
        }
        *ptr = 0;


@@ -1132,7 +1146,7 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
 
 void
 execsh(void) {

-       char **args, *sh;
+       char **args, *sh, *prog;

        const struct passwd *pw;
        char buf[sizeof(long) * 8 + 1];
 
        const struct passwd *pw;
        char buf[sizeof(long) * 8 + 1];
 


@@ -1143,13 +1157,21 @@ execsh(void) {
                else
                        die("who are you?\n");
        }
                else
                        die("who are you?\n");
        }

-       unsetenv("COLUMNS");
-       unsetenv("LINES");
-       unsetenv("TERMCAP");

 
        sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
 
        sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;

+       if(opt_cmd)
+               prog = opt_cmd[0];
+       else if(utmp)
+               prog = utmp;
+       else
+               prog = sh;
+       args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
+

        snprintf(buf, sizeof(buf), "%lu", xw.win);
 
        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("LOGNAME", pw->pw_name, 1);
        setenv("USER", pw->pw_name, 1);
        setenv("SHELL", sh, 1);


@@ -1164,8 +1186,7 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 

-       args = opt_cmd ? opt_cmd : (char *[]){sh, "-i", NULL};
-       execvp(args[0], args);
+       execvp(prog, args);

        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 


@@ -2405,7 +2426,7 @@ tcontrolcode(uchar ascii) {
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        if (bellvolume)
                        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 */
                }
                break;
        case '\033': /* ESC */


@@ -2413,11 +2434,9 @@ tcontrolcode(uchar ascii) {
                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
                term.esc |= ESC_START;
                return;
                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);
                return;
        case '\032': /* SUB */
                tsetchar(question, &term.c.attr, term.c.x, term.c.y);


@@ -2481,10 +2500,14 @@ eschandle(uchar ascii) {
        case 'k': /* old title set compatibility */
                tstrsequence(ascii);
                return 0;
        case 'k': /* old title set compatibility */
                tstrsequence(ascii);
                return 0;

-       case '(': /* set primary charset G0 */
-       case ')': /* set secondary charset G1 */
-       case '*': /* set tertiary charset G2 */
-       case '+': /* set quaternary charset G3 */
+       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 */
+       case '+': /* G3D4 -- set quaternary charset G3 */

                term.icharset = ascii - '(';
                term.esc |= ESC_ALTCHARSET;
                return 0;
                term.icharset = ascii - '(';
                term.esc |= ESC_ALTCHARSET;
                return 0;


@@ -2978,6 +3001,7 @@ xloadfonts(char *fontstr, double fontsize) {
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }

+               defaultfontsize = usedfontsize;

        }
 
        FcConfigSubstitute(0, pattern, FcMatchPattern);
        }
 
        FcConfigSubstitute(0, pattern, FcMatchPattern);


@@ -2990,6 +3014,8 @@ xloadfonts(char *fontstr, double fontsize) {
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;

+               if(fontsize == 0)
+                       defaultfontsize = fontval;

        }
 
        /* Setting character width and height. */
        }
 
        /* Setting character width and height. */


@@ -3045,13 +3071,31 @@ xunloadfonts(void) {
 
 void
 xzoom(const Arg *arg) {
 
 void
 xzoom(const Arg *arg) {

+       Arg larg;
+
+       larg.i = usedfontsize + arg->i;
+       xzoomabs(&larg);
+}
+
+void
+xzoomabs(const Arg *arg) {

        xunloadfonts();
        xunloadfonts();

-       xloadfonts(usedfont, usedfontsize + arg->i);
+       xloadfonts(usedfont, arg->i);

        cresize(0, 0);
        redraw(0);
        xhints();
 }
 
        cresize(0, 0);
        redraw(0);
        xhints();
 }
 

+void
+xzoomreset(const Arg *arg) {
+       Arg larg;
+
+       if(defaultfontsize > 0) {
+               larg.i = defaultfontsize;
+               xzoomabs(&larg);
+       }
+}
+

 void
 xinit(void) {
        XGCValues gcvalues;
 void
 xinit(void) {
        XGCValues gcvalues;


@@ -3449,39 +3493,40 @@ xdrawcursor(void) {
        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
                        oldy, width, sl);
 
        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
                        oldy, width, sl);
 

+       if(IS_SET(MODE_HIDE))
+               return;
+

        /* draw the new one */
        /* 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;

 }
 
 
 }