X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=st.c;h=833805f32fb44bbe7fedbe694c3bfcd6f35d0c99;hp=a7f957b1c52ee6ba40e89c46af79c2cae25c8437;hb=4d794b3479cc586de7796d9b060b2eb469a6500d;hpb=44d8c319a9fe51b011ba6a44779659aec45023a7

diff --git a/st.c b/st.c
index a7f957b..833805f 100644
--- a/st.c
+++ b/st.c
@@ -40,12 +40,9 @@ enum { CRset=1, CRupdate=2 };
 enum { TMwrap=1, TMinsert=2 };
 enum { SCupdate, SCredraw };
 
-typedef int Color;
+#include "config.h"
 
-typedef struct {
-	KeySym k;
-	char s[ESCSIZ];
-} Key;
+typedef int Color;
 
 typedef struct {
 	char c;     /* character code  */
@@ -98,8 +95,6 @@ typedef struct {
 	int cw; /* char width  */
 } XWindow; 
 
-#include "config.h"
-
 /* Drawing Context */
 typedef struct {
 	unsigned long col[LEN(colorname)];
@@ -997,15 +992,6 @@ draw(int redraw_all) {
 	xcursor(CSdraw);
 }
 
-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(XKeyEvent *e) {
 	KeySym ksym;
@@ -1018,7 +1004,7 @@ kpress(XKeyEvent *e) {
 	meta  = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
 	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
-	if(skmap = kmap(ksym))
+	if(skmap = key[ksym])
 		ttywrite(skmap, strlen(skmap));
 	else if(len > 0) {
 		buf[sizeof(buf)-1] = '\0';