From: Aurélien Aptel <aurelien.aptel@gmail.com>
Date: Sun, 21 Jun 2009 17:52:06 +0000 (+0200)
Subject: reverted back to the old Key struct.
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=0a5e5102096d65a3ba8e39ea9b9b0eb89fe30e04

reverted back to the old Key struct.
---

diff --git a/config.h b/config.h
index b66985f..c01354d 100644
--- a/config.h
+++ b/config.h
@@ -24,15 +24,16 @@ static char* colorname[] = {
 #define DefaultCS 1
 #define BellCol   DefaultFG
 
+
 /* special keys */
-static char* key[] = {
-	[XK_Delete] = "\033[3~",
-	[XK_Home]   = "\033[1~",
-	[XK_End]    = "\033[4~",
-	[XK_Prior]  = "\033[5~",
-	[XK_Next]   = "\033[6~",
-	[XK_Left]   = "\033[D",
-	[XK_Right]  = "\033[C",
-	[XK_Up]     = "\033[A",
-	[XK_Down]   = "\033[B",
+static Key key[] = {
+	{ XK_Delete, "\033[3~" },
+	{ XK_Home,   "\033[1~" },
+	{ XK_End,    "\033[4~" },
+	{ XK_Prior,  "\033[5~" },
+	{ XK_Next,   "\033[6~" },
+	{ XK_Left,   "\033[D" },
+	{ XK_Right,  "\033[C" },
+	{ XK_Up,     "\033[A" },
+	{ XK_Down,   "\033[B" },
 };
diff --git a/st.c b/st.c
index 833805f..a7f957b 100644
--- a/st.c
+++ b/st.c
@@ -40,11 +40,14 @@ enum { CRset=1, CRupdate=2 };
 enum { TMwrap=1, TMinsert=2 };
 enum { SCupdate, SCredraw };
 
-#include "config.h"
-
 typedef int Color;
 
 typedef struct {
+	KeySym k;
+	char s[ESCSIZ];
+} Key;
+
+typedef struct {
 	char c;     /* character code  */
 	char mode;  /* attribute flags */
 	Color fg;   /* foreground      */
@@ -95,6 +98,8 @@ typedef struct {
 	int cw; /* char width  */
 } XWindow; 
 
+#include "config.h"
+
 /* Drawing Context */
 typedef struct {
 	unsigned long col[LEN(colorname)];
@@ -992,6 +997,15 @@ 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;
@@ -1004,7 +1018,7 @@ kpress(XKeyEvent *e) {
 	meta  = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
 	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
-	if(skmap = key[ksym])
+	if(skmap = kmap(ksym))
 		ttywrite(skmap, strlen(skmap));
 	else if(len > 0) {
 		buf[sizeof(buf)-1] = '\0';