X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/5dc48af29e9972527767977be3bbc9c072cf1c13..78f8843bc7d6dc731f23d5ff3a8536fdcc5e4be6:/st.c?ds=sidebyside
diff --git a/st.c b/st.c
index 23a43c1..c97712c 100644
--- a/st.c
+++ b/st.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <stdint.h>
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/stat.h>
@@ -19,6 +20,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
+#include <libgen.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -26,6 +28,7 @@
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
+#include <wchar.h>
#include "arg.h"
@@ -36,6 +39,7 @@ char *argv0;
#define Draw XftDraw *
#define Colour XftColor
#define Colourmap Colormap
+#define Rectangle XRectangle
#if defined(__linux)
#include <pty.h>
@@ -74,6 +78,14 @@ char *argv0;
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
#define IS_SET(flag) ((term.mode & (flag)) != 0)
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
+#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
+
+#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
+#define IS_TRUECOL(x) (1 << 24 & (x))
+#define TRUERED(x) (((x) & 0xff0000) >> 8)
+#define TRUEGREEN(x) (((x) & 0xff00))
+#define TRUEBLUE(x) (((x) & 0xff) << 8)
+
#define VT102ID "\033[?6c"
@@ -85,6 +97,9 @@ enum glyph_attribute {
ATTR_GFX = 8,
ATTR_ITALIC = 16,
ATTR_BLINK = 32,
+ ATTR_WRAP = 64,
+ ATTR_WIDE = 128,
+ ATTR_WDUMMY = 256,
};
enum cursor_movement {
@@ -95,35 +110,49 @@ enum cursor_movement {
enum cursor_state {
CURSOR_DEFAULT = 0,
CURSOR_WRAPNEXT = 1,
- CURSOR_ORIGIN = 2
-};
-
-enum glyph_state {
- GLYPH_SET = 1,
- GLYPH_DIRTY = 2
+ CURSOR_ORIGIN = 2
};
enum term_mode {
- MODE_WRAP = 1,
+ MODE_WRAP = 1,
MODE_INSERT = 2,
MODE_APPKEYPAD = 4,
MODE_ALTSCREEN = 8,
- MODE_CRLF = 16,
+ MODE_CRLF = 16,
MODE_MOUSEBTN = 32,
MODE_MOUSEMOTION = 64,
- MODE_MOUSE = 32|64,
MODE_REVERSE = 128,
MODE_KBDLOCK = 256,
- MODE_HIDE = 512,
- MODE_ECHO = 1024,
- MODE_APPCURSOR = 2048,
+ MODE_HIDE = 512,
+ MODE_ECHO = 1024,
+ MODE_APPCURSOR = 2048,
MODE_MOUSESGR = 4096,
+ MODE_8BIT = 8192,
+ MODE_BLINK = 16384,
+ MODE_FBLINK = 32768,
+ MODE_FOCUS = 65536,
+ MODE_MOUSEX10 = 131072,
+ MODE_MOUSEMANY = 262144,
+ MODE_BRCKTPASTE = 524288,
+ MODE_PRINT = 1048576,
+ MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
+ |MODE_MOUSEMANY,
+};
+
+enum charset {
+ CS_GRAPHIC0,
+ CS_GRAPHIC1,
+ CS_UK,
+ CS_USA,
+ CS_MULTI,
+ CS_GER,
+ CS_FIN
};
enum escape_state {
ESC_START = 1,
- ESC_CSI = 2,
- ESC_STR = 4, /* DSC, OSC, PM, APC */
+ ESC_CSI = 2,
+ ESC_STR = 4, /* DSC, OSC, PM, APC */
ESC_ALTCHARSET = 8,
ESC_STR_END = 16, /* a final string was encountered */
ESC_TEST = 32, /* Enter in test mode */
@@ -140,9 +169,10 @@ enum selection_type {
SEL_RECTANGULAR = 2
};
-/* bit macro */
-#undef B0
-enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
+enum selection_snap {
+ SNAP_WORD = 1,
+ SNAP_LINE = 2
+};
typedef unsigned char uchar;
typedef unsigned int uint;
@@ -150,17 +180,16 @@ typedef unsigned long ulong;
typedef unsigned short ushort;
typedef struct {
- char c[UTF_SIZ]; /* character code */
- uchar mode; /* attribute flags */
- ushort fg; /* foreground */
- ushort bg; /* background */
- uchar state; /* state flags */
+ char c[UTF_SIZ]; /* character code */
+ ushort mode; /* attribute flags */
+ uint32_t fg; /* foreground */
+ uint32_t bg; /* background */
} Glyph;
typedef Glyph *Line;
typedef struct {
- Glyph attr; /* current char attributes */
+ Glyph attr; /* current char attributes */
int x;
int y;
char state;
@@ -170,36 +199,39 @@ 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 type; /* ESC type ... */
char buf[STR_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ int len; /* raw string length */
char *args[STR_ARG_SIZ];
- int narg; /* nb of args */
+ int narg; /* nb of args */
} STREscape;
/* Internal representation of the screen */
typedef struct {
- 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 bot; /* bottom scroll limit */
- int mode; /* terminal mode flags */
- int esc; /* escape state flags */
- bool numlock; /* lock numbers in keyboard */
+ 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 bot; /* bottom scroll limit */
+ int mode; /* terminal mode flags */
+ int esc; /* escape state flags */
+ char trantbl[4]; /* charset table translation */
+ int charset; /* current charset */
+ int icharset; /* selected charset for sequence */
+ bool numlock; /* lock numbers in keyboard */
bool *tabs;
} Term;
@@ -209,11 +241,12 @@ typedef struct {
Colourmap cmap;
Window win;
Drawable buf;
- Atom xembed, wmdeletewin;
+ Atom xembed, wmdeletewin, netwmname, netwmpid;
XIM xim;
XIC xic;
Draw draw;
Visual *vis;
+ XSetWindowAttributes attrs;
int scr;
bool isfixed; /* is fixed geometry? */
int fx, fy, fw, fh; /* fixed geometry */
@@ -224,25 +257,37 @@ typedef struct {
char state; /* focus, redraw, visible */
} XWindow;
+typedef struct {
+ uint b;
+ uint mask;
+ char *s;
+} Mousekey;
+
typedef struct {
KeySym k;
uint mask;
- char s[ESC_BUF_SIZ];
+ char *s;
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
- signed char appkey; /* application keypad */
- signed char appcursor; /* application cursor */
- signed char crlf; /* crlf mode */
+ signed char appkey; /* application keypad */
+ signed char appcursor; /* application cursor */
+ signed char crlf; /* crlf mode */
} Key;
-/* TODO: use better name for vars... */
typedef struct {
int mode;
int type;
- int bx, by;
- int ex, ey;
+ int snap;
+ /*
+ * Selection variables:
+ * nb â normalized coordinates of the beginning of the selection
+ * ne â normalized coordinates of the end of the selection
+ * ob â original coordinates of the beginning of the selection
+ * oe â original coordinates of the end of the selection
+ */
struct {
int x, y;
- } b, e;
+ } nb, ne, ob, oe;
+
char *clip;
Atom xtarget;
bool alt;
@@ -269,6 +314,9 @@ static void clippaste(const Arg *);
static void numlock(const Arg *);
static void selpaste(const Arg *);
static void xzoom(const Arg *);
+static void printsel(const Arg *);
+static void printscreen(const Arg *) ;
+static void toggleprinter(const Arg *);
/* Config.h for applying patches and the configuration. */
#include "config.h"
@@ -310,7 +358,12 @@ static void strhandle(void);
static void strparse(void);
static void strreset(void);
-static void tclearregion(int, int, int, int, int);
+static int tattrset(int);
+static void tprinter(char *s, size_t len);
+static void tdumpsel(void);
+static void tdumpline(int);
+static void tdump(void);
+static void tclearregion(int, int, int, int);
static void tcursor(int);
static void tdeletechar(int);
static void tdeleteline(int);
@@ -331,14 +384,18 @@ static void tsetchar(char *, Glyph *, int, int);
static void tsetscroll(int, int);
static void tswapscreen(void);
static void tsetdirt(int, int);
+static void tsetdirtattr(int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(char *, int);
-
+static int32_t tdefcolor(int *, int *, int);
+static void tselcs(void);
+static void tdeftran(char);
static inline bool match(uint, uint);
static void ttynew(void);
static void ttyread(void);
static void ttyresize(void);
+static void ttysend(char *, size_t);
static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int);
@@ -349,12 +406,15 @@ static void xinit(void);
static void xloadcols(void);
static int xsetcolorname(int, const char *);
static int xloadfont(Font *, FcPattern *);
-static void xloadfonts(char *, int);
+static void xloadfonts(char *, double);
+static int xloadfontset(Font *);
static void xsettitle(char *);
static void xresettitle(void);
+static void xsetpointermotion(int);
static void xseturgency(int);
static void xsetsel(char*);
static void xtermclear(int, int, int, int);
+static void xunloadfont(Font *f);
static void xunloadfonts(void);
static void xresize(int, int);
@@ -375,9 +435,12 @@ static void selclear(XEvent *);
static void selrequest(XEvent *);
static void selinit(void);
+static void selsort(void);
static inline bool selected(int, int);
+static char *getsel(void);
static void selcopy(void);
static void selscroll(int, int);
+static void selsnap(int, int *, int *, int);
static int utf8decode(char *, long *);
static int utf8encode(long *, char *);
@@ -387,7 +450,7 @@ static int isfullutf8(char *, int);
static ssize_t xwrite(int, char *, size_t);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
-static void *xcalloc(size_t, size_t);
+static char *xstrdup(char *s);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
@@ -415,16 +478,17 @@ static STREscape strescseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
-static int iofd = -1;
+static int iofd = STDOUT_FILENO;
static char **opt_cmd = NULL;
static char *opt_io = NULL;
static char *opt_title = NULL;
static char *opt_embed = NULL;
static char *opt_class = NULL;
static char *opt_font = NULL;
+static int oldbutton = 3; /* button event on startup: 3 = release */
static char *usedfont = NULL;
-static int usedfontsize = 0;
+static double usedfontsize = 0;
/* Font Ring Cache */
enum {
@@ -436,17 +500,12 @@ enum {
typedef struct {
XftFont *font;
- long c;
int flags;
} Fontcache;
-/*
- * Fontcache is a ring buffer, with frccur as current position and frclen as
- * the current length of used elements.
- */
-
-static Fontcache frc[1024];
-static int frccur = -1, frclen = 0;
+/* Fontcache is an array now. A new font will be appended to the array. */
+static Fontcache frc[16];
+static int frclen = 0;
ssize_t
xwrite(int fd, char *s, size_t len) {
@@ -480,11 +539,11 @@ xrealloc(void *p, size_t len) {
return p;
}
-void *
-xcalloc(size_t nmemb, size_t size) {
- void *p = calloc(nmemb, size);
+char *
+xstrdup(char *s) {
+ char *p = strdup(s);
- if(!p)
+ if (!p)
die("Out of memory\n");
return p;
@@ -497,17 +556,17 @@ utf8decode(char *s, long *u) {
rtn = 1;
c = *s;
- if(~c & B7) { /* 0xxxxxxx */
+ if(~c & 0x80) { /* 0xxxxxxx */
*u = c;
return rtn;
- } else if((c & (B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
- *u = c&(B4|B3|B2|B1|B0);
+ } else if((c & 0xE0) == 0xC0) { /* 110xxxxx */
+ *u = c & 0x1F;
n = 1;
- } else if((c & (B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
- *u = c&(B3|B2|B1|B0);
+ } else if((c & 0xF0) == 0xE0) { /* 1110xxxx */
+ *u = c & 0x0F;
n = 2;
- } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
- *u = c & (B2|B1|B0);
+ } else if((c & 0xF8) == 0xF0) { /* 11110xxx */
+ *u = c & 0x07;
n = 3;
} else {
goto invalid;
@@ -515,10 +574,10 @@ utf8decode(char *s, long *u) {
for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
c = *s;
- if((c & (B7|B6)) != B7) /* 10xxxxxx */
+ if((c & 0xC0) != 0x80) /* 10xxxxxx */
goto invalid;
*u <<= 6;
- *u |= c & (B5|B4|B3|B2|B1|B0);
+ *u |= c & 0x3F;
}
if((n == 1 && *u < 0x80) ||
@@ -547,20 +606,20 @@ utf8encode(long *u, char *s) {
*sp = uc; /* 0xxxxxxx */
return 1;
} else if(*u < 0x800) {
- *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
+ *sp = (uc >> 6) | 0xC0; /* 110xxxxx */
n = 1;
} else if(uc < 0x10000) {
- *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
+ *sp = (uc >> 12) | 0xE0; /* 1110xxxx */
n = 2;
} else if(uc <= 0x10FFFF) {
- *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
+ *sp = (uc >> 18) | 0xF0; /* 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 */
+ *sp = ((uc >> 6*(i-1)) & 0x3F) | 0x80; /* 10xxxxxx */
return n+1;
invalid:
@@ -583,16 +642,16 @@ isfullutf8(char *s, int b) {
c3 = (uchar *)++s;
if(b < 1) {
return 0;
- } else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) {
+ } else if((*c1 & 0xE0) == 0xC0 && b == 1) {
return 0;
- } else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+ } else if((*c1 & 0xF0) == 0xE0 &&
((b == 1) ||
- ((b == 2) && (*c2&(B7|B6)) == B7))) {
+ ((b == 2) && (*c2 & 0xC0) == 0x80))) {
return 0;
- } else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+ } else if((*c1 & 0xF8) == 0xF0 &&
((b == 1) ||
- ((b == 2) && (*c2&(B7|B6)) == B7) ||
- ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) {
+ ((b == 2) && (*c2 & 0xC0) == 0x80) ||
+ ((b == 3) && (*c2 & 0xC0) == 0x80 && (*c3 & 0xC0) == 0x80))) {
return 0;
} else {
return 1;
@@ -603,23 +662,23 @@ int
utf8size(char *s) {
uchar c = *s;
- if(~c&B7) {
+ if(~c & 0x80) {
return 1;
- } else if((c&(B7|B6|B5)) == (B7|B6)) {
+ } else if((c & 0xE0) == 0xC0) {
return 2;
- } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) {
+ } else if((c & 0xF0) == 0xE0) {
return 3;
} else {
return 4;
}
}
-void
+static void
selinit(void) {
memset(&sel.tclick1, 0, sizeof(sel.tclick1));
memset(&sel.tclick2, 0, sizeof(sel.tclick2));
sel.mode = 0;
- sel.bx = -1;
+ sel.ob.x = -1;
sel.clip = NULL;
sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
if(sel.xtarget == None)
@@ -642,25 +701,114 @@ y2row(int y) {
return LIMIT(y, 0, term.row-1);
}
+static void
+selsort(void) {
+ if(sel.ob.y == sel.oe.y) {
+ sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+ sel.ne.x = MAX(sel.ob.x, sel.oe.x);
+ } else {
+ sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
+ sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+ }
+ sel.nb.y = MIN(sel.ob.y, sel.oe.y);
+ sel.ne.y = MAX(sel.ob.y, sel.oe.y);
+}
+
static inline bool
selected(int x, int y) {
- int bx, ex;
-
- if(sel.ey == y && sel.by == y) {
- bx = MIN(sel.bx, sel.ex);
- ex = MAX(sel.bx, sel.ex);
+ if(sel.ne.y == y && sel.nb.y == y)
+ return BETWEEN(x, sel.nb.x, sel.ne.x);
- return BETWEEN(x, bx, ex);
+ if(sel.type == SEL_RECTANGULAR) {
+ return ((sel.nb.y <= y && y <= sel.ne.y)
+ && (sel.nb.x <= x && x <= sel.ne.x));
}
- if(sel.type == SEL_RECTANGULAR) {
- return ((sel.b.y <= y && y <= sel.e.y)
- && (sel.b.x <= x && x <= sel.e.x));
+ return ((sel.nb.y < y && y < sel.ne.y)
+ || (y == sel.ne.y && x <= sel.ne.x))
+ || (y == sel.nb.y && x >= sel.nb.x
+ && (x <= sel.ne.x || sel.nb.y != sel.ne.y));
+}
+
+void
+selsnap(int mode, int *x, int *y, int direction) {
+ int i;
+
+ switch(mode) {
+ case SNAP_WORD:
+ /*
+ * Snap around if the word wraps around at the end or
+ * beginning of a line.
+ */
+ for(;;) {
+ if(direction < 0 && *x <= 0) {
+ if(*y > 0 && term.line[*y - 1][term.col-1].mode
+ & ATTR_WRAP) {
+ *y -= 1;
+ *x = term.col-1;
+ } else {
+ break;
+ }
+ }
+ if(direction > 0 && *x >= term.col-1) {
+ if(*y < term.row-1 && term.line[*y][*x].mode
+ & ATTR_WRAP) {
+ *y += 1;
+ *x = 0;
+ } else {
+ break;
+ }
+ }
+
+ if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) {
+ *x += direction;
+ continue;
+ }
+
+ if(strchr(worddelimiters,
+ term.line[*y][*x+direction].c[0])) {
+ break;
+ }
+
+ *x += direction;
+ }
+ break;
+ case SNAP_LINE:
+ /*
+ * Snap around if the the previous line or the current one
+ * has set ATTR_WRAP at its end. Then the whole next or
+ * previous line will be selected.
+ */
+ *x = (direction < 0) ? 0 : term.col - 1;
+ if(direction < 0 && *y > 0) {
+ for(; *y > 0; *y += direction) {
+ if(!(term.line[*y-1][term.col-1].mode
+ & ATTR_WRAP)) {
+ break;
+ }
+ }
+ } else if(direction > 0 && *y < term.row-1) {
+ for(; *y < term.row; *y += direction) {
+ if(!(term.line[*y][term.col-1].mode
+ & ATTR_WRAP)) {
+ break;
+ }
+ }
+ }
+ break;
+ default:
+ /*
+ * Select the whole line when the end of line is reached.
+ */
+ if(direction > 0) {
+ i = term.col;
+ while(--i > 0 && term.line[*y][i].c[0] == ' ')
+ /* nothing */;
+ if(i > 0 && i < *x)
+ *x = term.col - 1;
+ }
+ break;
}
- 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
@@ -670,13 +818,18 @@ getbuttoninfo(XEvent *e) {
sel.alt = IS_SET(MODE_ALTSCREEN);
- sel.ex = x2col(e->xbutton.x);
- sel.ey = y2row(e->xbutton.y);
+ sel.oe.x = x2col(e->xbutton.x);
+ sel.oe.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);
+ if(sel.ob.y < sel.oe.y
+ || (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) {
+ selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
+ selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
+ } else {
+ selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1);
+ selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1);
+ }
+ selsort();
sel.type = SEL_REGULAR;
for(type = 1; type < LEN(selmasks); ++type) {
@@ -693,31 +846,46 @@ mousereport(XEvent *e) {
button = e->xbutton.button, state = e->xbutton.state,
len;
char buf[40];
- static int ob, ox, oy;
+ static int ox, oy;
/* from urxvt */
if(e->xbutton.type == MotionNotify) {
- if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
+ if(x == ox && y == oy)
+ return;
+ if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
+ return;
+ /* MOUSE_MOTION: no reporting if no button is pressed */
+ if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
return;
- button = ob + 32;
- ox = x, oy = y;
- } else if(!IS_SET(MODE_MOUSESGR)
- && (e->xbutton.type == ButtonRelease
- || button == AnyButton)) {
- button = 3;
+
+ button = oldbutton + 32;
+ ox = x;
+ oy = y;
} else {
- button -= Button1;
- if(button >= 3)
- button += 64 - 3;
+ if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
+ button = 3;
+ } else {
+ button -= Button1;
+ if(button >= 3)
+ button += 64 - 3;
+ }
if(e->xbutton.type == ButtonPress) {
- ob = button;
- ox = x, oy = y;
+ oldbutton = button;
+ ox = x;
+ oy = y;
+ } else if(e->xbutton.type == ButtonRelease) {
+ oldbutton = 3;
+ /* MODE_MOUSEX10: no button release reporting */
+ if(IS_SET(MODE_MOUSEX10))
+ return;
}
}
- button += (state & ShiftMask ? 4 : 0)
- + (state & Mod4Mask ? 8 : 0)
- + (state & ControlMask ? 16 : 0);
+ if(!IS_SET(MODE_MOUSEX10)) {
+ button += (state & ShiftMask ? 4 : 0)
+ + (state & Mod4Mask ? 8 : 0)
+ + (state & ControlMask ? 16 : 0);
+ }
len = 0;
if(IS_SET(MODE_MOUSESGR)) {
@@ -736,56 +904,88 @@ mousereport(XEvent *e) {
void
bpress(XEvent *e) {
+ struct timeval now;
+ Mousekey *mk;
+
if(IS_SET(MODE_MOUSE)) {
mousereport(e);
- } else if(e->xbutton.button == Button1) {
- if(sel.bx != -1) {
- sel.bx = -1;
- tsetdirt(sel.b.y, sel.e.y);
- draw();
+ return;
+ }
+
+ for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
+ if(e->xbutton.button == mk->b
+ && match(mk->mask, e->xbutton.state)) {
+ ttysend(mk->s, strlen(mk->s));
+ return;
}
+ }
+
+ if(e->xbutton.button == Button1) {
+ gettimeofday(&now, NULL);
+
+ /* Clear previous selection, logically and visually. */
+ selclear(NULL);
sel.mode = 1;
sel.type = SEL_REGULAR;
- sel.ex = sel.bx = x2col(e->xbutton.x);
- sel.ey = sel.by = y2row(e->xbutton.y);
- } else if(e->xbutton.button == Button4) {
- ttywrite("\031", 1);
- } else if(e->xbutton.button == Button5) {
- ttywrite("\005", 1);
+ sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
+ sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
+
+ /*
+ * If the user clicks below predefined timeouts specific
+ * snapping behaviour is exposed.
+ */
+ if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+ sel.snap = SNAP_LINE;
+ } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+ sel.snap = SNAP_WORD;
+ } else {
+ sel.snap = 0;
+ }
+ selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
+ selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
+ selsort();
+
+ /*
+ * Draw selection, unless it's regular and we don't want to
+ * make clicks visible
+ */
+ if(sel.snap != 0) {
+ sel.mode++;
+ tsetdirt(sel.nb.y, sel.ne.y);
+ }
+ sel.tclick2 = sel.tclick1;
+ sel.tclick1 = now;
}
}
-void
-selcopy(void) {
- char *str, *ptr, *p;
- int x, y, bufsize, isselected = 0, size;
+char *
+getsel(void) {
+ char *str, *ptr;
+ int x, y, bufsize, size, i, ex;
Glyph *gp, *last;
- if(sel.bx == -1) {
+ if(sel.ob.x == -1) {
str = NULL;
} else {
- bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+ bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
ptr = str = xmalloc(bufsize);
/* append every set & selected glyph to the selection */
- for(y = sel.b.y; y < sel.e.y + 1; y++) {
- isselected = 0;
+ for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
gp = &term.line[y][0];
- last = gp + term.col;
+ last = &gp[term.col-1];
- while(--last >= gp && !(last->state & GLYPH_SET))
- /* nothing */;
+ while(last >= gp && !(selected(last - gp, y) &&
+ strcmp(last->c, " ") != 0)) {
+ --last;
+ }
for(x = 0; gp <= last; x++, ++gp) {
- if(!selected(x, y)) {
+ if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
continue;
- } else {
- isselected = 1;
- }
- p = (gp->state & GLYPH_SET) ? gp->c : " ";
- size = utf8size(p);
- memcpy(ptr, p, size);
+ size = utf8size(gp->c);
+ memcpy(ptr, gp->c, size);
ptr += size;
}
@@ -798,12 +998,32 @@ selcopy(void) {
* st.
* FIXME: Fix the computer world.
*/
- if(isselected && y < sel.e.y)
+ if(y < sel.ne.y && x > 0 && !((gp-1)->mode & ATTR_WRAP))
*ptr++ = '\n';
+
+ /*
+ * If the last selected line expands in the selection
+ * after the visible text '\n' is appended.
+ */
+ if(y == sel.ne.y) {
+ i = term.col;
+ while(--i > 0 && term.line[y][i].c[0] == ' ')
+ /* nothing */;
+ ex = sel.ne.x;
+ if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x)
+ ex = sel.nb.x;
+ if(i < ex)
+ *ptr++ = '\n';
+ }
}
*ptr = 0;
}
- xsetsel(str);
+ return str;
+}
+
+void
+selcopy(void) {
+ xsetsel(getsel());
}
void
@@ -835,7 +1055,11 @@ selnotify(XEvent *e) {
*repl++ = '\r';
}
- ttywrite((const char *)data, nitems * format / 8);
+ if(IS_SET(MODE_BRCKTPASTE))
+ ttywrite("\033[200~", 6);
+ ttysend((char *)data, nitems * format / 8);
+ if(IS_SET(MODE_BRCKTPASTE))
+ ttywrite("\033[201~", 6);
XFree(data);
/* number of 32-bit chunks returned */
ofs += nitems * format / 32;
@@ -859,10 +1083,10 @@ clippaste(const Arg *dummy) {
void
selclear(XEvent *e) {
- if(sel.bx == -1)
+ if(sel.ob.x == -1)
return;
- sel.bx = -1;
- tsetdirt(sel.b.y, sel.e.y);
+ sel.ob.x = -1;
+ tsetdirt(sel.nb.y, sel.ne.y);
}
void
@@ -916,8 +1140,6 @@ xsetsel(char *str) {
void
brelease(XEvent *e) {
- struct timeval now;
-
if(IS_SET(MODE_MOUSE)) {
mousereport(e);
return;
@@ -926,42 +1148,15 @@ brelease(XEvent *e) {
if(e->xbutton.button == Button2) {
selpaste(NULL);
} else if(e->xbutton.button == Button1) {
- sel.mode = 0;
- getbuttoninfo(e);
- term.dirty[sel.ey] = 1;
- if(sel.bx == sel.ex && sel.by == sel.ey) {
- sel.bx = -1;
- gettimeofday(&now, NULL);
-
- if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
- /* 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) <= doubleclicktimeout) {
- /* 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();
- }
+ if(sel.mode < 2) {
+ selclear(NULL);
} else {
+ getbuttoninfo(e);
selcopy();
}
+ sel.mode = 0;
+ tsetdirt(sel.nb.y, sel.ne.y);
}
-
- memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
- gettimeofday(&sel.tclick1, NULL);
}
void
@@ -976,15 +1171,15 @@ bmotion(XEvent *e) {
if(!sel.mode)
return;
- oldey = sel.ey;
- oldex = sel.ex;
- oldsby = sel.b.y;
- oldsey = sel.e.y;
+ sel.mode++;
+ oldey = sel.oe.y;
+ oldex = sel.oe.x;
+ oldsby = sel.nb.y;
+ oldsey = sel.ne.y;
getbuttoninfo(e);
- if(oldey != sel.ey || oldex != sel.ex) {
- tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey));
- }
+ if(oldey != sel.oe.y || oldex != sel.oe.x)
+ tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
}
void
@@ -1037,7 +1232,7 @@ sigchld(int a) {
int stat = 0;
if(waitpid(pid, &stat, 0) < 0)
- die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+ die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
if(WIFEXITED(stat)) {
exit(WEXITSTATUS(stat));
@@ -1075,6 +1270,7 @@ ttynew(void) {
cmdfd = m;
signal(SIGCHLD, sigchld);
if(opt_io) {
+ term.mode |= MODE_PRINT;
iofd = (!strcmp(opt_io, "-")) ?
STDOUT_FILENO :
open(opt_io, O_WRONLY | O_CREAT, 0666);
@@ -1130,6 +1326,13 @@ ttywrite(const char *s, size_t n) {
die("write error on tty: %s\n", SERRNO);
}
+void
+ttysend(char *s, size_t n) {
+ ttywrite(s, n);
+ if(IS_SET(MODE_ECHO))
+ techo(s, n);
+}
+
void
ttyresize(void) {
struct winsize w;
@@ -1142,6 +1345,20 @@ ttyresize(void) {
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
+int
+tattrset(int attr) {
+ int i, j;
+
+ for(i = 0; i < term.row-1; i++) {
+ for(j = 0; j < term.col-1; j++) {
+ if(term.line[i][j].mode & attr)
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
void
tsetdirt(int top, int bot) {
int i;
@@ -1153,6 +1370,20 @@ tsetdirt(int top, int bot) {
term.dirty[i] = 1;
}
+void
+tsetdirtattr(int attr) {
+ int i, j;
+
+ for(i = 0; i < term.row-1; i++) {
+ for(j = 0; j < term.col-1; j++) {
+ if(term.line[i][j].mode & attr) {
+ tsetdirt(i, i);
+ break;
+ }
+ }
+ }
+}
+
void
tfulldirt(void) {
tsetdirt(0, term.row-1);
@@ -1160,13 +1391,14 @@ tfulldirt(void) {
void
tcursor(int mode) {
- static TCursor c;
+ static TCursor c[2];
+ bool alt = IS_SET(MODE_ALTSCREEN);
if(mode == CURSOR_SAVE) {
- c = term.c;
+ c[alt] = term.c;
} else if(mode == CURSOR_LOAD) {
- term.c = c;
- tmoveto(c.x, c.y);
+ term.c = c[alt];
+ tmoveto(c[alt].x, c[alt].y);
}
}
@@ -1186,31 +1418,20 @@ treset(void) {
term.top = 0;
term.bot = term.row - 1;
term.mode = MODE_WRAP;
+ memset(term.trantbl, sizeof(term.trantbl), CS_USA);
+ term.charset = 0;
- tclearregion(0, 0, term.col-1, term.row-1, 0);
+ tclearregion(0, 0, term.col-1, term.row-1);
tmoveto(0, 0);
tcursor(CURSOR_SAVE);
}
void
tnew(int col, int row) {
- /* set screen size */
- term.row = row;
- term.col = col;
- term.line = xmalloc(term.row * sizeof(Line));
- term.alt = xmalloc(term.row * sizeof(Line));
- term.dirty = xmalloc(term.row * sizeof(*term.dirty));
- term.tabs = xmalloc(term.col * sizeof(*term.tabs));
-
- for(row = 0; row < term.row; row++) {
- term.line[row] = xmalloc(term.col * sizeof(Glyph));
- term.alt [row] = xmalloc(term.col * sizeof(Glyph));
- term.dirty[row] = 0;
- }
-
+ term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
+ tresize(col, row);
term.numlock = 1;
- memset(term.tabs, 0, term.col * sizeof(*term.tabs));
- /* setup screen */
+
treset();
}
@@ -1231,7 +1452,7 @@ tscrolldown(int orig, int n) {
LIMIT(n, 0, term.bot-orig+1);
- tclearregion(0, term.bot-n+1, term.col-1, term.bot, 0);
+ tclearregion(0, term.bot-n+1, term.col-1, term.bot);
for(i = term.bot; i >= orig+n; i--) {
temp = term.line[i];
@@ -1251,7 +1472,7 @@ tscrollup(int orig, int n) {
Line temp;
LIMIT(n, 0, term.bot-orig+1);
- tclearregion(0, orig, term.col-1, orig+n-1, 0);
+ tclearregion(0, orig, term.col-1, orig+n-1);
for(i = orig; i <= term.bot-n; i++) {
temp = term.line[i];
@@ -1267,31 +1488,30 @@ tscrollup(int orig, int n) {
void
selscroll(int orig, int n) {
- if(sel.bx == -1)
+ if(sel.ob.x == -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;
+ if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
+ if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+ selclear(NULL);
return;
}
if(sel.type == SEL_RECTANGULAR) {
- if(sel.by < term.top)
- sel.by = term.top;
- if(sel.ey > term.bot)
- sel.ey = term.bot;
+ if(sel.ob.y < term.top)
+ sel.ob.y = term.top;
+ if(sel.oe.y > term.bot)
+ sel.oe.y = term.bot;
} else {
- if(sel.by < term.top) {
- sel.by = term.top;
- sel.bx = 0;
+ if(sel.ob.y < term.top) {
+ sel.ob.y = term.top;
+ sel.ob.x = 0;
}
- if(sel.ey > term.bot) {
- sel.ey = term.bot;
- sel.ex = term.col;
+ if(sel.oe.y > term.bot) {
+ sel.oe.y = term.bot;
+ sel.oe.x = term.col;
}
}
- sel.b.y = sel.by, sel.b.x = sel.bx;
- sel.e.y = sel.ey, sel.e.x = sel.ex;
+ selsort();
}
}
@@ -1382,14 +1602,23 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
}
}
+ if(term.line[y][x].mode & ATTR_WIDE) {
+ if(x+1 < term.col) {
+ term.line[y][x+1].c[0] = ' ';
+ term.line[y][x+1].mode &= ~ATTR_WDUMMY;
+ }
+ } else if(term.line[y][x].mode & ATTR_WDUMMY) {
+ term.line[y][x-1].c[0] = ' ';
+ term.line[y][x-1].mode &= ~ATTR_WIDE;
+ }
+
term.dirty[y] = 1;
term.line[y][x] = *attr;
memcpy(term.line[y][x].c, c, UTF_SIZ);
- term.line[y][x].state |= GLYPH_SET;
}
void
-tclearregion(int x1, int y1, int x2, int y2, int bce) {
+tclearregion(int x1, int y1, int x2, int y2) {
int x, y, temp;
if(x1 > x2)
@@ -1405,13 +1634,10 @@ tclearregion(int x1, int y1, int x2, int y2, int bce) {
for(y = y1; y <= y2; y++) {
term.dirty[y] = 1;
for(x = x1; x <= x2; x++) {
- if(bce) {
- term.line[y][x] = term.c.attr;
- memcpy(term.line[y][x].c, " ", 2);
- term.line[y][x].state |= GLYPH_SET;
- } else {
- term.line[y][x].state = 0;
- }
+ if(selected(x, y))
+ selclear(NULL);
+ term.line[y][x] = term.c.attr;
+ memcpy(term.line[y][x].c, " ", 2);
}
}
}
@@ -1425,13 +1651,13 @@ tdeletechar(int n) {
term.dirty[term.c.y] = 1;
if(src >= term.col) {
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 0);
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
size * sizeof(Glyph));
- tclearregion(term.col-n, term.c.y, term.col-1, term.c.y, 0);
+ tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
}
void
@@ -1443,13 +1669,13 @@ tinsertblank(int n) {
term.dirty[term.c.y] = 1;
if(dst >= term.col) {
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 0);
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
size * sizeof(Glyph));
- tclearregion(src, term.c.y, dst - 1, term.c.y, 0);
+ tclearregion(src, term.c.y, dst - 1, term.c.y);
}
void
@@ -1468,15 +1694,65 @@ tdeleteline(int n) {
tscrollup(term.c.y, n);
}
+int32_t
+tdefcolor(int *attr, int *npar, int l) {
+ int32_t idx = -1;
+ uint r, g, b;
+
+ switch (attr[*npar + 1]) {
+ case 2: /* direct colour in RGB space */
+ if (*npar + 4 >= l) {
+ fprintf(stderr,
+ "erresc(38): Incorrect number of parameters (%d)\n",
+ *npar);
+ break;
+ }
+ r = attr[*npar + 2];
+ g = attr[*npar + 3];
+ b = attr[*npar + 4];
+ *npar += 4;
+ if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
+ fprintf(stderr, "erresc: bad rgb color (%d,%d,%d)\n",
+ r, g, b);
+ else
+ idx = TRUECOLOR(r, g, b);
+ break;
+ case 5: /* indexed colour */
+ if (*npar + 2 >= l) {
+ fprintf(stderr,
+ "erresc(38): Incorrect number of parameters (%d)\n",
+ *npar);
+ break;
+ }
+ *npar += 2;
+ if(!BETWEEN(attr[*npar], 0, 255))
+ fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
+ else
+ idx = attr[*npar];
+ break;
+ case 0: /* implemented defined (only foreground) */
+ case 1: /* transparent */
+ case 3: /* direct colour in CMY space */
+ case 4: /* direct colour in CMYK space */
+ default:
+ fprintf(stderr,
+ "erresc(38): gfx attr %d unknown\n", attr[*npar]);
+ }
+
+ return idx;
+}
+
void
tsetattr(int *attr, int l) {
int i;
+ int32_t idx;
for(i = 0; i < l; i++) {
switch(attr[i]) {
case 0:
- term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
- | ATTR_ITALIC | ATTR_BLINK);
+ term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE \
+ | ATTR_BOLD | ATTR_ITALIC \
+ | ATTR_BLINK);
term.c.attr.fg = defaultfg;
term.c.attr.bg = defaultbg;
break;
@@ -1514,39 +1790,15 @@ tsetattr(int *attr, int l) {
term.c.attr.mode &= ~ATTR_REVERSE;
break;
case 38:
- if(i + 2 < l && attr[i + 1] == 5) {
- i += 2;
- 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(38): gfx attr %d unknown\n",
- attr[i]);
- }
+ if ((idx = tdefcolor(attr, &i, l)) >= 0)
+ term.c.attr.fg = idx;
break;
case 39:
term.c.attr.fg = defaultfg;
break;
case 48:
- if(i + 2 < l && attr[i + 1] == 5) {
- i += 2;
- 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(48): gfx attr %d unknown\n",
- attr[i]);
- }
+ if ((idx = tdefcolor(attr, &i, l)) >= 0)
+ term.c.attr.bg = idx;
break;
case 49:
term.c.attr.bg = defaultbg;
@@ -1625,29 +1877,47 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 25: /* DECTCEM -- Text Cursor Enable Mode */
MODBIT(term.mode, !set, MODE_HIDE);
break;
- case 1000: /* 1000,1002: enable xterm mouse report */
+ case 9: /* X10 mouse compatibility mode */
+ xsetpointermotion(0);
+ MODBIT(term.mode, 0, MODE_MOUSE);
+ MODBIT(term.mode, set, MODE_MOUSEX10);
+ break;
+ case 1000: /* 1000: report button press */
+ xsetpointermotion(0);
+ MODBIT(term.mode, 0, MODE_MOUSE);
MODBIT(term.mode, set, MODE_MOUSEBTN);
- MODBIT(term.mode, 0, MODE_MOUSEMOTION);
break;
- case 1002:
+ case 1002: /* 1002: report motion on button press */
+ xsetpointermotion(0);
+ MODBIT(term.mode, 0, MODE_MOUSE);
MODBIT(term.mode, set, MODE_MOUSEMOTION);
- MODBIT(term.mode, 0, MODE_MOUSEBTN);
break;
- case 1006:
+ case 1003: /* 1003: enable all mouse motions */
+ xsetpointermotion(set);
+ MODBIT(term.mode, 0, MODE_MOUSE);
+ MODBIT(term.mode, set, MODE_MOUSEMANY);
+ break;
+ case 1004: /* 1004: send focus events to tty */
+ MODBIT(term.mode, set, MODE_FOCUS);
+ break;
+ case 1006: /* 1006: extended reporting mode */
MODBIT(term.mode, set, MODE_MOUSESGR);
break;
- case 1049: /* = 1047 and 1048 */
- case 47:
+ case 1034:
+ MODBIT(term.mode, set, MODE_8BIT);
+ break;
+ case 1049: /* swap screen & set/restore cursor as xterm */
+ tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+ case 47: /* swap screen */
case 1047:
if (!allowaltscreen)
break;
-
alt = IS_SET(MODE_ALTSCREEN);
if(alt) {
tclearregion(0, 0, term.col-1,
- term.row-1, 0);
+ term.row-1);
}
- if(set ^ alt) /* set is always 1 or 0 */
+ if(set ^ alt) /* set is always 1 or 0 */
tswapscreen();
if(*args != 1049)
break;
@@ -1655,6 +1925,18 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 1048:
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
break;
+ case 2004: /* 2004: bracketed paste mode */
+ MODBIT(term.mode, set, MODE_BRCKTPASTE);
+ break;
+ /* Not implemented mouse modes. See comments there. */
+ case 1001: /* mouse highlight mode; can hang the
+ terminal by design when implemented. */
+ case 1005: /* UTF-8 mouse mode; will confuse
+ applications not supporting UTF-8
+ and luit. */
+ case 1015: /* urxvt mangled mouse mode; incompatible
+ and can be mistaken for other control
+ codes. */
default:
fprintf(stderr,
"erresc: unknown private set/reset mode %d\n",
@@ -1686,11 +1968,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
}
}
}
-#undef MODBIT
-
void
csihandle(void) {
+ char buf[40];
+ int len;
+
switch(csiescseq.mode) {
default:
unknown:
@@ -1711,6 +1994,25 @@ csihandle(void) {
DEFAULT(csiescseq.arg[0], 1);
tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
break;
+ case 'i': /* MC -- Media Copy */
+ switch(csiescseq.arg[0]) {
+ case 0:
+ tdump();
+ break;
+ case 1:
+ tdumpline(term.c.y);
+ break;
+ case 2:
+ tdumpsel();
+ break;
+ case 4:
+ term.mode &= ~MODE_PRINT;
+ break;
+ case 5:
+ term.mode |= MODE_PRINT;
+ break;
+ }
+ break;
case 'c': /* DA -- Device Attributes */
if(csiescseq.arg[0] == 0)
ttywrite(VT102ID, sizeof(VT102ID) - 1);
@@ -1761,22 +2063,22 @@ csihandle(void) {
tputtab(1);
break;
case 'J': /* ED -- Clear screen */
- sel.bx = -1;
+ selclear(NULL);
switch(csiescseq.arg[0]) {
case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 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, 1);
+ term.row-1);
}
break;
case 1: /* above */
if(term.c.y > 1)
- tclearregion(0, 0, term.col-1, term.c.y-1, 1);
- tclearregion(0, term.c.y, term.c.x, 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, 1);
+ tclearregion(0, 0, term.col-1, term.row-1);
break;
default:
goto unknown;
@@ -1786,13 +2088,13 @@ csihandle(void) {
switch(csiescseq.arg[0]) {
case 0: /* right */
tclearregion(term.c.x, term.c.y, term.col-1,
- term.c.y, 1);
+ term.c.y);
break;
case 1: /* left */
- tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
+ tclearregion(0, term.c.y, term.c.x, term.c.y);
break;
case 2: /* all */
- tclearregion(0, term.c.y, term.col-1, term.c.y, 1);
+ tclearregion(0, term.c.y, term.col-1, term.c.y);
break;
}
break;
@@ -1818,7 +2120,7 @@ csihandle(void) {
case 'X': /* ECH -- Erase <n> char */
DEFAULT(csiescseq.arg[0], 1);
tclearregion(term.c.x, term.c.y,
- term.c.x + csiescseq.arg[0] - 1, term.c.y, 1);
+ term.c.x + csiescseq.arg[0] - 1, term.c.y);
break;
case 'P': /* DCH -- Delete <n> char */
DEFAULT(csiescseq.arg[0], 1);
@@ -1839,6 +2141,13 @@ csihandle(void) {
case 'm': /* SGR -- Terminal attribute (color) */
tsetattr(csiescseq.arg, csiescseq.narg);
break;
+ case 'n': /* DSR â Device Status Report (cursor position) */
+ if (csiescseq.arg[0] == 6) {
+ len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
+ term.c.y+1, term.c.x+1);
+ ttywrite(buf, len);
+ break;
+ }
case 'r': /* DECSTBM -- Set Scrolling Region */
if(csiescseq.priv) {
goto unknown;
@@ -1889,20 +2198,21 @@ csireset(void) {
void
strhandle(void) {
char *p = NULL;
- int i, j, narg;
+ int j, narg, par;
strparse();
narg = strescseq.narg;
+ par = atoi(strescseq.args[0]);
switch(strescseq.type) {
case ']': /* OSC -- Operating System Command */
- switch(i = atoi(strescseq.args[0])) {
+ switch(par) {
case 0:
case 1:
case 2:
if(narg > 1)
xsettitle(strescseq.args[1]);
- break;
+ return;
case 4: /* color set */
if(narg < 3)
break;
@@ -1919,25 +2229,20 @@ strhandle(void) {
*/
redraw(0);
}
- break;
- default:
- fprintf(stderr, "erresc: unknown str ");
- strdump();
- break;
+ return;
}
break;
case 'k': /* old title set compatibility */
xsettitle(strescseq.args[0]);
- break;
+ return;
case 'P': /* DSC -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
- default:
- fprintf(stderr, "erresc: unknown str ");
- strdump();
- /* die(""); */
- break;
+ return;
}
+
+ fprintf(stderr, "erresc: unknown str ");
+ strdump();
}
void
@@ -1980,6 +2285,64 @@ strreset(void) {
memset(&strescseq, 0, sizeof(strescseq));
}
+void
+tprinter(char *s, size_t len) {
+ if(iofd != -1 && xwrite(iofd, s, len) < 0) {
+ fprintf(stderr, "Error writing in %s:%s\n",
+ opt_io, strerror(errno));
+ close(iofd);
+ iofd = -1;
+ }
+}
+
+void
+toggleprinter(const Arg *arg) {
+ term.mode ^= MODE_PRINT;
+}
+
+void
+printscreen(const Arg *arg) {
+ tdump();
+}
+
+void
+printsel(const Arg *arg) {
+ tdumpsel();
+}
+
+void
+tdumpsel(void)
+{
+ char *ptr;
+
+ ptr = getsel();
+ tprinter(ptr, strlen(ptr));
+ free(ptr);
+}
+
+void
+tdumpline(int n) {
+ Glyph *bp, *end;
+
+ bp = &term.line[n][0];
+ end = &bp[term.col-1];
+ while(end > bp && !strcmp(" ", end->c))
+ --end;
+ if(bp != end || strcmp(bp->c, " ")) {
+ for( ;bp <= end; ++bp)
+ tprinter(bp->c, strlen(bp->c));
+ }
+ tprinter("\n", 1);
+}
+
+void
+tdump(void) {
+ int i;
+
+ for(i = 0; i < term.row; ++i)
+ tdumpline(i);
+}
+
void
tputtab(bool forward) {
uint x = term.c.x;
@@ -2003,10 +2366,10 @@ techo(char *buf, int len) {
for(; len > 0; buf++, len--) {
char c = *buf;
- if(c == '\033') { /* escape */
+ if(c == '\033') { /* escape */
tputc("^", 1);
tputc("[", 1);
- } else if(c < '\x20') { /* control code */
+ } else if(c < '\x20') { /* control code */
if(c != '\n' && c != '\r' && c != '\t') {
c |= '\x40';
tputc("^", 1);
@@ -2020,20 +2383,50 @@ techo(char *buf, int len) {
tputc(buf, len);
}
+void
+tdeftran(char ascii) {
+ char c, (*bp)[2];
+ static char tbl[][2] = {
+ {'0', CS_GRAPHIC0}, {'1', CS_GRAPHIC1}, {'A', CS_UK},
+ {'B', CS_USA}, {'<', CS_MULTI}, {'K', CS_GER},
+ {'5', CS_FIN}, {'C', CS_FIN},
+ {0, 0}
+ };
+
+ for (bp = &tbl[0]; (c = (*bp)[0]) && c != ascii; ++bp)
+ /* nothing */;
+
+ if (c == 0)
+ fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
+ else
+ term.trantbl[term.icharset] = (*bp)[1];
+}
+
+void
+tselcs(void) {
+ if (term.trantbl[term.charset] == CS_GRAPHIC0)
+ term.c.attr.mode |= ATTR_GFX;
+ else
+ term.c.attr.mode &= ~ATTR_GFX;
+}
+
void
tputc(char *c, int len) {
uchar ascii = *c;
bool control = ascii < '\x20' || ascii == 0177;
+ long u8char;
+ int width;
- if(iofd != -1) {
- if(xwrite(iofd, c, len) < 0) {
- fprintf(stderr, "Error writing in %s:%s\n",
- opt_io, strerror(errno));
- close(iofd);
- iofd = -1;
- }
+ if(len == 1) {
+ width = 1;
+ } else {
+ utf8decode(c, &u8char);
+ width = wcwidth(u8char);
}
+ if(IS_SET(MODE_PRINT))
+ tprinter(c, len);
+
/*
* STR sequences must be checked before anything else
* because it can use some control codes as part of the sequence.
@@ -2077,47 +2470,48 @@ tputc(char *c, int len) {
*/
if(control) {
switch(ascii) {
- case '\t': /* HT */
+ case '\t': /* HT */
tputtab(1);
return;
- case '\b': /* BS */
+ case '\b': /* BS */
tmoveto(term.c.x-1, term.c.y);
return;
- case '\r': /* CR */
+ case '\r': /* CR */
tmoveto(0, term.c.y);
return;
- case '\f': /* LF */
- case '\v': /* VT */
- case '\n': /* LF */
+ case '\f': /* LF */
+ case '\v': /* VT */
+ case '\n': /* LF */
/* go to first col if the mode is set */
tnewline(IS_SET(MODE_CRLF));
return;
- case '\a': /* BEL */
+ case '\a': /* BEL */
if(!(xw.state & WIN_FOCUSED))
xseturgency(1);
+ if (bellvolume)
+ XBell(xw.dpy, bellvolume);
return;
- case '\033': /* ESC */
+ case '\033': /* ESC */
csireset();
term.esc = ESC_START;
return;
- case '\016': /* SO */
- case '\017': /* SI */
- /*
- * Different charsets are hard to handle. Applications
- * should use the right alt charset escapes for the
- * only reason they still exist: line drawing. The
- * rest is incompatible history st should not support.
- */
+ case '\016': /* SO */
+ term.charset = 0;
+ tselcs();
+ return;
+ case '\017': /* SI */
+ term.charset = 1;
+ tselcs();
return;
- case '\032': /* SUB */
- case '\030': /* CAN */
+ case '\032': /* SUB */
+ case '\030': /* CAN */
csireset();
return;
- case '\005': /* ENQ (IGNORED) */
- case '\000': /* NUL (IGNORED) */
- case '\021': /* XON (IGNORED) */
- case '\023': /* XOFF (IGNORED) */
- case 0177: /* DEL (IGNORED) */
+ case '\005': /* ENQ (IGNORED) */
+ case '\000': /* NUL (IGNORED) */
+ case '\021': /* XON (IGNORED) */
+ case '\023': /* XOFF (IGNORED) */
+ case 0177: /* DEL (IGNORED) */
return;
}
} else if(term.esc & ESC_START) {
@@ -2135,22 +2529,8 @@ tputc(char *c, int len) {
if(ascii == '\\')
strhandle();
} else if(term.esc & ESC_ALTCHARSET) {
- switch(ascii) {
- case '0': /* Line drawing set */
- term.c.attr.mode |= ATTR_GFX;
- break;
- case 'B': /* USASCII */
- term.c.attr.mode &= ~ATTR_GFX;
- break;
- case 'A': /* UK (IGNORED) */
- case '<': /* multinational charset (IGNORED) */
- case '5': /* Finnish (IGNORED) */
- case 'C': /* Finnish (IGNORED) */
- case 'K': /* German (IGNORED) */
- break;
- default:
- fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
- }
+ tdeftran(ascii);
+ tselcs();
term.esc = 0;
} else if(term.esc & ESC_TEST) {
if(ascii == '8') { /* DEC screen alignment test. */
@@ -2181,13 +2561,12 @@ tputc(char *c, int len) {
term.esc |= ESC_STR;
break;
case '(': /* set primary charset G0 */
+ case ')': /* set secondary charset G1 */
+ case '*': /* set tertiary charset G2 */
+ case '+': /* set quaternary charset G3 */
+ term.icharset = ascii - '(';
term.esc |= ESC_ALTCHARSET;
break;
- case ')': /* set secondary charset G1 (IGNORED) */
- case '*': /* set tertiary charset G2 (IGNORED) */
- case '+': /* set quaternary charset G3 (IGNORED) */
- term.esc = 0;
- break;
case 'D': /* IND -- Linefeed */
if(term.c.y == term.bot) {
tscrollup(term.top, 1);
@@ -2220,6 +2599,7 @@ tputc(char *c, int len) {
treset();
term.esc = 0;
xresettitle();
+ xloadcols();
break;
case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
@@ -2257,10 +2637,12 @@ tputc(char *c, int len) {
*/
if(control && !(term.c.attr.mode & ATTR_GFX))
return;
- if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
- sel.bx = -1;
- if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
- tnewline(1); /* always go to first col */
+ if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+ selclear(NULL);
+ if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+ term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
+ tnewline(1);
+ }
if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
memmove(&term.line[term.c.y][term.c.x+1],
@@ -2268,9 +2650,20 @@ tputc(char *c, int len) {
(term.col - term.c.x - 1) * sizeof(Glyph));
}
+ if(term.c.x+width > term.col)
+ tnewline(1);
+
tsetchar(c, &term.c.attr, term.c.x, term.c.y);
- if(term.c.x+1 < term.col) {
- tmoveto(term.c.x+1, term.c.y);
+
+ if(width == 2) {
+ term.line[term.c.y][term.c.x].mode |= ATTR_WIDE;
+ if(term.c.x+1 < term.col) {
+ term.line[term.c.y][term.c.x+1].c[0] = '\0';
+ term.line[term.c.y][term.c.x+1].mode = ATTR_WDUMMY;
+ }
+ }
+ if(term.c.x+width < term.col) {
+ tmoveto(term.c.x+width, term.c.y);
} else {
term.c.state |= CURSOR_WRAPNEXT;
}
@@ -2278,11 +2671,12 @@ tputc(char *c, int len) {
int
tresize(int col, int row) {
- int i, x;
+ int i;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int slide = term.c.y - row + 1;
bool *bp;
+ Line *orig;
if(col < 1 || row < 1)
return 0;
@@ -2318,17 +2712,13 @@ tresize(int col, int row) {
term.dirty[i] = 1;
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = xrealloc(term.alt[i], col * 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] = xcalloc(col, sizeof(Glyph));
- term.alt [i] = xcalloc(col, sizeof(Glyph));
+ term.line[i] = xmalloc(col * sizeof(Glyph));
+ term.alt[i] = xmalloc(col * sizeof(Glyph));
}
if(col > term.col) {
bp = term.tabs + term.col;
@@ -2346,6 +2736,17 @@ tresize(int col, int row) {
tsetscroll(0, row-1);
/* make use of the LIMIT in tmoveto */
tmoveto(term.c.x, term.c.y);
+ /* Clearing both screens */
+ orig = term.line;
+ do {
+ if(mincol < col && 0 < minrow) {
+ tclearregion(mincol, 0, col - 1, minrow - 1);
+ }
+ if(0 < col && minrow < row) {
+ tclearregion(0, minrow, col - 1, row - 1);
+ }
+ tswapscreen();
+ } while(orig != term.line);
return (slide > 0);
}
@@ -2358,10 +2759,8 @@ xresize(int col, int row) {
XFreePixmap(xw.dpy, xw.buf);
xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
DefaultDepth(xw.dpy, xw.scr));
- XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);
- XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
-
XftDrawChange(xw.draw, xw.buf);
+ xclear(0, 0, xw.w, xw.h);
}
static inline ushort
@@ -2373,6 +2772,13 @@ void
xloadcols(void) {
int i, r, g, b;
XRenderColor color = { .alpha = 0xffff };
+ static bool loaded;
+ Colour *cp;
+
+ if(loaded) {
+ for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp)
+ XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
+ }
/* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
for(i = 0; i < LEN(colorname); i++) {
@@ -2405,6 +2811,7 @@ xloadcols(void) {
die("Could not allocate color %d\n", i);
}
}
+ loaded = true;
}
int
@@ -2493,16 +2900,12 @@ xloadfont(Font *f, FcPattern *pattern) {
if(!match)
return 1;
- if(!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) {
- FcPatternDestroy(match);
- return 1;
- }
-
if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
return 1;
}
+ f->set = NULL;
f->pattern = FcPatternDuplicate(pattern);
f->ascent = f->match->ascent;
@@ -2517,9 +2920,9 @@ xloadfont(Font *f, FcPattern *pattern) {
}
void
-xloadfonts(char *fontstr, int fontsize) {
+xloadfonts(char *fontstr, double fontsize) {
FcPattern *pattern;
- FcResult result;
+ FcResult r_sz, r_psz;
double fontval;
if(fontstr[0] == '-') {
@@ -2533,12 +2936,16 @@ xloadfonts(char *fontstr, int fontsize) {
if(fontsize > 0) {
FcPatternDel(pattern, FC_PIXEL_SIZE);
+ FcPatternDel(pattern, FC_SIZE);
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
usedfontsize = fontsize;
} else {
- result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
- if(result == FcResultMatch) {
- usedfontsize = (int)fontval;
+ r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
+ r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
+ if(r_psz == FcResultMatch) {
+ usedfontsize = fontval;
+ } else if(r_sz == FcResultMatch) {
+ usedfontsize = -1;
} else {
/*
* Default font size is 12, if none given. This is to
@@ -2555,9 +2962,15 @@ xloadfonts(char *fontstr, int fontsize) {
if(xloadfont(&dc.font, pattern))
die("st: can't open font %s\n", fontstr);
+ if(usedfontsize < 0) {
+ FcPatternGetDouble(dc.font.match->pattern,
+ FC_PIXEL_SIZE, 0, &fontval);
+ usedfontsize = fontval;
+ }
+
/* Setting character width and height. */
- xw.cw = dc.font.width;
- xw.ch = dc.font.height;
+ xw.cw = CEIL(dc.font.width * cwscale);
+ xw.ch = CEIL(dc.font.height * chscale);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
@@ -2577,34 +2990,37 @@ xloadfonts(char *fontstr, int fontsize) {
FcPatternDestroy(pattern);
}
+int
+xloadfontset(Font *f) {
+ FcResult result;
+
+ if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
+ return 1;
+ return 0;
+}
+
+void
+xunloadfont(Font *f) {
+ XftFontClose(xw.dpy, f->match);
+ FcPatternDestroy(f->pattern);
+ if(f->set)
+ FcFontSetDestroy(f->set);
+}
+
void
xunloadfonts(void) {
- int i, ip;
+ int i;
- /*
- * Free the loaded fonts in the font cache. This is done backwards
- * from the frccur.
- */
- for(i = 0, ip = frccur; i < frclen; i++, ip--) {
- if(ip < 0)
- ip = LEN(frc) - 1;
- XftFontClose(xw.dpy, frc[ip].font);
+ /* Free the loaded fonts in the font cache. */
+ for(i = 0; i < frclen; i++) {
+ XftFontClose(xw.dpy, frc[i].font);
}
- frccur = -1;
frclen = 0;
- XftFontClose(xw.dpy, dc.font.match);
- FcPatternDestroy(dc.font.pattern);
- FcFontSetDestroy(dc.font.set);
- XftFontClose(xw.dpy, dc.bfont.match);
- FcPatternDestroy(dc.bfont.pattern);
- FcFontSetDestroy(dc.bfont.set);
- XftFontClose(xw.dpy, dc.ifont.match);
- FcPatternDestroy(dc.ifont.pattern);
- FcFontSetDestroy(dc.ifont.set);
- XftFontClose(xw.dpy, dc.ibfont.match);
- FcPatternDestroy(dc.ibfont.pattern);
- FcFontSetDestroy(dc.ibfont.set);
+ xunloadfont(&dc.font);
+ xunloadfont(&dc.bfont);
+ xunloadfont(&dc.ifont);
+ xunloadfont(&dc.ibfont);
}
void
@@ -2617,11 +3033,11 @@ xzoom(const Arg *arg) {
void
xinit(void) {
- XSetWindowAttributes attrs;
XGCValues gcvalues;
Cursor cursor;
Window parent;
int sw, sh;
+ pid_t thispid = getpid();
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
@@ -2659,22 +3075,20 @@ xinit(void) {
}
/* Events */
- attrs.background_pixel = dc.col[defaultbg].pixel;
- attrs.border_pixel = dc.col[defaultbg].pixel;
- attrs.bit_gravity = NorthWestGravity;
- attrs.event_mask = FocusChangeMask | KeyPressMask
+ xw.attrs.background_pixel = dc.col[defaultbg].pixel;
+ xw.attrs.border_pixel = dc.col[defaultbg].pixel;
+ xw.attrs.bit_gravity = NorthWestGravity;
+ xw.attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- attrs.colormap = xw.cmap;
+ xw.attrs.colormap = xw.cmap;
parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
XRootWindow(xw.dpy, xw.scr);
xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
- xw.vis,
- CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
- | CWColormap,
- &attrs);
+ xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
+ | CWEventMask | CWColormap, &xw.attrs);
memset(&gcvalues, 0, sizeof(gcvalues));
gcvalues.graphics_exposures = False;
@@ -2689,7 +3103,7 @@ xinit(void) {
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* input methods */
- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+ if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
XSetLocaleModifiers("@im=local");
if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
XSetLocaleModifiers("@im=");
@@ -2715,8 +3129,13 @@ xinit(void) {
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+ xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
+ xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
+ XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
+ PropModeReplace, (unsigned char *)&thispid, 1);
+
xresettitle();
XMapWindow(xw.dpy, xw.win);
xhints();
@@ -2727,7 +3146,7 @@ void
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
width = charlen * xw.cw, xp, i;
- int frp, frcflags;
+ int frcflags;
int u8fl, u8fblen, u8cblen, doesexist;
char *u8c, *u8fs;
long u8char;
@@ -2736,8 +3155,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
FcPattern *fcpattern, *fontpattern;
FcFontSet *fcsets[] = { NULL };
FcCharSet *fccharset;
- Colour *fg, *bg, *temp, revfg, revbg;
+ Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
XRenderColor colfg, colbg;
+ Rectangle r;
+ int oneatatime;
frcflags = FRC_NORMAL;
@@ -2755,8 +3176,29 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
if(base.fg == defaultfg)
base.fg = defaultunderline;
}
- fg = &dc.col[base.fg];
- bg = &dc.col[base.bg];
+ if(IS_TRUECOL(base.fg)) {
+ colfg.alpha = 0xffff;
+ colfg.red = TRUERED(base.fg);
+ colfg.green = TRUEGREEN(base.fg);
+ colfg.blue = TRUEBLUE(base.fg);
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg);
+ fg = &truefg;
+ } else {
+ fg = &dc.col[base.fg];
+ }
+
+ if(IS_TRUECOL(base.bg)) {
+ colbg.alpha = 0xffff;
+ colbg.green = TRUEGREEN(base.bg);
+ colbg.red = TRUERED(base.bg);
+ colbg.blue = TRUEBLUE(base.bg);
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg);
+ bg = &truebg;
+ } else {
+ bg = &dc.col[base.bg];
+ }
+
+
if(base.mode & ATTR_BOLD) {
if(BETWEEN(base.fg, 0, 7)) {
@@ -2771,9 +3213,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
}
/*
* Those ranges will not be brightened:
- * 8 - 15 â bright system colors
- * 196 - 231 â highest 256 color cube
- * 252 - 255 â brightest colors in greyscale
+ * 8 - 15 â bright system colors
+ * 196 - 231 â highest 256 color cube
+ * 252 - 255 â brightest colors in greyscale
*/
font = &dc.bfont;
frcflags = FRC_BOLD;
@@ -2809,6 +3251,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
bg = temp;
}
+ if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+ fg = bg;
+
/* Intelligent cleaning up of the borders. */
if(x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
@@ -2826,7 +3271,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
/* Clean up the region we want to draw to. */
XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
- fcsets[0] = font->set;
+ /* Set the clip region because Xft is sometimes dirty. */
+ r.x = 0;
+ r.y = 0;
+ r.height = xw.ch;
+ r.width = width;
+ XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+
for(xp = winx; bytelen > 0;) {
/*
* Search for the range in the to be printed string of glyphs
@@ -2837,15 +3288,16 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
u8fs = s;
u8fblen = 0;
u8fl = 0;
+ oneatatime = font->width != xw.cw;
for(;;) {
u8c = s;
u8cblen = utf8decode(s, &u8char);
s += u8cblen;
bytelen -= u8cblen;
- doesexist = XftCharIndex(xw.dpy, font->match, u8char);
- if(!doesexist || bytelen <= 0) {
- if(bytelen <= 0) {
+ doesexist = XftCharExists(xw.dpy, font->match, u8char);
+ if(oneatatime || !doesexist || bytelen <= 0) {
+ if(oneatatime || bytelen <= 0) {
if(doesexist) {
u8fl++;
u8fblen += u8cblen;
@@ -2858,7 +3310,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
winy + font->ascent,
(FcChar8 *)u8fs,
u8fblen);
- xp += font->width * u8fl;
+ xp += xw.cw * u8fl;
+
}
break;
}
@@ -2866,23 +3319,26 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
u8fl++;
u8fblen += u8cblen;
}
- if(doesexist)
+ if(doesexist) {
+ if (oneatatime)
+ continue;
break;
+ }
- frp = frccur;
/* Search the font cache. */
- for(i = 0; i < frclen; i++, frp--) {
- if(frp <= 0)
- frp = LEN(frc) - 1;
-
- if(frc[frp].c == u8char
- && frc[frp].flags == frcflags) {
+ for(i = 0; i < frclen; i++) {
+ if(XftCharExists(xw.dpy, frc[i].font, u8char)
+ && frc[i].flags == frcflags) {
break;
}
}
/* Nothing was found. */
if(i >= frclen) {
+ if(!font->set)
+ xloadfontset(font);
+ fcsets[0] = font->set;
+
/*
* Nothing was found in the cache. Now use
* some dozen of Fontconfig calls to get the
@@ -2907,31 +3363,27 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
/*
* Overwrite or create the new cache entry.
*/
- frccur++;
- frclen++;
- if(frccur >= LEN(frc))
- frccur = 0;
- if(frclen > LEN(frc)) {
- frclen = LEN(frc);
- XftFontClose(xw.dpy, frc[frccur].font);
+ if(frclen >= LEN(frc)) {
+ frclen = LEN(frc) - 1;
+ XftFontClose(xw.dpy, frc[frclen].font);
}
- frc[frccur].font = XftFontOpenPattern(xw.dpy,
+ frc[frclen].font = XftFontOpenPattern(xw.dpy,
fontpattern);
- frc[frccur].c = u8char;
- frc[frccur].flags = frcflags;
+ frc[frclen].flags = frcflags;
+
+ i = frclen;
+ frclen++;
FcPatternDestroy(fcpattern);
FcCharSetDestroy(fccharset);
-
- frp = frccur;
}
- XftDrawStringUtf8(xw.draw, fg, frc[frp].font,
- xp, winy + frc[frp].font->ascent,
+ XftDrawStringUtf8(xw.draw, fg, frc[i].font,
+ xp, winy + frc[i].font->ascent,
(FcChar8 *)u8c, u8cblen);
- xp += font->width;
+ xp += xw.cw * wcwidth(u8char);
}
/*
@@ -2943,40 +3395,68 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
width, 1);
}
+
+ /* Reset clip to none. */
+ XftDrawSetClip(xw.draw, 0);
}
void
xdrawcursor(void) {
static int oldx = 0, oldy = 0;
- int sl;
- Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs, 0};
+ int sl, width, curx;
+ Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
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);
+ curx = term.c.x;
+
+ /* adjust position if in dummy */
+ if(term.line[oldy][oldx].mode & ATTR_WDUMMY)
+ oldx--;
+ if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
+ curx--;
+
+ 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) {
- sl = utf8size(term.line[oldy][oldx].c);
- xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
- oldy, 1, sl);
- } else {
- xtermclear(oldx, oldy, oldx, oldy);
- }
+ sl = utf8size(term.line[oldy][oldx].c);
+ width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;
+ xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
+ oldy, width, sl);
/* draw the new one */
if(!(IS_SET(MODE_HIDE))) {
- if(!(xw.state & WIN_FOCUSED))
- g.bg = defaultucs;
-
- if(IS_SET(MODE_REVERSE))
- g.mode |= ATTR_REVERSE, g.fg = defaultcs, g.bg = defaultfg;
+ if(xw.state & WIN_FOCUSED) {
+ 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;
+ sl = utf8size(g.c);
+ width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
+ ? 2 : 1;
+ xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+ } else {
+ XftDrawRect(xw.draw, &dc.col[defaultcs],
+ borderpx + curx * xw.cw,
+ borderpx + term.c.y * xw.ch,
+ xw.cw - 1, 1);
+ XftDrawRect(xw.draw, &dc.col[defaultcs],
+ borderpx + curx * xw.cw,
+ borderpx + term.c.y * xw.ch,
+ 1, xw.ch - 1);
+ XftDrawRect(xw.draw, &dc.col[defaultcs],
+ borderpx + (curx + 1) * xw.cw - 1,
+ borderpx + term.c.y * xw.ch,
+ 1, xw.ch - 1);
+ XftDrawRect(xw.draw, &dc.col[defaultcs],
+ borderpx + curx * xw.cw,
+ borderpx + (term.c.y + 1) * xw.ch - 1,
+ xw.cw, 1);
+ }
+ oldx = curx, oldy = term.c.y;
}
}
@@ -2988,6 +3468,8 @@ xsettitle(char *p) {
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
XSetWMName(xw.dpy, xw.win, &prop);
+ XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
+ XFree(prop.value);
}
void
@@ -3023,7 +3505,8 @@ drawregion(int x1, int y1, int x2, int y2) {
int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
- bool ena_sel = sel.bx != -1;
+ bool ena_sel = sel.ob.x != -1;
+ long u8char;
if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
ena_sel = 0;
@@ -3041,25 +3524,24 @@ drawregion(int x1, int y1, int x2, int y2) {
ic = ib = ox = 0;
for(x = x1; x < x2; x++) {
new = term.line[y][x];
- if(ena_sel && *(new.c) && selected(x, y))
+ if(new.mode == ATTR_WDUMMY)
+ continue;
+ if(ena_sel && selected(x, y))
new.mode ^= ATTR_REVERSE;
- if(ib > 0 && (!(new.state & GLYPH_SET)
- || ATTRCMP(base, new)
+ if(ib > 0 && (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(ib == 0) {
- ox = x;
- base = new;
- }
-
- sl = utf8size(new.c);
- memcpy(buf+ib, new.c, sl);
- ib += sl;
- ++ic;
+ if(ib == 0) {
+ ox = x;
+ base = new;
}
+
+ sl = utf8decode(new.c, &u8char);
+ memcpy(buf+ib, new.c, sl);
+ ib += sl;
+ ic += (new.mode & ATTR_WIDE)? 2 : 1;
}
if(ib > 0)
xdraws(buf, base, ox, y, ic, ib);
@@ -3095,6 +3577,12 @@ unmap(XEvent *ev) {
xw.state &= ~WIN_VISIBLE;
}
+void
+xsetpointermotion(int set) {
+ MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
+ XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
+}
+
void
xseturgency(int add) {
XWMHints *h = XGetWMHints(xw.dpy, xw.win);
@@ -3115,23 +3603,19 @@ focus(XEvent *ev) {
XSetICFocus(xw.xic);
xw.state |= WIN_FOCUSED;
xseturgency(0);
+ if(IS_SET(MODE_FOCUS))
+ ttywrite("\033[I", 3);
} else {
XUnsetICFocus(xw.xic);
xw.state &= ~WIN_FOCUSED;
+ if(IS_SET(MODE_FOCUS))
+ ttywrite("\033[O", 3);
}
}
-inline bool
+static inline bool
match(uint mask, uint state) {
- state &= ~(ignoremod);
-
- if(mask == XK_NO_MOD && state)
- return false;
- if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
- return false;
- if((state & mask) != state)
- return false;
- return true;
+ return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
}
void
@@ -3141,7 +3625,6 @@ numlock(const Arg *dummy) {
char*
kmap(KeySym k, uint state) {
- uint mask;
Key *kp;
int i;
@@ -3156,33 +3639,22 @@ kmap(KeySym k, uint state) {
}
for(kp = key; kp < key + LEN(key); kp++) {
- mask = kp->mask;
-
if(kp->k != k)
continue;
- if(!match(mask, state))
+ if(!match(kp->mask, state))
continue;
- if(kp->appkey > 0) {
- if(!IS_SET(MODE_APPKEYPAD))
- continue;
- if(term.numlock && kp->appkey == 2)
- continue;
- } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+ if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+ continue;
+ if(term.numlock && kp->appkey == 2)
continue;
- }
- if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
- (kp->appcursor > 0
- && !IS_SET(MODE_APPCURSOR))) {
+ if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
continue;
- }
- if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
- (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+ if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
continue;
- }
return kp->s;
}
@@ -3194,16 +3666,16 @@ void
kpress(XEvent *ev) {
XKeyEvent *e = &ev->xkey;
KeySym ksym;
- char xstr[31], buf[32], *customkey, *cp = buf;
+ char buf[32], *customkey;
int len;
+ long c;
Status status;
Shortcut *bp;
if(IS_SET(MODE_KBDLOCK))
return;
- len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
- e->state &= ~Mod2Mask;
+ len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
/* 1. shortcuts */
for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
if(ksym == bp->keysym && match(bp->mod, e->state)) {
@@ -3214,23 +3686,26 @@ kpress(XEvent *ev) {
/* 2. custom keys from config.h */
if((customkey = kmap(ksym, e->state))) {
- len = strlen(customkey);
- memcpy(buf, customkey, len);
- /* 2. hardcoded (overrides X lookup) */
- } else {
- if(len == 0)
- return;
-
- if(len == 1 && e->state & Mod1Mask)
- *cp++ = '\033';
-
- memcpy(cp, xstr, len);
- len = cp - buf + len;
+ ttysend(customkey, strlen(customkey));
+ return;
}
- ttywrite(buf, len);
- if(IS_SET(MODE_ECHO))
- techo(buf, len);
+ /* 3. composed string from input method */
+ if(len == 0)
+ return;
+ if(len == 1 && e->state & Mod1Mask) {
+ if(IS_SET(MODE_8BIT)) {
+ if(*buf < 0177) {
+ c = *buf | 0x80;
+ len = utf8encode(&c, buf);
+ }
+ } else {
+ buf[1] = buf[0];
+ buf[0] = '\033';
+ len = 2;
+ }
+ }
+ ttysend(buf, len);
}
@@ -3282,35 +3757,75 @@ resize(XEvent *e) {
void
run(void) {
XEvent ev;
+ int w = xw.w, h = xw.h;
fd_set rfd;
- int xfd = XConnectionNumber(xw.dpy), xev;
- struct timeval drawtimeout, *tv = NULL, now, last;
+ int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
+ struct timeval drawtimeout, *tv = NULL, now, last, lastblink;
+
+ /* Waiting for window mapping */
+ while(1) {
+ XNextEvent(xw.dpy, &ev);
+ if(ev.type == ConfigureNotify) {
+ w = ev.xconfigure.width;
+ h = ev.xconfigure.height;
+ } else if(ev.type == MapNotify) {
+ break;
+ }
+ }
+
+ ttynew();
+ if(!xw.isfixed)
+ cresize(w, h);
+ else
+ cresize(xw.fw, xw.fh);
+ gettimeofday(&lastblink, NULL);
gettimeofday(&last, NULL);
for(xev = actionfps;;) {
+ long deltatime;
+
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
+
if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
if(errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
}
+ if(FD_ISSET(cmdfd, &rfd)) {
+ ttyread();
+ if(blinktimeout) {
+ blinkset = tattrset(ATTR_BLINK);
+ if(!blinkset)
+ MODBIT(term.mode, 0, MODE_BLINK);
+ }
+ }
+
+ if(FD_ISSET(xfd, &rfd))
+ xev = actionfps;
gettimeofday(&now, NULL);
drawtimeout.tv_sec = 0;
drawtimeout.tv_usec = (1000/xfps) * 1000;
tv = &drawtimeout;
- if(FD_ISSET(cmdfd, &rfd))
- ttyread();
-
- if(FD_ISSET(xfd, &rfd))
- xev = actionfps;
+ dodraw = 0;
+ if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
+ tsetdirtattr(ATTR_BLINK);
+ term.mode ^= MODE_BLINK;
+ gettimeofday(&lastblink, NULL);
+ dodraw = 1;
+ }
+ deltatime = TIMEDIFF(now, last);
+ if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
+ || deltatime < 0) {
+ dodraw = 1;
+ last = now;
+ }
- if(TIMEDIFF(now, last) > \
- (xev ? (1000/xfps) : (1000/actionfps))) {
+ if(dodraw) {
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
if(XFilterEvent(&ev, None))
@@ -3321,12 +3836,24 @@ run(void) {
draw();
XFlush(xw.dpy);
- last = now;
if(xev && !FD_ISSET(xfd, &rfd))
xev--;
- if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd))
- tv = NULL;
+ if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+ if(blinkset) {
+ if(TIMEDIFF(now, lastblink) \
+ > blinktimeout) {
+ drawtimeout.tv_usec = 1;
+ } else {
+ drawtimeout.tv_usec = (1000 * \
+ (blinktimeout - \
+ TIMEDIFF(now,
+ lastblink)));
+ }
+ } else {
+ tv = NULL;
+ }
+ }
}
}
}
@@ -3342,6 +3869,7 @@ int
main(int argc, char *argv[]) {
int bitm, xr, yr;
uint wr, hr;
+ char *titles;
xw.fw = xw.fh = xw.fx = xw.fy = 0;
xw.isfixed = False;
@@ -3355,8 +3883,13 @@ main(int argc, char *argv[]) {
break;
case 'e':
/* eat all remaining arguments */
- if(argc > 1)
+ if(argc > 1) {
opt_cmd = &argv[1];
+ if(argv[1] != NULL && opt_title == NULL) {
+ titles = xstrdup(argv[1]);
+ opt_title = basename(titles);
+ }
+ }
goto run;
case 'f':
opt_font = EARGF(usage());
@@ -3373,7 +3906,7 @@ main(int argc, char *argv[]) {
xw.fh = (int)hr;
if(bitm & XNegative && xw.fx == 0)
xw.fx = -1;
- if(bitm & XNegative && xw.fy == 0)
+ if(bitm & YNegative && xw.fy == 0)
xw.fy = -1;
if(xw.fh != 0 && xw.fw != 0)
@@ -3398,7 +3931,6 @@ run:
XSetLocaleModifiers("");
tnew(80, 24);
xinit();
- ttynew();
selinit();
run();