X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/751fb765e4f26ce1500b4e8ee9f4cd5b6039b495..c6853fe18564437fe0a4cb06565a0a7d63d40b5a:/st.c?ds=sidebyside diff --git a/st.c b/st.c index e6a5e4e..4fc4d3d 100644 --- a/st.c +++ b/st.c @@ -24,6 +24,7 @@ #include #include #include +#include #if defined(__linux) #include @@ -66,17 +67,61 @@ #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 }; -enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, - CURSOR_SAVE, CURSOR_LOAD }; -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_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 }; +enum glyph_attribute { + ATTR_NULL = 0, + ATTR_REVERSE = 1, + ATTR_UNDERLINE = 2, + ATTR_BOLD = 4, + ATTR_GFX = 8, +}; + +enum cursor_movement { + CURSOR_UP, + CURSOR_DOWN, + CURSOR_LEFT, + CURSOR_RIGHT, + CURSOR_SAVE, + CURSOR_LOAD +}; + +enum cursor_state { + CURSOR_DEFAULT = 0, + CURSOR_HIDE = 1, + CURSOR_WRAPNEXT = 2 +}; + +enum glyph_state { + GLYPH_SET = 1, + GLYPH_DIRTY = 2 +}; +enum term_mode { + MODE_WRAP = 1, + MODE_INSERT = 2, + MODE_APPKEYPAD = 4, + MODE_ALTSCREEN = 8, + MODE_CRLF = 16, + MODE_MOUSEBTN = 32, + MODE_MOUSEMOTION = 64, + MODE_MOUSE = 32|64, + MODE_REVERSE = 128 +}; + +enum escape_state { + ESC_START = 1, + ESC_CSI = 2, + ESC_OSC = 4, + ESC_TITLE = 8, + ESC_ALTCHARSET = 16 +}; + +enum window_state { + WIN_VISIBLE = 1, + WIN_REDRAW = 2, + WIN_FOCUSED = 4 +}; + +/* bit macro */ #undef B0 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 }; @@ -134,15 +179,13 @@ typedef struct { Display* dpy; Colormap cmap; Window win; - Pixmap buf; + XdbeBackBuffer buf; Atom xembed; XIM xim; XIC xic; int scr; int w; /* window width */ int h; /* window height */ - int bufw; /* pixmap width */ - int bufh; /* pixmap height */ int ch; /* char height */ int cw; /* char width */ char state; /* focus, redraw, visible */ @@ -215,6 +258,7 @@ static void tsetattr(int*, int); static void tsetchar(char*); static void tsetscroll(int, int); static void tswapscreen(void); +static void tsetdirt(int, int); static void tfulldirt(void); static void ttynew(void); @@ -225,7 +269,7 @@ static void ttywrite(const char *, size_t); static void xdraws(char *, Glyph, int, int, int, int); static void xhints(void); static void xclear(int, int, int, int); -static void xcopy(int, int, int, int); +static void xcopy(); static void xdrawcursor(void); static void xinit(void); static void xloadcols(void); @@ -402,8 +446,8 @@ utf8size(char *s) { void selinit(void) { - sel.tclick1.tv_sec = 0; - sel.tclick1.tv_usec = 0; + memset(&sel.tclick1, 0, sizeof(sel.tclick1)); + memset(&sel.tclick2, 0, sizeof(sel.tclick2)); sel.mode = 0; sel.bx = -1; sel.clip = NULL; @@ -476,8 +520,7 @@ bpress(XEvent *e) { mousereport(e); else if(e->xbutton.button == Button1) { if(sel.bx != -1) - for(int i=sel.b.y; i<=sel.e.y; i++) - term.dirty[i] = 1; + tsetdirt(sel.b.y, sel.e.y); sel.mode = 1; sel.ex = sel.bx = X2COL(e->xbutton.x); sel.ey = sel.by = Y2ROW(e->xbutton.y); @@ -487,21 +530,28 @@ bpress(XEvent *e) { void selcopy(void) { char *str, *ptr; - int x, y, sz, sl, ls = 0; + int x, y, bufsize, is_selected = 0; if(sel.bx == -1) str = NULL; + else { - sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; - ptr = str = malloc(sz); + bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; + ptr = str = malloc(bufsize); + + /* append every set & selected glyph to the selection */ for(y = 0; y < term.row; y++) { - for(x = 0; x < term.col; x++) - if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) { - sl = utf8size(term.line[y][x].c); - memcpy(ptr, term.line[y][x].c, sl); - ptr += sl; + for(x = 0; x < term.col; x++) { + is_selected = selected(x, y); + if((term.line[y][x].state & GLYPH_SET) && is_selected) { + int size = utf8size(term.line[y][x].c); + memcpy(ptr, term.line[y][x].c, size); + ptr += size; } - if(ls && y < sel.e.y) + } + + /* \n at the end of every selected line except for the last one */ + if(is_selected && y < sel.e.y) *ptr++ = '\n'; } *ptr = 0; @@ -643,8 +693,7 @@ bmotion(XEvent *e) { if(oldey != sel.ey || oldex != sel.ex) { int starty = MIN(oldey, sel.ey); int endy = MAX(oldey, sel.ey); - for(int i = starty; i <= endy; i++) - term.dirty[i] = 1; + tsetdirt(starty, endy); draw(); } } @@ -665,7 +714,7 @@ execsh(void) { char **args; char *envshell = getenv("SHELL"); - DEFAULT(envshell, "sh"); + DEFAULT(envshell, SHELL); putenv("TERM="TNAME); args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL}; execvp(args[0], args); @@ -769,13 +818,23 @@ ttyresize(int x, int y) { } void -tfulldirt(void) +tsetdirt(int top, int bot) { int i; - for(i = 0; i < term.row; i++) + + LIMIT(top, 0, term.row-1); + LIMIT(bot, 0, term.row-1); + + for(i = top; i <= bot; i++) term.dirty[i] = 1; } +void +tfulldirt(void) +{ + tsetdirt(0, term.row-1); +} + void tcursor(int mode) { static TCursor c; @@ -1343,8 +1402,17 @@ csihandle(void) { void csidump(void) { - fwrite("\033[", 1, 2, stdout); - fwrite(escseq.buf, 1, escseq.len, stdout); + int i; + printf("ESC["); + for(i = 0; i < escseq.len; i++) { + uint c = escseq.buf[i] & 0xff; + if(isprint(c)) putchar(c); + else if(c == '\n') printf("(\\n)"); + else if(c == '\r') printf("(\\r)"); + else if(c == 0x1b) printf("(\\e)"); + else printf("(%02x)", c); + } + putchar('\n'); } void @@ -1551,32 +1619,8 @@ tresize(int col, int row) { void xresize(int col, int row) { - Pixmap newbuf; - int oldw, oldh; - - oldw = xw.bufw; - oldh = xw.bufh; - xw.bufw = MAX(1, col * xw.cw); - xw.bufh = MAX(1, row * xw.ch); - newbuf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr)); - XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0); - XFreePixmap(xw.dpy, xw.buf); - XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]); - if(xw.bufw > oldw) - XFillRectangle(xw.dpy, newbuf, dc.gc, oldw, 0, - xw.bufw-oldw, MIN(xw.bufh, oldh)); - else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw)) - XClearArea(xw.dpy, xw.win, BORDER+xw.bufw, BORDER, - xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh), - False); - if(xw.bufh > oldh) - XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh, - xw.bufw, xw.bufh-oldh); - else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh)) - XClearArea(xw.dpy, xw.win, BORDER, BORDER+xw.bufh, - xw.w-2*BORDER, xw.h-xw.bufh-BORDER, - False); - xw.buf = newbuf; + xw.w = MAX(1, 2*BORDER + col * xw.cw); + xw.h = MAX(1, 2*BORDER + row * xw.ch); } void @@ -1625,7 +1669,7 @@ void xclear(int x1, int y1, int x2, int y2) { 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, + BORDER + x1 * xw.cw, BORDER + y1 * xw.ch, (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); } @@ -1711,10 +1755,8 @@ xinit(void) { xloadcols(); /* window - default size */ - xw.bufh = term.row * xw.ch; - xw.bufw = term.col * xw.cw; - xw.h = xw.bufh + 2*BORDER; - xw.w = xw.bufw + 2*BORDER; + 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]; @@ -1732,7 +1774,7 @@ xinit(void) { CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask | CWColormap, &attrs); - xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr)); + xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied); /* input methods */ @@ -1761,7 +1803,7 @@ xinit(void) { void xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { int fg = base.fg, bg = base.bg, temp; - int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw; + 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; @@ -1802,10 +1844,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { /* copy buffer pixmap to screen pixmap */ void -xcopy(int x, int y, int cols, int rows) { - int src_x = x*xw.cw, src_y = y*xw.ch, src_w = cols*xw.cw, src_h = rows*xw.ch; - int dst_x = BORDER+src_x, dst_y = BORDER+src_y; - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, src_x, src_y, src_w, src_h, dst_x, dst_y); +xcopy() { + XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}}; + XdbeSwapBuffers(xw.dpy, swpinfo, 1); + } void @@ -1849,6 +1891,7 @@ xdrawcursor(void) { void draw() { drawregion(0, 0, term.col, term.row); + xcopy(); gettimeofday(&xw.lastdraw, NULL); } @@ -1890,7 +1933,6 @@ drawregion(int x1, int y1, int x2, int y2) { } if(ib > 0) xdraws(buf, base, ox, y, ic, ib); - xcopy(0, y, term.col, 1); } xdrawcursor(); } @@ -1899,13 +1941,10 @@ void expose(XEvent *ev) { XExposeEvent *e = &ev->xexpose; if(xw.state & WIN_REDRAW) { - if(!e->count) { + if(!e->count) xw.state &= ~WIN_REDRAW; - xcopy(0, 0, term.col, term.row); - } - } else - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER, - e->width, e->height, e->x, e->y); + } + xcopy(); } void