Monotonic clock cannot jump backwards.

[st.git] / st.c

diff --git a/st.c b/st.c
index 7dbd87a..c7589f4 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,4 +1,4 @@
-/* See LICENSE for licence details. */
+/* See LICENSE for license details. */

 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -352,6 +352,7 @@ static void draw(void);
 static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);

+static void stty(void);

 static void sigchld(int);
 static void run(void);
 
 static void sigchld(int);
 static void run(void);
 


@@ -419,12 +420,11 @@ static int xsetcolorname(int, const char *);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);

-static int xloadfontset(Font *);

 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);

-static void xsetsel(char *);
+static void xsetsel(char *, Time);

 static void xtermclear(int, int, int, int);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xtermclear(int, int, int, int);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);


@@ -450,7 +450,7 @@ static void selinit(void);
 static void selnormalize(void);
 static inline bool selected(int, int);
 static char *getsel(void);
 static void selnormalize(void);
 static inline bool selected(int, int);
 static char *getsel(void);

-static void selcopy(void);
+static void selcopy(Time);

 static void selscroll(int, int);
 static void selsnap(int, int *, int *, int);
 static int x2col(int);
 static void selscroll(int, int);
 static void selsnap(int, int *, int *, int);
 static int x2col(int);


@@ -509,6 +509,7 @@ static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_font = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_font = NULL;

+static char *opt_line = NULL;

 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;


@@ -672,7 +673,8 @@ y2row(int y) {
        return LIMIT(y, 0, term.row-1);
 }
 
        return LIMIT(y, 0, term.row-1);
 }
 

