X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=deb161055009db9f6fd2dccb94b535fa648d9ecf;hb=b3b7ffce5f1cb1d82aa26df976f0316d89d15d7f;hp=2318435a4dd7302482bc0e9ffcb5d585898b7588;hpb=86fa756033e9072a4b114a50896baff36b804ce4;p=st.git diff --git a/st.c b/st.c old mode 100644 new mode 100755 index 2318435..deb1610 --- a/st.c +++ b/st.c @@ -1,13 +1,200 @@ -/* See LICENSE for licence details. */ -#include "st.h" +/* See LICENSE for licence details. */ +#define _XOPEN_SOURCE 600 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TNAME "xterm" + +/* Arbitrary sizes */ +#define ESC_TITLE_SIZ 256 +#define ESC_BUF_SIZ 256 +#define ESC_ARG_SIZ 16 +#define DRAW_BUF_SIZ 1024 + +#define SERRNO strerror(errno) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) < (b) ? (b) : (a)) +#define LEN(a) (sizeof(a) / sizeof(a[0])) +#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 { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 }; +enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, CURSOR_SAVE, CURSOR_LOAD }; +enum { GLYPH_SET=1, GLYPH_DIRTY=2 }; +enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 }; +enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 }; +enum { SCREEN_UPDATE, SCREEN_REDRAW }; + +typedef struct { + char c; /* character code */ + char mode; /* attribute flags */ + int fg; /* foreground */ + int bg; /* background */ + char state; /* state flags */ +} Glyph; + +typedef Glyph* Line; + +typedef struct { + Glyph attr; /* current char attributes */ + int x; + int y; +} TCursor; + +/* CSI Escape sequence structs */ +/* ESC '[' [[ [] [;]] ] */ +typedef struct { + char buf[ESC_BUF_SIZ]; /* raw string */ + int len; /* raw string length */ + char priv; + int arg[ESC_ARG_SIZ]; + int narg; /* nb of args */ + char mode; +} CSIEscape; + +/* Internal representation of the screen */ +typedef struct { + int row; /* nb row */ + int col; /* nb col */ + Line* line; /* screen */ + TCursor c; /* cursor */ + char hidec; + int top; /* top scroll limit */ + int bot; /* bottom scroll limit */ + int mode; /* terminal mode flags */ + int esc; /* escape state flags */ + char title[ESC_TITLE_SIZ]; + int titlelen; +} Term; + +/* Purely graphic info */ +typedef struct { + Display* dis; + Window win; + Pixmap buf; + int scr; + int w; /* window width */ + int h; /* window height */ + int ch; /* char height */ + int cw; /* char width */ +} XWindow; + +typedef struct { + KeySym k; + char s[ESC_BUF_SIZ]; +} Key; + +#include "config.h" + +/* Drawing Context */ +typedef struct { + unsigned long col[LEN(colorname)]; + XFontStruct* font; + XFontStruct* bfont; + GC gc; +} DC; + +static void die(const char *errstr, ...); +static void draw(int); +static void execsh(void); +static void sigchld(int); +static void run(void); + +static void csidump(void); +static void csihandle(void); +static void csiparse(void); +static void csireset(void); + +static void tclearregion(int, int, int, int); +static void tcursor(int); +static void tmovecursor(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 treset(void); +static void tresize(int, int); +static void tscroll(void); +static void tscrollup(int); +static void tscrolldown(int); +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 xinit(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; -int running; +static DC dc; +static XWindow xw; +static Term term; +static CSIEscape 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 & GLYPH_SET ? c.c : '.'); + } + } + putchar('\n'); + } +} +#endif void die(const char *errstr, ...) { @@ -27,35 +214,44 @@ execsh(void) { } void -xbell(void) { /* visual bell */ - XRectangle r = { 0, 0, xw.w, xw.h }; +xbell(void) { /* visual bell */ + XRectangle r = { BORDER, BORDER, xw.w, xw.h }; XSetForeground(xw.dis, dc.gc, dc.col[BellCol]); XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1); - XFlush(xw.dis); - usleep(30000); - draw(SCredraw); + /* usleep(30000); */ + draw(SCREEN_REDRAW); +} + +void +sigchld(int a) { + int stat = 0; + if(waitpid(pid, &stat, 0) < 0) + die("Waiting for pid %hd failed: %s\n", pid, SERRNO); + if(WIFEXITED(stat)) + exit(WEXITSTATUS(stat)); + else + exit(EXIT_FAILURE); } void ttynew(void) { int m, s; - pid_t pid; char *pts; if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0) - die("openpt"); - if(grantpt(m) == -1) - die("grandpt"); - if(unlockpt(m) == -1) - die("unlockpt"); - if((pts = ptsname(m)) == NULL) - die("ptsname"); + die("openpt failed: %s\n", SERRNO); + if(grantpt(m) < 0) + die("grandpt failed: %s\n", SERRNO); + if(unlockpt(m) < 0) + die("unlockpt failed: %s\n", SERRNO); + if(!(pts = ptsname(m))) + die("ptsname failed: %s\n", SERRNO); if((s = open(pts, O_RDWR | O_NOCTTY)) < 0) - die("slave open"); + die("Couldn't open slave: %s\n", SERRNO); fcntl(s, F_SETFL, O_NDELAY); switch(pid = fork()) { case -1: - die("fork"); + die("fork failed\n"); break; case 0: setsid(); /* create a new process group */ @@ -63,19 +259,20 @@ ttynew(void) { dup2(s, STDOUT_FILENO); dup2(s, STDERR_FILENO); if(ioctl(s, TIOCSCTTY, NULL) < 0) - die("slave TTIOCSTTY"); + die("ioctl TTIOCSTTY failed: %s\n", SERRNO); execsh(); break; default: close(s); cmdfd = m; + signal(SIGCHLD, sigchld); } } void dump(char c) { static int col; - fprintf(stderr, " %02x %c ", c, isprint(c)?c:'.'); + fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.'); if(++col % 10 == 0) fprintf(stderr, "\n"); } @@ -85,20 +282,16 @@ ttyread(void) { char buf[BUFSIZ] = {0}; int ret; - switch(ret = read(cmdfd, buf, BUFSIZ)) { - case -1: /* error or exit */ - /* XXX: be more precise */ - running = 0; - break; - default: + if((ret = read(cmdfd, buf, BUFSIZ)) < 0) + die("Couldn't read from shell: %s\n", SERRNO); + else tputs(buf, ret); - } } 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."); + die("write error on tty: %s\n", SERRNO); } void @@ -109,36 +302,29 @@ ttyresize(int x, int y) { w.ws_col = term.col; w.ws_xpixel = w.ws_ypixel = 0; if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0) - fprintf(stderr, "Couldn't set window size: %m\n"); + fprintf(stderr, "Couldn't set window size: %s\n", SERRNO); } -int -escfinal(char c) { - if(escseq.len == 1) - switch(c) { - case '[': - case ']': - case '(': - return 0; - case '=': - case '>': - default: - return 1; - } - else if(BETWEEN(c, 0x40, 0x7E)) - return 1; - return 0; +void +tcursor(int mode) { + static TCursor c; + + if(mode == CURSOR_SAVE) + c = term.c; + else if(mode == CURSOR_LOAD) + term.c = c, tmoveto(c.x, c.y); } void -tcpos(int mode) { - static int x = 0; - static int y = 0; - - if(mode == CSsave) - x = term.c.x, y = term.c.y; - else if(mode == CSload) - tmoveto(x, y); +treset(void) { + term.c.attr.mode = ATTR_NULL; + term.c.attr.fg = DefaultFG; + term.c.attr.bg = DefaultBG; + term.c.x = term.c.y = 0; + term.hidec = 0; + term.top = 0, term.bot = term.row - 1; + term.mode = MODE_WRAP; + tclearregion(0, 0, term.col-1, term.row-1); } void @@ -146,19 +332,20 @@ tnew(int col, int row) { /* screen size */ term.row = row, term.col = col; term.top = 0, term.bot = term.row - 1; /* mode */ - term.mode = TMwrap; + term.mode = MODE_WRAP; /* cursor */ - term.c.attr.mode = ATnone; + term.c.attr.mode = ATTR_NULL; term.c.attr.fg = DefaultFG; term.c.attr.bg = DefaultBG; term.c.x = term.c.y = 0; - term.c.hidden = 0; + term.hidec = 0; /* allocate screen */ term.line = calloc(term.row, sizeof(Line)); for(row = 0 ; row < term.row; row++) term.line[row] = calloc(term.col, sizeof(Glyph)); } +/* TODO: Replace with scrollup/scolldown */ void tscroll(void) { Line temp = term.line[term.top]; @@ -168,57 +355,70 @@ tscroll(void) { term.line[i] = term.line[i+1]; memset(temp, 0, sizeof(Glyph) * term.col); term.line[term.bot] = temp; - xscroll(); +} + +void +tscrolldown (int n) { + int i; + Line temp; + + LIMIT(n, 0, term.bot-term.top+1); + + for(i = 0; i < n; i++) + memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph)); + + for(i = term.bot; i >= term.top+n; i--) { + temp = term.line[i]; + term.line[i] = term.line[i-n]; + term.line[i-n] = temp; + } +} + +void +tscrollup (int n) { + int i; + Line temp; + LIMIT(n, 0, term.bot-term.top+1); + + 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++) { + temp = term.line[i]; + term.line[i] = term.line[i+n]; + term.line[i+n] = temp; + } } void tnewline(void) { int y = term.c.y + 1; - - if(y > term.bot) { + if(y > term.bot) tscroll(), y = term.bot; - } tmoveto(0, y); } -int -escaddc(char c) { - escseq.buf[escseq.len++] = c; - if(escfinal(c) || escseq.len >= ESCSIZ) { - escparse(), eschandle(); - return 0; - } - return 1; -} - void -escparse(void) { +csiparse(void) { /* int noarg = 1; */ char *p = escseq.buf; escseq.narg = 0; - switch(escseq.pre = *p++) { - case '[': /* CSI */ - if(*p == '?') - escseq.priv = 1, p++; - - while(p < escseq.buf+escseq.len) { - while(isdigit(*p)) { - escseq.arg[escseq.narg] *= 10; - escseq.arg[escseq.narg] += *(p++) - '0'/*, noarg = 0 */; - } - if(*p == ';') - escseq.narg++, p++; - else { - escseq.mode = *p; - escseq.narg++; - return; - } + if(*p == '?') + escseq.priv = 1, p++; + + while(p < escseq.buf+escseq.len) { + while(isdigit(*p)) { + escseq.arg[escseq.narg] *= 10; + escseq.arg[escseq.narg] += *p++ - '0'/*, noarg = 0 */; + } + if(*p == ';' && escseq.narg+1 < ESC_ARG_SIZ) + escseq.narg++, p++; + else { + escseq.mode = *p; + escseq.narg++; + return; } - break; - case '(': - /* XXX: graphic character set */ - break; } } @@ -229,27 +429,27 @@ tmoveto(int x, int y) { } void -tcursor(int dir) { +tmovecursor(int dir) { int xf = term.c.x, yf = term.c.y; - + switch(dir) { - case CSup: + case CURSOR_UP: yf--; break; - case CSdown: + case CURSOR_DOWN: yf++; break; - case CSleft: + case CURSOR_LEFT: xf--; - if(xf < 0) { + if(term.mode & MODE_WRAP && xf < 0) { xf = term.col-1, yf--; if(yf < term.top) yf = term.top, xf = 0; } break; - case CSright: + case CURSOR_RIGHT: xf++; - if(xf >= term.col) { + if(term.mode & MODE_WRAP && xf >= term.col) { xf = 0, yf++; if(yf > term.bot) yf = term.bot, tscroll(); @@ -258,29 +458,30 @@ tcursor(int dir) { } tmoveto(xf, yf); } - + void tsetchar(char c) { term.line[term.c.y][term.c.x] = term.c.attr; term.line[term.c.y][term.c.x].c = c; - term.line[term.c.y][term.c.x].state |= CRset | CRupdate; + term.line[term.c.y][term.c.x].state |= GLYPH_SET; } void tclearregion(int x1, int y1, int x2, int y2) { - int x, y; + int y, temp; + + if(x1 > x2) + temp = x1, x1 = x2, x2 = temp; + if(y1 > y2) + temp = y1, y1 = y2, y2 = temp; LIMIT(x1, 0, term.col-1); LIMIT(x2, 0, term.col-1); LIMIT(y1, 0, term.row-1); LIMIT(y2, 0, term.row-1); - /* XXX: could be optimized */ - for(x = x1; x <= x2; x++) - for(y = y1; y <= y2; y++) - memset(&term.line[y][x], 0, sizeof(Glyph)); - - xclear(x1, y1, x2, y2); + for(y = y1; y <= y2; y++) + memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1)); } void @@ -312,7 +513,7 @@ tinsertblank(int n) { } void -tinsertblankline (int n) { +tinsertblankline(int n) { int i; Line blank; int bot = term.bot; @@ -335,7 +536,6 @@ tinsertblankline (int n) { } } - void tdeleteline(int n) { int i; @@ -364,63 +564,47 @@ void tsetattr(int *attr, int l) { int i; -#ifdef TRUECOLOR /* ESC [ ? ; ; ; m */ - Color col; - if(escseq.priv && escseq.len == 4) { /* True color extension :) */ - col = (escseq.arg[1]<<16) + (escseq.arg[2]<<8) + escseq.arg[3]; - switch(escseq.arg[0]) { - case 3: /* foreground */ - term.c.attr.fg = col; + for(i = 0; i < l; i++) { + switch(attr[i]) { + case 0: + term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD); + term.c.attr.fg = DefaultFG; + term.c.attr.bg = DefaultBG; + break; + case 1: + term.c.attr.mode |= ATTR_BOLD; + break; + case 4: + term.c.attr.mode |= ATTR_UNDERLINE; + break; + case 7: + term.c.attr.mode |= ATTR_REVERSE; + break; + case 22: + term.c.attr.mode &= ~ATTR_BOLD; + break; + case 24: + term.c.attr.mode &= ~ATTR_UNDERLINE; + break; + case 27: + term.c.attr.mode &= ~ATTR_REVERSE; + break; + case 39: + term.c.attr.fg = DefaultFG; + break; + case 49: + term.c.attr.fg = DefaultBG; break; - case 4: /* background */ - term.c.attr.bg = col; + default: + if(BETWEEN(attr[i], 30, 37)) + term.c.attr.fg = attr[i] - 30; + else if(BETWEEN(attr[i], 40, 47)) + term.c.attr.bg = attr[i] - 40; + else + fprintf(stderr, "erresc: gfx attr %d unkown\n", attr[i]); break; } } - else -#endif - for(i = 0; i < l; i++) { - switch(attr[i]) { - case 0: - memset(&term.c.attr, 0, sizeof(term.c.attr)); - term.c.attr.fg = DefaultFG; - term.c.attr.bg = DefaultBG; - break; - case 1: - term.c.attr.mode |= ATbold; - break; - case 4: - term.c.attr.mode |= ATunderline; - break; - case 7: - term.c.attr.mode |= ATreverse; - break; - case 8: - term.c.hidden = CShide; - break; - case 22: - term.c.attr.mode &= ~ATbold; - break; - case 24: - term.c.attr.mode &= ~ATunderline; - break; - case 27: - term.c.attr.mode &= ~ATreverse; - break; - case 39: - term.c.attr.fg = DefaultFG; - break; - case 49: - term.c.attr.fg = DefaultBG; - break; - default: - if(BETWEEN(attr[i], 30, 37)) - term.c.attr.fg = attr[i] - 30; - else if(BETWEEN(attr[i], 40, 47)) - term.c.attr.bg = attr[i] - 40; - break; - } - } } void @@ -435,162 +619,334 @@ tsetscroll(int t, int b) { b = temp; } term.top = t; - term.bot = b; + term.bot = b; } - void -eschandle(void) { - /* escdump(); */ - switch(escseq.pre) { - case '[': - switch(escseq.mode) { - case '@': /* Insert blank char */ - DEFAULT(escseq.arg[0], 1); - tinsertblank(escseq.arg[0]); - break; - case 'A': /* Cursor Up */ - case 'e': - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x, term.c.y-escseq.arg[0]); - break; - case 'B': /* Cursor Down */ - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x, term.c.y+escseq.arg[0]); - break; - case 'C': /* Cursor Forward */ - case 'a': - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x+escseq.arg[0], term.c.y); +csihandle(void) { + switch(escseq.mode) { + default: + unknown: + printf("erresc: unknown csi "); + csidump(); + /* die(""); */ + break; + case '@': /* ICH -- Insert blank char */ + DEFAULT(escseq.arg[0], 1); + tinsertblank(escseq.arg[0]); + break; + case 'A': /* CUU -- Cursor Up */ + case 'e': + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x, term.c.y-escseq.arg[0]); + break; + case 'B': /* CUD -- Cursor Down */ + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x, term.c.y+escseq.arg[0]); + break; + case 'C': /* CUF -- Cursor Forward */ + case 'a': + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x+escseq.arg[0], term.c.y); + break; + case 'D': /* CUB -- Cursor Backward */ + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x-escseq.arg[0], term.c.y); + break; + case 'E': /* CNL -- Cursor Down and first col */ + DEFAULT(escseq.arg[0], 1); + tmoveto(0, term.c.y+escseq.arg[0]); + break; + case 'F': /* CPL -- Cursor Up and first col */ + DEFAULT(escseq.arg[0], 1); + tmoveto(0, term.c.y-escseq.arg[0]); + break; + case 'G': /* CHA -- Move to */ + case '`': /* XXX: HPA -- same? */ + DEFAULT(escseq.arg[0], 1); + tmoveto(escseq.arg[0]-1, term.c.y); + break; + case 'H': /* CUP -- Move to */ + case 'f': /* XXX: HVP -- same? */ + DEFAULT(escseq.arg[0], 1); + DEFAULT(escseq.arg[1], 1); + tmoveto(escseq.arg[1]-1, escseq.arg[0]-1); + break; + /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation tab stops */ + case 'J': /* ED -- Clear screen */ + switch(escseq.arg[0]) { + case 0: /* below */ + tclearregion(term.c.x, term.c.y, term.col-1, term.row-1); break; - case 'D': /* Cursor Backward */ - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x-escseq.arg[0], term.c.y); + case 1: /* above */ + tclearregion(0, 0, term.c.x, term.c.y); break; - case 'E': /* Cursor Down and first col */ - DEFAULT(escseq.arg[0], 1); - tmoveto(0, term.c.y+escseq.arg[0]); + case 2: /* all */ + tclearregion(0, 0, term.col-1, term.row-1); break; - case 'F': /* Cursor Up and first col */ - DEFAULT(escseq.arg[0], 1); - tmoveto(0, term.c.y-escseq.arg[0]); + case 3: /* XXX: erase saved lines (xterm) */ + default: + goto unknown; + } + break; + case 'K': /* EL -- Clear line */ + switch(escseq.arg[0]) { + case 0: /* right */ + tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); break; - case 'G': /* Move to */ - case '`': - DEFAULT(escseq.arg[0], 1); - tmoveto(escseq.arg[0]-1, term.c.y); + case 1: /* left */ + tclearregion(0, term.c.y, term.c.x, term.c.y); break; - case 'H': /* Move to */ - case 'f': - DEFAULT(escseq.arg[0], 1); - DEFAULT(escseq.arg[1], 1); - tmoveto(escseq.arg[1]-1, escseq.arg[0]-1); + case 2: /* all */ + tclearregion(0, term.c.y, term.col-1, term.c.y); break; - case 'J': /* Clear screen */ + } + break; + case 'S': /* SU -- Scroll line up */ + DEFAULT(escseq.arg[0], 1); + tscrollup(escseq.arg[0]); + break; + case 'T': /* SD -- Scroll line down */ + DEFAULT(escseq.arg[0], 1); + tscrolldown(escseq.arg[0]); + break; + case 'L': /* IL -- Insert blank lines */ + DEFAULT(escseq.arg[0], 1); + tinsertblankline(escseq.arg[0]); + break; + case 'l': /* RM -- Reset Mode */ + if(escseq.priv) { switch(escseq.arg[0]) { - case 0: /* below */ - tclearregion(term.c.x, term.c.y, term.col-1, term.row-1); + case 1: + term.mode &= ~MODE_APPKEYPAD; + break; + case 7: + term.mode &= ~MODE_WRAP; + break; + case 12: /* att610 -- Stop blinking cursor (IGNORED) */ break; - case 1: /* above */ - tclearregion(0, 0, term.c.x, term.c.y); + case 25: + term.hidec = 1; break; - case 2: /* all */ + case 1048: /* XXX: no alt. screen to erase/save */ + case 1049: + tcursor(CURSOR_LOAD); tclearregion(0, 0, term.col-1, term.row-1); - break; + break; + default: + goto unknown; } - break; - case 'K': /* Clear line */ + } else { + switch(escseq.arg[0]) { + case 4: + term.mode &= ~MODE_INSERT; + break; + default: + goto unknown; + } + } + break; + case 'M': /* DL -- Delete lines */ + DEFAULT(escseq.arg[0], 1); + tdeleteline(escseq.arg[0]); + break; + case 'X': /* ECH -- Erase char */ + DEFAULT(escseq.arg[0], 1); + tclearregion(term.c.x, term.c.y, term.c.x + escseq.arg[0], term.c.y); + break; + case 'P': /* DCH -- Delete char */ + DEFAULT(escseq.arg[0], 1); + tdeletechar(escseq.arg[0]); + break; + /* XXX: (CSI n Z) CBT -- Cursor Backward Tabulation tab stops */ + case 'd': /* VPA -- Move to */ + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x, escseq.arg[0]-1); + break; + case 'h': /* SM -- Set terminal mode */ + if(escseq.priv) { switch(escseq.arg[0]) { - case 0: /* right */ - tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); + case 1: + term.mode |= MODE_APPKEYPAD; break; - case 1: /* left */ - tclearregion(0, term.c.y, term.c.x, term.c.y); + case 7: + term.mode |= MODE_WRAP; break; - case 2: /* all */ - tclearregion(0, term.c.y, term.col-1, term.c.y); + case 12: /* att610 -- Start blinking cursor (IGNORED) */ break; + case 25: + term.hidec = 0; + break; + case 1048: + case 1049: /* XXX: no alt. screen to erase/save */ + tcursor(CURSOR_SAVE); + tclearregion(0, 0, term.col-1, term.row-1); + break; + default: goto unknown; } - break; - case 'L': /* Insert blank lines */ - DEFAULT(escseq.arg[0], 1); - tinsertblankline(escseq.arg[0]); - break; - case 'M': /* Delete lines */ - DEFAULT(escseq.arg[0], 1); - tdeleteline(escseq.arg[0]); - break; - case 'P': /* Delete char */ - DEFAULT(escseq.arg[0], 1); - tdeletechar(escseq.arg[0]); - break; - case 'd': /* Move to */ - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x, escseq.arg[0]-1); - break; - case 'h': /* Set terminal mode */ - break; - case 'm': /* Terminal attribute (color) */ - tsetattr(escseq.arg, escseq.narg); - break; - case 'r': - if(escseq.priv) - ; - else { - DEFAULT(escseq.arg[0], 1); - DEFAULT(escseq.arg[1], term.row); - tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1); + } else { + switch(escseq.arg[0]) { + case 4: + term.mode |= MODE_INSERT; + break; + default: goto unknown; } - break; - case 's': /* Save cursor position */ - tcpos(CSsave); - break; - case 'u': /* Load cursor position */ - tcpos(CSload); - break; + }; + break; + case 'm': /* SGR -- Terminal attribute (color) */ + tsetattr(escseq.arg, escseq.narg); + break; + case 'r': /* DECSTBM -- Set Scrolling Region */ + if(escseq.priv) + goto unknown; + else { + DEFAULT(escseq.arg[0], 1); + DEFAULT(escseq.arg[1], term.row); + tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1); } break; + case 's': /* DECSC -- Save cursor position (ANSI.SYS) */ + tcursor(CURSOR_SAVE); + break; + case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */ + tcursor(CURSOR_LOAD); + break; } } void -escdump(void) { +csidump(void) { int i; - puts("------"); - printf("rawbuf : %s\n", escseq.buf); - printf("prechar : %c\n", escseq.pre); - printf("private : %c\n", escseq.priv ? '?' : ' '); - printf("narg : %d\n", escseq.narg); - if(escseq.narg) { + printf("ESC [ %s", escseq.priv ? "? " : ""); + if(escseq.narg) for(i = 0; i < escseq.narg; i++) - printf("\targ %d = %d\n", i, escseq.arg[i]); - } - printf("mode : %c\n", escseq.mode); + printf("%d ", escseq.arg[i]); + if(escseq.mode) + putchar(escseq.mode); + putchar('\n'); } void -escreset(void) { +csireset(void) { memset(&escseq, 0, sizeof(escseq)); } void +tputtab(void) { + int space = TAB - term.c.x % TAB; + + if(term.c.x + space >= term.col) + space--; + + for(; space > 0; space--) + tmovecursor(CURSOR_RIGHT); +} + +void tputc(char c) { - static int inesc = 0; - - dump(c); - /* start of escseq */ - if(c == '\033') - escreset(), inesc = 1; - else if(inesc) { - inesc = escaddc(c); - } /* normal char */ - else switch(c) { - default: - tsetchar(c); - tcursor(CSright); + /* dump(c); */ + if(term.esc & ESC_START) { + if(term.esc & ESC_CSI) { + escseq.buf[escseq.len++] = c; + if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) { + term.esc = 0; + csiparse(), csihandle(); + } + } else if(term.esc & ESC_OSC) { + if(c == ';') { + term.titlelen = 0; + term.esc = ESC_START | ESC_TITLE; + } + } else if(term.esc & ESC_TITLE) { + if(c == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) { + term.esc = 0; + term.title[term.titlelen] = '\0'; + XStoreName(xw.dis, xw.win, term.title); + } else { + term.title[term.titlelen++] = c; + } + } else if(term.esc & ESC_ALTCHARSET) { + switch(c) { + case '0': /* Line drawing crap */ + term.c.attr.mode |= ATTR_GFX; + break; + case 'B': /* Back to regular text */ + term.c.attr.mode &= ~ATTR_GFX; + break; + default: + printf("esc unhandled charset: ESC ( %c\n", c); + } + term.esc = 0; + } else { + switch(c) { + case '[': + term.esc |= ESC_CSI; + break; + case ']': + term.esc |= ESC_OSC; + break; + case '(': + term.esc |= ESC_ALTCHARSET; + break; + case 'A': + tmoveto(term.c.x, term.c.y-1); + term.esc = 0; + break; + case 'B': + tmoveto(term.c.x, term.c.y+1); + term.esc = 0; + break; + case 'C': + tmoveto(term.c.x+1, term.c.y); + term.esc = 0; + break; + case 'D': /* XXX: CUP (VT100) or IND (VT52) ... */ + tmoveto(term.c.x-1, term.c.y); + term.esc = 0; + break; + case 'E': /* NEL -- Next line */ + tnewline(); + term.esc = 0; + break; + case 'M': /* RI -- Reverse index */ + if(term.c.y == term.top) + tscrolldown(1); + else + tmoveto(term.c.x, term.c.y-1); + term.esc = 0; + break; + case 'c': /* RIS -- Reset to inital state */ + treset(); + term.esc = 0; + break; + case '=': /* DECPAM */ + term.mode |= MODE_APPKEYPAD; + term.esc = 0; + break; + case '>': /* DECPNM */ + term.mode &= ~MODE_APPKEYPAD; + term.esc = 0; + break; + case '7': + tcursor(CURSOR_SAVE); + term.esc = 0; + break; + case '8': + tcursor(CURSOR_LOAD); + term.esc = 0; + break; + default: + fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.'); + term.esc = 0; + } + } + } else { + switch(c) { + case '\t': + tputtab(); break; case '\b': - tcursor(CSleft); + tmovecursor(CURSOR_LEFT); break; case '\r': tmoveto(0, term.c.y); @@ -601,6 +957,15 @@ tputc(char c) { case '\a': xbell(); break; + case '\033': + csireset(); + term.esc = ESC_START; + break; + default: + tsetchar(c); + tmovecursor(CURSOR_RIGHT); + break; + } } } @@ -611,24 +976,6 @@ tputs(char *s, int len) { } 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; @@ -637,19 +984,23 @@ tresize(int col, int row) { if(col < 1 || row < 1) return; + /* alloc */ line = calloc(row, sizeof(Line)); for(i = 0 ; i < row; i++) line[i] = calloc(col, sizeof(Glyph)); - for(i = 0 ; i < minrow; i++) { + /* copy */ + for(i = 0 ; i < minrow; i++) memcpy(line[i], term.line[i], mincol * sizeof(Glyph)); + /* free */ + for(i = 0; i < term.row; i++) free(term.line[i]); - } free(term.line); + LIMIT(term.c.x, 0, col-1); LIMIT(term.c.y, 0, row-1); LIMIT(term.top, 0, row-1); LIMIT(term.bot, 0, row-1); - // if(term.bot == term.row-1) + term.bot = row-1; term.line = line; term.col = col, term.row = row; @@ -667,34 +1018,16 @@ xgetcol(const char *s) { return color.pixel; } - void xclear(int x1, int y1, int x2, int y2) { - XClearArea(xw.dis, xw.win, - x1 * xw.cw, y1 * xw.ch, - (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch, - False); + XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]); + XFillRectangle(xw.dis, xw.buf, dc.gc, + x1 * xw.cw, y1 * xw.ch, + (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); } - -void -xscroll(void) { - int srcy = (term.top+1) * xw.ch; - int dsty = term.top * xw.ch; - int height = (term.bot-term.top) * xw.ch; - - xcursor(CShide); - XCopyArea(xw.dis, xw.win, xw.win, dc.gc, 0, srcy, xw.w, height, 0, dsty); - xclear(0, term.bot, term.col-1, term.bot); -} - - - - void xinit(void) { - XGCValues values; - unsigned long valuemask; XClassHint chint; XWMHints wmhint; XSizeHints shint; @@ -703,15 +1036,16 @@ xinit(void) { xw.dis = XOpenDisplay(NULL); xw.scr = XDefaultScreen(xw.dis); - if(!xw.dis) - die("can not open display"); - + if(!xw.dis) + die("Can't open display\n"); + /* font */ - if(!(dc.font = XLoadQueryFont(xw.dis, FONT))) - die("can not find font " FONT); + if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT))) + die("Can't load font %s\n", dc.font ? BOLDFONT : FONT); + /* XXX: Assuming same size for bold font */ xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing; - xw.ch = dc.font->ascent + dc.font->descent + LINESPACE; + xw.ch = dc.font->ascent + dc.font->descent; /* colors */ for(i = 0; i < LEN(colorname); i++) @@ -719,139 +1053,190 @@ xinit(void) { term.c.attr.fg = DefaultFG; term.c.attr.bg = DefaultBG; - term.c.attr.mode = ATnone; + term.c.attr.mode = ATTR_NULL; /* windows */ - xw.h = term.row * xw.ch; + xw.h = term.row * xw.ch; xw.w = term.col * xw.cw; - /* XXX: this BORDER is useless after the first resize, handle it in xdraws() */ xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0, - xw.w, xw.h, BORDER, + xw.w + 2*BORDER, xw.h + 2*BORDER, 0, dc.col[DefaultBG], dc.col[DefaultBG]); + xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr)); /* gc */ - values.foreground = XWhitePixel(xw.dis, xw.scr); - values.font = dc.font->fid; - valuemask = GCForeground | GCFont; - dc.gc = XCreateGC(xw.dis, xw.win, valuemask, &values); + dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL); XMapWindow(xw.dis, xw.win); /* wm stuff */ chint.res_name = TNAME, chint.res_class = TNAME; wmhint.input = 1, wmhint.flags = InputHint; shint.height_inc = xw.ch, shint.width_inc = xw.cw; - shint.height = xw.h, shint.width = xw.w; + shint.height = xw.h + 2*BORDER, shint.width = xw.w + 2*BORDER; shint.flags = PSize | PResizeInc; XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint); XStoreName(xw.dis, xw.win, TNAME); + XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h); XSync(xw.dis, 0); - + } void -xdrawc(int x, int y, Glyph g) { - XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch }; +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; + int i; - /* reverse video */ - if(g.mode & ATreverse) - xfg = dc.col[g.bg], xbg = dc.col[g.fg]; + if(base.mode & ATTR_REVERSE) + xfg = dc.col[base.bg], xbg = dc.col[base.fg]; 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 */ + xfg = dc.col[base.fg], xbg = dc.col[base.bg]; + + 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); - } + + if(base.mode & ATTR_GFX) + for(i = 0; i < len; i++) + s[i] = gfx[s[i]]; + + XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid); + XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len); + + if(base.mode & ATTR_UNDERLINE) + XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1); } void xcursor(int mode) { static int oldx = 0; static int oldy = 0; - Glyph g = {' ', ATnone, DefaultBG, DefaultCS, 0}; - - if(term.line[term.c.y][term.c.x].state & CRset) + Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0}; + + LIMIT(oldx, 0, term.col-1); + LIMIT(oldy, 0, term.row-1); + + if(term.line[term.c.y][term.c.x].state & GLYPH_SET) g.c = term.line[term.c.y][term.c.x].c; + /* remove the old cursor */ - if(term.line[oldy][oldx].state & CRset) - xdrawc(oldx, oldy, term.line[oldy][oldx]); - else xclear(oldx, oldy, oldx, oldy); /* XXX: maybe a bug */ - if(mode == CSdraw && !term.c.hidden) { - xdrawc(term.c.x, term.c.y, g); + if(term.line[oldy][oldx].state & GLYPH_SET) + xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1); + else + xclear(oldx, oldy, oldx, oldy); + + /* draw the new one */ + if(mode == CURSOR_DRAW) { + xdraws(&g.c, g, term.c.x, term.c.y, 1); oldx = term.c.x, oldy = term.c.y; } } +#ifdef DEBUG +/* basic drawing routines */ void -draw(int redraw_all) { +xdrawc(int x, int y, Glyph g) { + XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch }; + XSetBackground(xw.dis, dc.gc, dc.col[g.bg]); + XSetForeground(xw.dis, dc.gc, dc.col[g.fg]); + XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid); + XDrawImageString(xw.dis, xw.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1); +} + +void +draw_(int dummy) { int x, y; - int changed, set; - if(redraw_all) - XClearWindow(xw.dis, xw.win); - /* XXX: drawing could be optimised */ + xclear(0, 0, term.col-1, term.row-1); + for(y = 0; y < term.row; y++) + for(x = 0; x < term.col; x++) + if(term.line[y][x].state & GLYPH_SET) + xdrawc(x, y, term.line[y][x]); + + if(!term.hidec) + xcursor(CURSOR_DRAW); + XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER); + XFlush(xw.dis); +} +#endif + +void +draw(int redraw_all) { + int i, x, y, ox; + Glyph base, new; + char buf[DRAW_BUF_SIZ]; + 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((changed && set) || (redraw_all && set)) { - term.line[y][x].state &= ~CRupdate; - xdrawc(x, y, term.line[y][x]); + new = term.line[y][x]; + if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ) + 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); + xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW); + XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER); + XFlush(xw.dis); } void -kpress(XKeyEvent *e) { +expose(XEvent *ev) { + draw(SCREEN_REDRAW); +} + +char* +kmap(KeySym k) { + int i; + for(i = 0; i < LEN(key); i++) + if(key[i].k == k) + return (char*)key[i].s; + return NULL; +} + +void +kpress(XEvent *ev) { + XKeyEvent *e = &ev->xkey; KeySym ksym; char buf[32]; + char *customkey; int len; int meta; int shift; - meta = e->state & Mod4Mask; + meta = e->state & Mod1Mask; shift = e->state & ShiftMask; len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); - if(len > 0) { + + if(customkey = kmap(ksym)) + ttywrite(customkey, strlen(customkey)); + else if(len > 0) { buf[sizeof(buf)-1] = '\0'; if(meta && len == 1) ttywrite("\033", 1); ttywrite(buf, len); - return; - } - switch(ksym) { -#ifdef DEBUG1 - default: - printf("errkey: %d\n", (int)ksym); - break; -#endif - case XK_Up: - case XK_Down: - case XK_Left: - case XK_Right: - sprintf(buf, "\033[%c", "DACB"[ksym - XK_Left]); - ttywrite(buf, 3); - break; - case XK_Delete: ttywrite(KEYDELETE, sizeof(KEYDELETE)-1); break; - case XK_Home: ttywrite( KEYHOME, sizeof( KEYHOME)-1); break; - case XK_End: ttywrite( KEYEND, sizeof( KEYEND)-1); break; - case XK_Prior: ttywrite( KEYPREV, sizeof( KEYPREV)-1); break; - case XK_Next: ttywrite( KEYNEXT, sizeof( KEYNEXT)-1); break; - case XK_Insert: - /* XXX: paste X clipboard */ - if(shift); - break; - } + } else + switch(ksym) { + case XK_Up: + case XK_Down: + case XK_Left: + case XK_Right: + sprintf(buf, "\033%c%c", term.mode & MODE_APPKEYPAD ? 'O' : '[', "DACB"[ksym - XK_Left]); + ttywrite(buf, 3); + break; + case XK_Insert: + if(shift) + draw(1), puts("draw!")/* XXX: paste X clipboard */; + break; + default: + fprintf(stderr, "errkey: %d\n", (int)ksym); + break; + } } void @@ -859,56 +1244,45 @@ resize(XEvent *e) { int col, row; col = e->xconfigure.width / xw.cw; row = e->xconfigure.height / xw.ch; - - if(term.col != col && term.row != row) { + + if(term.col != col || term.row != row) { tresize(col, row); ttyresize(col, row); xw.w = e->xconfigure.width; xw.h = e->xconfigure.height; - draw(SCredraw); + XFreePixmap(xw.dis, xw.buf); + xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr)); + draw(SCREEN_REDRAW); } } - void run(void) { - int ret; XEvent ev; fd_set rfd; - struct timeval tv = {0, 10000}; + int xfd = XConnectionNumber(xw.dis); running = 1; XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask); - XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* seems to fix the resize bug in wmii */ + XResizeWindow(xw.dis, xw.win, xw.w+2*BORDER, xw.h+2*BORDER); /* fix resize bug in wmii (?) */ + while(running) { - 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; - } - } FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); - ret = select(cmdfd+1, &rfd, NULL, NULL, &tv); - if(ret < 0) { - fprintf(stderr, "select: %m\n"); - running = 0; + FD_SET(xfd, &rfd); + if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) { + if(errno == EINTR) + continue; + die("select failed: %s\n", SERRNO); } - if(!ret) - continue; if(FD_ISSET(cmdfd, &rfd)) { ttyread(); - draw(SCupdate); + draw(SCREEN_UPDATE); + } + while(XPending(xw.dis)) { + XNextEvent(xw.dis, &ev); + if(handler[ev.type]) + (handler[ev.type])(&ev); } } } @@ -920,9 +1294,9 @@ main(int argc, char *argv[]) { else if(argc != 1) die("usage: st [-v]\n"); setlocale(LC_CTYPE, ""); - tnew(80, 24); - ttynew(); - xinit(); - run(); + tnew(80, 24); + ttynew(); + xinit(); + run(); return 0; }