X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/8eaed2cdda375e8e951eb389af3859e18761eddc..7d352f143655ace75dd4e40432199f18f296da5e:/st.c diff --git a/st.c b/st.c index 56c3c6b..01ffa21 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_CRLF=16, MODE_MOUSE=32 }; 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,19 +403,47 @@ 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; sel.e.y = MAX(sel.by, sel.ey); } +void +mousereport(XEvent *e) { + 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; + + /* from urxvt */ + if(e->xbutton.type == ButtonRelease || button == AnyButton) + button = 3; + else { + button -= Button1; + if(button >= 3) + button += 64 - 3; + } + + buf[3] = 32 + button + (state & ShiftMask ? 4 : 0) + + (state & Mod4Mask ? 8 : 0) + + (state & ControlMask ? 16 : 0); + + ttywrite(buf, sizeof(buf)); +} + 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; + sel.ex = sel.bx = X2COL(e->xbutton.x); + sel.ey = sel.by = Y2ROW(e->xbutton.y); } void @@ -526,6 +556,7 @@ brelease(XEvent *e) { 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) @@ -534,13 +565,13 @@ brelease(XEvent *e) { struct timeval now; 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 && @@ -1085,6 +1116,9 @@ csihandle(void) { case 25: term.c.state |= CURSOR_HIDE; break; + case 1000: /* disable X11 xterm mouse reporting */ + term.mode &= ~MODE_MOUSE; + break; case 1049: /* = 1047 and 1048 */ case 1047: if(IS_SET(MODE_ALTSCREEN)) { @@ -1148,6 +1182,9 @@ csihandle(void) { case 25: term.c.state &= ~CURSOR_HIDE; break; + case 1000: /* enable X11 xterm mouse reporting */ + term.mode |= MODE_MOUSE; + break; case 1049: /* = 1047 and 1048 */ case 1047: if(IS_SET(MODE_ALTSCREEN)) @@ -1870,17 +1907,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();