-int tlinelen(int y) {
+int
+tlinelen(int y) {

        int i = term.col;
 
        if(term.line[y][i - 1].mode & ATTR_WRAP)
        int i = term.col;
 
        if(term.line[y][i - 1].mode & ATTR_WRAP)


@@ -945,7 +947,7 @@ getsel(void) {
        ptr = str = xmalloc(bufsize);
 
        /* append every set & selected glyph to the selection */
        ptr = str = xmalloc(bufsize);
 
        /* append every set & selected glyph to the selection */

-       for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
+       for(y = sel.nb.y; y <= sel.ne.y; y++) {

                linelen = tlinelen(y);
 
                if(sel.type == SEL_RECTANGULAR) {
                linelen = tlinelen(y);
 
                if(sel.type == SEL_RECTANGULAR) {


@@ -985,8 +987,8 @@ getsel(void) {
 }
 
 void
 }
 
 void

-selcopy(void) {
-       xsetsel(getsel());
+selcopy(Time t) {
+       xsetsel(getsel(), t);

 }
 
 void
 }
 
 void


@@ -998,7 +1000,7 @@ selnotify(XEvent *e) {
        XSelectionEvent *xsev;
 
        ofs = 0;
        XSelectionEvent *xsev;
 
        ofs = 0;

-       xsev = (XSelectionEvent *)e;
+       xsev = &e->xselection;

        if (xsev->property == None)
            return;
        do {
        if (xsev->property == None)
            return;
        do {


@@ -1084,6 +1086,9 @@ selrequest(XEvent *e) {
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;

+        if (xsre->property == None)
+            xsre->property = xsre->target;
+

        /* reject */
        xev.property = None;
 
        /* reject */
        xev.property = None;
 


@@ -1126,11 +1131,13 @@ selrequest(XEvent *e) {
 }
 
 void
 }
 
 void

-xsetsel(char *str) {
+xsetsel(char *str, Time t) {

        free(sel.primary);
        sel.primary = str;
 
        free(sel.primary);
        sel.primary = str;
 

-       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
+       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
+        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
+            selclear(0);

 }
 
 void
 }
 
 void


@@ -1147,7 +1154,7 @@ brelease(XEvent *e) {
                        selclear(NULL);
                } else {
                        getbuttoninfo(e);
                        selclear(NULL);
                } else {
                        getbuttoninfo(e);

-                       selcopy();
+                       selcopy(e->xbutton.time);

                }
                sel.mode = 0;
                tsetdirt(sel.nb.y, sel.ne.y);
                }
                sel.mode = 0;
                tsetdirt(sel.nb.y, sel.ne.y);


@@ -1249,11 +1256,55 @@ sigchld(int a) {
        exit(EXIT_SUCCESS);
 }
 
        exit(EXIT_SUCCESS);
 }
 

+
+void
+stty(void)
+{
+       char cmd[_POSIX_ARG_MAX], **p, *q, *s;
+       size_t n, siz;
+
+       if((n = strlen(stty_args)) > sizeof(cmd)-1)
+               die("incorrect stty parameters\n");
+       memcpy(cmd, stty_args, n);
+       q = cmd + n;
+       siz = sizeof(cmd) - n;
+       for(p = opt_cmd; p && (s = *p); ++p) {
+               if((n = strlen(s)) > siz-1)
+                       die("stty parameter length too long\n");
+               *q++ = ' ';
+               q = memcpy(q, s, n);
+               q += n;
+               siz-= n + 1;
+       }
+       *q = '\0';
+       system(cmd);
+}
+

 void
 ttynew(void) {
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
 
 void
 ttynew(void) {
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
 

+       if(opt_io) {
+               term.mode |= MODE_PRINT;
+               iofd = (!strcmp(opt_io, "-")) ?
+                         STDOUT_FILENO :
+                         open(opt_io, O_WRONLY | O_CREAT, 0666);
+               if(iofd < 0) {
+                       fprintf(stderr, "Error opening %s:%s\n",
+                               opt_io, strerror(errno));
+               }
+       }
+
+       if (opt_line) {
+               if((cmdfd = open(opt_line, O_RDWR)) < 0)
+                       die("open line failed: %s\n", strerror(errno));
+               close(STDIN_FILENO);
+               dup(cmdfd);
+               stty();
+               return;
+       }
+

        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", strerror(errno));
        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", strerror(errno));


@@ -1263,6 +1314,7 @@ ttynew(void) {
                die("fork failed\n");
                break;
        case 0:
                die("fork failed\n");
                break;
        case 0:

+               close(iofd);

                setsid(); /* create a new process group */
                dup2(s, STDIN_FILENO);
                dup2(s, STDOUT_FILENO);
                setsid(); /* create a new process group */
                dup2(s, STDIN_FILENO);
                dup2(s, STDOUT_FILENO);


@@ -1277,16 +1329,6 @@ ttynew(void) {
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);

-               if(opt_io) {
-                       term.mode |= MODE_PRINT;
-                       iofd = (!strcmp(opt_io, "-")) ?
-                                 STDOUT_FILENO :
-                                 open(opt_io, O_WRONLY | O_CREAT, 0666);
-                       if(iofd < 0) {
-                               fprintf(stderr, "Error opening %s:%s\n",
-                                       opt_io, strerror(errno));
-                       }
-               }

                break;
        }
 }
                break;
        }
 }


@@ -1572,11 +1614,9 @@ tmoveto(int x, int y) {
                miny = 0;
                maxy = term.row - 1;
        }
                miny = 0;
                maxy = term.row - 1;
        }

-       LIMIT(x, 0, term.col-1);
-       LIMIT(y, miny, maxy);

        term.c.state &= ~CURSOR_WRAPNEXT;
        term.c.state &= ~CURSOR_WRAPNEXT;

-       term.c.x = x;
-       term.c.y = y;
+       term.c.x = LIMIT(x, 0, term.col-1);
+       term.c.y = LIMIT(y, miny, maxy);

 }
 
 void
 }
 
 void


@@ -2393,7 +2433,7 @@ tputtab(int n) {
                        for(--x; x > 0 && !term.tabs[x]; --x)
                                /* nothing */ ;
        }
                        for(--x; x > 0 && !term.tabs[x]; --x)
                                /* nothing */ ;
        }

-       tmoveto(x, term.c.y);
+       term.c.x = LIMIT(x, 0, term.col-1);

 }
 
 void
 }
 
 void


