X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/cf65699a29683bff9d50187c18b160e21a538f48..4e6915a16b75c1e79142e15a9b23e761140d4e9b:/st.c

diff --git a/st.c b/st.c
index 559dcda..62b877f 100644
--- a/st.c
+++ b/st.c
@@ -42,11 +42,6 @@ enum { SCupdate, SCredraw };
 
 typedef int Color;
 
-typedef struct {
-	KeySym k;
-	char s[ESCSIZ];
-} Key;
-
 typedef struct {
 	char c;     /* character code  */
 	char mode;  /* attribute flags */
@@ -98,6 +93,11 @@ typedef struct {
 	int cw; /* char width  */
 } XWindow; 
 
+typedef struct {
+	KeySym k;
+	char s[ESCSIZ];
+} Key;
+
 #include "config.h"
 
 /* Drawing Context */
@@ -125,7 +125,6 @@ static void tcpos(int);
 static void tcursor(int);
 static void tdeletechar(int);
 static void tdeleteline(int);
-static void tdump(void);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
@@ -152,6 +151,7 @@ static void xinit(void);
 static void xscroll(void);
 
 static void expose(XEvent *);
+static char * kmap(KeySym);
 static void kpress(XEvent *);
 static void resize(XEvent *);
 
@@ -170,6 +170,26 @@ static int cmdfd;
 static pid_t pid;
 static int running;
 
+#ifdef DEBUG
+void
+tdump(void) {
+	int row, col;
+	Glyph c;
+
+	for(row = 0; row < term.row; row++) {
+		for(col = 0; col < term.col; col++) {
+			if(col == term.c.x && row == term.c.y)
+				putchar('#');
+			else {
+				c = term.line[row][col];
+				putchar(c.state & CRset ? c.c : '.');
+			}
+		}
+		putchar('\n');
+	}
+}
+#endif
+
 void
 die(const char *errstr, ...) {
 	va_list ap;
@@ -797,24 +817,6 @@ tputs(char *s, int len) {
 		tputc(*s++);
 }
 
-void
-tdump(void) {
-	int row, col;
-	Glyph c;
-
-	for(row = 0; row < term.row; row++) {
-		for(col = 0; col < term.col; col++) {
-			if(col == term.c.x && row == term.c.y)
-				putchar('#');
-			else {
-				c = term.line[row][col];
-				putchar(c.state & CRset ? c.c : '.');
-			}
-		}
-		putchar('\n');
-	}
-}
-
 void
 tresize(int col, int row) {
 	int i;
@@ -1009,11 +1011,21 @@ expose(XEvent *ev) {
 	draw(SCredraw);
 }
 
+char *
+kmap(KeySym k) {
+	int i;
+	for(i = 0; i < LEN(key); i++)
+		if(key[i].k == k)
+			return (char*)key[i].s;
+	return NULL;
+}
+
 void
 kpress(XEvent *ev) {
 	XKeyEvent *e = &ev->xkey;
 	KeySym ksym;
 	char buf[32];
+	char *customkey;
 	int len;
 	int meta;
 	int shift;
@@ -1021,8 +1033,9 @@ kpress(XEvent *ev) {
 	meta  = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
 	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
-	if(key[ksym])
-		ttywrite(key[ksym], strlen(key[ksym]));
+
+	if(customkey = kmap(ksym))
+		ttywrite(customkey, strlen(customkey));
 	else if(len > 0) {
 		buf[sizeof(buf)-1] = '\0';
 		if(meta && len == 1)