#endif
#define USAGE \
- "st " VERSION " (c) 2010-2012 st engineers\n" \
+ "st " VERSION " (c) 2010-2013 st engineers\n" \
"usage: st [-v] [-c class] [-f font] [-g geometry] [-o file]" \
" [-t title] [-w windowid] [-e command ...]\n"
uchar state; /* state flags */
} Glyph;
-typedef Glyph* Line;
+typedef Glyph *Line;
typedef struct {
Glyph attr; /* current char attributes */
Display *dpy;
Colourmap cmap;
Window win;
- XdbeBackBuffer buf;
+ Drawable buf;
Atom xembed, wmdeletewin;
XIM xim;
XIC xic;
bool isfixed; /* is 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 w, h; /* window width and height */
int ch; /* char height */
int cw; /* char width */
char state; /* focus, redraw, visible */
typedef struct {
Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
Font font, bfont, ifont, ibfont;
+ GC gc;
} DC;
static void die(const char *, ...);
static void draw(void);
-static void redraw(void);
+static void redraw(int);
static void drawregion(int, int, int, int);
static void execsh(void);
static void sigchld(int);
static void strparse(void);
static void strreset(void);
-static void tclearregion(int, int, int, int);
+static void tclearregion(int, int, int, int, int);
static void tcursor(int);
static void tdeletechar(int);
static void tdeleteline(int);
static char *opt_class = NULL;
static char *opt_font = NULL;
+bool usedbe = False;
+
static char *usedfont = NULL;
static int usedfontsize = 0;
term.bot = term.row - 1;
term.mode = MODE_WRAP;
- tclearregion(0, 0, term.col-1, term.row-1);
+ tclearregion(0, 0, term.col-1, term.row-1, 0);
tmoveto(0, 0);
tcursor(CURSOR_SAVE);
}
LIMIT(n, 0, term.bot-orig+1);
- tclearregion(0, term.bot-n+1, term.col-1, term.bot);
+ tclearregion(0, term.bot-n+1, term.col-1, term.bot, 0);
for(i = term.bot; i >= orig+n; i--) {
temp = term.line[i];
Line temp;
LIMIT(n, 0, term.bot-orig+1);
- tclearregion(0, orig, term.col-1, orig+n-1);
+ tclearregion(0, orig, term.col-1, orig+n-1, 0);
for(i = orig; i <= term.bot-n; i++) {
temp = term.line[i];
}
void
-tclearregion(int x1, int y1, int x2, int y2) {
+tclearregion(int x1, int y1, int x2, int y2, int bce) {
int x, y, temp;
if(x1 > x2)
for(y = y1; y <= y2; y++) {
term.dirty[y] = 1;
- for(x = x1; x <= x2; x++)
- term.line[y][x].state = 0;
+ for(x = x1; x <= x2; x++) {
+ if(bce) {
+ term.line[y][x] = term.c.attr;
+ memcpy(term.line[y][x].c, " ", 2);
+ term.line[y][x].state |= GLYPH_SET;
+ } else {
+ term.line[y][x].state = 0;
+ }
+ }
}
}
term.dirty[term.c.y] = 1;
if(src >= term.col) {
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 0);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
size * sizeof(Glyph));
- tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
+ tclearregion(term.col-n, term.c.y, term.col-1, term.c.y, 0);
}
void
term.dirty[term.c.y] = 1;
if(dst >= term.col) {
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 0);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
size * sizeof(Glyph));
- tclearregion(src, term.c.y, dst - 1, term.c.y);
+ tclearregion(src, term.c.y, dst - 1, term.c.y, 0);
}
void
mode = term.mode;
MODBIT(term.mode, set, MODE_REVERSE);
if(mode != term.mode)
- redraw();
+ redraw(REDRAW_TIMEOUT);
break;
case 6: /* DECOM -- Origin */
MODBIT(term.c.state, set, CURSOR_ORIGIN);
case 47:
case 1047: {
alt = IS_SET(MODE_ALTSCREEN);
- if(alt)
- tclearregion(0, 0, term.col-1, term.row-1);
+ if(alt) {
+ tclearregion(0, 0, term.col-1,
+ term.row-1, 0);
+ }
if(set ^ alt) /* set is always 1 or 0 */
tswapscreen();
if(*args != 1049)
sel.bx = -1;
switch(csiescseq.arg[0]) {
case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
- if(term.c.y < term.row-1)
- tclearregion(0, term.c.y+1, term.col-1, term.row-1);
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 1);
+ if(term.c.y < term.row-1) {
+ tclearregion(0, term.c.y+1, term.col-1,
+ term.row-1, 1);
+ }
break;
case 1: /* above */
if(term.c.y > 1)
- tclearregion(0, 0, term.col-1, term.c.y-1);
- tclearregion(0, term.c.y, term.c.x, term.c.y);
+ tclearregion(0, 0, term.col-1, term.c.y-1, 1);
+ tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
break;
case 2: /* all */
- tclearregion(0, 0, term.col-1, term.row-1);
+ tclearregion(0, 0, term.col-1, term.row-1, 1);
break;
default:
goto unknown;
case 'K': /* EL -- Clear line */
switch(csiescseq.arg[0]) {
case 0: /* right */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+ tclearregion(term.c.x, term.c.y, term.col-1,
+ term.c.y, 1);
break;
case 1: /* left */
- tclearregion(0, term.c.y, term.c.x, term.c.y);
+ tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
break;
case 2: /* all */
- tclearregion(0, term.c.y, term.col-1, term.c.y);
+ tclearregion(0, term.c.y, term.col-1, term.c.y, 1);
break;
}
break;
break;
case 'X': /* ECH -- Erase <n> char */
DEFAULT(csiescseq.arg[0], 1);
- tclearregion(term.c.x, term.c.y, term.c.x + csiescseq.arg[0], term.c.y);
+ tclearregion(term.c.x, term.c.y, term.c.x + csiescseq.arg[0],
+ term.c.y, 0);
break;
case 'P': /* DCH -- Delete <n> char */
DEFAULT(csiescseq.arg[0], 1);
term.esc = ESC_START;
return;
case '\016': /* SO */
- term.c.attr.mode |= ATTR_GFX;
- return;
case '\017': /* SI */
- term.c.attr.mode &= ~ATTR_GFX;
+ /*
+ * Different charsets are hard to handle. Applications
+ * should use the right alt charset escapes for the
+ * only reason they still exist: line drawing. The
+ * rest is incompatible history st should not support.
+ */
return;
case '\032': /* SUB */
case '\030': /* CAN */
xw.tw = MAX(1, col * xw.cw);
xw.th = MAX(1, row * xw.ch);
+ if(!usedbe) {
+ XFreePixmap(xw.dpy, xw.buf);
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+ DefaultDepth(xw.dpy, xw.scr));
+ XSetForeground(xw.dpy, dc.gc, 0);
+ XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+ }
+
XftDrawChange(xw.draw, xw.buf);
}
xunloadfonts();
xloadfonts(usedfont, usedfontsize + arg->i);
cresize(0, 0);
- draw();
+ redraw(0);
}
void
xw.fy = 0;
}
+ /* Events */
attrs.background_pixel = dc.col[defaultbg].pixel;
attrs.border_pixel = dc.col[defaultbg].pixel;
attrs.bit_gravity = NorthWestGravity;
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
attrs.colormap = xw.cmap;
- parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
+ parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
+ XRootWindow(xw.dpy, xw.scr);
xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
xw.vis,
&attrs);
/* double buffering */
- if(!XdbeQueryExtension(xw.dpy, &major, &minor))
- die("Xdbe extension is not present\n");
- xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeBackground);
+ /*
+ if(XdbeQueryExtension(xw.dpy, &major, &minor)) {
+ xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win,
+ XdbeBackground);
+ usedbe = True;
+ } else {
+ */
+ dc.gc = XCreateGC(xw.dpy, parent, 0, 0);
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+ DefaultDepth(xw.dpy, xw.scr));
+ XSetForeground(xw.dpy, dc.gc, 0);
+ XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+ //xw.buf = xw.win;
+ /*
+ }
+ */
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
}
void
-redraw(void) {
- struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+redraw(int timeout) {
+ struct timespec tv = {0, timeout * 1000};
tfulldirt();
draw();
- XSync(xw.dpy, False); /* necessary for a good tput flash */
- nanosleep(&tv, NULL);
+
+ if(timeout > 0) {
+ nanosleep(&tv, NULL);
+ XSync(xw.dpy, False); /* necessary for a good tput flash */
+ }
}
void
XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
drawregion(0, 0, term.col, term.row);
- XdbeSwapBuffers(xw.dpy, swpinfo, 1);
+ if(usedbe) {
+ XdbeSwapBuffers(xw.dpy, swpinfo, 1);
+ } else {
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
+ xw.h, 0, 0);
+ XSetForeground(xw.dpy, dc.gc, 0);
+ XSync(xw.dpy, False);
+ }
}
void
ox = x;
base = new;
}
+
sl = utf8size(new.c);
memcpy(buf+ib, new.c, sl);
ib += sl;
if(!e->count)
xw.state &= ~WIN_REDRAW;
}
+ redraw(0);
}
void