Implement Xdbe-based double-buffering

[st.git] / st.c

diff --git a/st.c b/st.c
index baea2bc..0e82eaf 100644 (file)
--- a/st.c
+++ b/st.c
@@ -24,6 +24,7 @@
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
+#include <X11/extensions/Xdbe.h>
 
 #if   defined(__linux)
  #include <pty.h>
@@ -178,7 +179,7 @@ typedef struct {
        Display* dpy;
        Colormap cmap;
        Window win;
-       Pixmap buf;
+       XdbeBackBuffer buf;
        Atom xembed;
        XIM xim;
        XIC xic;
@@ -259,6 +260,7 @@ static void tsetattr(int*, int);
 static void tsetchar(char*);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
+static void tsetdirt(int, int);
 static void tfulldirt(void);
 
 static void ttynew(void);
@@ -269,7 +271,7 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
-static void xcopy(int, int, int, int);
+static void xcopy();
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
@@ -446,8 +448,8 @@ utf8size(char *s) {
 
 void
 selinit(void) {
-       sel.tclick1.tv_sec = 0;
-       sel.tclick1.tv_usec = 0;
+       memset(&sel.tclick1, 0, sizeof(sel.tclick1));
+       memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.bx = -1;
        sel.clip = NULL;
@@ -520,8 +522,7 @@ bpress(XEvent *e) {
                mousereport(e);
        else if(e->xbutton.button == Button1) {
                if(sel.bx != -1)
-                       for(int i=sel.b.y; i<=sel.e.y; i++)
-                               term.dirty[i] = 1;
+                       tsetdirt(sel.b.y, sel.e.y);
                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);
@@ -531,21 +532,28 @@ bpress(XEvent *e) {
 void
 selcopy(void) {
        char *str, *ptr;
-       int x, y, sz, sl, ls = 0;
+       int x, y, bufsize, is_selected = 0;
 
        if(sel.bx == -1)
                str = NULL;
+
        else {
-               sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
-               ptr = str = malloc(sz);
+               bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+               ptr = str = malloc(bufsize);
+
+               /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
-                       for(x = 0; x < term.col; x++)
-                               if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {
-                                       sl = utf8size(term.line[y][x].c);
-                                       memcpy(ptr, term.line[y][x].c, sl);
-                                       ptr += sl;
+                       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;
                                }
-                       if(ls && y < sel.e.y)
+                       }
+
+                       /* \n at the end of every selected line except for the last one */
+                       if(is_selected && y < sel.e.y)
                                *ptr++ = '\n';
                }
                *ptr = 0;
@@ -687,8 +695,7 @@ bmotion(XEvent *e) {
                if(oldey != sel.ey || oldex != sel.ex) {
                        int starty = MIN(oldey, sel.ey);
                        int endy = MAX(oldey, sel.ey);
-                       for(int i = starty; i <= endy; i++)
-                               term.dirty[i] = 1;
+                       tsetdirt(starty, endy);
                        draw();
                }
        }
@@ -709,7 +716,7 @@ execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 
-       DEFAULT(envshell, "sh");
+       DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
        execvp(args[0], args);
@@ -813,13 +820,23 @@ ttyresize(int x, int y) {
 }
 
 void
-tfulldirt(void)
+tsetdirt(int top, int bot)
 {
        int i;
-       for(i = 0; i < term.row; i++)
+
+       LIMIT(top, 0, term.row-1);
+       LIMIT(bot, 0, term.row-1);
+
+       for(i = top; i <= bot; i++)
                term.dirty[i] = 1;
 }
 
+void
+tfulldirt(void)
+{
+       tsetdirt(0, term.row-1);
+}
+
 void
 tcursor(int mode) {
        static TCursor c;
@@ -1604,32 +1621,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
-       Pixmap newbuf;
-       int oldw, oldh;
-
-       oldw = xw.bufw;
-       oldh = xw.bufh;
        xw.bufw = MAX(1, col * xw.cw);
        xw.bufh = MAX(1, row * xw.ch);
-       newbuf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
-       XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
-       XFreePixmap(xw.dpy, xw.buf);
-       XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);
-       if(xw.bufw > oldw)
-               XFillRectangle(xw.dpy, newbuf, dc.gc, oldw, 0,
-                               xw.bufw-oldw, MIN(xw.bufh, oldh));
-       else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
-               XClearArea(xw.dpy, xw.win, BORDER+xw.bufw, BORDER,
-                               xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
-                               False);
-       if(xw.bufh > oldh)
-               XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh,
-                               xw.bufw, xw.bufh-oldh);
-       else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
-               XClearArea(xw.dpy, xw.win, BORDER, BORDER+xw.bufh,
-                               xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
-                               False);
-       xw.buf = newbuf;
 }
 
 void
@@ -1785,7 +1778,7 @@ xinit(void) {
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
                        &attrs);
-       xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
+       xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
 
 
        /* input methods */
@@ -1855,10 +1848,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
 /* copy buffer pixmap to screen pixmap */
 void
-xcopy(int x, int y, int cols, int rows) {
-       int src_x = x*xw.cw, src_y = y*xw.ch, src_w = cols*xw.cw, src_h = rows*xw.ch;
-       int dst_x = BORDER+src_x, dst_y = BORDER+src_y;
-       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, src_x, src_y, src_w, src_h, dst_x, dst_y);
+xcopy() {
+        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
+        XdbeSwapBuffers(xw.dpy, swpinfo, 1);
+
 }
 
 void
@@ -1902,6 +1895,7 @@ xdrawcursor(void) {
 void
 draw() {
        drawregion(0, 0, term.col, term.row);
+       xcopy();
        gettimeofday(&xw.lastdraw, NULL);
 }
 
@@ -1943,7 +1937,6 @@ drawregion(int x1, int y1, int x2, int y2) {
                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);
-               xcopy(0, y, term.col, 1);
        }
        xdrawcursor();
 }
@@ -1952,13 +1945,10 @@ void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
        if(xw.state & WIN_REDRAW) {
-               if(!e->count) {
+               if(!e->count)
                        xw.state &= ~WIN_REDRAW;
-                       xcopy(0, 0, term.col, term.row);
-               }
-       } else
-               XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
-                               e->width, e->height, e->x, e->y);
+        }
+        xcopy();
 }
 
 void