X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/f211bc2eedaa8ea86dc66ad04ccd08938c73a93c..bcb7ec68c2780a65d0d362bafd3690b2a8f5473e:/st.c?ds=sidebyside
diff --git a/st.c b/st.c
index 1497dd2..b1db093 100644
--- a/st.c
+++ b/st.c
@@ -6,6 +6,7 @@
#include <limits.h>
#include <locale.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -13,36 +14,57 @@
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/stat.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <time.h>
#include <unistd.h>
+#include <X11/Xatom.h>
#include <X11/Xlib.h>
-#include <X11/keysym.h>
#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
#if defined(__linux)
#include <pty.h>
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#include <util.h>
#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#endif
+#define USAGE \
+ "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
#define ESC_BUF_SIZ 256
#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 SELECT_TIMEOUT (20*1000) /* 20 ms */
+#define DRAW_TIMEOUT (20*1000) /* 20 ms */
#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 };
@@ -50,12 +72,20 @@ 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, 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
+enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
+
+typedef unsigned char uchar;
+typedef unsigned int uint;
+typedef unsigned long ulong;
typedef struct {
- char c; /* character code */
+ char c[UTF_SIZ]; /* character code */
char mode; /* attribute flags */
int fg; /* foreground */
int bg; /* background */
@@ -75,21 +105,22 @@ typedef struct {
/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
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 */
+ bool* dirty; /* dirtyness of lines */
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 */
@@ -99,47 +130,64 @@ typedef struct {
/* Purely graphic info */
typedef struct {
- Display* dis;
+ Display* dpy;
+ 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 */
- int hasfocus;
-} XWindow;
+ char state; /* focus, redraw, visible */
+ struct timeval lastdraw;
+} XWindow;
typedef struct {
KeySym k;
+ uint mask;
char s[ESC_BUF_SIZ];
} Key;
/* Drawing Context */
typedef struct {
- unsigned long col[256];
- XFontStruct* font;
- XFontStruct* bfont;
+ ulong col[256];
GC gc;
+ struct {
+ int ascent;
+ int descent;
+ short lbearing;
+ short rbearing;
+ XFontSet set;
+ } font, bfont;
} DC;
+/* TODO: use better name for vars... */
typedef struct {
int mode;
int bx, by;
int ex, ey;
- int b[2], e[2];
+ 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);
+static bool last_draw_too_old(void);
static void csidump(void);
static void csihandle(void);
@@ -154,51 +202,74 @@ 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 tputc(char*);
static void treset(void);
-static void tresize(int, int);
-static void tscrollup(int);
-static void tscrolldown(int);
+static int tresize(int, int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
static void tsetattr(int*, int);
-static void tsetchar(char);
+static void tsetchar(char*);
static void tsetscroll(int, int);
static void tswapscreen(void);
+static void tfulldirt(void);
static void ttynew(void);
static void ttyread(void);
static void ttyresize(int, int);
static void ttywrite(const char *, size_t);
-static void xdraws(char *, Glyph, int, int, int);
+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 xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
static void xseturgency(int);
+static void xsetsel(char*);
+static void xresize(int, int);
static void expose(XEvent *);
-static char* kmap(KeySym);
+static void visibility(XEvent *);
+static void unmap(XEvent *);
+static char* kmap(KeySym, uint);
static void kpress(XEvent *);
+static void cmessage(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
-static void brelease(XEvent *e);
-static void bpress(XEvent *e);
-static void bmotion(XEvent *e);
-
+static void brelease(XEvent *);
+static void bpress(XEvent *);
+static void bmotion(XEvent *);
+static void selnotify(XEvent *);
+static void selrequest(XEvent *);
+
+static void selinit(void);
+static inline bool selected(int, int);
+static void selcopy(void);
+static void selpaste();
+static void selscroll(int, int);
+
+static int utf8decode(char *, long *);
+static int utf8encode(long *, char *);
+static int utf8size(char *);
+static int isfullutf8(char *, int);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
- [Expose] = expose,
+ [ClientMessage] = cmessage,
[ConfigureNotify] = resize,
+ [VisibilityNotify] = visibility,
+ [UnmapNotify] = unmap,
+ [Expose] = expose,
[FocusIn] = focus,
[FocusOut] = focus,
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
+ [SelectionNotify] = selnotify,
+ [SelectionRequest] = selrequest,
};
/* Globals */
@@ -209,116 +280,373 @@ static CSIEscape escseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
+static char **opt_cmd = NULL;
+static char *opt_title = NULL;
+static char *opt_embed = NULL;
+static char *opt_class = NULL;
+
+int
+utf8decode(char *s, long *u) {
+ uchar c;
+ int i, n, rtn;
+
+ rtn = 1;
+ c = *s;
+ if(~c & B7) { /* 0xxxxxxx */
+ *u = c;
+ return rtn;
+ } else if((c & (B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+ *u = c&(B4|B3|B2|B1|B0);
+ n = 1;
+ } else if((c & (B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
+ *u = c&(B3|B2|B1|B0);
+ n = 2;
+ } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+ *u = c & (B2|B1|B0);
+ n = 3;
+ } else
+ goto invalid;
+ for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
+ c = *s;
+ if((c & (B7|B6)) != B7) /* 10xxxxxx */
+ goto invalid;
+ *u <<= 6;
+ *u |= c & (B5|B4|B3|B2|B1|B0);
+ }
+ if((n == 1 && *u < 0x80) ||
+ (n == 2 && *u < 0x800) ||
+ (n == 3 && *u < 0x10000) ||
+ (*u >= 0xD800 && *u <= 0xDFFF))
+ goto invalid;
+ return rtn;
+invalid:
+ *u = 0xFFFD;
+ return rtn;
+}
-static inline int selected(int x, int y) {
- if ((sel.ey==y && sel.by==y)) {
+int
+utf8encode(long *u, char *s) {
+ uchar *sp;
+ ulong uc;
+ int i, n;
+
+ sp = (uchar*) s;
+ uc = *u;
+ if(uc < 0x80) {
+ *sp = uc; /* 0xxxxxxx */
+ return 1;
+ } else if(*u < 0x800) {
+ *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
+ n = 1;
+ } else if(uc < 0x10000) {
+ *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
+ n = 2;
+ } else if(uc <= 0x10FFFF) {
+ *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
+ n = 3;
+ } else {
+ goto invalid;
+ }
+ for(i=n,++sp; i>0; --i,++sp)
+ *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
+ return n+1;
+invalid:
+ /* U+FFFD */
+ *s++ = '\xEF';
+ *s++ = '\xBF';
+ *s = '\xBD';
+ return 3;
+}
+
+/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
+ UTF-8 otherwise return 0 */
+int
+isfullutf8(char *s, int b) {
+ uchar *c1, *c2, *c3;
+
+ c1 = (uchar *) s;
+ c2 = (uchar *) ++s;
+ c3 = (uchar *) ++s;
+ if(b < 1)
+ return 0;
+ 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 == 2) && (*c2&(B7|B6)) == B7)))
+ return 0;
+ else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+ ((b == 1) ||
+ ((b == 2) && (*c2&(B7|B6)) == B7) ||
+ ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))
+ return 0;
+ else
+ return 1;
+}
+
+int
+utf8size(char *s) {
+ uchar c = *s;
+
+ if(~c&B7)
+ return 1;
+ else if((c&(B7|B6|B5)) == (B7|B6))
+ return 2;
+ else if((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+ return 3;
+ 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 bool
+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 (x>=bx && x<=ex);
+ return BETWEEN(x, bx, ex);
}
- return (((y>sel.b[1] && y<sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) || \
- (y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1])));
+ 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));
}
-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;
- *x = e->xbutton.x/xw.cw;
- *y = e->xbutton.y/xw.ch;
- sel.b[0] = sel.by<sel.ey?sel.bx:sel.ex;
- sel.b[1] = MIN(sel.by, sel.ey);
- sel.e[0] = sel.by<sel.ey?sel.ex:sel.bx;
- sel.e[1] = MAX(sel.by, sel.ey);
+void
+getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
+ if(b)
+ *b = e->xbutton.button;
+
+ *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);
}
-static 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;
+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) {
+ if(IS_SET(MODE_MOUSE))
+ 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;
+ sel.mode = 1;
+ sel.ex = sel.bx = X2COL(e->xbutton.x);
+ sel.ey = sel.by = Y2ROW(e->xbutton.y);
+ }
}
-static char *getseltext() {
+void
+selcopy(void) {
char *str, *ptr;
- int ls, x, y, sz;
- if(sel.bx==-1)
- return NULL;
- sz = ((xw.w/xw.ch) * (sel.e[1]-sel.b[1]+2));
- ptr = str = malloc (sz);
- 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))) {
- *ptr = term.line[y][x].c;
- ptr++;
- }
- }
- if (ls) {
- *ptr = '\n';
- ptr++;
+ int x, y, sz, sl, ls = 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);
+ 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;
+ }
+ if(ls && y < sel.e.y)
+ *ptr++ = '\n';
}
+ *ptr = 0;
}
- *ptr = 0;
- return str;
+ xsetsel(str);
}
-/* TODO: use X11 clipboard */
-static void clipboard_copy(char *str) {
- free(sel.clip);
- sel.clip = str;
+void
+selnotify(XEvent *e) {
+ ulong nitems, ofs, rem;
+ int format;
+ uchar *data;
+ Atom type;
+
+ ofs = 0;
+ do {
+ if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+ False, AnyPropertyType, &type, &format,
+ &nitems, &rem, &data)) {
+ fprintf(stderr, "Clipboard allocation failed\n");
+ return;
+ }
+ ttywrite((const char *) data, nitems * format / 8);
+ XFree(data);
+ /* number of 32-bit chunks returned */
+ ofs += nitems * format / 32;
+ } while(rem > 0);
}
-static void clipboard_paste() {
- if(sel.clip)
- ttywrite(sel.clip, strlen(sel.clip));
+void
+selpaste() {
+ XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
-/* TODO: doubleclick to select word */
-static void brelease(XEvent *e) {
- int b;
- sel.mode = 0;
- getbuttoninfo(e, &b, &sel.ex, &sel.ey);
- if(b==4)
- tscrollup(1);
- else
- if(b==5)
- tscrolldown(1);
- else
- if(sel.bx==sel.ex && sel.by==sel.ey) {
- sel.bx = -1;
- if(b==2)
- clipboard_paste();
- } else {
- if(b==1)
- clipboard_copy(getseltext());
+void
+selrequest(XEvent *e) {
+ XSelectionRequestEvent *xsre;
+ XSelectionEvent xev;
+ 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.dpy, "TARGETS", 0);
+ if(xsre->target == xa_targets) {
+ /* respond with the supported type */
+ Atom string = sel.xtarget;
+ XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+ XA_ATOM, 32, PropModeReplace,
+ (uchar *) &string, 1);
+ xev.property = xsre->property;
+ } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
+ XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+ xsre->target, 8, PropModeReplace,
+ (uchar *) sel.clip, strlen(sel.clip));
+ xev.property = xsre->property;
}
- draw(1);
+
+ /* all done, send a notification to the listener */
+ if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
+ fprintf(stderr, "Error sending SelectionNotify event\n");
}
-static void bmotion(XEvent *e) {
- if (sel.mode) {
+void
+xsetsel(char *str) {
+ /* register the selection for both the clipboard and the primary */
+ Atom clipboard;
+
+ free(sel.clip);
+ sel.clip = str;
+
+ XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
+
+ clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+ XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+
+ XFlush(xw.dpy);
+}
+
+void
+brelease(XEvent *e) {
+ 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);
- draw(1);
+ term.dirty[sel.ey] = 1;
+ 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();
}
+ memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
+ gettimeofday(&sel.tclick1, NULL);
+ draw();
}
-#ifdef DEBUG
void
-tdump(void) {
- int row, col;
- Glyph c;
+bmotion(XEvent *e) {
+ 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);
- for(row = 0; row < term.row; row++) {
- for(col = 0; col < term.col; col++) {
- if(col == term.c.x && row == term.c.y)
- putchar('#');
- else {
- c = term.line[row][col];
- putchar(c.state & GLYPH_SET ? c.c : '.');
- }
+ 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;
+ draw();
}
- putchar('\n');
}
}
-#endif
void
die(const char *errstr, ...) {
@@ -332,13 +660,17 @@ die(const char *errstr, ...) {
void
execsh(void) {
- char *args[3] = {getenv("SHELL"), "-i", NULL};
- DEFAULT(args[0], SHELL); /* if getenv() failed */
- putenv("TERM=" TNAME);
+ char **args;
+ char *envshell = getenv("SHELL");
+
+ 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)
@@ -390,13 +722,31 @@ dump(char c) {
void
ttyread(void) {
- char buf[BUFSIZ] = {0};
+ static char buf[BUFSIZ];
+ static int buflen = 0;
+ char *ptr;
+ char s[UTF_SIZ];
+ int charsize; /* size of utf8 char in bytes */
+ long utf8c;
int ret;
- if((ret = read(cmdfd, buf, BUFSIZ)) < 0)
+ /* append read bytes to unprocessed bytes */
+ if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
die("Couldn't read from shell: %s\n", SERRNO);
- else
- tputs(buf, ret);
+
+ /* process every complete utf8 char */
+ buflen += ret;
+ ptr = buf;
+ while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
+ charsize = utf8decode(ptr, &utf8c);
+ utf8encode(&utf8c, s);
+ tputc(s);
+ ptr += charsize;
+ buflen -= charsize;
+ }
+
+ /* keep any uncomplete utf8 char for the next call */
+ memmove(buf, ptr, buflen);
}
void
@@ -416,6 +766,14 @@ ttyresize(int x, int y) {
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
+void
+tfulldirt(void)
+{
+ int i;
+ for(i = 0; i < term.row; i++)
+ term.dirty[i] = 1;
+}
+
void
tcursor(int mode) {
static TCursor c;
@@ -429,8 +787,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};
@@ -445,9 +803,12 @@ 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++) {
+ term.dirty = malloc(term.row * sizeof(*term.dirty));
+
+ for(row = 0; row < term.row; row++) {
term.line[row] = malloc(term.col * sizeof(Glyph));
term.alt [row] = malloc(term.col * sizeof(Glyph));
+ term.dirty[row] = 0;
}
/* setup screen */
treset();
@@ -459,47 +820,81 @@ tswapscreen(void) {
term.line = term.alt;
term.alt = tmp;
term.mode ^= MODE_ALTSCREEN;
+ tfulldirt();
}
void
-tscrolldown (int n) {
+tscrolldown(int orig, int n) {
int i;
Line temp;
- LIMIT(n, 0, term.bot-term.top+1);
+ LIMIT(n, 0, term.bot-orig+1);
- for(i = 0; i < n; i++)
- memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
+ tclearregion(0, term.bot-n+1, term.col-1, term.bot);
- for(i = term.bot; i >= term.top+n; i--) {
+ for(i = term.bot; i >= orig+n; i--) {
temp = term.line[i];
term.line[i] = term.line[i-n];
term.line[i-n] = temp;
+
+ term.dirty[i] = 1;
+ term.dirty[i-n] = 1;
}
+
+ selscroll(orig, n);
}
void
-tscrollup (int n) {
+tscrollup(int orig, int n) {
int i;
Line temp;
- LIMIT(n, 0, term.bot-term.top+1);
+ LIMIT(n, 0, term.bot-orig+1);
- for(i = 0; i < n; i++)
- memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
+ tclearregion(0, orig, term.col-1, orig+n-1);
- for(i = term.top; 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;
+
+ term.dirty[i] = 1;
+ term.dirty[i+n] = 1;
}
+
+ selscroll(orig, -n);
}
void
-tnewline(void) {
- int y = term.c.y + 1;
- if(y > term.bot)
- tscrollup(1), y = term.bot;
- tmoveto(0, y);
+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
+tnewline(int first_col) {
+ int y = term.c.y;
+ if(y == term.bot)
+ tscrollup(term.top, 1);
+ else
+ y++;
+ tmoveto(first_col ? 0 : term.c.x, y);
}
void
@@ -536,15 +931,16 @@ tmoveto(int x, int y) {
}
void
-tsetchar(char c) {
+tsetchar(char *c) {
+ term.dirty[term.c.y] = 1;
term.line[term.c.y][term.c.x] = term.c.attr;
- term.line[term.c.y][term.c.x].c = c;
+ memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
term.line[term.c.y][term.c.x].state |= GLYPH_SET;
}
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;
@@ -556,8 +952,11 @@ tclearregion(int x1, int y1, int x2, int y2) {
LIMIT(y1, 0, term.row-1);
LIMIT(y2, 0, term.row-1);
- for(y = y1; y <= y2; y++)
- memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
+ for(y = y1; y <= y2; y++) {
+ term.dirty[y] = 1;
+ for(x = x1; x <= x2; x++)
+ term.line[y][x].state = 0;
+ }
}
void
@@ -565,6 +964,8 @@ tdeletechar(int n) {
int src = term.c.x + n;
int dst = term.c.x;
int size = term.col - src;
+
+ term.dirty[term.c.y] = 1;
if(src >= term.col) {
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
@@ -580,6 +981,8 @@ tinsertblank(int n) {
int dst = src + n;
int size = term.col - dst;
+ term.dirty[term.c.y] = 1;
+
if(dst >= term.col) {
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
return;
@@ -590,50 +993,18 @@ tinsertblank(int n) {
void
tinsertblankline(int n) {
- int i;
- Line blank;
- int bot = term.bot;
-
- if(term.c.y > term.bot)
- bot = term.row - 1;
- else if(term.c.y < term.top)
- bot = term.top - 1;
- if(term.c.y + n >= bot) {
- tclearregion(0, term.c.y, term.col-1, bot);
+ if(term.c.y < term.top || term.c.y > term.bot)
return;
- }
- for(i = bot; i >= term.c.y+n; i--) {
- /* swap deleted line <-> blanked line */
- blank = term.line[i];
- term.line[i] = term.line[i-n];
- term.line[i-n] = blank;
- /* blank it */
- memset(blank, 0, term.col * sizeof(Glyph));
- }
+
+ tscrolldown(term.c.y, n);
}
void
tdeleteline(int n) {
- int i;
- Line blank;
- int bot = term.bot;
-
- if(term.c.y > term.bot)
- bot = term.row - 1;
- else if(term.c.y < term.top)
- bot = term.top - 1;
- if(term.c.y + n >= bot) {
- tclearregion(0, term.c.y, term.col-1, bot);
+ if(term.c.y < term.top || term.c.y > term.bot)
return;
- }
- for(i = term.c.y; i <= bot-n; i++) {
- /* swap deleted line <-> blanked line */
- blank = term.line[i];
- term.line[i] = term.line[i+n];
- term.line[i+n] = blank;
- /* blank it */
- memset(blank, 0, term.col * sizeof(Glyph));
- }
+
+ tscrollup(term.c.y, n);
}
void
@@ -648,47 +1019,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;
@@ -702,8 +1073,9 @@ 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
- fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+ else
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+
break;
}
}
@@ -721,7 +1093,7 @@ tsetscroll(int t, int b) {
b = temp;
}
term.top = t;
- term.bot = b;
+ term.bot = b;
}
void
@@ -729,7 +1101,7 @@ csihandle(void) {
switch(escseq.mode) {
default:
unknown:
- printf("erresc: unknown csi ");
+ fprintf(stderr, "erresc: unknown csi ");
csidump();
/* die(""); */
break;
@@ -776,12 +1148,17 @@ csihandle(void) {
break;
/* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> 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.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);
@@ -805,11 +1182,11 @@ csihandle(void) {
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(escseq.arg[0], 1);
- tscrollup(escseq.arg[0]);
+ tscrollup(term.top, escseq.arg[0]);
break;
case 'T': /* SD -- Scroll <n> line down */
DEFAULT(escseq.arg[0], 1);
- tscrolldown(escseq.arg[0]);
+ tscrolldown(term.top, escseq.arg[0]);
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(escseq.arg[0], 1);
@@ -821,21 +1198,37 @@ csihandle(void) {
case 1:
term.mode &= ~MODE_APPKEYPAD;
break;
+ case 5: /* DECSCNM -- Remove reverse video */
+ if(IS_SET(MODE_REVERSE)) {
+ term.mode &= ~MODE_REVERSE;
+ draw();
+ }
+ break;
case 7:
term.mode &= ~MODE_WRAP;
break;
case 12: /* att610 -- Stop blinking cursor (IGNORED) */
break;
+ case 20:
+ term.mode &= ~MODE_CRLF;
+ break;
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);
@@ -876,21 +1269,39 @@ csihandle(void) {
case 1:
term.mode |= MODE_APPKEYPAD;
break;
+ case 5: /* DECSCNM -- Reverve video */
+ if(!IS_SET(MODE_REVERSE)) {
+ term.mode |= MODE_REVERSE;
+ draw();
+ }
+ break;
case 7:
term.mode |= MODE_WRAP;
break;
- case 12: /* att610 -- Start blinking cursor (IGNORED) */
+ 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)
+ break;
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);
@@ -929,7 +1340,7 @@ csihandle(void) {
}
void
-csidump(void) {
+csidump(void) {
int i;
printf("ESC [ %s", escseq.priv ? "? " : "");
if(escseq.narg)
@@ -952,29 +1363,31 @@ tputtab(void) {
}
void
-tputc(char c) {
+tputc(char *c) {
+ char ascii = *c;
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
- escseq.buf[escseq.len++] = c;
- if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
+ escseq.buf[escseq.len++] = ascii;
+ if(BETWEEN(ascii, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
term.esc = 0;
csiparse(), csihandle();
}
+ /* TODO: handle other OSC */
} else if(term.esc & ESC_OSC) {
- if(c == ';') {
+ if(ascii == ';') {
term.titlelen = 0;
term.esc = ESC_START | ESC_TITLE;
}
} else if(term.esc & ESC_TITLE) {
- if(c == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
+ if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
term.esc = 0;
term.title[term.titlelen] = '\0';
- XStoreName(xw.dis, xw.win, term.title);
+ XStoreName(xw.dpy, xw.win, term.title);
} else {
- term.title[term.titlelen++] = c;
+ term.title[term.titlelen++] = ascii;
}
} else if(term.esc & ESC_ALTCHARSET) {
- switch(c) {
+ switch(ascii) {
case '0': /* Line drawing crap */
term.c.attr.mode |= ATTR_GFX;
break;
@@ -982,11 +1395,11 @@ tputc(char c) {
term.c.attr.mode &= ~ATTR_GFX;
break;
default:
- printf("esc unhandled charset: ESC ( %c\n", c);
+ fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
}
term.esc = 0;
} else {
- switch(c) {
+ switch(ascii) {
case '[':
term.esc |= ESC_CSI;
break;
@@ -998,18 +1411,18 @@ tputc(char c) {
break;
case 'D': /* IND -- Linefeed */
if(term.c.y == term.bot)
- tscrollup(1);
+ tscrollup(term.top, 1);
else
tmoveto(term.c.x, term.c.y+1);
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 */
if(term.c.y == term.top)
- tscrolldown(1);
+ tscrolldown(term.top, 1);
else
tmoveto(term.c.x, term.c.y-1);
term.esc = 0;
@@ -1035,12 +1448,15 @@ tputc(char c) {
term.esc = 0;
break;
default:
- fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.');
+ fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
+ (uchar) ascii, isprint(ascii)?ascii:'.');
term.esc = 0;
}
}
} else {
- switch(c) {
+ if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+ sel.bx = -1;
+ switch(ascii) {
case '\t':
tputtab();
break;
@@ -1050,11 +1466,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.hasfocus)
+ if(!(xw.state & WIN_FOCUSED))
xseturgency(1);
break;
case '\033':
@@ -1063,34 +1482,40 @@ 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);
else
term.c.state |= CURSOR_WRAPNEXT;
- break;
}
}
}
-void
-tputs(char *s, int len) {
- for(; len > 0; len--)
- tputc(*s++);
-}
-
-void
+int
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;
if(col < 1 || row < 1)
- return;
-
- /* free uneeded rows */
- for(i = row; i < term.row; i++) {
+ return 0;
+
+ /* free unneeded rows */
+ i = 0;
+ if(slide > 0) {
+ /* slide screen to keep cursor where we expect it -
+ * tscrollup would work here, but we can optimize to
+ * memmove because we're freeing the earlier lines */
+ for(/* i = 0 */; i < slide; i++) {
+ free(term.line[i]);
+ free(term.alt[i]);
+ }
+ memmove(term.line, term.line + slide, row * sizeof(Line));
+ memmove(term.alt, term.alt + slide, row * sizeof(Line));
+ }
+ for(i += row; i < term.row; i++) {
free(term.line[i]);
free(term.alt[i]);
}
@@ -1098,17 +1523,22 @@ tresize(int col, int row) {
/* resize to new height */
term.line = realloc(term.line, row * sizeof(Line));
term.alt = realloc(term.alt, row * sizeof(Line));
+ term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
+ term.dirty[i] = 1;
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 */
for(/* i == minrow */; i < row; i++) {
+ term.dirty[i] = 1;
term.line[i] = calloc(col, sizeof(Glyph));
term.alt [i] = calloc(col, sizeof(Glyph));
}
@@ -1119,17 +1549,48 @@ 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.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;
}
void
xloadcols(void) {
int i, r, g, b;
XColor color;
- Colormap cmap = DefaultColormap(xw.dis, xw.scr);
- unsigned long white = WhitePixel(xw.dis, xw.scr);
+ ulong white = WhitePixel(xw.dpy, xw.scr);
- for(i = 0; i < 16; i++) {
- if (!XAllocNamedColor(xw.dis, 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
@@ -1143,7 +1604,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.dis, cmap, &color)) {
+ if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
@@ -1153,7 +1614,7 @@ xloadcols(void) {
for(r = 0; r < 24; r++, i++) {
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
- if (!XAllocColor(xw.dis, cmap, &color)) {
+ if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
@@ -1163,16 +1624,15 @@ xloadcols(void) {
void
xclear(int x1, int y1, int x2, int y2) {
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
- XFillRectangle(xw.dis, xw.buf, dc.gc,
+ 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)
-{
- XClassHint class = {TNAME, TNAME};
+xhints(void) {
+ XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints size = {
.flags = PSize | PResizeInc | PBaseSize,
@@ -1183,192 +1643,305 @@ xhints(void)
.base_height = 2*BORDER,
.base_width = 2*BORDER,
};
- XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+ XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+}
+
+XFontSet
+xinitfont(char *fontstr) {
+ XFontSet set;
+ char *def, **missing;
+ int n;
+
+ missing = NULL;
+ set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
+ if(missing) {
+ while(n--)
+ fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
+ XFreeStringList(missing);
+ }
+ return set;
+}
+
+void
+xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) {
+ XFontStruct **xfonts;
+ char **font_names;
+ int i, n;
+
+ *ascent = *descent = *lbearing = *rbearing = 0;
+ n = XFontsOfFontSet(set, &xfonts, &font_names);
+ for(i = 0; i < n; i++) {
+ *ascent = MAX(*ascent, (*xfonts)->ascent);
+ *descent = MAX(*descent, (*xfonts)->descent);
+ *lbearing = MAX(*lbearing, (*xfonts)->min_bounds.lbearing);
+ *rbearing = MAX(*rbearing, (*xfonts)->max_bounds.rbearing);
+ xfonts++;
+ }
+}
+
+void
+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);
+ xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
+ &dc.font.lbearing, &dc.font.rbearing);
+ xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
+ &dc.bfont.lbearing, &dc.bfont.rbearing);
}
void
xinit(void) {
- if(!(xw.dis = XOpenDisplay(NULL)))
+ XSetWindowAttributes attrs;
+ Cursor cursor;
+ Window parent;
+
+ if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
- xw.scr = XDefaultScreen(xw.dis);
+ xw.scr = XDefaultScreen(xw.dpy);
/* font */
- if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
- die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
+ initfonts(FONT, BOLDFONT);
/* XXX: Assuming same size for bold font */
- xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
- xw.ch = dc.font->ascent + dc.font->descent;
+ xw.cw = dc.font.rbearing - dc.font.lbearing;
+ xw.ch = dc.font.ascent + dc.font.descent;
/* colors */
+ xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
xloadcols();
- /* windows */
- xw.h = term.row * xw.ch + 2*BORDER;
- xw.w = term.col * xw.cw + 2*BORDER;
- xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
- xw.w, xw.h, 0,
- dc.col[DefaultBG],
- dc.col[DefaultBG]);
- xw.bufw = xw.w - 2*BORDER;
- xw.bufh = xw.h - 2*BORDER;
- xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+ /* 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;
+
+ attrs.background_pixel = dc.col[DefaultBG];
+ attrs.border_pixel = dc.col[DefaultBG];
+ attrs.bit_gravity = NorthWestGravity;
+ attrs.event_mask = FocusChangeMask | KeyPressMask
+ | ExposureMask | VisibilityChangeMask | StructureNotifyMask
+ | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
+ | EnterWindowMask | LeaveWindowMask;
+ attrs.colormap = xw.cmap;
+
+ 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
+ | CWColormap,
+ &attrs);
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
+
+
+ /* input methods */
+ xw.xim = XOpenIM(xw.dpy, 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);
+ dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
- /* event mask */
- XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
- | StructureNotifyMask | FocusChangeMask | PointerMotionMask
- | ButtonPressMask | ButtonReleaseMask);
-
- XMapWindow(xw.dis, xw.win);
+ /* 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.dis, xw.win, "st");
- XSync(xw.dis, 0);
+ XSync(xw.dpy, 0);
}
void
-xdraws(char *s, Glyph base, int x, int y, int len) {
- unsigned long xfg, xbg;
- int winx = x*xw.cw, winy = y*xw.ch + dc.font->ascent, width = len*xw.cw;
+xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
+ ulong 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];
-
- XSetBackground(xw.dis, dc.gc, xbg);
- XSetForeground(xw.dis, dc.gc, xfg);
-
- if(base.mode & ATTR_GFX)
- for(i = 0; i < len; i++)
- s[i] = gfx[(int)s[i]];
+ temp = xfg, xfg = xbg, xbg = temp;
+
+ XSetBackground(xw.dpy, dc.gc, xbg);
+ XSetForeground(xw.dpy, dc.gc, xfg);
+
+ if(base.mode & ATTR_GFX) {
+ for(i = 0; i < bytelen; i++) {
+ char c = gfx[(uint)s[i] % 256];
+ if(c)
+ s[i] = c;
+ else if(s[i] > 0x5f)
+ s[i] -= 0x5f;
+ }
+ }
- XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
- XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
+ XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
+ dc.gc, winx, winy, s, bytelen);
if(base.mode & ATTR_UNDERLINE)
- XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+ XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+}
+
+/* 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);
}
void
xdrawcursor(void) {
static int oldx = 0;
static int oldy = 0;
- Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0};
+ int sl;
+ Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
LIMIT(oldx, 0, term.col-1);
LIMIT(oldy, 0, term.row-1);
if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
- g.c = term.line[term.c.y][term.c.x].c;
-
+ memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
+
/* remove the old cursor */
- if(term.line[oldy][oldx].state & GLYPH_SET)
- xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
- else
+ if(term.line[oldy][oldx].state & GLYPH_SET) {
+ sl = utf8size(term.line[oldy][oldx].c);
+ xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
+ } else
xclear(oldx, oldy, oldx, oldy);
-
+
+ xcopy(oldx, oldy, 1, 1);
+
/* draw the new one */
- if(!(term.c.state & CURSOR_HIDE) && xw.hasfocus) {
- xdraws(&g.c, g, term.c.x, term.c.y, 1);
+ 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) {
- XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
- XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
- XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
- XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
- XDrawImageString(xw.dis, xw.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
+ xcopy(term.c.x, term.c.y, 1, 1);
}
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.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
- XFlush(xw.dis);
+draw() {
+ drawregion(0, 0, term.col, term.row);
+ gettimeofday(&xw.lastdraw, NULL);
}
-#else
-/* optimized drawing routine */
void
-draw(int redraw_all) {
- int i, x, y, ox;
+drawregion(int x1, int y1, int x2, int y2) {
+ int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
- XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
- for(y = 0; y < term.row; y++) {
+ if(!(xw.state & WIN_VISIBLE))
+ return;
+
+ for(y = y1; y < y2; y++) {
+ if(!term.dirty[y])
+ continue;
+ xclear(0, y, term.col, y);
+ term.dirty[y] = 0;
base = term.line[y][0];
- i = ox = 0;
- for(x = 0; x < term.col; x++) {
+ ic = ib = ox = 0;
+ 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(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
- i >= DRAW_BUF_SIZ)) {
- xdraws(buf, base, ox, y, i);
- i = 0;
+ if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+ ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+ xdraws(buf, base, ox, y, ic, ib);
+ ic = ib = 0;
}
if(new.state & GLYPH_SET) {
- if(i == 0) {
+ if(ib == 0) {
ox = x;
base = new;
}
- buf[i++] = new.c;
+ sl = utf8size(new.c);
+ memcpy(buf+ib, new.c, sl);
+ ib += sl;
+ ++ic;
}
}
- if(i > 0)
- xdraws(buf, base, ox, y, i);
+ if(ib > 0)
+ xdraws(buf, base, ox, y, ic, ib);
+ xcopy(0, y, term.col, 1);
}
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;
+ 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);
+}
+
+void
+visibility(XEvent *ev) {
+ XVisibilityEvent *e = &ev->xvisibility;
+ 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.state &= ~WIN_VISIBLE;
}
void
xseturgency(int add) {
- XWMHints *h = XGetWMHints(xw.dis, xw.win);
+ XWMHints *h = XGetWMHints(xw.dpy, xw.win);
h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
- XSetWMHints(xw.dis, xw.win, h);
+ XSetWMHints(xw.dpy, xw.win, h);
XFree(h);
}
void
focus(XEvent *ev) {
- if((xw.hasfocus = ev->type == FocusIn))
+ if(ev->type == FocusIn) {
+ xw.state |= WIN_FOCUSED;
xseturgency(0);
- draw(SCREEN_UPDATE);
+ } else
+ xw.state &= ~WIN_FOCUSED;
+ draw();
}
char*
-kmap(KeySym k) {
+kmap(KeySym k, uint state) {
int i;
- for(i = 0; i < LEN(key); i++)
- if(key[i].k == k)
+ state &= ~Mod2Mask;
+ for(i = 0; i < LEN(key); i++) {
+ uint mask = key[i].mask;
+ if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
return (char*)key[i].s;
+ }
return NULL;
}
@@ -1381,37 +1954,62 @@ 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);
-
- if((customkey = kmap(ksym)))
+ len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
+
+ /* 1. custom keys from config.h */
+ if((customkey = kmap(ksym, e->state)))
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:
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:
if(shift)
- draw(1), puts("draw!")/* XXX: paste X clipboard */;
+ 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) {
+ if(meta && len == 1)
+ ttywrite("\033", 1);
+ ttywrite(buf, len);
+ }
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;
@@ -1421,40 +2019,56 @@ 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();
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));
- draw(SCREEN_REDRAW);
+ xresize(col, row);
+}
+
+bool
+last_draw_too_old(void) {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000;
}
void
run(void) {
XEvent ev;
fd_set rfd;
- int xfd = XConnectionNumber(xw.dis);
-
+ int xfd = XConnectionNumber(xw.dpy);
+ struct timeval timeout = {0};
+ bool stuff_to_print = 0;
+
for(;;) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
+ timeout.tv_sec = 0;
+ timeout.tv_usec = SELECT_TIMEOUT;
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, &timeout) < 0) {
if(errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
}
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
- draw(SCREEN_UPDATE);
+ stuff_to_print = 1;
+ }
+
+ if(stuff_to_print && last_draw_too_old()) {
+ stuff_to_print = 0;
+ draw();
}
- while(XPending(xw.dis)) {
- XNextEvent(xw.dis, &ev);
+
+ while(XPending(xw.dpy)) {
+ XNextEvent(xw.dpy, &ev);
+ if(XFilterEvent(&ev, xw.win))
+ continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
}
@@ -1463,14 +2077,35 @@ run(void) {
int
main(int argc, char *argv[]) {
- if(argc == 2 && !strncmp("-v", argv[1], 3))
- die("st-" VERSION ", (c) 2010 st engineers\n");
- else if(argc != 1)
- die("usage: st [-v]\n");
+ int i;
+
+ for(i = 1; i < argc; i++) {
+ switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+ case 't':
+ if(++i < argc) opt_title = argv[i];
+ break;
+ case 'c':
+ if(++i < argc) opt_class = argv[i];
+ break;
+ 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();
xinit();
+ selinit();
run();
return 0;
}