X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=108908721d2dab133753096e02c1b4b5ebec7b5a;hb=638a30359d26c1f84a87f0f8df17df1765068029;hp=99ab085f173aa1e064880b2aa65b25394ab7202b;hpb=6faedce53a8de8a81da1ba045ffbc2b7603128cd;p=st.git diff --git a/st.c b/st.c index 99ab085..1089087 100644 --- a/st.c +++ b/st.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -54,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 */ @@ -107,6 +110,8 @@ typedef struct { Colormap cmap; Window win; Pixmap buf; + XIM xim; + XIC xic; int scr; int w; /* window width */ int h; /* window height */ @@ -114,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 { @@ -161,7 +165,7 @@ 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); @@ -186,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 *); @@ -197,7 +202,8 @@ static void focus(XEvent *); static void brelease(XEvent *); static void bpress(XEvent *); static void bmotion(XEvent *); - +static void selection_notify(XEvent *); +static void selection_request(XEvent *); static void (*handler[LASTEvent])(XEvent *) = { [KeyPress] = kpress, @@ -210,6 +216,8 @@ static void (*handler[LASTEvent])(XEvent *) = { [MotionNotify] = bmotion, [ButtonPress] = bpress, [ButtonRelease] = brelease, + [SelectionNotify] = selection_notify, + [SelectionRequest] = selection_request, }; /* Globals */ @@ -241,8 +249,9 @@ static inline int selected(int x, int y) { } static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) { - if(b) *b = e->xbutton.state, - *b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1; + if(b) + *b = e->xbutton.button; + *x = e->xbutton.x/xw.cw; *y = e->xbutton.y/xw.ch; sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex; @@ -275,15 +284,129 @@ static char *getseltext() { return str; } -/* TODO: use X11 clipboard */ +static void selection_notify(XEvent *e) { + unsigned long nitems; + unsigned long length; + int format, res; + 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"); + 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); + } +} + +static void selpaste() { + XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime); +} + +static void selection_request(XEvent *e) +{ + XSelectionRequestEvent *xsre; + XSelectionEvent xev; + int res; + Atom xa_targets; + + xsre = (XSelectionRequestEvent *) e; + xev.type = SelectionNotify; + xev.requestor = xsre->requestor; + xev.selection = xsre->selection; + xev.target = xsre->target; + xev.time = xsre->time; + /* reject */ + xev.property = None; + + xa_targets = XInternAtom(xw.dis, "TARGETS", 0); + 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; + } + } 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; + } + } + + /* 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"); + } +} + 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; -} -static void selpaste() { - if(sel.clip) - ttywrite(sel.clip, strlen(sel.clip)); + res = XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime); + switch(res) { + case BadAtom: + case BadWindow: + fprintf(stderr, "Invalid copy, XSetSelectionOwner"); + return; + } + + 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; + } + + XFlush(xw.dis); } /* TODO: doubleclick to select word */ @@ -505,13 +628,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 @@ -556,7 +679,7 @@ tsetchar(char c) { void tclearregion(int x1, int y1, int x2, int y2) { - int y, temp; + int x, y, temp; if(x1 > x2) temp = x1, x1 = x2, x2 = temp; @@ -569,7 +692,8 @@ tclearregion(int x1, int y1, int x2, int y2) { LIMIT(y2, 0, term.row-1); for(y = y1; y <= y2; y++) - memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1)); + for(x = x1; x <= x2; x++) + term.line[y][x].state = 0; } void @@ -809,6 +933,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; @@ -865,6 +992,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) @@ -993,7 +1123,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 */ @@ -1039,11 +1169,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': @@ -1052,7 +1185,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); @@ -1071,7 +1204,7 @@ tputs(char *s, int len) { void tresize(int col, int row) { - int i; + int i, x; int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); int slide = term.c.y - row + 1; @@ -1105,8 +1238,10 @@ tresize(int col, int row) { for(i = 0; i < minrow; i++) { term.line[i] = realloc(term.line[i], col * sizeof(Glyph)); term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph)); - memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph)); - memset(term.alt[i] + mincol, 0, (col - mincol) * sizeof(Glyph)); + for(x = mincol; x < col; x++) { + term.line[i][x].state = 0; + term.alt[i][x].state = 0; + } } /* allocate any new rows */ @@ -1123,6 +1258,36 @@ tresize(int col, int row) { tsetscroll(0, row-1); } +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 xloadcols(void) { int i, r, g, b; @@ -1228,6 +1393,13 @@ xinit(void) { | CWColormap, &attrs); xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr)); + + + /* input methods */ + xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL); + xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing + | XIMStatusNothing, XNClientWindow, xw.win, + XNFocusWindow, xw.win, NULL); /* gc */ dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL); @@ -1286,7 +1458,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; } @@ -1326,7 +1498,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); @@ -1355,27 +1527,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 @@ -1388,8 +1569,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); } @@ -1411,19 +1595,17 @@ kpress(XEvent *ev) { int len; int meta; int shift; + Status status; meta = e->state & Mod1Mask; shift = e->state & ShiftMask; - len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); - + 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: @@ -1434,10 +1616,23 @@ kpress(XEvent *ev) { break; case XK_Insert: if(shift) - selpaste(), draw(1); + 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; } } @@ -1451,16 +1646,13 @@ 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; + col = (xw.w - 2*BORDER) / xw.cw; + row = (xw.h - 2*BORDER) / xw.ch; + if(col == term.col && row == term.row) + return; tresize(col, row); 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 @@ -1484,6 +1676,8 @@ run(void) { } while(XPending(xw.dis)) { XNextEvent(xw.dis, &ev); + if (XFilterEvent(&ev, xw.win)) + continue; if(handler[ev.type]) (handler[ev.type])(&ev); }