X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=8b30d4ca6bd8021f65e0be0e824427579355dc63;hb=579f12d47b38e23abb1073b8e70d67c0c203c42c;hp=8cc0e1d6bf0a1c548c13e4bcf8d81b330726e0e2;hpb=c58950f2efd8f203e72add7b22e7f5b973c09a7d;p=st.git diff --git a/st.c b/st.c index 8cc0e1d..8b30d4c 100644 --- a/st.c +++ b/st.c @@ -36,7 +36,8 @@ #define USAGE \ "st " VERSION " (c) 2010-2012 st engineers\n" \ - "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n" + "usage: st [-t title] [-c class] [-g geometry]" \ + " [-w windowid] [-v] [-f file] [-e command...]\n" /* XEMBED messages */ #define XEMBED_FOCUS_IN 4 @@ -54,6 +55,7 @@ #define SELECT_TIMEOUT (20*1000) /* 20 ms */ #define DRAW_TIMEOUT (20*1000) /* 20 ms */ +#define REDRAW_TIMEOUT (80*1000) /* 80 ms */ #define SERRNO strerror(errno) #define MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -194,6 +196,8 @@ typedef struct { XIM xim; XIC xic; int scr; + Bool isfixed; /* is fixed geometry? */ + int fx, fy, fw, fh; /* fixed geometry */ int w; /* window width */ int h; /* window height */ int ch; /* char height */ @@ -238,6 +242,7 @@ typedef struct { static void die(const char*, ...); static void draw(void); +static void redraw(void); static void drawregion(int, int, int, int); static void execsh(void); static void sigchld(int); @@ -273,6 +278,7 @@ static void tsetchar(char*); static void tsetscroll(int, int); static void tswapscreen(void); static void tsetdirt(int, int); +static void tsetmode(bool, bool, int *, int); static void tfulldirt(void); static void ttynew(void); @@ -341,7 +347,9 @@ static STREscape strescseq; static int cmdfd; static pid_t pid; static Selection sel; +static FILE *fileio; static char **opt_cmd = NULL; +static char *opt_io = NULL; static char *opt_title = NULL; static char *opt_embed = NULL; static char *opt_class = NULL; @@ -503,7 +511,7 @@ mousereport(XEvent *e) { int state = e->xbutton.state; char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 }; static int ob, ox, oy; - + /* from urxvt */ if(e->xbutton.type == MotionNotify) { if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy)) @@ -521,11 +529,11 @@ mousereport(XEvent *e) { ox = x, oy = y; } } - + buf[3] = 32 + button + (state & ShiftMask ? 4 : 0) + (state & Mod4Mask ? 8 : 0) + (state & ControlMask ? 16 : 0); - + ttywrite(buf, sizeof(buf)); } @@ -750,7 +758,7 @@ sigchld(int a) { void ttynew(void) { int m, s; - + /* seems to work fine on linux, openbsd and freebsd */ struct winsize w = {term.row, term.col, 0, 0}; if(openpty(&m, &s, NULL, NULL, &w) < 0) @@ -775,6 +783,10 @@ ttynew(void) { close(s); cmdfd = m; signal(SIGCHLD, sigchld); + if (opt_io && !(fileio = fopen(opt_io, "w"))) { + fprintf(stderr, "Error opening %s:%s", + opt_io, strerror(errno)); + } } } @@ -909,11 +921,11 @@ void tscrolldown(int orig, int n) { int i; Line temp; - + LIMIT(n, 0, term.bot-orig+1); tclearregion(0, term.bot-n+1, term.col-1, term.bot); - + for(i = term.bot; i >= orig+n; i--) { temp = term.line[i]; term.line[i] = term.line[i-n]; @@ -931,9 +943,9 @@ tscrollup(int orig, int n) { int i; Line temp; LIMIT(n, 0, term.bot-orig+1); - + tclearregion(0, orig, term.col-1, orig+n-1); - + for(i = orig; i <= term.bot-n; i++) { temp = term.line[i]; term.line[i] = term.line[i+n]; @@ -950,7 +962,7 @@ void selscroll(int orig, int n) { if(sel.bx == -1) return; - + if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) { if((sel.by += n) > term.bot || (sel.ey += n) < term.top) { sel.bx = -1; @@ -987,7 +999,7 @@ csiparse(void) { csiescseq.narg = 0; if(*p == '?') csiescseq.priv = 1, p++; - + while(p < csiescseq.buf+csiescseq.len) { while(isdigit(*p)) { csiescseq.arg[csiescseq.narg] *= 10; @@ -1046,7 +1058,7 @@ tdeletechar(int n) { int src = term.c.x + n; int dst = term.c.x; int size = term.col - src; - + term.dirty[term.c.y] = 1; if(src >= term.col) { @@ -1103,6 +1115,9 @@ tsetattr(int *attr, int l) { case 1: term.c.attr.mode |= ATTR_BOLD; break; + case 3: /* enter standout (highlight) mode TODO: make it italic */ + term.c.attr.mode |= ATTR_REVERSE; + break; case 4: term.c.attr.mode |= ATTR_UNDERLINE; break; @@ -1112,6 +1127,9 @@ tsetattr(int *attr, int l) { case 22: term.c.attr.mode &= ~ATTR_BOLD; break; + case 23: /* leave standout (highlight) mode TODO: make it italic */ + term.c.attr.mode &= ~ATTR_REVERSE; + break; case 24: term.c.attr.mode &= ~ATTR_UNDERLINE; break; @@ -1127,7 +1145,7 @@ tsetattr(int *attr, int l) { fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]); } else - fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); + fprintf(stderr, "erresc(38): gfx attr %d unknown\n", attr[i]); break; case 39: term.c.attr.fg = DefaultFG; @@ -1141,7 +1159,7 @@ tsetattr(int *attr, int l) { fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]); } else - fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); + fprintf(stderr, "erresc(48): gfx attr %d unknown\n", attr[i]); break; case 49: term.c.attr.bg = DefaultBG; @@ -1156,8 +1174,7 @@ tsetattr(int *attr, int l) { 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]), csidump(); - + fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump(); break; } } @@ -1178,6 +1195,79 @@ tsetscroll(int t, int b) { term.bot = b; } +#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit))) + +void +tsetmode(bool priv, bool set, int *args, int narg) { + int *lim, mode; + + for (lim = args + narg; args < lim; ++args) { + if(priv) { + switch(*args) { + case 1: + MODBIT(term.mode, set, MODE_APPKEYPAD); + break; + case 5: /* DECSCNM -- Reverve video */ + mode = term.mode; + MODBIT(term.mode,set, MODE_REVERSE); + if (mode != term.mode) + redraw(); + break; + case 7: + MODBIT(term.mode, set, MODE_WRAP); + break; + case 20: + MODBIT(term.mode, set, MODE_CRLF); + break; + case 12: /* att610 -- Start blinking cursor (IGNORED) */ + break; + case 25: + MODBIT(term.c.state, !set, CURSOR_HIDE); + break; + case 1000: /* 1000,1002: enable xterm mouse report */ + MODBIT(term.mode, set, MODE_MOUSEBTN); + break; + case 1002: + MODBIT(term.mode, set, MODE_MOUSEMOTION); + break; + case 1049: /* = 1047 and 1048 */ + case 47: + case 1047: + if(IS_SET(MODE_ALTSCREEN)) + tclearregion(0, 0, term.col-1, term.row-1); + if ((set && !IS_SET(MODE_ALTSCREEN)) || + (!set && IS_SET(MODE_ALTSCREEN))) { + tswapscreen(); + } + if (*args != 1049) + break; + /* pass through */ + case 1048: + tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); + break; + default: + fprintf(stderr, + "erresc: unknown private set/reset mode %d\n", + *args); + break; + } + } else { + switch(*args) { + case 4: + MODBIT(term.mode, set, MODE_INSERT); + break; + default: + fprintf(stderr, + "erresc: unknown set/reset mode %d\n", + *args); + break; + } + } + } +} +#undef MODBIT + + void csihandle(void) { switch(csiescseq.mode) { @@ -1291,58 +1381,7 @@ csihandle(void) { tinsertblankline(csiescseq.arg[0]); break; case 'l': /* RM -- Reset Mode */ - if(csiescseq.priv) { - switch(csiescseq.arg[0]) { - case 1: - term.mode &= ~MODE_APPKEYPAD; - break; - case 5: /* DECSCNM -- Remove reverse video */ - if(IS_SET(MODE_REVERSE)) { - term.mode &= ~MODE_REVERSE; - draw(); - } - break; - case 7: - term.mode &= ~MODE_WRAP; - break; - case 12: /* att610 -- Stop blinking cursor (IGNORED) */ - break; - case 20: - term.mode &= ~MODE_CRLF; - break; - case 25: - term.c.state |= CURSOR_HIDE; - break; - case 1000: /* disable X11 xterm mouse reporting */ - term.mode &= ~MODE_MOUSEBTN; - break; - case 1002: - term.mode &= ~MODE_MOUSEMOTION; - break; - case 1049: /* = 1047 and 1048 */ - case 47: - case 1047: - if(IS_SET(MODE_ALTSCREEN)) { - tclearregion(0, 0, term.col-1, term.row-1); - tswapscreen(); - } - if(csiescseq.arg[0] != 1049) - break; - case 1048: - tcursor(CURSOR_LOAD); - break; - default: - goto unknown; - } - } else { - switch(csiescseq.arg[0]) { - case 4: - term.mode &= ~MODE_INSERT; - break; - default: - goto unknown; - } - } + tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg); break; case 'M': /* DL -- Delete lines */ DEFAULT(csiescseq.arg[0], 1); @@ -1366,58 +1405,7 @@ csihandle(void) { tmoveto(term.c.x, csiescseq.arg[0]-1); break; case 'h': /* SM -- Set terminal mode */ - if(csiescseq.priv) { - switch(csiescseq.arg[0]) { - case 1: - term.mode |= MODE_APPKEYPAD; - break; - case 5: /* DECSCNM -- Reverve video */ - if(!IS_SET(MODE_REVERSE)) { - term.mode |= MODE_REVERSE; - draw(); - } - break; - case 7: - term.mode |= MODE_WRAP; - break; - case 20: - term.mode |= MODE_CRLF; - break; - case 12: /* att610 -- Start blinking cursor (IGNORED) */ - /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */ - if(csiescseq.narg > 1 && csiescseq.arg[1] != 25) - break; - case 25: - term.c.state &= ~CURSOR_HIDE; - break; - case 1000: /* 1000,1002: enable xterm mouse report */ - term.mode |= MODE_MOUSEBTN; - break; - case 1002: - term.mode |= MODE_MOUSEMOTION; - break; - case 1049: /* = 1047 and 1048 */ - case 47: - case 1047: - if(IS_SET(MODE_ALTSCREEN)) - tclearregion(0, 0, term.col-1, term.row-1); - else - tswapscreen(); - if(csiescseq.arg[0] != 1049) - break; - case 1048: - tcursor(CURSOR_SAVE); - break; - default: goto unknown; - } - } else { - switch(csiescseq.arg[0]) { - case 4: - term.mode |= MODE_INSERT; - break; - default: goto unknown; - } - }; + tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg); break; case 'm': /* SGR -- Terminal attribute (color) */ tsetattr(csiescseq.arg, csiescseq.narg); @@ -1465,7 +1453,12 @@ void strhandle(void) { char *p; - p = strescseq.buf; + /* + * TODO: make this being useful in case of color palette change. + */ + strparse(); + + p = strescseq.buf; switch(strescseq.type) { case ']': /* OSC -- Operating System Command */ @@ -1552,6 +1545,9 @@ tputtab(bool forward) { void tputc(char *c) { char ascii = *c; + + if (fileio) + putc(ascii, fileio); if(term.esc & ESC_START) { if(term.esc & ESC_CSI) { csiescseq.buf[csiescseq.len++] = ascii; @@ -1789,7 +1785,7 @@ xloadcols(void) { } else dc.col[i] = color.pixel; } - + /* load colors [16-255] ; same colors as xterm */ for(i = 16, r = 0; r < 6; r++) for(g = 0; g < 6; g++) @@ -1827,16 +1823,25 @@ void xhints(void) { XClassHint class = {opt_class ? opt_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.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class); + XSizeHints *sizeh = NULL; + + sizeh = XAllocSizeHints(); + if(xw.isfixed == False) { + sizeh->flags = PSize | PResizeInc | PBaseSize; + sizeh->height = xw.h; + sizeh->width = xw.w; + sizeh->height_inc = xw.ch; + sizeh->width_inc = xw.cw; + sizeh->base_height = 2*BORDER; + sizeh->base_width = 2*BORDER; + } else { + sizeh->flags = PMaxSize | PMinSize; + sizeh->min_width = sizeh->max_width = xw.fw; + sizeh->min_height = sizeh->max_height = xw.fh; + } + + XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class); + XFree(sizeh); } XFontSet @@ -1888,11 +1893,28 @@ xinit(void) { XSetWindowAttributes attrs; Cursor cursor; Window parent; + int sw, sh; if(!(xw.dpy = XOpenDisplay(NULL))) die("Can't open display\n"); xw.scr = XDefaultScreen(xw.dpy); - + + /* adjust fixed window geometry */ + if(xw.isfixed) { + sw = DisplayWidth(xw.dpy, xw.scr); + sh = DisplayWidth(xw.dpy, xw.scr); + if(xw.fx < 0) + xw.fx = sw + xw.fx - xw.fw; + if(xw.fy < 0) + xw.fy = sh + xw.fy - xw.fh; + } else { + /* window - default size */ + xw.h = 2*BORDER + term.row * xw.ch; + xw.w = 2*BORDER + term.col * xw.cw; + xw.fw = xw.w; + xw.fh = xw.h; + } + /* font */ initfonts(FONT, BOLDFONT); @@ -1904,10 +1926,6 @@ xinit(void) { xw.cmap = XDefaultColormap(xw.dpy, xw.scr); xloadcols(); - /* window - default size */ - xw.h = 2*BORDER + term.row * xw.ch; - xw.w = 2*BORDER + term.col * xw.cw; - attrs.background_pixel = dc.col[DefaultBG]; attrs.border_pixel = dc.col[DefaultBG]; attrs.bit_gravity = NorthWestGravity; @@ -1918,8 +1936,8 @@ xinit(void) { attrs.colormap = xw.cmap; parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr); - xw.win = XCreateWindow(xw.dpy, parent, 0, 0, - xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, + xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy, + xw.fw, xw.fh, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, XDefaultVisual(xw.dpy, xw.scr), CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask | CWColormap, @@ -1934,7 +1952,7 @@ xinit(void) { XNFocusWindow, xw.win, NULL); /* gc */ dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL); - + /* white cursor, black outline */ cursor = XCreateFontCursor(xw.dpy, XC_xterm); XDefineCursor(xw.dpy, xw.win, cursor); @@ -1956,7 +1974,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw; XFontSet fontset = dc.font.set; int i; - + /* only switch default fg/bg if term is in RV mode */ if(IS_SET(MODE_REVERSE)) { if(fg == DefaultFG) @@ -1987,7 +2005,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { } XmbDrawImageString(xw.dpy, xw.buf, fontset, dc.gc, winx, winy, s, bytelen); - + if(base.mode & ATTR_UNDERLINE) XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1); } @@ -2006,10 +2024,10 @@ xdrawcursor(void) { static int oldy = 0; int sl; 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) memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ); @@ -2039,6 +2057,14 @@ xdrawcursor(void) { } void +redraw(void) { + struct timespec tv = {0, REDRAW_TIMEOUT * 1000}; + tfulldirt(); + draw(); + nanosleep(&tv, NULL); +} + +void draw() { drawregion(0, 0, term.col, term.row); xcopy(); @@ -2156,7 +2182,7 @@ kpress(XEvent *ev) { meta = e->state & Mod1Mask; shift = e->state & ShiftMask; len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status); - + /* 1. custom keys from config.h */ if((customkey = kmap(ksym, e->state))) ttywrite(customkey, strlen(customkey)); @@ -2210,10 +2236,10 @@ cmessage(XEvent *e) { void resize(XEvent *e) { int col, row; - + if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) return; - + xw.w = e->xconfigure.width; xw.h = e->xconfigure.height; col = (xw.w - 2*BORDER) / xw.cw; @@ -2240,7 +2266,7 @@ run(void) { int xfd = XConnectionNumber(xw.dpy); struct timeval timeout = {0}; bool stuff_to_print = 0; - + for(;;) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); @@ -2274,8 +2300,11 @@ run(void) { int main(int argc, char *argv[]) { - int i; - + int i, bitm, xr, yr; + unsigned int wr, hr; + + xw.fw = xw.fh = xw.fx = xw.fy = 0; + for(i = 1; i < argc; i++) { switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) { case 't': @@ -2287,10 +2316,34 @@ main(int argc, char *argv[]) { case 'w': if(++i < argc) opt_embed = argv[i]; break; + case 'f': + if (++i < argc) opt_io = argv[i]; + break; case 'e': /* eat every remaining arguments */ if(++i < argc) opt_cmd = &argv[i]; goto run; + case 'g': + if(++i >= argc) + break; + + bitm = XParseGeometry(argv[i], &xr, &yr, &wr, &hr); + if(bitm & XValue) + xw.fx = xr; + if(bitm & YValue) + xw.fy = yr; + if(bitm & WidthValue) + xw.fw = (int)wr; + if(bitm & HeightValue) + xw.fh = (int)hr; + if(bitm & XNegative && xw.fx == 0) + xw.fx = -1; + if(bitm & XNegative && xw.fy == 0) + xw.fy = -1; + + if(xw.fh != 0 && xw.fw != 0) + xw.isfixed = True; + break; case 'v': default: die(USAGE); @@ -2306,3 +2359,4 @@ main(int argc, char *argv[]) { run(); return 0; } +