X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=9df6707c1b7e4884eb57b96a720804b194db46fd;hb=8e577322a3a55abf2f8226218ec87a7eec7fc3b1;hp=331509fdb6834ca10f97b6c81a1be4332f94c56d;hpb=02ae3ce6fdc178ca6eb9b10b6447bb56a6513a27;p=st.git

diff --git a/st.c b/st.c
index 331509f..9df6707 100644
--- a/st.c
+++ b/st.c
@@ -264,7 +264,7 @@ typedef struct {
 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 */
@@ -386,6 +386,7 @@ 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);
@@ -893,9 +894,7 @@ bpress(XEvent *e) {
 	for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
 		if(e->xbutton.button == mk->b
 				&& match(mk->mask, e->xbutton.state)) {
-			ttywrite(mk->s, strlen(mk->s));
-			if(IS_SET(MODE_ECHO))
-				techo(mk->s, strlen(mk->s));
+			ttysend(mk->s, strlen(mk->s));
 			return;
 		}
 	}
@@ -1031,7 +1030,7 @@ selnotify(XEvent *e) {
 
 		if(IS_SET(MODE_BRCKTPASTE))
 			ttywrite("\033[200~", 6);
-		ttywrite((const char *)data, nitems * format / 8);
+		ttysend((char *)data, nitems * format / 8);
 		if(IS_SET(MODE_BRCKTPASTE))
 			ttywrite("\033[201~", 6);
 		XFree(data);
@@ -1299,6 +1298,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;
@@ -3584,30 +3590,26 @@ kpress(XEvent *ev) {
 
 	/* 2. custom keys from config.h */
 	if((customkey = kmap(ksym, e->state))) {
-		len = strlen(customkey);
-		memcpy(buf, customkey, len);
-	/* 3. composed string from input method */
-	} else {
-		if(len == 0)
-			return;
+		ttysend(customkey, strlen(customkey));
+		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;
+	/* 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;
 		}
 	}
-
-	ttywrite(buf, len);
-	if(IS_SET(MODE_ECHO))
-		techo(buf, len);
+	ttysend(buf, len);
 }