aclindsa/st
1
0
Fork 0
Code Releases Activity

Implement Xdbe-based double-buffering

Browse Source
This commit is contained in:
Brandon Invergo
2012-07-28 14:27:26 +02:00
parent 8fdba7494f
commit 94771d0588
2 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.mk
View File

@@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib
# includes and libs # includes and libs
INCS = -I. -I/usr/include -I${X11INC} INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext
# flags # flags
CPPFLAGS = -DVERSION=\"${VERSION}\" CPPFLAGS = -DVERSION=\"${VERSION}\"

50
st.c
View File

@@ -24,6 +24,7 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/Xdbe.h>
#if defined(__linux) #if defined(__linux)
#include <pty.h> #include <pty.h>
@@ -178,7 +179,7 @@ typedef struct {
Display* dpy; Display* dpy;
Colormap cmap; Colormap cmap;
Window win; Window win;
Pixmap buf; XdbeBackBuffer buf;
Atom xembed; Atom xembed;
XIM xim; XIM xim;
XIC xic; XIC xic;
@@ -270,7 +271,7 @@ static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int); static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void); static void xhints(void);
static void xclear(int, int, int, int); static void xclear(int, int, int, int);
static void xcopy(int, int, int, int); static void xcopy();
static void xdrawcursor(void); static void xdrawcursor(void);
static void xinit(void); static void xinit(void);
static void xloadcols(void); static void xloadcols(void);
@@ -1620,32 +1621,8 @@ tresize(int col, int row) {
void void
xresize(int col, int row) { xresize(int col, int row) {
Pixmap newbuf;
int oldw, oldh;
oldw = xw.bufw;
oldh = xw.bufh;
xw.bufw = MAX(1, col * xw.cw); xw.bufw = MAX(1, col * xw.cw);
xw.bufh = MAX(1, row * xw.ch); 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 void
@@ -1801,7 +1778,7 @@ xinit(void) {
CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
| CWColormap, | CWColormap,
&attrs); &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 */ /* input methods */
@@ -1871,10 +1848,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
/* copy buffer pixmap to screen pixmap */ /* copy buffer pixmap to screen pixmap */
void void
xcopy(int x, int y, int cols, int rows) { xcopy() {
int src_x = x*xw.cw, src_y = y*xw.ch, src_w = cols*xw.cw, src_h = rows*xw.ch; XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
int dst_x = BORDER+src_x, dst_y = BORDER+src_y; XdbeSwapBuffers(xw.dpy, swpinfo, 1);
XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, src_x, src_y, src_w, src_h, dst_x, dst_y);
} }
void void
@@ -1918,6 +1895,7 @@ xdrawcursor(void) {
void void
draw() { draw() {
drawregion(0, 0, term.col, term.row); drawregion(0, 0, term.col, term.row);
xcopy();
gettimeofday(&xw.lastdraw, NULL); gettimeofday(&xw.lastdraw, NULL);
} }
@@ -1959,7 +1937,6 @@ drawregion(int x1, int y1, int x2, int y2) {
} }
if(ib > 0) if(ib > 0)
xdraws(buf, base, ox, y, ic, ib); xdraws(buf, base, ox, y, ic, ib);
xcopy(0, y, term.col, 1);
} }
xdrawcursor(); xdrawcursor();
} }
@@ -1968,13 +1945,10 @@ void
expose(XEvent *ev) { expose(XEvent *ev) {
XExposeEvent *e = &ev->xexpose; XExposeEvent *e = &ev->xexpose;
if(xw.state & WIN_REDRAW) { if(xw.state & WIN_REDRAW) {
if(!e->count) { if(!e->count)
xw.state &= ~WIN_REDRAW; xw.state &= ~WIN_REDRAW;
xcopy(0, 0, term.col, term.row); }
} xcopy();
} else
XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
e->width, e->height, e->x, e->y);
} }
void void