Simplify a bit more tdeletechar and tinsertblank

[st.git] / st.c

diff --git a/st.c b/st.c
index 4ccef9c..e468d73 100644 (file)
--- a/st.c
+++ b/st.c
@@ -75,6 +75,7 @@ char *argv0;
 #define IS_SET(flag) ((term.mode & (flag)) != 0)
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
 #define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
+#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)    (1 << 24 & (x))
@@ -297,13 +298,13 @@ typedef struct {
 
 typedef union {
        int i;
-       unsigned int ui;
+       uint ui;
        float f;
        const void *v;
 } Arg;
 
 typedef struct {
-       unsigned int mod;
+       uint mod;
        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;
@@ -359,7 +360,7 @@ static void strparse(void);
 static void strreset(void);
 
 static int tattrset(int);
-static void tprinter(char *s, size_t len);
+static void tprinter(char *, size_t);
 static void tdumpsel(void);
 static void tdumpline(int);
 static void tdump(void);
@@ -370,7 +371,7 @@ static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
-static void tmoveato(int x, int y);
+static void tmoveato(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
@@ -379,7 +380,7 @@ static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
-static void tsetattr(int*, int);
+static void tsetattr(int *, int);
 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
@@ -412,9 +413,9 @@ static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
-static void xsetsel(char*);
+static void xsetsel(char *);
 static void xtermclear(int, int, int, int);
-static void xunloadfont(Font *f);
+static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xresize(int, int);
 
@@ -452,7 +453,7 @@ static size_t utf8validate(long *, size_t);
 static ssize_t xwrite(int, char *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
-static char *xstrdup(char *s);
+static char *xstrdup(char *);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
@@ -548,12 +549,10 @@ xrealloc(void *p, size_t len) {
 
 char *
 xstrdup(char *s) {
-       char *p = strdup(s);
-
-       if (!p)
+       if((s = strdup(s)) == NULL)
                die("Out of memory\n");
 
-       return p;
+       return s;
 }
 
 size_t
@@ -1399,15 +1398,13 @@ tscrolldown(int orig, int n) {
 
        LIMIT(n, 0, term.bot-orig+1);
 
+       tsetdirt(orig, term.bot-n);
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
-
-               term.dirty[i] = 1;
-               term.dirty[i-n] = 1;
        }
 
        selscroll(orig, n);
@@ -1417,17 +1414,16 @@ void
 tscrollup(int orig, int n) {
        int i;
        Line temp;
+
        LIMIT(n, 0, term.bot-orig+1);
 
        tclearregion(0, orig, term.col-1, orig+n-1);
+       tsetdirt(orig+n, term.bot);
 
        for(i = orig; i <= term.bot-n; i++) {
-                temp = term.line[i];
-                term.line[i] = term.line[i+n];
-                term.line[i+n] = temp;
-
-                term.dirty[i] = 1;
-                term.dirty[i+n] = 1;
+               temp = term.line[i];
+               term.line[i] = term.line[i+n];
+               term.line[i+n] = temp;
        }
 
        selscroll(orig, -n);
@@ -1543,8 +1539,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
         * The table is proudly stolen from rxvt.
         */
        if(attr->mode & ATTR_GFX) {
-               if(c[0] >= 0x41 && c[0] <= 0x7e
-                               && vt100_0[c[0] - 0x41]) {
+               if(BETWEEN(c[0], 0x41, 0x7e) && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
@@ -1591,54 +1586,46 @@ tclearregion(int x1, int y1, int x2, int y2) {
 
 void
 tdeletechar(int n) {
-       int src = term.c.x + n;
-       int dst = term.c.x;
-       int size = term.col - src;
+       int dst, src, size;
+       Glyph *line;
 
-       term.dirty[term.c.y] = 1;
+       LIMIT(n, 0, term.col - term.c.x);
 
-       if(src >= term.col) {
-               tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-               return;
-       }
+       dst = term.c.x;
+       src = term.c.x + n;
+       size = term.col - src;
+       line = term.line[term.c.y];
 
-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
-                       size * sizeof(Glyph));
+       memmove(&line[dst], &line[src], size * sizeof(Glyph));
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {
-       int src = term.c.x;
-       int dst = src + n;
-       int size = term.col - dst;
+       int dst, src, size;
+       Glyph *line;
 
-       term.dirty[term.c.y] = 1;
+       LIMIT(n, 0, term.col - term.c.x);
 
-       if(dst >= term.col) {
-               tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-               return;
-       }
+       dst = term.c.x + n;
+       src = term.c.x;
+       size = term.col - dst;
+       line = term.line[term.c.y];
 
-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
-                       size * sizeof(Glyph));
+       memmove(&line[dst], &line[src], size * sizeof(Glyph));
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
 tinsertblankline(int n) {
-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
-
-       tscrolldown(term.c.y, n);
+       if(BETWEEN(term.c.y, term.top, term.bot))
+               tscrolldown(term.c.y, n);
 }
 
 void
 tdeleteline(int n) {
-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
-
-       tscrollup(term.c.y, n);
+       if(BETWEEN(term.c.y, term.top, term.bot))
+               tscrollup(term.c.y, n);
 }
 
 int32_t
@@ -1784,8 +1771,6 @@ tsetscroll(int t, int b) {
        term.bot = b;
 }
 
-#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-
 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
@@ -2261,8 +2246,7 @@ printsel(const Arg *arg) {
 }
 
 void
-tdumpsel(void)
-{
+tdumpsel(void) {
        char *ptr;
 
        if((ptr = getsel())) {
@@ -2317,9 +2301,9 @@ techo(char *buf, int len) {
        for(; len > 0; buf++, len--) {
                char c = *buf;
 
-               if(c < '\x20') { /* control code */
+               if(c < 0x20 || c == 0177) { /* control code */
                        if(c != '\n' && c != '\r' && c != '\t') {
-                               c |= '\x40';
+                               c ^= '\x40';
                                tputc("^", 1);
                        }
                        tputc(&c, 1);
@@ -2352,10 +2336,9 @@ tdeftran(char ascii) {
 
 void
 tselcs(void) {
-       if (term.trantbl[term.charset] == CS_GRAPHIC0)
-               term.c.attr.mode |= ATTR_GFX;
-       else
-               term.c.attr.mode &= ~ATTR_GFX;
+       MODBIT(term.c.attr.mode,
+              term.trantbl[term.charset] == CS_GRAPHIC0,
+              ATTR_GFX);
 }
 
 void
@@ -3083,7 +3066,7 @@ xinit(void) {
 
        xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
-                       PropModeReplace, (unsigned char *)&thispid, 1);
+                       PropModeReplace, (uchar *)&thispid, 1);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
@@ -3817,7 +3800,7 @@ run(void) {
 
 void
 usage(void) {
-       die("%s " VERSION " (c) 2010-2013 st engineers\n" \
+       die("%s " VERSION " (c) 2010-2014 st engineers\n" \
        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
        " [-t title] [-w windowid] [-e command ...]\n", argv0);
 }