use typedef'd unsigned type and regular bool type.

[st.git] / st.c

diff --git a/st.c b/st.c
index 397f6a6..35f6f16 100644 (file)
--- a/st.c
+++ b/st.c
@@ -48,7 +48,7 @@
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   256
 #define STR_ARG_SIZ   16
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   256
 #define STR_ARG_SIZ   16

-#define DRAW_BUF_SIZ  1024
+#define DRAW_BUF_SIZ  20*1024

 #define UTF_SIZ       4
 #define XK_NO_MOD     UINT_MAX
 #define XK_ANY_MOD    0
 #define UTF_SIZ       4
 #define XK_NO_MOD     UINT_MAX
 #define XK_ANY_MOD    0


@@ -196,8 +196,9 @@ typedef struct {
        XIM xim;
        XIC xic;
        int scr;
        XIM xim;
        XIC xic;
        int scr;

-       Bool isfixed; /* is fixed geometry? */
+       bool isfixed; /* is fixed geometry? */

        int fx, fy, fw, fh; /* fixed geometry */
        int fx, fy, fw, fh; /* fixed geometry */

+       int tw, th; /* tty width and height */

        int w;  /* window width */
        int h;  /* window height */
        int ch; /* char height */
        int w;  /* window width */
        int h;  /* window height */
        int ch; /* char height */


@@ -324,6 +325,7 @@ static int isfullutf8(char *, int);
 
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);

+static void *xcalloc(size_t nmemb, size_t size);

 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,


@@ -362,14 +364,22 @@ void *
 xmalloc(size_t len) {
        void *p = malloc(len);
        if(!p)
 xmalloc(size_t len) {
        void *p = malloc(len);
        if(!p)

-               die("Out of memory");
+               die("Out of memory\n");

        return p;
 }
 
 void *
 xrealloc(void *p, size_t len) {
        if((p = realloc(p, len)) == NULL)
        return p;
 }
 
 void *
 xrealloc(void *p, size_t len) {
        if((p = realloc(p, len)) == NULL)

-               die("Out of memory");
+               die("Out of memory\n");
+       return p;
+}
+
+void *
+xcalloc(size_t nmemb, size_t size) {
+       void *p = calloc(nmemb, size);
+       if(!p)
+               die("Out of memory\n");

        return p;
 }
 
        return p;
 }
 


@@ -561,8 +571,11 @@ bpress(XEvent *e) {
        if(IS_SET(MODE_MOUSE))
                mousereport(e);
        else if(e->xbutton.button == Button1) {
        if(IS_SET(MODE_MOUSE))
                mousereport(e);
        else if(e->xbutton.button == Button1) {

-               if(sel.bx != -1)
+               if(sel.bx != -1) {
+                       sel.bx = -1;

                        tsetdirt(sel.b.y, sel.e.y);
                        tsetdirt(sel.b.y, sel.e.y);

+                       draw();
+               }

                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);
                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);


@@ -584,14 +597,17 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
                        for(x = 0; x < term.col; x++) {
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
                        for(x = 0; x < term.col; x++) {

-                               is_selected = selected(x, y);
-                               if((term.line[y][x].state & GLYPH_SET) && is_selected) {
-                                       int size = utf8size(term.line[y][x].c);
-                                       memcpy(ptr, term.line[y][x].c, size);
-                                       ptr += size;
-                               }
+                               int size;
+                               char *p;
+                               Glyph *gp = &term.line[y][x];
+
+                               if(!(is_selected = selected(x, y)))
+                                       continue;
+                               p = (gp->state & GLYPH_SET) ? gp->c : " ";
+                               size = utf8size(p);
+                               memcpy(ptr, p, size);
+                               ptr += size;

                        }
                        }

-

                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)
                                *ptr++ = '\n';
                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)
                                *ptr++ = '\n';


@@ -879,8 +895,8 @@ ttyresize(int x, int y) {
 
        w.ws_row = term.row;
        w.ws_col = term.col;
 
        w.ws_row = term.row;
        w.ws_col = term.col;

-       w.ws_xpixel = xw.w;
-       w.ws_ypixel = xw.h;
+       w.ws_xpixel = xw.tw;
+       w.ws_ypixel = xw.th;

        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }


