fixed pixmap buffer drawing.

[st.git] / st.c

diff --git a/st.c b/st.c
index 9b77a0b..5f206fd 100644 (file)
--- a/st.c
+++ b/st.c
@@ -230,6 +230,7 @@ void
 xbell(void) {
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
        XFillRectangle(xw.dis, xw.win, dc.gc, BORDER, BORDER, xw.bufw, xw.bufh);
 xbell(void) {
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
        XFillRectangle(xw.dis, xw.win, dc.gc, BORDER, BORDER, xw.bufw, xw.bufh);

+       XFlush(xw.dis);

        usleep(BellTime);
        draw(SCREEN_REDRAW);
 }
        usleep(BellTime);
        draw(SCREEN_REDRAW);
 }


@@ -372,11 +373,11 @@ tscrollup (int n) {
        for(i = 0; i < n; i++)
                memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
        
        for(i = 0; i < n; i++)
                memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
        

-        for(i = term.top; i <= term.bot-n; i++) { 
+       for(i = term.top; i <= term.bot-n; i++) { 

                 temp = term.line[i];
                 term.line[i] = term.line[i+n]; 
                 term.line[i+n] = temp;
                 temp = term.line[i];
                 term.line[i] = term.line[i+n]; 
                 term.line[i+n] = temp;

-        }
+       }

 }
 
 void
 }
 
 void


@@ -1180,7 +1181,7 @@ draw(int redraw_all) {
        char buf[DRAW_BUF_SIZ];
        
        XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
        char buf[DRAW_BUF_SIZ];
        
        XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);

-       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);

        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;


@@ -1293,7 +1294,7 @@ run(void) {
                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) == -1) {
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {

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