X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=0204b2e14d1d561f0bdfbf3e0007bdeec03de37f;hb=89807ed453e27893dea5ac73ee2c6b4f8dd15afb;hp=b1d3791aba830e96f7fc9e45f72947a81796622a;hpb=aff35af275cb82eb876630c9256298ea1d1b2b57;p=st.git diff --git a/st.c b/st.c index b1d3791..0204b2e 100644 --- a/st.c +++ b/st.c @@ -158,8 +158,7 @@ enum escape_state { enum window_state { WIN_VISIBLE = 1, - WIN_REDRAW = 2, - WIN_FOCUSED = 4 + WIN_FOCUSED = 2 }; enum selection_type { @@ -352,6 +351,7 @@ static void draw(void); static void redraw(void); static void drawregion(int, int, int, int); static void execsh(void); +static void stty(void); static void sigchld(int); static void run(void); @@ -508,6 +508,7 @@ static char *opt_title = NULL; static char *opt_embed = NULL; static char *opt_class = NULL; static char *opt_font = NULL; +static char *opt_line = NULL; static int oldbutton = 3; /* button event on startup: 3 = release */ static char *usedfont = NULL; @@ -671,7 +672,8 @@ y2row(int y) { return LIMIT(y, 0, term.row-1); } -int tlinelen(int y) { +int +tlinelen(int y) { int i = term.col; if(term.line[y][i - 1].mode & ATTR_WRAP) @@ -1253,11 +1255,55 @@ sigchld(int a) { exit(EXIT_SUCCESS); } + +void +stty(void) +{ + char cmd[_POSIX_ARG_MAX], **p, *q, *s; + size_t n, siz; + + if((n = strlen(stty_args)) > sizeof(cmd)-1) + die("incorrect stty parameters\n"); + memcpy(cmd, stty_args, n); + q = cmd + n; + siz = sizeof(cmd) - n; + for(p = opt_cmd; p && (s = *p); ++p) { + if((n = strlen(s)) > siz-1) + die("stty parameter length too long\n"); + *q++ = ' '; + q = memcpy(q, s, n); + q += n; + siz-= n + 1; + } + *q = '\0'; + system(cmd); +} + void ttynew(void) { int m, s; struct winsize w = {term.row, term.col, 0, 0}; + if(opt_io) { + term.mode |= MODE_PRINT; + iofd = (!strcmp(opt_io, "-")) ? + STDOUT_FILENO : + open(opt_io, O_WRONLY | O_CREAT, 0666); + if(iofd < 0) { + fprintf(stderr, "Error opening %s:%s\n", + opt_io, strerror(errno)); + } + } + + if (opt_line) { + if((cmdfd = open(opt_line, O_RDWR)) < 0) + die("open line failed: %s\n", strerror(errno)); + close(STDIN_FILENO); + dup(cmdfd); + stty(); + return; + } + /* seems to work fine on linux, openbsd and freebsd */ if(openpty(&m, &s, NULL, NULL, &w) < 0) die("openpty failed: %s\n", strerror(errno)); @@ -1267,6 +1313,7 @@ ttynew(void) { die("fork failed\n"); break; case 0: + close(iofd); setsid(); /* create a new process group */ dup2(s, STDIN_FILENO); dup2(s, STDOUT_FILENO); @@ -1281,16 +1328,6 @@ ttynew(void) { close(s); cmdfd = m; signal(SIGCHLD, sigchld); - if(opt_io) { - term.mode |= MODE_PRINT; - iofd = (!strcmp(opt_io, "-")) ? - STDOUT_FILENO : - open(opt_io, O_WRONLY | O_CREAT, 0666); - if(iofd < 0) { - fprintf(stderr, "Error opening %s:%s\n", - opt_io, strerror(errno)); - } - } break; } } @@ -1421,7 +1458,7 @@ treset(void) { term.top = 0; term.bot = term.row - 1; term.mode = MODE_WRAP; - memset(term.trantbl, sizeof(term.trantbl), CS_USA); + memset(term.trantbl, CS_USA, sizeof(term.trantbl)); term.charset = 0; for(i = 0; i < 2; i++) { @@ -2466,7 +2503,6 @@ tstrsequence(uchar c) { strreset(); strescseq.type = c; term.esc |= ESC_STR; - return; } void @@ -2548,7 +2584,6 @@ tcontrolcode(uchar ascii) { } /* only CAN, SUB, \a and C1 chars interrupt a sequence */ term.esc &= ~(ESC_STR_END|ESC_STR); - return; } /* @@ -2788,8 +2823,11 @@ tresize(int col, int row) { free(term.line[i]); free(term.alt[i]); } - memmove(term.line, term.line + i, row * sizeof(Line)); - memmove(term.alt, term.alt + i, row * sizeof(Line)); + /* ensure that both src and dst are not NULL */ + if (i > 0) { + memmove(term.line, term.line + i, row * sizeof(Line)); + memmove(term.alt, term.alt + i, row * sizeof(Line)); + } for(i += row; i < term.row; i++) { free(term.line[i]); free(term.alt[i]); @@ -2860,10 +2898,31 @@ sixd_to_16bit(int x) { return x == 0 ? 0 : 0x3737 + 0x2828 * x; } +bool +xloadcolor(int i, const char *name, Color *ncolor) { + XRenderColor color = { .alpha = 0xffff }; + + if(!name) { + if(BETWEEN(i, 16, 255)) { /* 256 color */ + if(i < 6*6*6+16) { /* same colors as xterm */ + color.red = sixd_to_16bit( ((i-16)/36)%6 ); + color.green = sixd_to_16bit( ((i-16)/6) %6 ); + color.blue = sixd_to_16bit( ((i-16)/1) %6 ); + } else { /* greyscale */ + color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16)); + color.green = color.blue = color.red; + } + return XftColorAllocValue(xw.dpy, xw.vis, + xw.cmap, &color, ncolor); + } else + name = colorname[i]; + } + return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); +} + void xloadcols(void) { int i; - XRenderColor color = { .alpha = 0xffff }; static bool loaded; Color *cp; @@ -2872,70 +2931,25 @@ xloadcols(void) { XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); } - /* load colors [0-15] and [256-LEN(colorname)] (config.h) */ - for(i = 0; i < LEN(colorname); i++) { - if(!colorname[i]) - continue; - if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) { - die("Could not allocate color '%s'\n", colorname[i]); + for(i = 0; i < LEN(dc.col); i++) + if(!xloadcolor(i, NULL, &dc.col[i])) { + if(colorname[i]) + die("Could not allocate color '%s'\n", colorname[i]); + else + die("Could not allocate color %d\n", i); } - } - - /* load colors [16-231] ; same colors as xterm */ - for(i = 16; i < 6*6*6+16; i++) { - color.red = sixd_to_16bit( ((i-16)/36)%6 ); - color.green = sixd_to_16bit( ((i-16)/6) %6 ); - color.blue = sixd_to_16bit( ((i-16)/1) %6 ); - if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) - die("Could not allocate color %d\n", i); - } - - /* load colors [232-255] ; grayscale */ - for(; i < 256; i++) { - color.red = color.green = color.blue = 0x0808 + 0x0a0a * (i-(6*6*6+16)); - if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) - die("Could not allocate color %d\n", i); - } loaded = true; } int xsetcolorname(int x, const char *name) { - XRenderColor color = { .alpha = 0xffff }; Color ncolor; - if(!BETWEEN(x, 0, LEN(colorname))) + if(!BETWEEN(x, 0, LEN(dc.col))) return 1; - if(!name) { - if(BETWEEN(x, 16, 16 + 215)) { /* 256 color */ - color.red = sixd_to_16bit( ((x-16)/36)%6 ); - color.green = sixd_to_16bit( ((x-16)/6) %6 ); - color.blue = sixd_to_16bit( ((x-16)/1) %6 ); - if(!XftColorAllocValue(xw.dpy, xw.vis, - xw.cmap, &color, &ncolor)) { - return 1; - } - - XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); - dc.col[x] = ncolor; - return 0; - } else if(BETWEEN(x, 16 + 216, 255)) { /* greyscale */ - color.red = color.green = color.blue = \ - 0x0808 + 0x0a0a * (x - (16 + 216)); - if(!XftColorAllocValue(xw.dpy, xw.vis, - xw.cmap, &color, &ncolor)) { - return 1; - } - XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); - dc.col[x] = ncolor; - return 0; - } else { /* system colors */ - name = colorname[x]; - } - } - if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &ncolor)) + if(!xloadcolor(x, name, &ncolor)) return 1; XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); @@ -3700,12 +3714,6 @@ drawregion(int x1, int y1, int x2, int y2) { void expose(XEvent *ev) { - XExposeEvent *e = &ev->xexpose; - - if(xw.state & WIN_REDRAW) { - if(!e->count) - xw.state &= ~WIN_REDRAW; - } redraw(); } @@ -3713,12 +3721,7 @@ void visibility(XEvent *ev) { XVisibilityEvent *e = &ev->xvisibility; - if(e->state == VisibilityFullyObscured) { - xw.state &= ~WIN_VISIBLE; - } else if(!(xw.state & WIN_VISIBLE)) { - /* need a full redraw for next Expose, not just a buf copy */ - xw.state |= WIN_VISIBLE | WIN_REDRAW; - } + MODBIT(xw.state, e->state != VisibilityFullyObscured, WIN_VISIBLE); } void @@ -3951,7 +3954,7 @@ run(void) { clock_gettime(CLOCK_MONOTONIC, &now); drawtimeout.tv_sec = 0; - drawtimeout.tv_nsec = (1000/xfps) * 1E6; + drawtimeout.tv_nsec = (1000 * 1E6)/ xfps; tv = &drawtimeout; dodraw = 0; @@ -3962,8 +3965,7 @@ run(void) { dodraw = 1; } deltatime = TIMEDIFF(now, last); - if(deltatime > (xev? (1000/xfps) : (1000/actionfps)) - || deltatime < 0) { + if(deltatime > 1000 / (xev ? xfps : actionfps)) { dodraw = 1; last = now; } @@ -4006,9 +4008,11 @@ run(void) { void usage(void) { - die("%s " VERSION " (c) 2010-2015 st engineers\n" \ + die("%s " VERSION " (c) 2010-2015 st engineers\n" "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n" - " [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n", + " [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n" + " st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n" + " [-i] [-t title] [-w windowid] [-l line] [stty_args ...]\n", argv0); } @@ -4044,6 +4048,9 @@ main(int argc, char *argv[]) { case 'o': opt_io = EARGF(usage()); break; + case 'l': + opt_line = EARGF(usage()); + break; case 't': opt_title = EARGF(usage()); break;