X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=72e57c8f73a868fc7871429b3ed22ddd17b21bcb;hb=907cb8bfa69926616639f9a19127117b37326029;hp=d43c30c805538b763041ac7b1c1701297e0af13c;hpb=732b9601ed2543b1fa6acbc08ddc05818279265f;p=st.git diff --git a/st.c b/st.c index d43c30c..72e57c8 100644 --- a/st.c +++ b/st.c @@ -16,10 +16,14 @@ #include #include #include -#include #include -#include +#include #include +#include +#include + +#include +#include #if defined(__linux) #include @@ -30,8 +34,12 @@ #endif #define USAGE \ - "st-" VERSION ", (c) 2010 st engineers\n" \ - "usage: st [-t title] [-c class] [-e cmd] [-v]\n" + "st " VERSION " (c) 2010-2011 st engineers\n" \ + "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n" + +/* XEMBED messages */ +#define XEMBED_FOCUS_IN 4 +#define XEMBED_FOCUS_OUT 5 /* Arbitrary sizes */ #define ESC_TITLE_SIZ 256 @@ -39,16 +47,21 @@ #define ESC_ARG_SIZ 16 #define DRAW_BUF_SIZ 1024 #define UTF_SIZ 4 +#define XK_NO_MOD UINT_MAX +#define XK_ANY_MOD 0 #define SERRNO strerror(errno) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) < (b) ? (b) : (a)) #define LEN(a) (sizeof(a) / sizeof(a[0])) -#define DEFAULT(a, b) (a) = (a) ? (a) : (b) +#define DEFAULT(a, b) (a) = (a) ? (a) : (b) #define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) #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 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 }; @@ -56,10 +69,9 @@ 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 }; +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 { SCREEN_UPDATE, SCREEN_REDRAW }; enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 }; #undef B0 @@ -86,21 +98,21 @@ typedef struct { /* ESC '[' [[ [] [;]] ] */ typedef struct { char buf[ESC_BUF_SIZ]; /* raw string */ - int len; /* raw string length */ + int len; /* raw string length */ char priv; int arg[ESC_ARG_SIZ]; - int narg; /* nb of args */ + int narg; /* nb of args */ char mode; } CSIEscape; /* Internal representation of the screen */ typedef struct { - int row; /* nb row */ + int row; /* nb row */ int col; /* nb col */ Line* line; /* screen */ Line* alt; /* alternate screen */ TCursor c; /* cursor */ - int top; /* top scroll limit */ + int top; /* top scroll limit */ int bot; /* bottom scroll limit */ int mode; /* terminal mode flags */ int esc; /* escape state flags */ @@ -114,20 +126,22 @@ typedef struct { Colormap cmap; Window win; Pixmap buf; + Atom xembed; XIM xim; XIC xic; int scr; - int w; /* window width */ + 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 */ -} XWindow; +} XWindow; typedef struct { KeySym k; + unsigned int mask; char s[ESC_BUF_SIZ]; } Key; @@ -149,14 +163,18 @@ typedef struct { int mode; int bx, by; int ex, ey; - struct {int x, y;} b, e; + struct {int x, y;} b, e; char *clip; + Atom xtarget; + struct timeval tclick1; + struct timeval tclick2; } Selection; #include "config.h" -static void die(const char *errstr, ...); -static void draw(int); +static void die(const char*, ...); +static void draw(void); +static void drawregion(int, int, int, int); static void execsh(void); static void sigchld(int); static void run(void); @@ -204,8 +222,9 @@ static void xresize(int, int); static void expose(XEvent *); static void visibility(XEvent *); static void unmap(XEvent *); -static char* kmap(KeySym); +static char* kmap(KeySym, unsigned int state); static void kpress(XEvent *); +static void cmessage(XEvent *); static void resize(XEvent *); static void focus(XEvent *); static void brelease(XEvent *); @@ -217,7 +236,8 @@ static void selrequest(XEvent *); static void selinit(void); static inline int selected(int, int); static void selcopy(void); -static void selpaste(void); +static void selpaste(); +static void selscroll(int, int); static int utf8decode(char *, long *); static int utf8encode(long *, char *); @@ -226,6 +246,7 @@ static int isfullutf8(char *, int); static void (*handler[LASTEvent])(XEvent *) = { [KeyPress] = kpress, + [ClientMessage] = cmessage, [ConfigureNotify] = resize, [VisibilityNotify] = visibility, [UnmapNotify] = unmap, @@ -247,8 +268,9 @@ static CSIEscape escseq; static int cmdfd; static pid_t pid; static Selection sel; -static char *opt_cmd = NULL; +static char **opt_cmd = NULL; static char *opt_title = NULL; +static char *opt_embed = NULL; static char *opt_class = NULL; int @@ -338,7 +360,7 @@ isfullutf8(char *s, int b) { else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) return 0; else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) && - ((b == 1) || + ((b == 1) || ((b == 2) && (*c2&(B7|B6)) == B7))) return 0; else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) && @@ -354,41 +376,46 @@ int utf8size(char *s) { unsigned char c = *s; - if (~c&B7) + if(~c&B7) return 1; - else if ((c&(B7|B6|B5)) == (B7|B6)) + else if((c&(B7|B6|B5)) == (B7|B6)) return 2; - else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5)) + else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) return 3; - else + else return 4; } void selinit(void) { + sel.tclick1.tv_sec = 0; + sel.tclick1.tv_usec = 0; sel.mode = 0; sel.bx = -1; sel.clip = NULL; + sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); + if(sel.xtarget == None) + sel.xtarget = XA_STRING; } -static inline int +static inline int selected(int x, int y) { if(sel.ey == y && sel.by == y) { int bx = MIN(sel.bx, sel.ex); int ex = MAX(sel.bx, sel.ex); return BETWEEN(x, bx, ex); } - return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x)) + return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x)) || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y)); } void getbuttoninfo(XEvent *e, int *b, int *x, int *y) { - if(b) + if(b) *b = e->xbutton.button; - *x = e->xbutton.x/xw.cw; - *y = e->xbutton.y/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; @@ -396,10 +423,48 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) { } 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 }; + static int ob, ox, oy; + + /* from urxvt */ + 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 { + 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) + + (state & Mod4Mask ? 8 : 0) + + (state & ControlMask ? 16 : 0); + + ttywrite(buf, sizeof(buf)); +} + +void bpress(XEvent *e) { - sel.mode = 1; - sel.ex = sel.bx = e->xbutton.x/xw.cw; - sel.ey = sel.by = e->xbutton.y/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 @@ -419,8 +484,8 @@ selcopy(void) { memcpy(ptr, term.line[y][x].c, sl); ptr += sl; } - if(ls) - *ptr = '\n', ptr++; + if(ls && y < sel.e.y) + *ptr++ = '\n'; } *ptr = 0; } @@ -429,8 +494,7 @@ selcopy(void) { void selnotify(XEvent *e) { - unsigned long nitems; - unsigned long ofs, rem; + unsigned long nitems, ofs, rem; int format; unsigned char *data; Atom type; @@ -452,7 +516,7 @@ selnotify(XEvent *e) { void selpaste() { - XConvertSelection(xw.dpy, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime); + XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime); } void @@ -473,12 +537,12 @@ selrequest(XEvent *e) { xa_targets = XInternAtom(xw.dpy, "TARGETS", 0); if(xsre->target == xa_targets) { /* respond with the supported type */ - Atom string = XA_STRING; + Atom string = sel.xtarget; 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) { + } else if(xsre->target == sel.xtarget) { XChangeProperty(xsre->display, xsre->requestor, xsre->property, xsre->target, 8, PropModeReplace, (unsigned char *) sel.clip, strlen(sel.clip)); @@ -506,30 +570,63 @@ xsetsel(char *str) { XFlush(xw.dpy); } -/* TODO: doubleclick to select word */ void brelease(XEvent *e) { - int b; - sel.mode = 0; - getbuttoninfo(e, &b, &sel.ex, &sel.ey); - 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(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(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) { + /* double click to select word */ + sel.bx = sel.ex; + 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(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 selcopy(); } - draw(1); + memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval)); + gettimeofday(&sel.tclick1, NULL); + draw(); } void bmotion(XEvent *e) { - if (sel.mode) { + if(IS_SET(MODE_MOUSE)) { + mousereport(e); + return; + } + if(sel.mode) { + int oldey = sel.ey, oldex = sel.ex; getbuttoninfo(e, NULL, &sel.ex, &sel.ey); - /* XXX: draw() can't keep up, disabled for now. - selection is visible on button release. - draw(1); */ + + if(oldey != sel.ey || oldex != sel.ex) { + int starty = MIN(oldey, sel.ey); + int endy = MAX(oldey, sel.ey); + drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row)); + } } } @@ -547,18 +644,15 @@ void execsh(void) { char **args; char *envshell = getenv("SHELL"); - DEFAULT(envshell, "sh"); - if(opt_cmd) - args = (char*[]){"sh", "-c", opt_cmd, NULL}; - else - args = (char*[]){envshell, "-i", NULL}; - + DEFAULT(envshell, "sh"); putenv("TERM="TNAME); + args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL}; execvp(args[0], args); + exit(EXIT_FAILURE); } -void +void sigchld(int a) { int stat = 0; if(waitpid(pid, &stat, 0) < 0) @@ -611,7 +705,7 @@ dump(char c) { void ttyread(void) { static char buf[BUFSIZ]; - static int buflen = 0; + static int buflen = 0; char *ptr; char s[UTF_SIZ]; int charsize; /* size of utf8 char in bytes */ @@ -667,8 +761,8 @@ tcursor(int mode) { void treset(void) { term.c = (TCursor){{ - .mode = ATTR_NULL, - .fg = DefaultFG, + .mode = ATTR_NULL, + .fg = DefaultFG, .bg = DefaultBG }, .x = 0, .y = 0, .state = CURSOR_DEFAULT}; @@ -683,7 +777,7 @@ tnew(int col, int row) { term.row = row, term.col = col; term.line = malloc(term.row * sizeof(Line)); term.alt = malloc(term.row * sizeof(Line)); - for(row = 0 ; row < term.row; row++) { + for(row = 0; row < term.row; row++) { term.line[row] = malloc(term.col * sizeof(Glyph)); term.alt [row] = malloc(term.col * sizeof(Glyph)); } @@ -713,6 +807,8 @@ tscrolldown(int orig, int n) { term.line[i] = term.line[i-n]; term.line[i-n] = temp; } + + selscroll(orig, n); } void @@ -723,11 +819,36 @@ tscrollup(int orig, int n) { tclearregion(0, orig, term.col-1, orig+n-1); - for(i = orig; i <= term.bot-n; i++) { + for(i = orig; i <= term.bot-n; i++) { temp = term.line[i]; - term.line[i] = term.line[i+n]; + term.line[i] = term.line[i+n]; term.line[i+n] = temp; } + + selscroll(orig, -n); +} + +void +selscroll(int orig, int n) { + if(sel.bx == -1) + return; + + if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) { + if((sel.by += n) > term.bot || (sel.ey += n) < term.top) { + sel.bx = -1; + return; + } + if(sel.by < term.top) { + sel.by = term.top; + sel.bx = 0; + } + if(sel.ey > term.bot) { + sel.ey = term.bot; + sel.ex = term.col; + } + sel.b.y = sel.by, sel.b.x = sel.bx; + sel.e.y = sel.ey, sel.e.x = sel.ex; + } } void @@ -855,47 +976,47 @@ tsetattr(int *attr, int l) { term.c.attr.bg = DefaultBG; break; case 1: - term.c.attr.mode |= ATTR_BOLD; + term.c.attr.mode |= ATTR_BOLD; break; - case 4: + case 4: term.c.attr.mode |= ATTR_UNDERLINE; break; - case 7: - term.c.attr.mode |= ATTR_REVERSE; + case 7: + term.c.attr.mode |= ATTR_REVERSE; break; - case 22: - term.c.attr.mode &= ~ATTR_BOLD; + case 22: + term.c.attr.mode &= ~ATTR_BOLD; break; - case 24: + case 24: term.c.attr.mode &= ~ATTR_UNDERLINE; break; - case 27: - term.c.attr.mode &= ~ATTR_REVERSE; + case 27: + term.c.attr.mode &= ~ATTR_REVERSE; break; case 38: - if (i + 2 < l && attr[i + 1] == 5) { + if(i + 2 < l && attr[i + 1] == 5) { i += 2; - if (BETWEEN(attr[i], 0, 255)) + if(BETWEEN(attr[i], 0, 255)) term.c.attr.fg = attr[i]; else fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]); } else - fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); + fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); break; case 39: term.c.attr.fg = DefaultFG; break; case 48: - if (i + 2 < l && attr[i + 1] == 5) { + if(i + 2 < l && attr[i + 1] == 5) { i += 2; - if (BETWEEN(attr[i], 0, 255)) + if(BETWEEN(attr[i], 0, 255)) term.c.attr.bg = attr[i]; else fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]); } else - fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); + fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); break; case 49: term.c.attr.bg = DefaultBG; @@ -909,7 +1030,7 @@ tsetattr(int *attr, int l) { term.c.attr.fg = attr[i] - 90 + 8; else if(BETWEEN(attr[i], 100, 107)) term.c.attr.fg = attr[i] - 100 + 8; - else + else fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump(); break; @@ -929,7 +1050,7 @@ tsetscroll(int t, int b) { b = temp; } term.top = t; - term.bot = b; + term.bot = b; } void @@ -937,7 +1058,7 @@ csihandle(void) { switch(escseq.mode) { default: unknown: - printf("erresc: unknown csi "); + fprintf(stderr, "erresc: unknown csi "); csidump(); /* die(""); */ break; @@ -984,6 +1105,7 @@ csihandle(void) { break; /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation tab stops */ case 'J': /* ED -- Clear screen */ + sel.bx = -1; switch(escseq.arg[0]) { case 0: /* below */ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); @@ -1033,7 +1155,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; @@ -1046,13 +1172,20 @@ csihandle(void) { case 25: term.c.state |= CURSOR_HIDE; break; + case 1000: /* disable X11 xterm mouse reporting */ + 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); @@ -1094,7 +1227,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; @@ -1109,13 +1245,20 @@ csihandle(void) { case 25: term.c.state &= ~CURSOR_HIDE; break; + 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); @@ -1154,7 +1297,7 @@ csihandle(void) { } void -csidump(void) { +csidump(void) { int i; printf("ESC [ %s", escseq.priv ? "? " : ""); if(escseq.narg) @@ -1187,7 +1330,7 @@ tputc(char *c) { csiparse(), csihandle(); } /* TODO: handle other OSC */ - } else if(term.esc & ESC_OSC) { + } else if(term.esc & ESC_OSC) { if(ascii == ';') { term.titlelen = 0; term.esc = ESC_START | ESC_TITLE; @@ -1209,7 +1352,7 @@ tputc(char *c) { term.c.attr.mode &= ~ATTR_GFX; break; default: - printf("esc unhandled charset: ESC ( %c\n", ascii); + fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii); } term.esc = 0; } else { @@ -1268,6 +1411,7 @@ tputc(char *c) { } } } else { + if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) sel.bx = -1; switch(ascii) { case '\t': tputtab(); @@ -1300,7 +1444,6 @@ tputc(char *c) { tmoveto(term.c.x+1, term.c.y); else term.c.state |= CURSOR_WRAPNEXT; - break; } } } @@ -1398,8 +1541,8 @@ xloadcols(void) { XColor color; unsigned long white = WhitePixel(xw.dpy, xw.scr); - for(i = 0; i < 16; i++) { - if (!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) { + for(i = 0; i < LEN(colorname); i++) { + if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) { dc.col[i] = white; fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]); } else @@ -1413,7 +1556,7 @@ xloadcols(void) { color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r; color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b; - if (!XAllocColor(xw.dpy, xw.cmap, &color)) { + if(!XAllocColor(xw.dpy, xw.cmap, &color)) { dc.col[i] = white; fprintf(stderr, "Could not allocate color %d\n", i); } else @@ -1433,15 +1576,14 @@ 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); } void -xhints(void) -{ +xhints(void) { XClassHint class = {opt_class ? opt_class : TNAME, TNAME}; XWMHints wm = {.flags = InputHint, .input = 1}; XSizeHints size = { @@ -1457,8 +1599,7 @@ xhints(void) } XFontSet -xinitfont(char *fontstr) -{ +xinitfont(char *fontstr) { XFontSet set; char *def, **missing; int n; @@ -1474,8 +1615,7 @@ xinitfont(char *fontstr) } void -xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) -{ +xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) { XFontStruct **xfonts; char **font_names; int i, n; @@ -1492,8 +1632,7 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb } void -initfonts(char *fontstr, char *bfontstr) -{ +initfonts(char *fontstr, char *bfontstr) { if((dc.font.set = xinitfont(fontstr)) == NULL || (dc.bfont.set = xinitfont(bfontstr)) == NULL) die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT); @@ -1506,6 +1645,8 @@ initfonts(char *fontstr, char *bfontstr) void xinit(void) { XSetWindowAttributes attrs; + Cursor cursor; + Window parent; if(!(xw.dpy = XOpenDisplay(NULL))) die("Can't open display\n"); @@ -1515,7 +1656,7 @@ xinit(void) { initfonts(FONT, BOLDFONT); /* XXX: Assuming same size for bold font */ - xw.cw = dc.font.rbearing - dc.font.lbearing; + xw.cw = dc.font.rbearing - dc.font.lbearing; xw.ch = dc.font.ascent + dc.font.descent; /* colors */ @@ -1523,8 +1664,8 @@ xinit(void) { xloadcols(); /* window - default size */ - xw.bufh = 24 * xw.ch; - xw.bufw = 80 * xw.cw; + xw.bufh = term.row * xw.ch; + xw.bufw = term.col * xw.cw; xw.h = xw.bufh + 2*BORDER; xw.w = xw.bufw + 2*BORDER; @@ -1533,10 +1674,12 @@ xinit(void) { attrs.bit_gravity = NorthWestGravity; attrs.event_mask = FocusChangeMask | KeyPressMask | ExposureMask | VisibilityChangeMask | StructureNotifyMask - | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; + | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask + | EnterWindowMask | LeaveWindowMask; attrs.colormap = xw.cmap; - xw.win = XCreateWindow(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0, + parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr); + xw.win = XCreateWindow(xw.dpy, parent, 0, 0, xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, XDefaultVisual(xw.dpy, xw.scr), CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask @@ -1547,28 +1690,43 @@ xinit(void) { /* input methods */ xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL); - xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing - | XIMStatusNothing, XNClientWindow, xw.win, + xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing + | XIMStatusNothing, XNClientWindow, xw.win, XNFocusWindow, xw.win, NULL); /* gc */ dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL); + /* white cursor, black outline */ + cursor = XCreateFontCursor(xw.dpy, XC_xterm); + XDefineCursor(xw.dpy, xw.win, cursor); + XRecolorCursor(xw.dpy, cursor, + &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff}, + &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000}); + + xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False); + + 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); @@ -1584,7 +1742,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { } XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set, - dc.gc, winx, winy, s, bytelen); + dc.gc, winx, winy, s, bytelen); if(base.mode & ATTR_UNDERLINE) XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1); @@ -1613,42 +1771,20 @@ 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; } } -#ifdef DEBUG -/* basic drawing routines */ -void -xdrawc(int x, int y, Glyph g) { - int sl = utf8size(g.c); - XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch }; - XSetBackground(xw.dpy, dc.gc, dc.col[g.bg]); - XSetForeground(xw.dpy, dc.gc, dc.col[g.fg]); - XmbDrawImageString(xw.dpy, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs, - dc.gc, r.x, r.y+dc.font.ascent, g.c, sl); -} - void -draw(int dummy) { - int x, y; - - xclear(0, 0, term.col-1, term.row-1); - for(y = 0; y < term.row; y++) - for(x = 0; x < term.col; x++) - if(term.line[y][x].state & GLYPH_SET) - xdrawc(x, y, term.line[y][x]); - - xdrawcursor(); - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); - XFlush(xw.dpy); +draw() { + drawregion(0, 0, term.col, term.row); } -#else -/* optimized drawing routine */ void -draw(int redraw_all) { +drawregion(int x1, int y1, int x2, int y2) { int ic, ib, x, y, ox, sl; Glyph base, new; char buf[DRAW_BUF_SIZ]; @@ -1656,13 +1792,13 @@ draw(int redraw_all) { if(!(xw.state & WIN_VISIBLE)) return; - xclear(0, 0, term.col-1, term.row-1); - for(y = 0; y < term.row; y++) { + xclear(x1, y1, x2-1, y2-1); + for(y = y1; y < y2; y++) { base = term.line[y][0]; ic = ib = ox = 0; - for(x = 0; x < term.col; x++) { + for(x = x1; x < x2; x++) { new = term.line[y][x]; - if(sel.bx!=-1 && *(new.c) && selected(x, y)) + if(sel.bx != -1 && *(new.c) && selected(x, y)) new.mode ^= ATTR_REVERSE; if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) || ib >= DRAW_BUF_SIZ-UTF_SIZ)) { @@ -1687,15 +1823,13 @@ draw(int redraw_all) { XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); } -#endif - void expose(XEvent *ev) { XExposeEvent *e = &ev->xexpose; if(xw.state & WIN_REDRAW) { if(!e->count) { xw.state &= ~WIN_REDRAW; - draw(SCREEN_REDRAW); + draw(); } } else XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER, @@ -1732,15 +1866,18 @@ focus(XEvent *ev) { xseturgency(0); } else xw.state &= ~WIN_FOCUSED; - draw(SCREEN_UPDATE); + draw(); } char* -kmap(KeySym k) { +kmap(KeySym k, unsigned int state) { int i; - for(i = 0; i < LEN(key); i++) - if(key[i].k == k) + state &= ~Mod2Mask; + for(i = 0; i < LEN(key); i++) { + unsigned int mask = key[i].mask; + if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state))) return (char*)key[i].s; + } return NULL; } @@ -1760,7 +1897,7 @@ kpress(XEvent *ev) { len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status); /* 1. custom keys from config.h */ - if((customkey = kmap(ksym))) + if((customkey = kmap(ksym, e->state))) ttywrite(customkey, strlen(customkey)); /* 2. hardcoded (overrides X lookup) */ else @@ -1769,7 +1906,8 @@ kpress(XEvent *ev) { case XK_Down: case XK_Left: case XK_Right: - sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]); + /* XXX: shift up/down doesn't work */ + sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]); ttywrite(buf, 3); break; case XK_Insert: @@ -1788,13 +1926,27 @@ kpress(XEvent *ev) { if(meta && len == 1) ttywrite("\033", 1); ttywrite(buf, len); - } else /* 4. nothing to send */ - fprintf(stderr, "errkey: %d\n", (int)ksym); + } break; } } void +cmessage(XEvent *e) { + /* See xembed specs + http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */ + if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) { + if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) { + xw.state |= WIN_FOCUSED; + xseturgency(0); + } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { + xw.state &= ~WIN_FOCUSED; + } + draw(); + } +} + +void resize(XEvent *e) { int col, row; @@ -1808,7 +1960,7 @@ resize(XEvent *e) { if(col == term.col && row == term.row) return; if(tresize(col, row)) - draw(SCREEN_REDRAW); + draw(); ttyresize(col, row); xresize(col, row); } @@ -1830,11 +1982,11 @@ run(void) { } if(FD_ISSET(cmdfd, &rfd)) { ttyread(); - draw(SCREEN_UPDATE); + draw(); } while(XPending(xw.dpy)) { XNextEvent(xw.dpy, &ev); - if (XFilterEvent(&ev, xw.win)) + if(XFilterEvent(&ev, xw.win)) continue; if(handler[ev.type]) (handler[ev.type])(&ev); @@ -1854,14 +2006,20 @@ main(int argc, char *argv[]) { case 'c': if(++i < argc) opt_class = argv[i]; break; - case 'e': - if(++i < argc) opt_cmd = argv[i]; + case 'w': + if(++i < argc) opt_embed = argv[i]; break; + case 'e': + /* eat every remaining arguments */ + if(++i < argc) opt_cmd = &argv[i]; + goto run; case 'v': default: die(USAGE); } } + + run: setlocale(LC_CTYPE, ""); tnew(80, 24); ttynew();