@@ -915,7 +931,7 @@ tcursor(int mode) {
 
 void
 treset(void) {
 
 void
 treset(void) {

-       unsigned i;
+       uint i;

        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,
        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,


@@ -1578,7 +1594,7 @@ strreset(void) {
 
 void
 tputtab(bool forward) {
 
 void
 tputtab(bool forward) {

-       unsigned x = term.c.x;
+       uint x = term.c.x;

 
        if(forward) {
                if(x == term.col)
 
        if(forward) {
                if(x == term.col)


@@ -1798,8 +1814,8 @@ tresize(int col, int row) {
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
                term.dirty[i] = 1;
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
                term.dirty[i] = 1;

-               term.line[i] = calloc(col, sizeof(Glyph));
-               term.alt [i] = calloc(col, sizeof(Glyph));
+               term.line[i] = xcalloc(col, sizeof(Glyph));
+               term.alt [i] = xcalloc(col, sizeof(Glyph));

        }
        if(col > term.col) {
                bool *bp = term.tabs + term.col;
        }
        if(col > term.col) {
                bool *bp = term.tabs + term.col;


@@ -1822,8 +1838,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
 
 void
 xresize(int col, int row) {

-       xw.w = MAX(1, 2*BORDER + col * xw.cw);
-       xw.h = MAX(1, 2*BORDER + row * xw.ch);
+       xw.tw = MAX(1, 2*BORDER + col * xw.cw);
+       xw.th = MAX(1, 2*BORDER + row * xw.ch);

 }
 
 void
 }
 
 void


@@ -2127,6 +2143,8 @@ xresettitle(void) {
 void
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
 void
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};

+
+       xclear(0, 0, xw.w, xw.h);

        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */
        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */


@@ -2316,8 +2334,9 @@ resize(XEvent *e) {
        row = (xw.h - 2*BORDER) / xw.ch;
        if(col == term.col && row == term.row)
                return;
        row = (xw.h - 2*BORDER) / xw.ch;
        if(col == term.col && row == term.row)
                return;

-       if(tresize(col, row))
-               draw();
+
+       xclear(0, 0, xw.w, xw.h);
+       tresize(col, row);

        xresize(col, row);
        ttyresize(col, row);
 }
        xresize(col, row);
        ttyresize(col, row);
 }


@@ -2326,20 +2345,38 @@ void
 run(void) {
        XEvent ev;
        fd_set rfd;
 run(void) {
        XEvent ev;
        fd_set rfd;

-       int xfd = XConnectionNumber(xw.dpy);
+       int xfd = XConnectionNumber(xw.dpy), i;
+       struct timeval drawtimeout, *tv = NULL;

 
 

-       for(;;) {
+       for(i = 0;; i++) {

                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);

-               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {

                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                }
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                }

-               if(FD_ISSET(cmdfd, &rfd))
+
+               /*
+                * Stop after a certain number of reads so the user does not
+                * feel like the system is stuttering.
+                */
+               if(i < 1000 && FD_ISSET(cmdfd, &rfd)) {

                        ttyread();
 
                        ttyread();
 

+                       /*
+                        * Just wait a bit so it isn't disturbing the
+                        * user and the system is able to write something.
+                        */
+                       drawtimeout.tv_sec = 0;
+                       drawtimeout.tv_usec = 5;
+                       tv = &drawtimeout;
+                       continue;
+               }
+               i = 0;
+               tv = NULL;
+

                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
                        if(XFilterEvent(&ev, xw.win))
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
                        if(XFilterEvent(&ev, xw.win))


@@ -2356,7 +2393,7 @@ run(void) {
 int
 main(int argc, char *argv[]) {
        int i, bitm, xr, yr;
 int
 main(int argc, char *argv[]) {
        int i, bitm, xr, yr;

-       unsigned int wr, hr;
+       uint wr, hr;

 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;
        xw.isfixed = False;
 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;
        xw.isfixed = False;