@@ -2447,21 +2487,19 @@ tdectest(char c) {
 
 void
 tstrsequence(uchar c) {
 
 void
 tstrsequence(uchar c) {

-       if (c & 0x80) {
-               switch (c) {
-               case 0x90:   /* DCS -- Device Control String */
-                       c = 'P';
-                       break;
-               case 0x9f:   /* APC -- Application Program Command */
-                       c = '_';
-                       break;
-               case 0x9e:   /* PM -- Privacy Message */
-                       c = '^';
-                       break;
-               case 0x9d:   /* OSC -- Operating System Command */
-                       c = ']';
-                       break;
-               }
+       switch (c) {
+       case 0x90:   /* DCS -- Device Control String */
+               c = 'P';
+               break;
+       case 0x9f:   /* APC -- Application Program Command */
+               c = '_';
+               break;
+       case 0x9e:   /* PM -- Privacy Message */
+               c = '^';
+               break;
+       case 0x9d:   /* OSC -- Operating System Command */
+               c = ']';
+               break;

        }
        strreset();
        strescseq.type = c;
        }
        strreset();
        strescseq.type = c;


@@ -2770,7 +2808,6 @@ tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);

-       int slide = term.c.y - row + 1;

        bool *bp;
        TCursor c;
 
        bool *bp;
        TCursor c;
 


@@ -2780,20 +2817,19 @@ tresize(int col, int row) {
                return;
        }
 
                return;
        }
 

-       /* free unneeded rows */
-       i = 0;
-       if(slide > 0) {
-               /*
-                * slide screen to keep cursor where we expect it -
-                * tscrollup would work here, but we can optimize to
-                * memmove because we're freeing the earlier lines
-                */
-               for(/* i = 0 */; i < slide; i++) {
-                       free(term.line[i]);
-                       free(term.alt[i]);
-               }
-               memmove(term.line, term.line + slide, row * sizeof(Line));
-               memmove(term.alt, term.alt + slide, row * sizeof(Line));
+       /*
+        * slide screen to keep cursor where we expect it -
+        * tscrollup would work here, but we can optimize to
+        * memmove because we're freeing the earlier lines
+        */
+       for(i = 0; i <= term.c.y - row; i++) {
+               free(term.line[i]);
+               free(term.alt[i]);
+       }
+       /* ensure that both src and dst are not NULL */
+       if (i > 0) {
+               memmove(term.line, term.line + i, row * sizeof(Line));
+               memmove(term.alt, term.alt + i, row * sizeof(Line));

        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);
        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);


@@ -3116,15 +3152,6 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPatternDestroy(pattern);
 }
 
        FcPatternDestroy(pattern);
 }
 

-int
-xloadfontset(Font *f) {
-       FcResult result;
-
-       if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
-               return 1;
-       return 0;
-}
-

 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);
 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);


@@ -3472,7 +3499,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)

-                               xloadfontset(font);
+                               font->set = FcFontSort(0, font->pattern,
+                                                      FcTrue, 0, &fcres);

                        fcsets[0] = font->set;
 
                        /*
                        fcsets[0] = font->set;
 
                        /*


@@ -3600,15 +3628,15 @@ xdrawcursor(void) {
                        case 4: /* Steady Underline */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                                borderpx + curx * xw.cw,
                        case 4: /* Steady Underline */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                                borderpx + curx * xw.cw,

-                                               borderpx + (term.c.y + 1) * xw.ch - 1,
-                                               xw.cw, 1);
+                                               borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
+                                               xw.cw, cursorthickness);

                                break;
                        case 5: /* Blinking bar */
                        case 6: /* Steady bar */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                break;
                        case 5: /* Blinking bar */
                        case 6: /* Steady bar */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],

