X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=72e57c8f73a868fc7871429b3ed22ddd17b21bcb;hb=907cb8bfa69926616639f9a19127117b37326029;hp=6f292ba470e4cfe78f7b36431e392e879c435400;hpb=8d2d8848e8ac7117adffe9e1d168c5125934dfcf;p=st.git

diff --git a/st.c b/st.c
index 6f292ba..72e57c8 100644
--- a/st.c
+++ b/st.c
@@ -34,7 +34,7 @@
 #endif
 
 #define USAGE \
-	"st-" VERSION ", (c) 2010-2011 st engineers\n" \
+	"st " VERSION " (c) 2010-2011 st engineers\n" \
 	"usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* XEMBED messages */
@@ -47,6 +47,8 @@
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4
+#define XK_NO_MOD     UINT_MAX
+#define XK_ANY_MOD    0
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -124,6 +126,7 @@ typedef struct {
 	Colormap cmap;
 	Window win;
 	Pixmap buf;
+	Atom xembed;
 	XIM xim;
 	XIC xic;
 	int scr;
@@ -234,6 +237,7 @@ static void selinit(void);
 static inline int selected(int, int);
 static void selcopy(void);
 static void selpaste();
+static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
@@ -268,7 +272,6 @@ static char **opt_cmd  = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
-static Atom xembedatom;
 
 int
 utf8decode(char *s, long *u) {
@@ -804,6 +807,8 @@ tscrolldown(int orig, int n) {
 		term.line[i] = term.line[i-n];
 		term.line[i-n] = temp;
 	}
+
+	selscroll(orig, n);
 }
 
 void
@@ -819,6 +824,31 @@ tscrollup(int orig, int n) {
 		 term.line[i] = term.line[i+n];
 		 term.line[i+n] = temp;
 	}
+
+	selscroll(orig, -n);
+}
+
+void
+selscroll(int orig, int n) {
+	if(sel.bx == -1)
+		return;
+	
+	if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
+		if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+			sel.bx = -1;
+			return;
+		}
+		if(sel.by < term.top) {
+			sel.by = term.top;
+			sel.bx = 0;
+		}
+		if(sel.ey > term.bot) {
+			sel.ey = term.bot;
+			sel.ex = term.col;
+		}
+		sel.b.y = sel.by, sel.b.x = sel.bx;
+		sel.e.y = sel.ey, sel.e.x = sel.ex;
+	}
 }
 
 void
@@ -1075,6 +1105,7 @@ csihandle(void) {
 		break;
 	/* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
 	case 'J': /* ED -- Clear screen */
+		sel.bx = -1;
 		switch(escseq.arg[0]) {
 		case 0: /* below */
 			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
@@ -1380,6 +1411,7 @@ tputc(char *c) {
 			}
 		}
 	} else {
+		if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) sel.bx = -1;
 		switch(ascii) {
 		case '\t':
 			tputtab();
@@ -1509,7 +1541,7 @@ xloadcols(void) {
 	XColor color;
 	unsigned long white = WhitePixel(xw.dpy, xw.scr);
 
-	for(i = 0; i < 16; i++) {
+	for(i = 0; i < LEN(colorname); i++) {
 		if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
 			dc.col[i] = white;
 			fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
@@ -1671,7 +1703,7 @@ xinit(void) {
 		&(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
 		&(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
-	xembedatom = XInternAtom(xw.dpy, "_XEMBED", False);
+	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
 
 	XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
 	XMapWindow(xw.dpy, xw.win);
@@ -1840,9 +1872,12 @@ focus(XEvent *ev) {
 char*
 kmap(KeySym k, unsigned int state) {
 	int i;
-	for(i = 0; i < LEN(key); i++)
-		if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+	state &= ~Mod2Mask;
+	for(i = 0; i < LEN(key); i++) {
+		unsigned int mask = key[i].mask;
+		if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
 			return (char*)key[i].s;
+	}
 	return NULL;
 }
 
@@ -1898,7 +1933,9 @@ kpress(XEvent *ev) {
 
 void
 cmessage(XEvent *e) {
-	if (e->xclient.message_type == xembedatom && e->xclient.format == 32) {
+	/* 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);