X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=st.c;h=895519df99e7b9fd5731516ec806cc5a44fdca97;hb=d581bfccd7c2987e12809383d8ce1f833529b715;hp=004220476a3af0ff275c2b8d5b87dfc8f05e36dd;hpb=68d8fcf62a4f016c0292db543c1c2e694afc5b54;p=st.git diff --git a/st.c b/st.c index 0042204..895519d 100644 --- a/st.c +++ b/st.c @@ -55,9 +55,11 @@ 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 }; +enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, + MODE_CRLF=16 }; enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 }; enum { SCREEN_UPDATE, SCREEN_REDRAW }; +enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 }; typedef struct { char c; /* character code */ @@ -117,8 +119,7 @@ typedef struct { int bufh; /* pixmap height */ int ch; /* char height */ int cw; /* char width */ - int focus; - int vis; /* is visible */ + char state; /* focus, redraw, visible */ } XWindow; typedef struct { @@ -164,12 +165,12 @@ static void tinsertblank(int); static void tinsertblankline(int); static void tmoveto(int, int); static void tnew(int, int); -static void tnewline(void); +static void tnewline(int); static void tputtab(void); static void tputc(char); static void tputs(char*, int); static void treset(void); -static void tresize(int, int); +static int tresize(int, int); static void tscrollup(int, int); static void tscrolldown(int, int); static void tsetattr(int*, int); @@ -189,6 +190,7 @@ static void xdrawcursor(void); static void xinit(void); static void xloadcols(void); static void xseturgency(int); +static void xresize(int, int); static void expose(XEvent *); static void visibility(XEvent *); @@ -284,35 +286,24 @@ static char *getseltext() { static void selection_notify(XEvent *e) { unsigned long nitems; - unsigned long length; - int format, res; + unsigned long ofs, rem; + int format; unsigned char *data; Atom type; - res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, 0, False, - AnyPropertyType, &type, &format, &nitems, &length, &data); - switch(res) { - case BadAtom: - case BadValue: - case BadWindow: - fprintf(stderr, "Invalid paste, XGetWindowProperty0"); + ofs = 0; + do { + if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4, + False, AnyPropertyType, &type, &format, + &nitems, &rem, &data)) { + fprintf(stderr, "Clipboard allocation failed\n"); return; - } - - res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, length, False, - AnyPropertyType, &type, &format, &nitems, &length, &data); - switch(res) { - case BadAtom: - case BadValue: - case BadWindow: - fprintf(stderr, "Invalid paste, XGetWindowProperty0"); - return; - } - - if(data) { + } ttywrite((const char *) data, nitems * format / 8); XFree(data); - } + /* number of 32-bit chunks returned */ + ofs += nitems * format / 32; + } while(rem > 0); } static void selpaste() { @@ -323,7 +314,6 @@ static void selection_request(XEvent *e) { XSelectionRequestEvent *xsre; XSelectionEvent xev; - int res; Atom xa_targets; xsre = (XSelectionRequestEvent *) e; @@ -339,70 +329,33 @@ static void selection_request(XEvent *e) if(xsre->target == xa_targets) { /* respond with the supported type */ Atom string = XA_STRING; - res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32, - PropModeReplace, (unsigned char *) &string, 1); - switch(res) { - case BadAlloc: - case BadAtom: - case BadMatch: - case BadValue: - case BadWindow: - fprintf(stderr, "Error in selection_request, TARGETS"); - break; - default: - xev.property = xsre->property; - } + XChangeProperty(xsre->display, xsre->requestor, xsre->property, + XA_ATOM, 32, PropModeReplace, + (unsigned char *) &string, 1); + xev.property = xsre->property; } else if(xsre->target == XA_STRING) { - res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, - xsre->target, 8, PropModeReplace, (unsigned char *) sel.clip, - strlen(sel.clip)); - switch(res) { - case BadAlloc: - case BadAtom: - case BadMatch: - case BadValue: - case BadWindow: - fprintf(stderr, "Error in selection_request, XA_STRING"); - break; - default: - xev.property = xsre->property; - } + XChangeProperty(xsre->display, xsre->requestor, xsre->property, + xsre->target, 8, PropModeReplace, + (unsigned char *) sel.clip, strlen(sel.clip)); + xev.property = xsre->property; } /* all done, send a notification to the listener */ - res = XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev); - switch(res) { - case 0: - case BadValue: - case BadWindow: - fprintf(stderr, "Error in selection_requested, XSendEvent"); - } + if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev)) + fprintf(stderr, "Error sending SelectionNotify event\n"); } static void selcopy(char *str) { /* register the selection for both the clipboard and the primary */ Atom clipboard; - int res; free(sel.clip); sel.clip = str; - res = XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime); - switch(res) { - case BadAtom: - case BadWindow: - fprintf(stderr, "Invalid copy, XSetSelectionOwner"); - return; - } + XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime); clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0); - res = XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime); - switch(res) { - case BadAtom: - case BadWindow: - fprintf(stderr, "Invalid copy, XSetSelectionOwner"); - return; - } + XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime); XFlush(xw.dis); } @@ -626,13 +579,13 @@ tscrollup(int orig, int n) { } void -tnewline(void) { +tnewline(int first_col) { int y = term.c.y; - if(term.c.y == term.bot) + if(y == term.bot) tscrollup(term.top, 1); else y++; - tmoveto(0, y); + tmoveto(first_col ? 0 : term.c.x, y); } void @@ -881,10 +834,14 @@ csihandle(void) { case 'J': /* ED -- Clear screen */ switch(escseq.arg[0]) { case 0: /* below */ - tclearregion(term.c.x, term.c.y, term.col-1, term.row-1); + tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); + if(term.c.y < term.row-1) + tclearregion(0, term.c.y+1, term.col-1, term.row-1); break; case 1: /* above */ - tclearregion(0, 0, term.c.x, term.c.y); + if(term.c.y > 1) + tclearregion(0, 0, term.col-1, term.c.y-1); + tclearregion(0, term.c.y, term.c.x, term.c.y); break; case 2: /* all */ tclearregion(0, 0, term.col-1, term.row-1); @@ -931,6 +888,9 @@ csihandle(void) { break; case 12: /* att610 -- Stop blinking cursor (IGNORED) */ break; + case 20: + term.mode &= ~MODE_CRLF; + break; case 25: term.c.state |= CURSOR_HIDE; break; @@ -987,6 +947,9 @@ csihandle(void) { 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(escseq.narg > 1 && escseq.arg[1] != 25) @@ -1115,7 +1078,7 @@ tputc(char c) { term.esc = 0; break; case 'E': /* NEL -- Next line */ - tnewline(); + tnewline(1); /* always go to first col */ term.esc = 0; break; case 'M': /* RI -- Reverse index */ @@ -1161,11 +1124,14 @@ tputc(char c) { case '\r': tmoveto(0, term.c.y); break; + case '\f': + case '\v': case '\n': - tnewline(); + /* go to first col if the mode is set */ + tnewline(IS_SET(MODE_CRLF)); break; case '\a': - if(!xw.focus) + if(!(xw.state & WIN_FOCUSED)) xseturgency(1); break; case '\033': @@ -1174,7 +1140,7 @@ tputc(char c) { break; default: if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT) - tnewline(); + tnewline(1); /* always go to first col */ tsetchar(c); if(term.c.x+1 < term.col) tmoveto(term.c.x+1, term.c.y); @@ -1191,7 +1157,7 @@ tputs(char *s, int len) { tputc(*s++); } -void +int tresize(int col, int row) { int i, x; int minrow = MIN(row, term.row); @@ -1199,7 +1165,7 @@ tresize(int col, int row) { int slide = term.c.y - row + 1; if(col < 1 || row < 1) - return; + return 0; /* free unneeded rows */ i = 0; @@ -1245,6 +1211,37 @@ tresize(int col, int row) { tmoveto(term.c.x, term.c.y); /* reset scrolling region */ tsetscroll(0, row-1); + return (slide > 0); +} + +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.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr)); + XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0); + XFreePixmap(xw.dis, xw.buf); + XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]); + if(xw.bufw > oldw) + XFillRectangle(xw.dis, 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.dis, xw.win, BORDER+xw.bufw, BORDER, + xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh), + False); + if(xw.bufh > oldh) + XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh, + xw.bufw, xw.bufh-oldh); + else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh)) + XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh, + xw.w-2*BORDER, xw.h-xw.bufh-BORDER, + False); + xw.buf = newbuf; } void @@ -1417,7 +1414,7 @@ xdrawcursor(void) { xclear(oldx, oldy, oldx, oldy); /* draw the new one */ - if(!(term.c.state & CURSOR_HIDE) && xw.focus) { + if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) { xdraws(&g.c, g, term.c.x, term.c.y, 1); oldx = term.c.x, oldy = term.c.y; } @@ -1457,7 +1454,7 @@ draw(int redraw_all) { Glyph base, new; char buf[DRAW_BUF_SIZ]; - if(!xw.vis) + if(!(xw.state & WIN_VISIBLE)) return; xclear(0, 0, term.col-1, term.row-1); @@ -1486,27 +1483,36 @@ draw(int redraw_all) { } xdrawcursor(); XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); - XFlush(xw.dis); } #endif void expose(XEvent *ev) { - draw(SCREEN_REDRAW); + XExposeEvent *e = &ev->xexpose; + if(xw.state & WIN_REDRAW) { + if(!e->count) { + xw.state &= ~WIN_REDRAW; + draw(SCREEN_REDRAW); + } + } else + XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER, + e->width, e->height, e->x, e->y); } void visibility(XEvent *ev) { XVisibilityEvent *e = &ev->xvisibility; - /* XXX if this goes from 0 to 1, need a full redraw for next Expose, - * not just a buf copy */ - xw.vis = e->state != VisibilityFullyObscured; + 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; } void unmap(XEvent *ev) { - xw.vis = 0; + xw.state &= ~WIN_VISIBLE; } void @@ -1519,8 +1525,11 @@ xseturgency(int add) { void focus(XEvent *ev) { - if((xw.focus = ev->type == FocusIn)) + if(ev->type == FocusIn) { + xw.state |= WIN_FOCUSED; xseturgency(0); + } else + xw.state &= ~WIN_FOCUSED; draw(SCREEN_UPDATE); } @@ -1547,15 +1556,12 @@ 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))) ttywrite(customkey, strlen(customkey)); - else if(len > 0) { - buf[sizeof(buf)-1] = '\0'; - if(meta && len == 1) - ttywrite("\033", 1); - ttywrite(buf, len); - } else + /* 2. hardcoded (overrides X lookup) */ + else switch(ksym) { case XK_Up: case XK_Down: @@ -1568,8 +1574,21 @@ kpress(XEvent *ev) { if(shift) selpaste(); break; + case XK_Return: + if(IS_SET(MODE_CRLF)) + ttywrite("\r\n", 2); + else + ttywrite("\r", 1); + break; + /* 3. X lookup */ default: - fprintf(stderr, "errkey: %d\n", (int)ksym); + if(len > 0) { + buf[sizeof(buf)-1] = '\0'; + if(meta && len == 1) + ttywrite("\033", 1); + ttywrite(buf, len); + } else /* 4. nothing to send */ + fprintf(stderr, "errkey: %d\n", (int)ksym); break; } } @@ -1583,16 +1602,14 @@ resize(XEvent *e) { xw.w = e->xconfigure.width; xw.h = e->xconfigure.height; - xw.bufw = xw.w - 2*BORDER; - xw.bufh = xw.h - 2*BORDER; - col = xw.bufw / xw.cw; - row = xw.bufh / xw.ch; - tresize(col, row); + col = (xw.w - 2*BORDER) / xw.cw; + row = (xw.h - 2*BORDER) / xw.ch; + if(col == term.col && row == term.row) + return; + if(tresize(col, row)) + draw(SCREEN_REDRAW); ttyresize(col, row); - xw.bufh = MAX(1, xw.bufh); - xw.bufw = MAX(1, xw.bufw); - XFreePixmap(xw.dis, xw.buf); - xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr)); + xresize(col, row); } void