X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=623ca29cd71e56936bfc2c6f48fb769564dab178;hb=c56332857145d1c6741d4f6c1bbc87dcc6c6ab97;hp=ca5fb5dab34dbc2b5a4082ca7676f2316aff773e;hpb=e6b3f5c755349ba7a339dd43958870e4cceb57bf;p=st.git diff --git a/st.c b/st.c index ca5fb5d..623ca29 100644 --- a/st.c +++ b/st.c @@ -20,13 +20,11 @@ #include #include -#define TNAME "xterm" - /* Arbitrary sizes */ -#define TITLESIZ 256 -#define ESCSIZ 256 -#define ESCARGSIZ 16 -#define MAXDRAWBUF 1024 +#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)) @@ -36,30 +34,29 @@ #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) +#define IS_SET(flag) (term.mode & (flag)) /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */ -enum { ATnone=0 , ATreverse=1 , ATunderline=2, ATbold=4, ATgfx=8 }; -enum { CSup, CSdown, CSright, CSleft, CShide, CSdraw, CSsave, CSload }; -enum { CRset=1, CRupdate=2 }; -enum { TMwrap=1, TMinsert=2 }; -enum { ESCin=1, ESCcsi=2, ESCosc=4, ESCtitle=8, ESCcharset=16 }; -enum { SCupdate, SCredraw }; - -typedef int Color; +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 */ - Color fg; /* foreground */ - Color bg; /* background */ - char state; /* state flag */ + int fg; /* foreground */ + int bg; /* background */ + char state; /* state flags */ } Glyph; typedef Glyph* Line; typedef struct { - Glyph attr; /* current char attributes */ - char hidden; + Glyph attr; /* current char attributes */ int x; int y; } TCursor; @@ -67,25 +64,26 @@ typedef struct { /* CSI Escape sequence structs */ /* ESC '[' [[ [] [;]] ] */ typedef struct { - char buf[ESCSIZ]; /* raw string */ - int len; /* raw string length */ + char buf[ESC_BUF_SIZ]; /* raw string */ + int len; /* raw string length */ char priv; - int arg[ESCARGSIZ]; - int narg; /* nb of args */ + 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 */ + int row; /* nb row */ + int col; /* nb col */ Line* line; /* screen */ - TCursor c; /* cursor */ - int top; /* top scroll limit */ - int bot; /* bottom scroll limit */ - int mode; /* terminal mode */ - int esc; - char title[TITLESIZ]; + 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; @@ -93,27 +91,31 @@ typedef struct { typedef struct { Display* dis; Window win; + Pixmap buf; int scr; - int w; /* window width */ - int h; /* window height */ + int w; /* window width */ + int h; /* window height */ + int bufw; /* pixmap width */ + int bufh; /* pixmap height */ int ch; /* char height */ int cw; /* char width */ } XWindow; typedef struct { KeySym k; - char s[ESCSIZ]; + char s[ESC_BUF_SIZ]; } Key; -#include "config.h" - /* Drawing Context */ typedef struct { - unsigned long col[LEN(colorname)]; + unsigned long col[256]; XFontStruct* font; + XFontStruct* bfont; GC gc; } DC; +#include "config.h" + static void die(const char *errstr, ...); static void draw(int); static void execsh(void); @@ -126,7 +128,6 @@ static void csiparse(void); static void csireset(void); static void tclearregion(int, int, int, int); -static void tcpos(int); static void tcursor(int); static void tdeletechar(int); static void tdeleteline(int); @@ -135,10 +136,14 @@ static void tinsertblankline(int); static void tmoveto(int, int); static void tnew(int, int); static void tnewline(void); +static void tputtab(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); @@ -148,15 +153,16 @@ static void ttyread(void); static void ttyresize(int, int); static void ttywrite(const char *, size_t); -static unsigned long xgetcol(const char *); +static void xbell(void); +static void xdraws(char *, Glyph, int, int, int); +static void xhints(void); 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 xloadcols(void); static void expose(XEvent *); -static char * kmap(KeySym); +static char* kmap(KeySym); static void kpress(XEvent *); static void resize(XEvent *); @@ -187,7 +193,7 @@ tdump(void) { putchar('#'); else { c = term.line[row][col]; - putchar(c.state & CRset ? c.c : '.'); + putchar(c.state & GLYPH_SET ? c.c : '.'); } } putchar('\n'); @@ -207,18 +213,19 @@ die(const char *errstr, ...) { void execsh(void) { - char *args[3] = {SHELL, "-i", NULL}; + char *args[3] = {getenv("SHELL"), "-i", NULL}; + DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */ putenv("TERM=" TNAME); - execvp(SHELL, args); + execvp(args[0], args); } void xbell(void) { /* visual bell */ - XRectangle r = { 0, 0, xw.w, xw.h }; + XRectangle r = { BORDER, BORDER, xw.bufw, xw.bufh }; XSetForeground(xw.dis, dc.gc, dc.col[BellCol]); XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1); /* usleep(30000); */ - draw(SCredraw); + draw(SCREEN_REDRAW); } void @@ -240,7 +247,7 @@ ttynew(void) { if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0) die("openpt failed: %s\n", SERRNO); if(grantpt(m) < 0) - die("grandpt failed: %s\n", SERRNO); + die("grantpt failed: %s\n", SERRNO); if(unlockpt(m) < 0) die("unlockpt failed: %s\n", SERRNO); if(!(pts = ptsname(m))) @@ -258,7 +265,9 @@ ttynew(void) { dup2(s, STDOUT_FILENO); dup2(s, STDERR_FILENO); if(ioctl(s, TIOCSCTTY, NULL) < 0) - die("ioctl TTIOCSTTY failed: %s\n", SERRNO); + die("ioctl TIOCSCTTY failed: %s\n", SERRNO); + close(s); + close(m); execsh(); break; default: @@ -281,13 +290,10 @@ ttyread(void) { char buf[BUFSIZ] = {0}; int ret; - switch(ret = read(cmdfd, buf, BUFSIZ)) { - case -1: + if((ret = read(cmdfd, buf, BUFSIZ)) < 0) die("Couldn't read from shell: %s\n", SERRNO); - break; - default: + else tputs(buf, ret); - } } void @@ -308,40 +314,52 @@ ttyresize(int x, int 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); +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 +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 -tnew(int col, int row) { /* screen size */ +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]; int i; - /* X stuff _before_ the line swapping (results in wrong line index) */ - xscroll(); + for(i = term.top; i < term.bot; i++) term.line[i] = term.line[i+1]; memset(temp, 0, sizeof(Glyph) * term.col); @@ -349,6 +367,39 @@ tscroll(void) { } 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) @@ -370,7 +421,7 @@ csiparse(void) { escseq.arg[escseq.narg] *= 10; escseq.arg[escseq.narg] += *p++ - '0'/*, noarg = 0 */; } - if(*p == ';' && escseq.narg+1 < ESCARGSIZ) + if(*p == ';' && escseq.narg+1 < ESC_ARG_SIZ) escseq.narg++, p++; else { escseq.mode = *p; @@ -387,58 +438,28 @@ tmoveto(int x, int y) { } void -tcursor(int dir) { - int xf = term.c.x, yf = term.c.y; - - switch(dir) { - case CSup: - yf--; - break; - case CSdown: - yf++; - break; - case CSleft: - xf--; - if(term.mode & TMwrap && xf < 0) { - xf = term.col-1, yf--; - if(yf < term.top) - yf = term.top, xf = 0; - } - break; - case CSright: - xf++; - if(term.mode & TMwrap && xf >= term.col) { - xf = 0, yf++; - if(yf > term.bot) - yf = term.bot, tscroll(); - } - break; - } - 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 @@ -452,32 +473,25 @@ tdeletechar(int n) { return; } memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph)); - tclearregion(term.col-size, term.c.y, term.col-1, term.c.y); + tclearregion(term.col-n, term.c.y, term.col-1, term.c.y); } void tinsertblank(int n) { int src = term.c.x; int dst = src + n; - int size = term.col - n - src; + int size = term.col - dst; if(dst >= term.col) { tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); return; } memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph)); - tclearregion(src, term.c.y, dst, term.c.y); + tclearregion(src, term.c.y, dst - 1, term.c.y); } void -tsetlinestate(int n, int state) { - int i; - for(i = 0; i < term.col; i++) - term.line[n][i].state |= state; -} - -void -tinsertblankline (int n) { +tinsertblankline(int n) { int i; Line blank; int bot = term.bot; @@ -497,8 +511,6 @@ tinsertblankline (int n) { term.line[i-n] = blank; /* blank it */ memset(blank, 0, term.col * sizeof(Glyph)); - tsetlinestate(i, CRupdate); - tsetlinestate(i-n, CRupdate); } } @@ -523,8 +535,6 @@ tdeleteline(int n) { term.line[i+n] = blank; /* blank it */ memset(blank, 0, term.col * sizeof(Glyph)); - tsetlinestate(i, CRupdate); - tsetlinestate(i-n, CRupdate); } } @@ -535,42 +545,67 @@ tsetattr(int *attr, int l) { for(i = 0; i < l; i++) { switch(attr[i]) { case 0: - term.c.attr.mode &= ~(ATreverse | ATunderline | ATbold); + 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 |= ATbold; + term.c.attr.mode |= ATTR_BOLD; break; case 4: - term.c.attr.mode |= ATunderline; + term.c.attr.mode |= ATTR_UNDERLINE; break; case 7: - term.c.attr.mode |= ATreverse; - break; - case 8: - term.c.hidden = CShide; + term.c.attr.mode |= ATTR_REVERSE; break; case 22: - term.c.attr.mode &= ~ATbold; + term.c.attr.mode &= ~ATTR_BOLD; break; case 24: - term.c.attr.mode &= ~ATunderline; + term.c.attr.mode &= ~ATTR_UNDERLINE; break; case 27: - term.c.attr.mode &= ~ATreverse; + term.c.attr.mode &= ~ATTR_REVERSE; + break; + case 38: + if (i + 2 < l && attr[i + 1] == 5) { + i += 2; + if (BETWEEN(attr[i], 0, 255)) + term.c.attr.fg = attr[i]; + else + fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]); + } + else + fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); break; case 39: term.c.attr.fg = DefaultFG; break; + case 48: + if (i + 2 < l && attr[i + 1] == 5) { + i += 2; + if (BETWEEN(attr[i], 0, 255)) + term.c.attr.bg = attr[i]; + else + fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]); + } + else + fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); + break; case 49: - term.c.attr.fg = DefaultBG; + term.c.attr.bg = 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; + else if(BETWEEN(attr[i], 90, 97)) + term.c.attr.fg = attr[i] - 90 + 8; + else if(BETWEEN(attr[i], 100, 107)) + term.c.attr.fg = attr[i] - 100 + 8; + else + fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); break; } } @@ -593,57 +628,56 @@ tsetscroll(int t, int b) { void csihandle(void) { - if(escseq.priv) - csidump(); switch(escseq.mode) { - unknown: default: - fprintf(stderr, "erresc: unknown sequence\n"); + unknown: + printf("erresc: unknown csi "); csidump(); /* die(""); */ break; - case '@': /* Insert blank char */ + case '@': /* ICH -- Insert blank char */ DEFAULT(escseq.arg[0], 1); tinsertblank(escseq.arg[0]); break; - case 'A': /* Cursor Up */ + 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': /* Cursor Down */ + case 'B': /* CUD -- Cursor Down */ DEFAULT(escseq.arg[0], 1); tmoveto(term.c.x, term.c.y+escseq.arg[0]); break; - case 'C': /* Cursor Forward */ + 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': /* Cursor Backward */ + case 'D': /* CUB -- Cursor Backward */ DEFAULT(escseq.arg[0], 1); tmoveto(term.c.x-escseq.arg[0], term.c.y); break; - case 'E': /* Cursor Down and first col */ + case 'E': /* CNL -- Cursor Down and first col */ DEFAULT(escseq.arg[0], 1); tmoveto(0, term.c.y+escseq.arg[0]); break; - case 'F': /* Cursor Up and first col */ + case 'F': /* CPL -- Cursor Up and first col */ DEFAULT(escseq.arg[0], 1); tmoveto(0, term.c.y-escseq.arg[0]); break; - case 'G': /* Move to */ - case '`': + case 'G': /* CHA -- Move to */ + case '`': /* XXX: HPA -- same? */ DEFAULT(escseq.arg[0], 1); - tmoveto(escseq.arg[0]-1, term.c.y); + tmoveto(escseq.arg[0]-1, term.c.y); break; - case 'H': /* Move to */ - case 'f': + 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; - case 'J': /* Clear screen */ + /* 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); @@ -653,10 +687,13 @@ csihandle(void) { break; case 2: /* all */ tclearregion(0, 0, term.col-1, term.row-1); - break; + break; + case 3: /* XXX: erase saved lines (xterm) */ + default: + goto unknown; } break; - case 'K': /* Clear line */ + 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); @@ -669,54 +706,101 @@ csihandle(void) { break; } break; - case 'S': - case 'L': /* Insert blank lines */ + 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': + case 'l': /* RM -- Reset Mode */ if(escseq.priv) { switch(escseq.arg[0]) { + case 1: + term.mode &= ~MODE_APPKEYPAD; + break; case 7: - term.mode &= ~TMwrap; + term.mode &= ~MODE_WRAP; + break; + case 12: /* att610 -- Stop blinking cursor (IGNORED) */ break; case 25: - term.c.hidden = 1; + term.hidec = 1; + break; + case 1048: /* XXX: no alt. screen to erase/save */ + case 1049: + tcursor(CURSOR_LOAD); + tclearregion(0, 0, term.col-1, term.row-1); break; + default: + goto unknown; + } + } else { + switch(escseq.arg[0]) { + case 4: + term.mode &= ~MODE_INSERT; + break; + default: + goto unknown; } } break; - case 'M': /* Delete lines */ + case 'M': /* DL -- Delete lines */ DEFAULT(escseq.arg[0], 1); tdeleteline(escseq.arg[0]); break; - case 'X': - case 'P': /* Delete char */ + 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; - case 'd': /* Move to */ + /* 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': /* Set terminal mode */ - if(escseq.priv) + case 'h': /* SM -- Set terminal mode */ + if(escseq.priv) { switch(escseq.arg[0]) { + case 1: + term.mode |= MODE_APPKEYPAD; + break; case 7: - term.mode |= TMwrap; + term.mode |= MODE_WRAP; + break; + case 12: /* att610 -- Start blinking cursor (IGNORED) */ break; case 25: - term.c.hidden = 0; + term.hidec = 0; break; - case 1034: - /* XXX: Interpret "meta" key, sets eighth bit. */ + 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; } + } else { + switch(escseq.arg[0]) { + case 4: + term.mode |= MODE_INSERT; + break; + default: goto unknown; + } + }; break; - case 'm': /* Terminal attribute (color) */ + case 'm': /* SGR -- Terminal attribute (color) */ tsetattr(escseq.arg, escseq.narg); break; - case 'r': + case 'r': /* DECSTBM -- Set Scrolling Region */ if(escseq.priv) goto unknown; else { @@ -725,11 +809,11 @@ csihandle(void) { tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1); } break; - case 's': /* Save cursor position */ - tcpos(CSsave); + case 's': /* DECSC -- Save cursor position (ANSI.SYS) */ + tcursor(CURSOR_SAVE); break; - case 'u': /* Load cursor position */ - tcpos(CSload); + case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */ + tcursor(CURSOR_LOAD); break; } } @@ -754,75 +838,104 @@ csireset(void) { void tputtab(void) { int space = TAB - term.c.x % TAB; - - if(term.c.x + space >= term.col) - space--; - - for(; space > 0; space--) - tcursor(CSright); + tmoveto(term.c.x + space, term.c.y); } void tputc(char c) { -#if 0 - dump(c); -#endif - if(term.esc & ESCin) { - if(term.esc & ESCcsi) { + if(term.esc & ESC_START) { + if(term.esc & ESC_CSI) { escseq.buf[escseq.len++] = c; - if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESCSIZ) { + if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) { term.esc = 0; csiparse(), csihandle(); } - } else if (term.esc & ESCosc) { + } else if(term.esc & ESC_OSC) { if(c == ';') { term.titlelen = 0; - term.esc = ESCin | ESCtitle; + term.esc = ESC_START | ESC_TITLE; } - } else if(term.esc & ESCtitle) { - if(c == '\a' || term.titlelen+1 >= TITLESIZ) { + } 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 & ESCcharset) { - printf("ESC ( %c\n", c); + } else if(term.esc & ESC_ALTCHARSET) { switch(c) { case '0': /* Line drawing crap */ - term.c.attr.mode |= ATgfx; + term.c.attr.mode |= ATTR_GFX; break; case 'B': /* Back to regular text */ - term.c.attr.mode &= ~ATgfx; + term.c.attr.mode &= ~ATTR_GFX; break; + default: + printf("esc unhandled charset: ESC ( %c\n", c); } term.esc = 0; - } else { + } else { switch(c) { case '[': - term.esc |= ESCcsi; + term.esc |= ESC_CSI; break; case ']': - term.esc |= ESCosc; + term.esc |= ESC_OSC; break; case '(': - term.esc |= ESCcharset; + 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': + 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 %02X '%c'\n", c, isprint(c)?c:'.'); + fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.'); + term.esc = 0; } } } else { @@ -831,7 +944,7 @@ tputc(char c) { tputtab(); break; case '\b': - tcursor(CSleft); + tmoveto(term.c.x-1, term.c.y); break; case '\r': tmoveto(0, term.c.y); @@ -844,18 +957,21 @@ tputc(char c) { break; case '\033': csireset(); - term.esc = ESCin; + term.esc = ESC_START; break; default: tsetchar(c); - tcursor(CSright); + if(term.c.x+1 < term.col) { + tmoveto(term.c.x+1, term.c.y); + } else if(IS_SET(MODE_WRAP)) + tnewline(); break; } } } void -tputs(char *s, int len) { +tputs(char *s, int len) { for(; len > 0; len--) tputc(*s++); } @@ -863,23 +979,28 @@ tputs(char *s, int len) { void tresize(int col, int row) { int i; - Line *line; int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); if(col < 1 || row < 1) return; - /* alloc */ - line = calloc(row, sizeof(Line)); - for(i = 0 ; i < row; i++) - line[i] = calloc(col, sizeof(Glyph)); - /* 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 uneeded rows */ + for(i = row; i < term.row; i++) free(term.line[i]); - free(term.line); + + /* resize to new height */ + term.line = realloc(term.line, row * sizeof(Line)); + + /* resize each row to new width, zero-pad if needed */ + for(i = 0; i < minrow; i++) { + term.line[i] = realloc(term.line[i], col * sizeof(Glyph)); + memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph)); + } + + /* allocate any new rows */ + for(/* i == minrow */; i < row; i++) + term.line[i] = calloc(col, sizeof(Glyph)); LIMIT(term.c.x, 0, col-1); LIMIT(term.c.y, 0, row-1); @@ -887,102 +1008,119 @@ tresize(int col, int row) { LIMIT(term.bot, 0, row-1); term.bot = row-1; - term.line = line; term.col = col, term.row = row; } -unsigned long -xgetcol(const char *s) { +void +xloadcols(void) { + int i, r, g, b; XColor color; Colormap cmap = DefaultColormap(xw.dis, xw.scr); + unsigned long white = WhitePixel(xw.dis, xw.scr); + + for(i = 0; i < 16; i++) { + if (!XAllocNamedColor(xw.dis, cmap, colorname[i], &color, &color)) { + dc.col[i] = white; + fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]); + } else + dc.col[i] = color.pixel; + } + + /* same colors as xterm */ + for(r = 0; r < 6; r++) + for(g = 0; g < 6; g++) + for(b = 0; b < 6; b++) { + color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r; + color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; + color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b; + if (!XAllocColor(xw.dis, cmap, &color)) { + dc.col[i] = white; + fprintf(stderr, "Could not allocate color %d\n", i); + } else + dc.col[i] = color.pixel; + i++; + } - if(!XAllocNamedColor(xw.dis, cmap, s, &color, &color)) { - color.pixel = WhitePixel(xw.dis, xw.scr); - fprintf(stderr, "Could not allocate color '%s'\n", s); + for(r = 0; r < 24; r++, i++) { + color.red = color.green = color.blue = 0x0808 + 0x0a0a * r; + if (!XAllocColor(xw.dis, cmap, &color)) { + dc.col[i] = white; + fprintf(stderr, "Could not allocate color %d\n", i); + } else + dc.col[i] = color.pixel; } - 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); +xhints(void) +{ + XClassHint class = {TNAME, TNAME}; + XWMHints wm = {.flags = InputHint, .input = 1}; + XSizeHints size = { + .flags = PSize | PResizeInc | PBaseSize, + .height = xw.h, + .width = xw.w, + .height_inc = xw.ch, + .width_inc = xw.cw, + .base_height = 2*BORDER, + .base_width = 2*BORDER, + }; + XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class); } void xinit(void) { - XGCValues values; - unsigned long valuemask; - XClassHint chint; - XWMHints wmhint; - XSizeHints shint; - char *args[] = {NULL}; - int i; - - xw.dis = XOpenDisplay(NULL); - xw.scr = XDefaultScreen(xw.dis); - if(!xw.dis) + if(!(xw.dis = XOpenDisplay(NULL))) die("Can't open display\n"); + xw.scr = XDefaultScreen(xw.dis); /* font */ - if(!(dc.font = XLoadQueryFont(xw.dis, FONT))) - die("Can't load font %s\n", 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++) - dc.col[i] = xgetcol(colorname[i]); + xloadcols(); 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.w = term.col * xw.cw; - /* XXX: this BORDER is useless after the first resize, handle it in xdraws() */ + xw.h = term.row * xw.ch + 2*BORDER; + xw.w = term.col * xw.cw + 2*BORDER; xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0, - xw.w, xw.h, BORDER, + xw.w, xw.h, 0, dc.col[DefaultBG], dc.col[DefaultBG]); + xw.bufw = xw.w - 2*BORDER; + xw.bufh = xw.h - 2*BORDER; + xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, 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.flags = PSize | PResizeInc; - XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint); - XStoreName(xw.dis, xw.win, TNAME); + xhints(); + XStoreName(xw.dis, xw.win, "st"); XSync(xw.dis, 0); } void -xdraws (char *s, Glyph base, int x, int y, int len) { +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; - if(base.mode & ATreverse) + if(base.mode & ATTR_REVERSE) xfg = dc.col[base.bg], xbg = dc.col[base.fg]; else xfg = dc.col[base.fg], xbg = dc.col[base.bg]; @@ -990,69 +1128,85 @@ xdraws (char *s, Glyph base, int x, int y, int len) { XSetBackground(xw.dis, dc.gc, xbg); XSetForeground(xw.dis, dc.gc, xfg); - if(base.mode & ATgfx) { - + if(base.mode & ATTR_GFX) for(i = 0; i < len; i++) - s[i] = gfx[s[i]]; - } - - 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; + s[i] = gfx[(int)s[i]]; - /* reverse video */ - if(g.mode & ATreverse) - xfg = dc.col[g.bg], xbg = dc.col[g.fg]; - else - xfg = dc.col[g.fg], xbg = dc.col[g.bg]; - /* background */ - XSetBackground(xw.dis, dc.gc, xbg); - XSetForeground(xw.dis, dc.gc, xfg); - XDrawImageString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1); + 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}; + 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 & CRset) + 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 + 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 == CSdraw) { - xdrawc(term.c.x, term.c.y, g); + 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 +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; + + 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.bufw, xw.bufh, BORDER, BORDER); + XFlush(xw.dis); +} + +#else +/* optimized drawing routine */ void draw(int redraw_all) { int i, x, y, ox; Glyph base, new; - char buf[MAXDRAWBUF]; + char buf[DRAW_BUF_SIZ]; + XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]); + XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h); for(y = 0; y < term.row; y++) { base = term.line[y][0]; i = ox = 0; for(x = 0; x < term.col; x++) { new = term.line[y][x]; - if(!ATTRCMP(base, new) && i < MAXDRAWBUF) + if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ) buf[i++] = new.c; else { xdraws(buf, base, ox, y, i); @@ -1064,13 +1218,16 @@ draw(int redraw_all) { } xdraws(buf, base, ox, y, i); } - if(!term.c.hidden) - xcursor(CSdraw); + xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW); + XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); + XFlush(xw.dis); } +#endif + void expose(XEvent *ev) { - draw(SCredraw); + draw(SCREEN_REDRAW); } char* @@ -1092,11 +1249,11 @@ kpress(XEvent *ev) { int meta; int shift; - meta = e->state & Mod1Mask; + meta = e->state & Mod1Mask; shift = e->state & ShiftMask; len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); - if(customkey = kmap(ksym)) + if((customkey = kmap(ksym))) ttywrite(customkey, strlen(customkey)); else if(len > 0) { buf[sizeof(buf)-1] = '\0'; @@ -1105,9 +1262,16 @@ kpress(XEvent *ev) { ttywrite(buf, len); } else switch(ksym) { + case XK_Up: + case XK_Down: + case XK_Left: + case XK_Right: + sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]); + ttywrite(buf, 3); + break; case XK_Insert: if(shift) - /* XXX: paste X clipboard */; + draw(1), puts("draw!")/* XXX: paste X clipboard */; break; default: fprintf(stderr, "errkey: %d\n", (int)ksym); @@ -1118,16 +1282,21 @@ kpress(XEvent *ev) { void 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) { - tresize(col, row); - ttyresize(col, row); - xw.w = e->xconfigure.width; - xw.h = e->xconfigure.height; - draw(SCredraw); - } + if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) + return; + + xw.w = e->xconfigure.width; + xw.h = e->xconfigure.height; + xw.bufw = xw.w - 2*BORDER; + xw.bufh = xw.h - 2*BORDER; + col = xw.bufw / xw.cw; + row = xw.bufh / xw.ch; + tresize(col, row); + ttyresize(col, row); + XFreePixmap(xw.dis, xw.buf); + xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr)); + draw(SCREEN_REDRAW); } void @@ -1138,7 +1307,7 @@ run(void) { running = 1; XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask); - XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* fix resize bug in wmii (?) */ + XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */ while(running) { FD_ZERO(&rfd); @@ -1151,7 +1320,7 @@ run(void) { } if(FD_ISSET(cmdfd, &rfd)) { ttyread(); - draw(SCupdate); + draw(SCREEN_UPDATE); } while(XPending(xw.dis)) { XNextEvent(xw.dis, &ev); @@ -1164,7 +1333,7 @@ run(void) { int main(int argc, char *argv[]) { if(argc == 2 && !strncmp("-v", argv[1], 3)) - die("st-" VERSION ", © 2009 st engineers\n"); + die("st-" VERSION ", (c) 2010 st engineers\n"); else if(argc != 1) die("usage: st [-v]\n"); setlocale(LC_CTYPE, "");