X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/eaf38bf310a3c7850df2444fcdd77683ab8e4dc2..b11d85c9bef5a49c071553410c3f73c3181c6ece:/st.c?ds=sidebyside
diff --git a/st.c b/st.c
index 35945b0..bd230a3 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,13 +14,17 @@
#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/Xlib.h>
#include <X11/Xatom.h>
-#include <X11/keysym.h>
+#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+#include <X11/extensions/Xdbe.h>
#if defined(__linux)
#include <pty.h>
@@ -30,47 +35,108 @@
#endif
#define USAGE \
- "st-" VERSION ", (c) 2010 st engineers\n" \
- "usage: st [-t title] [-c class] [-e cmd] [-v]\n"
+ "st " VERSION " (c) 2010-2012 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 STR_BUF_SIZ 256
+#define STR_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)
+
+enum glyph_attribute {
+ ATTR_NULL = 0,
+ ATTR_REVERSE = 1,
+ ATTR_UNDERLINE = 2,
+ ATTR_BOLD = 4,
+ ATTR_GFX = 8,
+};
-/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
-enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };
-enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT,
- CURSOR_SAVE, CURSOR_LOAD };
-enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
-enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
-enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8,
- MODE_CRLF=16 };
-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 };
+enum cursor_movement {
+ CURSOR_UP,
+ CURSOR_DOWN,
+ CURSOR_LEFT,
+ CURSOR_RIGHT,
+ CURSOR_SAVE,
+ CURSOR_LOAD
+};
+enum cursor_state {
+ CURSOR_DEFAULT = 0,
+ CURSOR_HIDE = 1,
+ CURSOR_WRAPNEXT = 2
+};
+
+enum glyph_state {
+ GLYPH_SET = 1,
+ GLYPH_DIRTY = 2
+};
+
+enum term_mode {
+ MODE_WRAP = 1,
+ MODE_INSERT = 2,
+ MODE_APPKEYPAD = 4,
+ MODE_ALTSCREEN = 8,
+ MODE_CRLF = 16,
+ MODE_MOUSEBTN = 32,
+ MODE_MOUSEMOTION = 64,
+ MODE_MOUSE = 32|64,
+ MODE_REVERSE = 128
+};
+
+enum escape_state {
+ ESC_START = 1,
+ ESC_CSI = 2,
+ ESC_STR = 4, /* DSC, OSC, PM, APC */
+ ESC_ALTCHARSET = 8,
+ ESC_STR_END = 16, /* a final string was encountered */
+};
+
+enum window_state {
+ WIN_VISIBLE = 1,
+ WIN_REDRAW = 2,
+ WIN_FOCUSED = 4
+};
+
+/* bit macro */
#undef B0
enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
+typedef unsigned char uchar;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned short ushort;
+
typedef struct {
char c[UTF_SIZ]; /* character code */
- char mode; /* attribute flags */
- int fg; /* foreground */
- int bg; /* background */
- char state; /* state flags */
+ uchar mode; /* attribute flags */
+ ushort fg; /* foreground */
+ ushort bg; /* background */
+ uchar state; /* state flags */
} Glyph;
typedef Glyph* Line;
@@ -86,54 +152,80 @@ 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;
+/* STR Escape sequence structs */
+/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
+typedef struct {
+ char type; /* ESC type ... */
+ char buf[STR_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
+ char *args[STR_ARG_SIZ];
+ int narg; /* nb of args */
+} STREscape;
+
/* 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 */
- char title[ESC_TITLE_SIZ];
- int titlelen;
+ bool *tabs;
} Term;
/* Purely graphic info */
typedef struct {
- Display* dis;
+ Display* dpy;
Colormap cmap;
Window win;
- Pixmap buf;
+ XdbeBackBuffer 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;
+ struct timeval lastdraw;
+} XWindow;
typedef struct {
KeySym k;
+ uint mask;
char s[ESC_BUF_SIZ];
} Key;
+
+/* TODO: use better name for vars... */
+typedef struct {
+ int mode;
+ int bx, by;
+ int ex, ey;
+ struct {int x, y;} b, e;
+ char *clip;
+ Atom xtarget;
+ struct timeval tclick1;
+ struct timeval tclick2;
+} Selection;
+
+#include "config.h"
+
/* Drawing Context */
typedef struct {
- unsigned long col[256];
+ ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
GC gc;
struct {
int ascent;
@@ -144,27 +236,22 @@ typedef struct {
} font, bfont;
} DC;
-/* TODO: use better name for vars... */
-typedef struct {
- int mode;
- int bx, by;
- int ex, ey;
- struct {int x, y;} b, e;
- char *clip;
-} 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);
static void csiparse(void);
static void csireset(void);
+static void strdump(void);
+static void strhandle(void);
+static void strparse(void);
+static void strreset(void);
static void tclearregion(int, int, int, int);
static void tcursor(int);
@@ -175,7 +262,7 @@ static void tinsertblankline(int);
static void tmoveto(int, int);
static void tnew(int, int);
static void tnewline(int);
-static void tputtab(void);
+static void tputtab(bool);
static void tputc(char*);
static void treset(void);
static int tresize(int, int);
@@ -185,6 +272,9 @@ static void tsetattr(int*, int);
static void tsetchar(char*);
static void tsetscroll(int, int);
static void tswapscreen(void);
+static void tsetdirt(int, int);
+static void tsetmode(bool, bool, int *, int);
+static void tfulldirt(void);
static void ttynew(void);
static void ttyread(void);
@@ -194,6 +284,7 @@ static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
+static void xcopy();
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
@@ -204,8 +295,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, uint);
static void kpress(XEvent *);
+static void cmessage(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
static void brelease(XEvent *);
@@ -215,9 +307,10 @@ static void selnotify(XEvent *);
static void selrequest(XEvent *);
static void selinit(void);
-static inline int selected(int, int);
+static inline bool 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 +319,7 @@ static int isfullutf8(char *, int);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
+ [ClientMessage] = cmessage,
[ConfigureNotify] = resize,
[VisibilityNotify] = visibility,
[UnmapNotify] = unmap,
@@ -243,41 +337,43 @@ static void (*handler[LASTEvent])(XEvent *) = {
static DC dc;
static XWindow xw;
static Term term;
-static CSIEscape escseq;
+static CSIEscape csiescseq;
+static STREscape strescseq;
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
utf8decode(char *s, long *u) {
- unsigned char c;
+ uchar c;
int i, n, rtn;
rtn = 1;
c = *s;
- if(~c&B7) { /* 0xxxxxxx */
+ if(~c & B7) { /* 0xxxxxxx */
*u = c;
return rtn;
- } else if((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+ } 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 */
+ } 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);
+ } 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) {
+ for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
c = *s;
- if((c&(B7|B6)) != B7) /* 10xxxxxx */
+ if((c & (B7|B6)) != B7) /* 10xxxxxx */
goto invalid;
*u <<= 6;
- *u |= c&(B5|B4|B3|B2|B1|B0);
+ *u |= c & (B5|B4|B3|B2|B1|B0);
}
if((n == 1 && *u < 0x80) ||
(n == 2 && *u < 0x800) ||
@@ -292,11 +388,11 @@ invalid:
int
utf8encode(long *u, char *s) {
- unsigned char *sp;
- unsigned long uc;
+ uchar *sp;
+ ulong uc;
int i, n;
- sp = (unsigned char*) s;
+ sp = (uchar*) s;
uc = *u;
if(uc < 0x80) {
*sp = uc; /* 0xxxxxxx */
@@ -328,17 +424,17 @@ invalid:
UTF-8 otherwise return 0 */
int
isfullutf8(char *s, int b) {
- unsigned char *c1, *c2, *c3;
+ uchar *c1, *c2, *c3;
- c1 = (unsigned char *) s;
- c2 = (unsigned char *) ++s;
- c3 = (unsigned char *) ++s;
+ 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 == 1) ||
((b == 2) && (*c2&(B7|B6)) == B7)))
return 0;
else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
@@ -352,75 +448,127 @@ isfullutf8(char *s, int b) {
int
utf8size(char *s) {
- unsigned char c = *s;
+ uchar 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) {
+ memset(&sel.tclick1, 0, sizeof(sel.tclick1));
+ memset(&sel.tclick2, 0, sizeof(sel.tclick2));
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 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 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;
sel.e.y = MAX(sel.by, sel.ey);
}
+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) {
+ if(sel.bx != -1)
+ tsetdirt(sel.b.y, sel.e.y);
+ sel.mode = 1;
+ sel.ex = sel.bx = X2COL(e->xbutton.x);
+ sel.ey = sel.by = Y2ROW(e->xbutton.y);
+ }
}
void
selcopy(void) {
char *str, *ptr;
- int x, y, sz, sl, ls = 0;
+ int x, y, bufsize, is_selected = 0;
if(sel.bx == -1)
str = NULL;
+
else {
- sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
- ptr = str = malloc(sz);
+ bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+ ptr = str = malloc(bufsize);
+
+ /* append every set & selected glyph to the selection */
for(y = 0; y < term.row; y++) {
- for(x = 0; x < term.col; x++)
- if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {
- sl = utf8size(term.line[y][x].c);
- memcpy(ptr, term.line[y][x].c, sl);
- ptr += sl;
+ for(x = 0; x < term.col; x++) {
+ is_selected = selected(x, y);
+ if((term.line[y][x].state & GLYPH_SET) && is_selected) {
+ int size = utf8size(term.line[y][x].c);
+ memcpy(ptr, term.line[y][x].c, size);
+ ptr += size;
}
- if(ls)
- *ptr = '\n', ptr++;
+ }
+
+ /* \n at the end of every selected line except for the last one */
+ if(is_selected && y < sel.e.y)
+ *ptr++ = '\n';
}
*ptr = 0;
}
@@ -429,15 +577,14 @@ selcopy(void) {
void
selnotify(XEvent *e) {
- unsigned long nitems;
- unsigned long ofs, rem;
+ ulong nitems, ofs, rem;
int format;
- unsigned char *data;
+ uchar *data;
Atom type;
ofs = 0;
do {
- if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+ if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
False, AnyPropertyType, &type, &format,
&nitems, &rem, &data)) {
fprintf(stderr, "Clipboard allocation failed\n");
@@ -452,7 +599,7 @@ selnotify(XEvent *e) {
void
selpaste() {
- XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+ XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
void
@@ -470,18 +617,18 @@ selrequest(XEvent *e) {
/* reject */
xev.property = None;
- xa_targets = XInternAtom(xw.dis, "TARGETS", 0);
+ 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);
+ (uchar *) &string, 1);
xev.property = xsre->property;
- } else if(xsre->target == XA_STRING) {
+ } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
xsre->target, 8, PropModeReplace,
- (unsigned char *) sel.clip, strlen(sel.clip));
+ (uchar *) sel.clip, strlen(sel.clip));
xev.property = xsre->property;
}
@@ -498,38 +645,73 @@ xsetsel(char *str) {
free(sel.clip);
sel.clip = str;
- XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
+ XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
- clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
- XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
+ clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+ XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
- XFlush(xw.dis);
+ 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);
+ 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();
}
- 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);
+ tsetdirt(starty, endy);
+ draw();
+ }
}
}
@@ -545,16 +727,17 @@ die(const char *errstr, ...) {
void
execsh(void) {
- char *args[] = {getenv("SHELL"), "-i", NULL};
- if(opt_cmd)
- args[0] = opt_cmd, args[1] = NULL;
- else
- DEFAULT(args[0], SHELL);
+ char **args;
+ char *envshell = getenv("SHELL");
+
+ DEFAULT(envshell, SHELL);
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)
@@ -568,7 +751,7 @@ sigchld(int a) {
void
ttynew(void) {
int m, s;
-
+
/* seems to work fine on linux, openbsd and freebsd */
struct winsize w = {term.row, term.col, 0, 0};
if(openpty(&m, &s, NULL, NULL, &w) < 0)
@@ -606,24 +789,31 @@ dump(char c) {
void
ttyread(void) {
- char buf[BUFSIZ], *ptr;
- char s[UTF_SIZ];
- int ret, br;
+ static char buf[BUFSIZ];
static int buflen = 0;
- long u;
+ char *ptr;
+ char s[UTF_SIZ];
+ int charsize; /* size of utf8 char in bytes */
+ long utf8c;
+ int ret;
+ /* 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 {
- buflen += ret;
- for(ptr=buf; buflen>=UTF_SIZ||isfullutf8(ptr,buflen); buflen-=br) {
- br = utf8decode(ptr, &u);
- utf8encode(&u, s);
- tputc(s);
- ptr += br;
- }
- memcpy(buf, ptr, buflen);
+
+ /* 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
@@ -643,6 +833,24 @@ ttyresize(int x, int y) {
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
+void
+tsetdirt(int top, int bot)
+{
+ int i;
+
+ LIMIT(top, 0, term.row-1);
+ LIMIT(bot, 0, term.row-1);
+
+ for(i = top; i <= bot; i++)
+ term.dirty[i] = 1;
+}
+
+void
+tfulldirt(void)
+{
+ tsetdirt(0, term.row-1);
+}
+
void
tcursor(int mode) {
static TCursor c;
@@ -655,12 +863,16 @@ tcursor(int mode) {
void
treset(void) {
+ unsigned i;
term.c = (TCursor){{
- .mode = ATTR_NULL,
- .fg = DefaultFG,
+ .mode = ATTR_NULL,
+ .fg = DefaultFG,
.bg = DefaultBG
}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
-
+
+ memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+ for (i = TAB; i < term.col; i += TAB)
+ term.tabs[i] = 1;
term.top = 0, term.bot = term.row - 1;
term.mode = MODE_WRAP;
tclearregion(0, 0, term.col-1, term.row-1);
@@ -672,10 +884,15 @@ 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));
+ term.tabs = malloc(term.col * sizeof(*term.tabs));
+
+ 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;
}
+ memset(term.tabs, 0, term.col * sizeof(*term.tabs));
/* setup screen */
treset();
}
@@ -686,22 +903,28 @@ tswapscreen(void) {
term.line = term.alt;
term.alt = tmp;
term.mode ^= MODE_ALTSCREEN;
+ tfulldirt();
}
void
tscrolldown(int orig, int n) {
int i;
Line temp;
-
+
LIMIT(n, 0, term.bot-orig+1);
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-
+
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
@@ -709,13 +932,41 @@ tscrollup(int orig, int n) {
int i;
Line temp;
LIMIT(n, 0, term.bot-orig+1);
-
+
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;
+
+ term.dirty[i] = 1;
+ term.dirty[i+n] = 1;
+ }
+
+ 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;
}
}
@@ -732,22 +983,22 @@ tnewline(int first_col) {
void
csiparse(void) {
/* int noarg = 1; */
- char *p = escseq.buf;
+ char *p = csiescseq.buf;
- escseq.narg = 0;
+ csiescseq.narg = 0;
if(*p == '?')
- escseq.priv = 1, p++;
-
- while(p < escseq.buf+escseq.len) {
+ csiescseq.priv = 1, p++;
+
+ while(p < csiescseq.buf+csiescseq.len) {
while(isdigit(*p)) {
- escseq.arg[escseq.narg] *= 10;
- escseq.arg[escseq.narg] += *p++ - '0'/*, noarg = 0 */;
+ csiescseq.arg[csiescseq.narg] *= 10;
+ csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
}
- if(*p == ';' && escseq.narg+1 < ESC_ARG_SIZ)
- escseq.narg++, p++;
+ if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ)
+ csiescseq.narg++, p++;
else {
- escseq.mode = *p;
- escseq.narg++;
+ csiescseq.mode = *p;
+ csiescseq.narg++;
return;
}
}
@@ -764,6 +1015,7 @@ tmoveto(int x, int y) {
void
tsetchar(char *c) {
+ term.dirty[term.c.y] = 1;
term.line[term.c.y][term.c.x] = term.c.attr;
memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
term.line[term.c.y][term.c.x].state |= GLYPH_SET;
@@ -783,9 +1035,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++)
+ for(y = y1; y <= y2; y++) {
+ term.dirty[y] = 1;
for(x = x1; x <= x2; x++)
term.line[y][x].state = 0;
+ }
}
void
@@ -794,6 +1048,8 @@ tdeletechar(int 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);
return;
@@ -808,6 +1064,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;
@@ -844,47 +1102,53 @@ 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 3: /* enter standout (highlight) mode TODO: make it italic */
+ term.c.attr.mode |= ATTR_REVERSE;
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;
break;
- case 22:
- term.c.attr.mode &= ~ATTR_BOLD;
+ case 23: /* leave standout (highlight) mode TODO: make it italic */
+ term.c.attr.mode &= ~ATTR_REVERSE;
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(38): 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(48): gfx attr %d unknown\n", attr[i]);
break;
case 49:
term.c.attr.bg = DefaultBG;
@@ -898,9 +1162,8 @@ 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]), csidump();
-
+ else
+ fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
break;
}
}
@@ -918,62 +1181,152 @@ tsetscroll(int t, int b) {
b = temp;
}
term.top = t;
- term.bot = b;
+ term.bot = b;
+}
+
+#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
+
+void
+tsetmode(bool priv, bool set, int *args, int narg) {
+ int *lim, mode;
+
+ for (lim = args + narg; args < lim; ++args) {
+ if(priv) {
+ switch(*args) {
+ case 1:
+ MODBIT(term.mode, set, MODE_APPKEYPAD);
+ break;
+ case 5: /* DECSCNM -- Reverve video */
+ mode = term.mode;
+ MODBIT(term.mode,set, MODE_REVERSE);
+ if (mode != term.mode)
+ draw();
+ break;
+ case 7:
+ MODBIT(term.mode, set, MODE_WRAP);
+ break;
+ case 20:
+ MODBIT(term.mode, set, MODE_CRLF);
+ break;
+ case 12: /* att610 -- Start blinking cursor (IGNORED) */
+ break;
+ case 25:
+ MODBIT(term.c.state, !set, CURSOR_HIDE);
+ break;
+ case 1000: /* 1000,1002: enable xterm mouse report */
+ MODBIT(term.mode, set, MODE_MOUSEBTN);
+ break;
+ case 1002:
+ MODBIT(term.mode, set, 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);
+ if ((set && !IS_SET(MODE_ALTSCREEN)) ||
+ (!set && IS_SET(MODE_ALTSCREEN))) {
+ tswapscreen();
+ }
+ if (*args != 1049)
+ break;
+ /* pass through */
+ case 1048:
+ tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+ break;
+ default:
+ fprintf(stderr,
+ "erresc: unknown private set/reset mode %d\n",
+ *args);
+ break;
+ }
+ } else {
+ switch(*args) {
+ case 4:
+ MODBIT(term.mode, set, MODE_INSERT);
+ break;
+ default:
+ fprintf(stderr,
+ "erresc: unknown set/reset mode %d\n",
+ *args);
+ break;
+ }
+ }
+ }
}
+#undef MODBIT
+
void
csihandle(void) {
- switch(escseq.mode) {
+ switch(csiescseq.mode) {
default:
unknown:
- printf("erresc: unknown csi ");
+ fprintf(stderr, "erresc: unknown csi ");
csidump();
/* die(""); */
break;
case '@': /* ICH -- Insert <n> blank char */
- DEFAULT(escseq.arg[0], 1);
- tinsertblank(escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tinsertblank(csiescseq.arg[0]);
break;
case 'A': /* CUU -- Cursor <n> Up */
case 'e':
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y-escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
break;
case 'B': /* CUD -- Cursor <n> Down */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y+escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
break;
case 'C': /* CUF -- Cursor <n> Forward */
case 'a':
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x+escseq.arg[0], term.c.y);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
break;
case 'D': /* CUB -- Cursor <n> Backward */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x-escseq.arg[0], term.c.y);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
break;
case 'E': /* CNL -- Cursor <n> Down and first col */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(0, term.c.y+escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(0, term.c.y+csiescseq.arg[0]);
break;
case 'F': /* CPL -- Cursor <n> Up and first col */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(0, term.c.y-escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(0, term.c.y-csiescseq.arg[0]);
+ break;
+ case 'g': /* TBC -- Tabulation clear */
+ switch (csiescseq.arg[0]) {
+ case 0: /* clear current tab stop */
+ term.tabs[term.c.x] = 0;
+ break;
+ case 3: /* clear all the tabs */
+ memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+ break;
+ default:
+ goto unknown;
+ }
break;
case 'G': /* CHA -- Move to <col> */
case '`': /* XXX: HPA -- same? */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(escseq.arg[0]-1, term.c.y);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(csiescseq.arg[0]-1, term.c.y);
break;
case 'H': /* CUP -- Move to <row> <col> */
case 'f': /* XXX: HVP -- same? */
- DEFAULT(escseq.arg[0], 1);
- DEFAULT(escseq.arg[1], 1);
- tmoveto(escseq.arg[1]-1, escseq.arg[0]-1);
+ DEFAULT(csiescseq.arg[0], 1);
+ DEFAULT(csiescseq.arg[1], 1);
+ tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
+ break;
+ case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
+ DEFAULT(csiescseq.arg[0], 1);
+ while (csiescseq.arg[0]--)
+ tputtab(1);
break;
- /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
case 'J': /* ED -- Clear screen */
- switch(escseq.arg[0]) {
+ sel.bx = -1;
+ switch(csiescseq.arg[0]) {
case 0: /* below */
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
if(term.c.y < term.row-1)
@@ -992,7 +1345,7 @@ csihandle(void) {
}
break;
case 'K': /* EL -- Clear line */
- switch(escseq.arg[0]) {
+ switch(csiescseq.arg[0]) {
case 0: /* right */
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
break;
@@ -1005,131 +1358,54 @@ csihandle(void) {
}
break;
case 'S': /* SU -- Scroll <n> line up */
- DEFAULT(escseq.arg[0], 1);
- tscrollup(term.top, escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tscrollup(term.top, csiescseq.arg[0]);
break;
case 'T': /* SD -- Scroll <n> line down */
- DEFAULT(escseq.arg[0], 1);
- tscrolldown(term.top, escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tscrolldown(term.top, csiescseq.arg[0]);
break;
case 'L': /* IL -- Insert <n> blank lines */
- DEFAULT(escseq.arg[0], 1);
- tinsertblankline(escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tinsertblankline(csiescseq.arg[0]);
break;
case 'l': /* RM -- Reset Mode */
- if(escseq.priv) {
- switch(escseq.arg[0]) {
- case 1:
- term.mode &= ~MODE_APPKEYPAD;
- break;
- case 5: /* TODO: DECSCNM -- Remove reverse video */
- 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 1049: /* = 1047 and 1048 */
- case 1047:
- if(IS_SET(MODE_ALTSCREEN)) {
- tclearregion(0, 0, term.col-1, term.row-1);
- tswapscreen();
- }
- if(escseq.arg[0] == 1047)
- break;
- case 1048:
- tcursor(CURSOR_LOAD);
- break;
- default:
- goto unknown;
- }
- } else {
- switch(escseq.arg[0]) {
- case 4:
- term.mode &= ~MODE_INSERT;
- break;
- default:
- goto unknown;
- }
- }
+ tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
break;
case 'M': /* DL -- Delete <n> lines */
- DEFAULT(escseq.arg[0], 1);
- tdeleteline(escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tdeleteline(csiescseq.arg[0]);
break;
case 'X': /* ECH -- Erase <n> char */
- DEFAULT(escseq.arg[0], 1);
- tclearregion(term.c.x, term.c.y, term.c.x + escseq.arg[0], term.c.y);
+ DEFAULT(csiescseq.arg[0], 1);
+ tclearregion(term.c.x, term.c.y, term.c.x + csiescseq.arg[0], term.c.y);
break;
case 'P': /* DCH -- Delete <n> char */
- DEFAULT(escseq.arg[0], 1);
- tdeletechar(escseq.arg[0]);
+ DEFAULT(csiescseq.arg[0], 1);
+ tdeletechar(csiescseq.arg[0]);
+ break;
+ case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
+ DEFAULT(csiescseq.arg[0], 1);
+ while (csiescseq.arg[0]--)
+ tputtab(0);
break;
- /* XXX: (CSI n Z) CBT -- Cursor Backward Tabulation <n> tab stops */
case 'd': /* VPA -- Move to <row> */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x, escseq.arg[0]-1);
+ DEFAULT(csiescseq.arg[0], 1);
+ tmoveto(term.c.x, csiescseq.arg[0]-1);
break;
case 'h': /* SM -- Set terminal mode */
- if(escseq.priv) {
- switch(escseq.arg[0]) {
- case 1:
- term.mode |= MODE_APPKEYPAD;
- break;
- case 5: /* DECSCNM -- Reverve video */
- /* TODO: set REVERSE on the whole screen (f) */
- break;
- 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)
- break;
- case 25:
- term.c.state &= ~CURSOR_HIDE;
- break;
- case 1049: /* = 1047 and 1048 */
- case 1047:
- if(IS_SET(MODE_ALTSCREEN))
- tclearregion(0, 0, term.col-1, term.row-1);
- else
- tswapscreen();
- if(escseq.arg[0] == 1047)
- break;
- case 1048:
- tcursor(CURSOR_SAVE);
- break;
- default: goto unknown;
- }
- } else {
- switch(escseq.arg[0]) {
- case 4:
- term.mode |= MODE_INSERT;
- break;
- default: goto unknown;
- }
- };
+ tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
break;
case 'm': /* SGR -- Terminal attribute (color) */
- tsetattr(escseq.arg, escseq.narg);
+ tsetattr(csiescseq.arg, csiescseq.narg);
break;
case 'r': /* DECSTBM -- Set Scrolling Region */
- if(escseq.priv)
+ if(csiescseq.priv)
goto unknown;
else {
- DEFAULT(escseq.arg[0], 1);
- DEFAULT(escseq.arg[1], term.row);
- tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1);
+ DEFAULT(csiescseq.arg[0], 1);
+ DEFAULT(csiescseq.arg[1], term.row);
+ tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
tmoveto(0, 0);
}
break;
@@ -1143,26 +1419,116 @@ csihandle(void) {
}
void
-csidump(void) {
+csidump(void) {
int i;
- printf("ESC [ %s", escseq.priv ? "? " : "");
- if(escseq.narg)
- for(i = 0; i < escseq.narg; i++)
- printf("%d ", escseq.arg[i]);
- if(escseq.mode)
- putchar(escseq.mode);
+ printf("ESC[");
+ for(i = 0; i < csiescseq.len; i++) {
+ uint c = csiescseq.buf[i] & 0xff;
+ if(isprint(c)) putchar(c);
+ else if(c == '\n') printf("(\\n)");
+ else if(c == '\r') printf("(\\r)");
+ else if(c == 0x1b) printf("(\\e)");
+ else printf("(%02x)", c);
+ }
putchar('\n');
}
void
csireset(void) {
- memset(&escseq, 0, sizeof(escseq));
+ memset(&csiescseq, 0, sizeof(csiescseq));
+}
+
+void
+strhandle(void) {
+ char *p;
+
+ /*
+ * TODO: make this being useful in case of color palette change.
+ */
+ strparse();
+
+ p = strescseq.buf;
+
+ switch(strescseq.type) {
+ case ']': /* OSC -- Operating System Command */
+ switch(p[0]) {
+ case '0':
+ case '1':
+ case '2':
+ /*
+ * TODO: Handle special chars in string, like umlauts.
+ */
+ if(p[1] == ';') {
+ XStoreName(xw.dpy, xw.win, strescseq.buf+2);
+ }
+ break;
+ case ';':
+ XStoreName(xw.dpy, xw.win, strescseq.buf+1);
+ break;
+ case '4': /* TODO: Set color (arg0) to "rgb:%hexr/$hexg/$hexb" (arg1) */
+ break;
+ default:
+ fprintf(stderr, "erresc: unknown str ");
+ strdump();
+ break;
+ }
+ break;
+ case 'P': /* DSC -- Device Control String */
+ case '_': /* APC -- Application Program Command */
+ case '^': /* PM -- Privacy Message */
+ default:
+ fprintf(stderr, "erresc: unknown str ");
+ strdump();
+ /* die(""); */
+ break;
+ }
}
void
-tputtab(void) {
- int space = TAB - term.c.x % TAB;
- tmoveto(term.c.x + space, term.c.y);
+strparse(void) {
+ /*
+ * TODO: Implement parsing like for CSI when required.
+ * Format: ESC type cmd ';' arg0 [';' argn] ESC \
+ */
+ return;
+}
+
+void
+strdump(void) {
+ int i;
+ printf("ESC%c", strescseq.type);
+ for(i = 0; i < strescseq.len; i++) {
+ uint c = strescseq.buf[i] & 0xff;
+ if(isprint(c)) putchar(c);
+ else if(c == '\n') printf("(\\n)");
+ else if(c == '\r') printf("(\\r)");
+ else if(c == 0x1b) printf("(\\e)");
+ else printf("(%02x)", c);
+ }
+ printf("ESC\\\n");
+}
+
+void
+strreset(void) {
+ memset(&strescseq, 0, sizeof(strescseq));
+}
+
+void
+tputtab(bool forward) {
+ unsigned x = term.c.x;
+
+ if (forward) {
+ if (x == term.col)
+ return;
+ for (++x; x < term.col && !term.tabs[x]; ++x)
+ /* nothing */ ;
+ } else {
+ if (x == 0)
+ return;
+ for (--x; x > 0 && !term.tabs[x]; --x)
+ /* nothing */ ;
+ }
+ tmoveto(x, term.c.y);
}
void
@@ -1170,25 +1536,31 @@ tputc(char *c) {
char ascii = *c;
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
- escseq.buf[escseq.len++] = ascii;
- if(BETWEEN(ascii, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
+ csiescseq.buf[csiescseq.len++] = ascii;
+ if(BETWEEN(ascii, 0x40, 0x7E) || csiescseq.len >= ESC_BUF_SIZ) {
term.esc = 0;
csiparse(), csihandle();
}
- /* TODO: handle other OSC */
- } else if(term.esc & ESC_OSC) {
- if(ascii == ';') {
- term.titlelen = 0;
- term.esc = ESC_START | ESC_TITLE;
- }
- } else if(term.esc & ESC_TITLE) {
- if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
+ } else if(term.esc & ESC_STR) {
+ switch(ascii) {
+ case '\033':
+ term.esc = ESC_START | ESC_STR_END;
+ break;
+ case '\a': /* backwards compatibility to xterm */
term.esc = 0;
- term.title[term.titlelen] = '\0';
- XStoreName(xw.dis, xw.win, term.title);
- } else {
- term.title[term.titlelen++] = ascii;
+ strhandle();
+ break;
+ default:
+ strescseq.buf[strescseq.len++] = ascii;
+ if (strescseq.len+1 >= STR_BUF_SIZ) {
+ term.esc = 0;
+ strhandle();
+ }
}
+ } else if(term.esc & ESC_STR_END) {
+ term.esc = 0;
+ if(ascii == '\\')
+ strhandle();
} else if(term.esc & ESC_ALTCHARSET) {
switch(ascii) {
case '0': /* Line drawing crap */
@@ -1198,7 +1570,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 {
@@ -1206,8 +1578,13 @@ tputc(char *c) {
case '[':
term.esc |= ESC_CSI;
break;
- case ']':
- term.esc |= ESC_OSC;
+ case 'P': /* DCS -- Device Control String */
+ case '_': /* APC -- Application Program Command */
+ case '^': /* PM -- Privacy Message */
+ case ']': /* OSC -- Operating System Command */
+ strreset();
+ strescseq.type = ascii;
+ term.esc |= ESC_STR;
break;
case '(':
term.esc |= ESC_ALTCHARSET;
@@ -1223,6 +1600,10 @@ tputc(char *c) {
tnewline(1); /* always go to first col */
term.esc = 0;
break;
+ case 'H': /* HTS -- Horizontal tab stop */
+ term.tabs[term.c.x] = 1;
+ term.esc = 0;
+ break;
case 'M': /* RI -- Reverse index */
if(term.c.y == term.top)
tscrolldown(term.top, 1);
@@ -1250,16 +1631,21 @@ tputc(char *c) {
tcursor(CURSOR_LOAD);
term.esc = 0;
break;
+ case '\\': /* ST -- Stop */
+ term.esc = 0;
+ break;
default:
fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
- (unsigned char) ascii, isprint(ascii)?ascii:'.');
+ (uchar) ascii, isprint(ascii)?ascii:'.');
term.esc = 0;
}
}
} else {
+ if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+ sel.bx = -1;
switch(ascii) {
case '\t':
- tputtab();
+ tputtab(1);
break;
case '\b':
tmoveto(term.c.x-1, term.c.y);
@@ -1289,7 +1675,6 @@ tputc(char *c) {
tmoveto(term.c.x+1, term.c.y);
else
term.c.state |= CURSOR_WRAPNEXT;
- break;
}
}
}
@@ -1325,9 +1710,12 @@ 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));
+ term.tabs = realloc(term.tabs, col * sizeof(*term.tabs));
/* 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));
for(x = mincol; x < col; x++) {
@@ -1338,71 +1726,60 @@ tresize(int col, int row) {
/* 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));
}
-
+ if (col > term.col) {
+ bool *bp = term.tabs + term.col;
+
+ memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
+ while (--bp > term.tabs && !*bp)
+ /* nothing */ ;
+ for (bp += TAB; bp < term.tabs + col; bp += TAB)
+ *bp = 1;
+ }
/* update terminal size */
term.col = col, term.row = row;
/* make use of the LIMIT in tmoveto */
tmoveto(term.c.x, term.c.y);
/* reset scrolling region */
tsetscroll(0, row-1);
+
return (slide > 0);
}
void
xresize(int col, int row) {
- Pixmap newbuf;
- int oldw, oldh;
-
- oldw = xw.bufw;
- oldh = xw.bufh;
- xw.bufw = MAX(1, col * xw.cw);
- xw.bufh = MAX(1, row * xw.ch);
- newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
- XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
- XFreePixmap(xw.dis, xw.buf);
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
- if(xw.bufw > oldw)
- XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
- xw.bufw-oldw, MIN(xw.bufh, oldh));
- else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
- XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
- xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
- False);
- if(xw.bufh > oldh)
- XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
- xw.bufw, xw.bufh-oldh);
- else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
- XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
- xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
- False);
- xw.buf = newbuf;
+ xw.w = MAX(1, 2*BORDER + col * xw.cw);
+ xw.h = MAX(1, 2*BORDER + row * xw.ch);
}
void
xloadcols(void) {
int i, r, g, b;
XColor color;
- 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, xw.cmap, colorname[i], &color, &color)) {
+ /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
+ for(i = 0; i < LEN(colorname); i++) {
+ if(!colorname[i])
+ continue;
+ 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
dc.col[i] = color.pixel;
}
- /* same colors as xterm */
- for(r = 0; r < 6; r++)
+ /* load colors [16-255] ; same colors as xterm */
+ for(i = 16, r = 0; r < 6; r++)
for(g = 0; g < 6; g++)
for(b = 0; b < 6; b++) {
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, xw.cmap, &color)) {
+ if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
@@ -1412,7 +1789,7 @@ xloadcols(void) {
for(r = 0; r < 24; r++, i++) {
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
- if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+ if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
@@ -1422,15 +1799,14 @@ 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,
- x1 * xw.cw, y1 * xw.ch,
- (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+ XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
+ XFillRectangle(xw.dpy, xw.buf, dc.gc,
+ BORDER + x1 * xw.cw, BORDER + 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 = {
@@ -1442,18 +1818,17 @@ 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)
-{
+xinitfont(char *fontstr) {
XFontSet set;
char *def, **missing;
int n;
missing = NULL;
- set = XCreateFontSet(xw.dis, fontstr, &missing, &n, &def);
+ set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
@@ -1463,8 +1838,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;
@@ -1481,8 +1855,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);
@@ -1495,87 +1868,118 @@ initfonts(char *fontstr, char *bfontstr)
void
xinit(void) {
XSetWindowAttributes attrs;
+ Cursor cursor;
+ Window parent;
- if(!(xw.dis = XOpenDisplay(NULL)))
+ if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
- xw.scr = XDefaultScreen(xw.dis);
-
+ xw.scr = XDefaultScreen(xw.dpy);
+
/* font */
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 */
- xw.cmap = XDefaultColormap(xw.dis, xw.scr);
+ xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
xloadcols();
/* window - default size */
- xw.bufh = 24 * xw.ch;
- xw.bufw = 80 * xw.cw;
- xw.h = xw.bufh + 2*BORDER;
- xw.w = xw.bufw + 2*BORDER;
+ xw.h = 2*BORDER + term.row * xw.ch;
+ xw.w = 2*BORDER + term.col * xw.cw;
attrs.background_pixel = dc.col[DefaultBG];
attrs.border_pixel = dc.col[DefaultBG];
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.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
- xw.w, xw.h, 0, XDefaultDepth(xw.dis, xw.scr), InputOutput,
- XDefaultVisual(xw.dis, xw.scr),
+ 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.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+ xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
/* input methods */
- xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
- xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
- | XIMStatusNothing, XNClientWindow, xw.win,
+ 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);
-
- XMapWindow(xw.dis, xw.win);
+ 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.dis, xw.win, opt_title ? opt_title : "st");
- XSync(xw.dis, 0);
+ XSync(xw.dpy, 0);
}
void
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
- unsigned long xfg, xbg;
- int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+ int fg = base.fg, bg = base.bg, temp;
+ int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+ XFontSet fontset = dc.font.set;
int i;
+ /* only switch default fg/bg if term is in RV mode */
+ if(IS_SET(MODE_REVERSE)) {
+ if(fg == DefaultFG)
+ fg = DefaultBG;
+ if(bg == DefaultBG)
+ bg = 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 = fg, fg = bg, bg = temp;
- XSetBackground(xw.dis, dc.gc, xbg);
- XSetForeground(xw.dis, dc.gc, xfg);
+ if(base.mode & ATTR_BOLD) {
+ fg += 8;
+ fontset = dc.bfont.set;
+ }
- if(base.mode & ATTR_GFX)
+ XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
+ XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
+
+ if(base.mode & ATTR_GFX) {
for(i = 0; i < bytelen; i++) {
- char c = gfx[(unsigned int)s[i] % 256];
+ char c = gfx[(uint)s[i] % 256];
if(c)
s[i] = c;
else if(s[i] > 0x5f)
s[i] -= 0x5f;
}
+ }
+
+ XmbDrawImageString(xw.dpy, xw.buf, fontset, dc.gc, winx, winy, s, bytelen);
- XmbDrawImageString(xw.dis, 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() {
+ XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
+ XdbeSwapBuffers(xw.dpy, swpinfo, 1);
+
}
void
@@ -1584,10 +1988,10 @@ xdrawcursor(void) {
static int oldy = 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)
memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
@@ -1597,46 +2001,34 @@ xdrawcursor(void) {
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.state & WIN_FOCUSED)) {
+ if(!(term.c.state & CURSOR_HIDE)) {
+ if(!(xw.state & WIN_FOCUSED))
+ g.bg = DefaultUCS;
+
+ if(IS_SET(MODE_REVERSE))
+ g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;
+
sl = utf8size(g.c);
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.dis, dc.gc, dc.col[g.bg]);
- XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
- XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
- dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
+ 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);
+ xcopy();
+ gettimeofday(&xw.lastdraw, NULL);
}
-#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];
@@ -1644,16 +2036,19 @@ 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++) {
+ 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];
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)) {
+ ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
xdraws(buf, base, ox, y, ic, ib);
ic = ib = 0;
}
@@ -1672,22 +2067,16 @@ draw(int redraw_all) {
xdraws(buf, base, ox, y, ic, ib);
}
xdrawcursor();
- XCopyArea(xw.dis, 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) {
+ 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);
+ }
+ xcopy();
}
void
@@ -1707,9 +2096,9 @@ unmap(XEvent *ev) {
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);
}
@@ -1720,15 +2109,18 @@ focus(XEvent *ev) {
xseturgency(0);
} else
xw.state &= ~WIN_FOCUSED;
- draw(SCREEN_UPDATE);
+ 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;
}
@@ -1746,9 +2138,9 @@ kpress(XEvent *ev) {
meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
-
+
/* 1. custom keys from config.h */
- if((customkey = kmap(ksym)))
+ if((customkey = kmap(ksym, e->state)))
ttywrite(customkey, strlen(customkey));
/* 2. hardcoded (overrides X lookup) */
else
@@ -1757,7 +2149,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:
@@ -1773,23 +2166,36 @@ kpress(XEvent *ev) {
/* 3. X lookup */
default:
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;
}
}
+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;
-
+
if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
return;
-
+
xw.w = e->xconfigure.width;
xw.h = e->xconfigure.height;
col = (xw.w - 2*BORDER) / xw.cw;
@@ -1797,33 +2203,50 @@ 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);
}
+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);
- if (XFilterEvent(&ev, xw.win))
+
+ while(XPending(xw.dpy)) {
+ XNextEvent(xw.dpy, &ev);
+ if(XFilterEvent(&ev, xw.win))
continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
@@ -1834,7 +2257,7 @@ run(void) {
int
main(int argc, char *argv[]) {
int i;
-
+
for(i = 1; i < argc; i++) {
switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
case 't':
@@ -1843,14 +2266,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();