-                                                               borderpx + curx * xw.cw,
-                                                               borderpx + term.c.y * xw.ch,
-                                                               1, xw.ch);
+                                               borderpx + curx * xw.cw,
+                                               borderpx + term.c.y * xw.ch,
+                                               cursorthickness, xw.ch);

                                break;
                }
        } else {
                                break;
                }
        } else {


@@ -3926,17 +3954,13 @@ run(void) {
        long deltatime;
 
        /* Waiting for window mapping */
        long deltatime;
 
        /* Waiting for window mapping */

-       while(1) {
+       do {

                XNextEvent(xw.dpy, &ev);
                XNextEvent(xw.dpy, &ev);

-               if(XFilterEvent(&ev, None))
-                       continue;

                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;

-               } else if(ev.type == MapNotify) {
-                       break;

                }
                }

-       }
+       } while(ev.type != MapNotify);

 
        ttynew();
        cresize(w, h);
 
        ttynew();
        cresize(w, h);


@@ -3979,8 +4003,7 @@ run(void) {
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);

-               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
-                               || deltatime < 0) {
+               if(deltatime > 1000 / (xev ? xfps : actionfps)) {

                        dodraw = 1;
                        last = now;
                }
                        dodraw = 1;
                        last = now;
                }


@@ -4023,14 +4046,16 @@ run(void) {
 
 void
 usage(void) {
 
 void
 usage(void) {

-       die("%s " VERSION " (c) 2010-2015 st engineers\n" \
+       die("%s " VERSION " (c) 2010-2015 st engineers\n"

        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"

-       "          [-i] [-t title] [-w windowid] [-e command ...]\n", argv0);
+       "          [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n"
+       "       st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+       "          [-i] [-t title] [-w windowid] [-l line] [stty_args ...]\n",
+       argv0);

 }
 
 int
 main(int argc, char *argv[]) {
 }
 
 int
 main(int argc, char *argv[]) {

-       char *titles;

        uint cols = 80, rows = 24;
 
        xw.l = xw.t = 0;
        uint cols = 80, rows = 24;
 
        xw.l = xw.t = 0;


@@ -4045,14 +4070,8 @@ main(int argc, char *argv[]) {
                opt_class = EARGF(usage());
                break;
        case 'e':
                opt_class = EARGF(usage());
                break;
        case 'e':

-               /* eat all remaining arguments */
-               if(argc > 1) {
-                       opt_cmd = &argv[1];
-                       if(argv[1] != NULL && opt_title == NULL) {
-                               titles = xstrdup(argv[1]);
-                               opt_title = basename(titles);
-                       }
-               }
+               if(argc > 1)
+                       --argc, ++argv;

                goto run;
        case 'f':
                opt_font = EARGF(usage());
                goto run;
        case 'f':
                opt_font = EARGF(usage());


@@ -4067,6 +4086,9 @@ main(int argc, char *argv[]) {
        case 'o':
                opt_io = EARGF(usage());
                break;
        case 'o':
                opt_io = EARGF(usage());
                break;

+       case 'l':
+               opt_line = EARGF(usage());
+               break;

        case 't':
                opt_title = EARGF(usage());
                break;
        case 't':
                opt_title = EARGF(usage());
                break;


@@ -4079,9 +4101,15 @@ main(int argc, char *argv[]) {
        } ARGEND;
 
 run:
        } ARGEND;
 
 run:

+       if(argc > 0) {
+               /* eat all remaining arguments */
+               opt_cmd = argv;
+               if(!opt_title)
+                       opt_title = basename(xstrdup(argv[0]));
+       }

        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");

-       tnew(cols? cols : 1, rows? rows : 1);
+       tnew(MAX(cols, 1), MAX(rows, 1));

        xinit();
        selinit();
        run();
        xinit();
        selinit();
        run();