/* See LICENSE for licence details. */
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <locale.h>
#include <stdarg.h>
#include <stdio.h>
/* Arbitrary sizes */
#define ESCSIZ 256
#define ESCARG 16
+#define MAXDRAWBUF 1024
#define SERRNO strerror(errno)
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
+#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
enum { ATnone=0 , ATreverse=1 , ATunderline=2, ATbold=4 };
typedef int Color;
typedef struct {
- KeySym k;
- char s[ESCSIZ];
-} Key;
-
-typedef struct {
char c; /* character code */
char mode; /* attribute flags */
Color fg; /* foreground */
int cw; /* char width */
} XWindow;
+typedef struct {
+ KeySym k;
+ char s[ESCSIZ];
+} Key;
+
#include "config.h"
/* Drawing Context */
GC gc;
} DC;
-void die(const char *errstr, ...);
-void draw(int);
-void execsh(void);
-void sigchld(int);
-char* kmap(KeySym);
-void kpress(XKeyEvent *);
-void resize(XEvent *);
-void run(void);
-
-int escaddc(char);
-int escfinal(char);
-void escdump(void);
-void eschandle(void);
-void escparse(void);
-void escreset(void);
-
-void tclearregion(int, int, int, int);
-void tcpos(int);
-void tcursor(int);
-void tdeletechar(int);
-void tdeleteline(int);
-void tdump(void);
-void tinsertblank(int);
-void tinsertblankline(int);
-void tmoveto(int, int);
-void tnew(int, int);
-void tnewline(void);
-void tputc(char);
-void tputs(char*, int);
-void tresize(int, int);
-void tscroll(void);
-void tsetattr(int*, int);
-void tsetchar(char);
-void tsetscroll(int, int);
-
-void ttynew(void);
-void ttyread(void);
-void ttyresize(int, int);
-void ttywrite(char *, size_t);
-
-unsigned long xgetcol(const char *);
-void xclear(int, int, int, int);
-void xcursor(int);
-void xdrawc(int, int, Glyph);
-void xinit(void);
-void xscroll(void);
+static void die(const char *errstr, ...);
+static void draw(int);
+static void execsh(void);
+static void sigchld(int);
+static void run(void);
+
+static int escaddc(char);
+static int escfinal(char);
+static void escdump(void);
+static void eschandle(void);
+static void escparse(void);
+static void escreset(void);
+
+static void tclearregion(int, int, int, int);
+static void tcpos(int);
+static void tcursor(int);
+static void tdeletechar(int);
+static void tdeleteline(int);
+static void tinsertblank(int);
+static void tinsertblankline(int);
+static void tmoveto(int, int);
+static void tnew(int, int);
+static void tnewline(void);
+static void tputc(char);
+static void tputs(char*, int);
+static void tresize(int, int);
+static void tscroll(void);
+static void tsetattr(int*, int);
+static void tsetchar(char);
+static void tsetscroll(int, int);
+
+static void ttynew(void);
+static void ttyread(void);
+static void ttyresize(int, int);
+static void ttywrite(const char *, size_t);
+
+static unsigned long xgetcol(const char *);
+static void xclear(int, int, int, int);
+static void xcursor(int);
+static void xdrawc(int, int, Glyph);
+static void xinit(void);
+static void xscroll(void);
+
+static void expose(XEvent *);
+static char * kmap(KeySym);
+static void kpress(XEvent *);
+static void resize(XEvent *);
+
+static void (*handler[LASTEvent])(XEvent *) = {
+ [KeyPress] = kpress,
+ [Expose] = expose,
+ [ConfigureNotify] = resize
+};
/* Globals */
-DC dc;
-XWindow xw;
-Term term;
-Escseq escseq;
-int cmdfd;
-pid_t pid;
-int running;
+static DC dc;
+static XWindow xw;
+static Term term;
+static Escseq escseq;
+static int cmdfd;
+static pid_t pid;
+static int running;
+
+#ifdef DEBUG
+void
+tdump(void) {
+ int row, col;
+ Glyph c;
+
+ for(row = 0; row < term.row; row++) {
+ for(col = 0; col < term.col; col++) {
+ if(col == term.c.x && row == term.c.y)
+ putchar('#');
+ else {
+ c = term.line[row][col];
+ putchar(c.state & CRset ? c.c : '.');
+ }
+ }
+ putchar('\n');
+ }
+}
+#endif
void
die(const char *errstr, ...) {
}
void
-ttywrite(char *s, size_t n) {
+ttywrite(const char *s, size_t n) {
if(write(cmdfd, s, n) == -1)
die("write error on tty: %s\n", SERRNO);
}
}
void
-tdump(void) {
- int row, col;
- Glyph c;
-
- for(row = 0; row < term.row; row++) {
- for(col = 0; col < term.col; col++) {
- if(col == term.c.x && row == term.c.y)
- putchar('#');
- else {
- c = term.line[row][col];
- putchar(c.state & CRset ? c.c : '.');
- }
- }
- putchar('\n');
- }
-}
-
-void
tresize(int col, int row) {
int i;
Line *line;
}
void
+xdraws (char *s, Glyph base, int x, int y, int len) {
+ unsigned long xfg, xbg;
+ int winx = x*xw.cw, winy = y*xw.ch + dc.font->ascent, width = len*xw.cw;
+ if(base.mode & ATreverse)
+ xfg = dc.col[base.bg], xbg = dc.col[base.fg];
+ else
+ xfg = dc.col[base.fg], xbg = dc.col[base.bg];
+
+ XSetBackground(xw.dis, dc.gc, xbg);
+ XSetForeground(xw.dis, dc.gc, xfg);
+ XDrawImageString(xw.dis, xw.win, dc.gc, winx, winy, s, len);
+
+ if(base.mode & ATunderline)
+ XDrawLine(xw.dis, xw.win, dc.gc, winx, winy+1, winx+width-1, winy+1);
+}
+
+void
xdrawc(int x, int y, Glyph g) {
XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
unsigned long xfg, xbg;
else
xfg = dc.col[g.fg], xbg = dc.col[g.bg];
/* background */
- XSetForeground(xw.dis, dc.gc, xbg);
- XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
- /* string */
+ XSetBackground(xw.dis, dc.gc, xbg);
XSetForeground(xw.dis, dc.gc, xfg);
- XDrawString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &(g.c), 1);
- if(g.mode & ATbold) /* XXX: bold hack (draw again at x+1) */
- XDrawString(xw.dis, xw.win, dc.gc, r.x+1, r.y+dc.font->ascent, &(g.c), 1);
- /* underline */
- if(g.mode & ATunderline) {
- r.y += dc.font->ascent + 1;
- XDrawLine(xw.dis, xw.win, dc.gc, r.x, r.y, r.x+r.width-1, r.y);
- }
+ XDrawImageString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
}
void
void
draw(int redraw_all) {
- int x, y;
- int changed, set;
-
- if(redraw_all)
- XClearWindow(xw.dis, xw.win);
-
- /* XXX: drawing could be optimised */
+ int i, x, y, ox;
+ Glyph base, new;
+ char buf[MAXDRAWBUF];
+
for(y = 0; y < term.row; y++) {
+ base = term.line[y][0];
+ i = ox = 0;
for(x = 0; x < term.col; x++) {
- changed = term.line[y][x].state & CRupdate;
- set = term.line[y][x].state & CRset;
- if(redraw_all || changed) {
- term.line[y][x].state &= ~CRupdate;
- if(set)
- xdrawc(x, y, term.line[y][x]);
- else
- xclear(x, y, x, y);
+ new = term.line[y][x];
+ if(!ATTRCMP(base, new) && i < MAXDRAWBUF)
+ buf[i++] = new.c;
+ else {
+ xdraws(buf, base, ox, y, i);
+ buf[0] = new.c;
+ i = 1;
+ ox = x;
+ base = new;
}
}
+ xdraws(buf, base, ox, y, i);
}
xcursor(CSdraw);
}
-char*
+void
+expose(XEvent *ev) {
+ draw(SCredraw);
+}
+
+char *
kmap(KeySym k) {
int i;
for(i = 0; i < LEN(key); i++)
}
void
-kpress(XKeyEvent *e) {
+kpress(XEvent *ev) {
+ XKeyEvent *e = &ev->xkey;
KeySym ksym;
char buf[32];
+ char *customkey;
int len;
int meta;
int shift;
- char* skmap;
meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
- if(skmap = kmap(ksym))
- ttywrite(skmap, strlen(skmap));
+
+ if(customkey = kmap(ksym))
+ ttywrite(customkey, strlen(customkey));
else if(len > 0) {
buf[sizeof(buf)-1] = '\0';
if(meta && len == 1)
void
run(void) {
- int ret;
XEvent ev;
fd_set rfd;
int xfd = XConnectionNumber(xw.dis);
running = 1;
XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* fix resize bug in wmii (?) */
-
+
while(running) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- XFlush(xw.dis);
- ret = select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL);
-
- if(ret < 0)
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+ if(errno == EINTR)
+ continue;
die("select failed: %s\n", SERRNO);
-
- if(FD_ISSET(xfd, &rfd)) {
- while(XPending(xw.dis)) {
- XNextEvent(xw.dis, &ev);
- switch (ev.type) {
- default:
- break;
- case KeyPress:
- kpress(&ev.xkey);
- break;
- case Expose:
- draw(SCredraw);
- break;
- case ConfigureNotify:
- resize(&ev);
- break;
- }
- }
}
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
draw(SCupdate);
}
+ while(XPending(xw.dis)) {
+ XNextEvent(xw.dis, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev);
+ }
}
}
Got questions, comments, patches, etc.? Contact Jason Woofenden