X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=ba93f2fec177d087138111acbaeed8ef20ec5840;hb=d5640c772998de7bccd76c3f8e934fa685cb2bb4;hp=14408c566a54369e7fde2d7a167930fb75b21803;hpb=ea782bfc5d34d712bc9391e498935d2d27f3116c;p=st.git

diff --git a/st.c b/st.c
index 14408c5..ba93f2f 100644
--- a/st.c
+++ b/st.c
@@ -59,8 +59,8 @@
 #define STR_ARG_SIZ   16
 #define DRAW_BUF_SIZ  20*1024
 #define UTF_SIZ       4
-#define XK_NO_MOD     UINT_MAX
-#define XK_ANY_MOD    0
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
@@ -2100,11 +2100,19 @@ tputc(char *c, int len) {
 		sel.bx = -1;
 	if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
 		tnewline(1); /* always go to first col */
+
+	if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
+		memmove(&term.line[term.c.y][term.c.x+1],
+			&term.line[term.c.y][term.c.x],
+			(term.col - term.c.x - 1) * sizeof(Glyph));
+	}
+
 	tsetchar(c, &term.c.attr, term.c.x, term.c.y);
-	if(term.c.x+1 < term.col)
+	if(term.c.x+1 < term.col) {
 		tmoveto(term.c.x+1, term.c.y);
-	else
+	} else {
 		term.c.state |= CURSOR_WRAPNEXT;
+	}
 }
 
 int
@@ -2699,21 +2707,32 @@ kmap(KeySym k, uint state) {
 
 		if(kp->k != k)
 			continue;
-		if((state & mask) != mask &&
-		   (mask == XK_NO_MOD && state))
+
+		if(mask == XK_NO_MOD && state)
+			continue;
+		if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
 			continue;
+		if((state & mask) != state)
+			continue;
+
 		if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
-		   (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD)))
+				(kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
 			continue;
+		}
+
 		if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-		   (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR)))
+				(kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
 			continue;
+		}
+
 		if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
-		   (kp->crlf > 0 && !IS_SET(MODE_CRLF)))
+				(kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
 			continue;
+		}
 
 		return kp->s;
 	}
+
 	return NULL;
 }
 
@@ -2755,6 +2774,7 @@ kpress(XEvent *ev) {
 		memcpy(cp, xstr, len);
 		len = cp - buf + len;
 	}
+
 	ttywrite(buf, len);
 	if(IS_SET(MODE_ECHO))
 		techo(buf, len);
@@ -2869,7 +2889,7 @@ main(int argc, char *argv[]) {
 				opt_class = argv[i];
 			break;
 		case 'e':
-			/* eat every remaining arguments */
+			/* eat all remaining arguments */
 			if(++i < argc)
 				opt_cmd = &argv[i];
 			goto run;
@@ -2924,6 +2944,7 @@ run:
 	ttynew();
 	selinit();
 	run();
+
 	return 0;
 }