X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=bc17df35d4285aeaae547059e2e44d733a17024f;hb=189a81caa11a278079fde3e610870e07870d8968;hp=65c7532fa1b542c930dfac7b34388d75f6aea2d4;hpb=80da37203e1699d9143cacfcfaeae7e7645c645d;p=st.git diff --git a/st.c b/st.c index 65c7532..bc17df3 100644 --- a/st.c +++ b/st.c @@ -34,8 +34,8 @@ #endif #define USAGE \ - "st-" VERSION ", (c) 2010 st engineers\n" \ - "usage: st [-t title] [-c class] [-v] [-e cmd]\n" + "st-" VERSION ", (c) 2010-2011 st engineers\n" \ + "usage: st [-t title] [-c class] [-v] [-e command...]\n" /* Arbitrary sizes */ #define ESC_TITLE_SIZ 256 @@ -53,7 +53,9 @@ #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)) -#define TIMEDIFFERENCE(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) +#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) +#define X2COL(x) (((x) - BORDER)/xw.cw) +#define Y2ROW(y) (((y) - BORDER)/xw.ch) /* 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 }; @@ -62,7 +64,7 @@ enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 }; enum { GLYPH_SET=1, GLYPH_DIRTY=2 }; enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, - MODE_CRLF=16, MODE_MOUSE=32 }; + MODE_CRLF=16, MODE_MOUSEBTN=32, MODE_MOUSEMOTION=64, MODE_MOUSE=32|64, MODE_REVERSE=128 }; enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 }; enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 }; @@ -401,8 +403,8 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) { if(b) *b = e->xbutton.button; - *x = (e->xbutton.x - BORDER)/xw.cw; - *y = (e->xbutton.y - BORDER)/xw.ch; + *x = X2COL(e->xbutton.x); + *y = Y2ROW(e->xbutton.y); sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex; sel.b.y = MIN(sel.by, sel.ey); sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx; @@ -411,22 +413,29 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) { void mousereport(XEvent *e) { - int x = (e->xbutton.x - BORDER)/xw.cw; - int y = (e->xbutton.y - BORDER)/xw.ch; + int x = X2COL(e->xbutton.x); + int y = Y2ROW(e->xbutton.y); int button = e->xbutton.button; int state = e->xbutton.state; char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 }; - - if(!IS_SET(MODE_MOUSE)) - return; + static int ob, ox, oy; /* from urxvt */ - if(e->xbutton.type == ButtonRelease || button == AnyButton) + if(e->xbutton.type == MotionNotify) { + if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy)) + return; + button = ob + 32; + ox = x, oy = y; + } else if(e->xbutton.type == ButtonRelease || button == AnyButton) { button = 3; - else { + } else { button -= Button1; if(button >= 3) button += 64 - 3; + if(e->xbutton.type == ButtonPress) { + ob = button; + ox = x, oy = y; + } } buf[3] = 32 + button + (state & ShiftMask ? 4 : 0) @@ -438,10 +447,13 @@ mousereport(XEvent *e) { void bpress(XEvent *e) { - mousereport(e); - sel.mode = 1; - sel.ex = sel.bx = (e->xbutton.x - BORDER)/xw.cw; - sel.ey = sel.by = (e->xbutton.y - BORDER)/xw.ch; + if(IS_SET(MODE_MOUSE)) + mousereport(e); + else if(e->xbutton.button == Button1) { + sel.mode = 1; + sel.ex = sel.bx = X2COL(e->xbutton.x); + sel.ey = sel.by = Y2ROW(e->xbutton.y); + } } void @@ -550,40 +562,41 @@ xsetsel(char *str) { void brelease(XEvent *e) { - int b; - - sel.mode = 0; - getbuttoninfo(e, &b, &sel.ex, &sel.ey); - mousereport(e); - if(sel.bx == sel.ex && sel.by == sel.ey) { - sel.bx = -1; - if(b == 2) - selpaste(); - else if(b == 1) { + if(IS_SET(MODE_MOUSE)) { + mousereport(e); + return; + } + if(e->xbutton.button == Button2) + selpaste(); + else if(e->xbutton.button == Button1) { + sel.mode = 0; + getbuttoninfo(e, NULL, &sel.ex, &sel.ey); + if(sel.bx == sel.ex && sel.by == sel.ey) { struct timeval now; + sel.bx = -1; gettimeofday(&now, NULL); - if(TIMEDIFFERENCE(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) { + if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) { /* triple click on the line */ sel.b.x = sel.bx = 0; sel.e.x = sel.ex = term.col; sel.b.y = sel.e.y = sel.ey; selcopy(); - } else if(TIMEDIFFERENCE(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) { + } else if(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) { /* double click to select word */ sel.bx = sel.ex; - while(term.line[sel.ey][sel.bx-1].state & GLYPH_SET && + while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET && term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--; sel.b.x = sel.bx; - while(term.line[sel.ey][sel.ex+1].state & GLYPH_SET && + while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET && term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++; sel.e.x = sel.ex; sel.b.y = sel.e.y = sel.ey; selcopy(); } - } - } else if(b == 1) - selcopy(); + } else + selcopy(); + } memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval)); gettimeofday(&sel.tclick1, NULL); draw(); @@ -591,9 +604,12 @@ brelease(XEvent *e) { void bmotion(XEvent *e) { + if(IS_SET(MODE_MOUSE)) { + mousereport(e); + return; + } if(sel.mode) { - int oldey = sel.ey, - oldex = sel.ex; + int oldey = sel.ey, oldex = sel.ex; getbuttoninfo(e, NULL, &sel.ex, &sel.ey); if(oldey != sel.ey || oldex != sel.ex) { @@ -1101,7 +1117,11 @@ csihandle(void) { case 1: term.mode &= ~MODE_APPKEYPAD; break; - case 5: /* TODO: DECSCNM -- Remove reverse video */ + case 5: /* DECSCNM -- Remove reverse video */ + if(IS_SET(MODE_REVERSE)) { + term.mode &= ~MODE_REVERSE; + draw(); + } break; case 7: term.mode &= ~MODE_WRAP; @@ -1115,15 +1135,19 @@ csihandle(void) { term.c.state |= CURSOR_HIDE; break; case 1000: /* disable X11 xterm mouse reporting */ - term.mode &= ~MODE_MOUSE; + 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(escseq.arg[0] == 1047) + if(escseq.arg[0] != 1049) break; case 1048: tcursor(CURSOR_LOAD); @@ -1165,7 +1189,10 @@ csihandle(void) { term.mode |= MODE_APPKEYPAD; break; case 5: /* DECSCNM -- Reverve video */ - /* TODO: set REVERSE on the whole screen (f) */ + if(!IS_SET(MODE_REVERSE)) { + term.mode |= MODE_REVERSE; + draw(); + } break; case 7: term.mode |= MODE_WRAP; @@ -1180,16 +1207,20 @@ csihandle(void) { case 25: term.c.state &= ~CURSOR_HIDE; break; - case 1000: /* enable X11 xterm mouse reporting */ - term.mode |= MODE_MOUSE; + 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(escseq.arg[0] == 1047) + if(escseq.arg[0] != 1049) break; case 1048: tcursor(CURSOR_SAVE); @@ -1506,7 +1537,7 @@ xloadcols(void) { void xclear(int x1, int y1, int x2, int y2) { - XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]); + XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]); XFillRectangle(xw.dpy, xw.buf, dc.gc, x1 * xw.cw, y1 * xw.ch, (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); @@ -1603,7 +1634,7 @@ xinit(void) { attrs.bit_gravity = NorthWestGravity; attrs.event_mask = FocusChangeMask | KeyPressMask | ExposureMask | VisibilityChangeMask | StructureNotifyMask - | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; + | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; attrs.colormap = xw.cmap; xw.win = XCreateWindow(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0, @@ -1630,22 +1661,28 @@ xinit(void) { &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff}, &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000}); + XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"); XMapWindow(xw.dpy, xw.win); xhints(); - XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"); XSync(xw.dpy, 0); } void xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { - unsigned long xfg, xbg; + unsigned long xfg = dc.col[base.fg], xbg = dc.col[base.bg], temp; int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw; int i; + + /* only switch default fg/bg if term is in RV mode */ + if(IS_SET(MODE_REVERSE)) { + if(base.fg == DefaultFG) + xfg = dc.col[DefaultBG]; + if(base.bg == DefaultBG) + xbg = dc.col[DefaultFG]; + } 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]; + temp = xfg, xfg = xbg, xbg = temp; XSetBackground(xw.dpy, dc.gc, xbg); XSetForeground(xw.dpy, dc.gc, xfg); @@ -1690,6 +1727,8 @@ xdrawcursor(void) { /* draw the new one */ if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) { sl = utf8size(g.c); + if(IS_SET(MODE_REVERSE)) + g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG; xdraws(g.c, g, term.c.x, term.c.y, 1, sl); oldx = term.c.x, oldy = term.c.y; } @@ -1905,17 +1944,17 @@ main(int argc, char *argv[]) { case 'c': if(++i < argc) opt_class = argv[i]; break; - case 'e': + case 'e': + /* eat every remaining arguments */ if(++i < argc) opt_cmd = &argv[i]; - break; + goto run; case 'v': default: die(USAGE); } - /* -e eats every remaining arguments */ - if(opt_cmd) - break; } + + run: setlocale(LC_CTYPE, ""); tnew(80, 24); ttynew();