[hackers] [st] reverted back to the old Key struct. || Aur?lien Aptel

changeset: 64:5d5e8590f224
tag: tip
user: Aur?lien Aptel <aurelien.aptel_AT_gmail.com>
date: Sun Jun 21 19:52:06 2009 +0200
files: config.h st.c
description:
reverted back to the old Key struct.

diff -r d045f7fc239f -r 5d5e8590f224 config.h
--- a/config.h Sun Jun 21 19:37:12 2009 +0200
+++ b/config.h Sun Jun 21 19:52:06 2009 +0200
@@ -24,15 +24,16 @@
 #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 -r d045f7fc239f -r 5d5e8590f224 st.c
--- a/st.c Sun Jun 21 19:37:12 2009 +0200
+++ b/st.c Sun Jun 21 19:52:06 2009 +0200
@@ -40,9 +40,12 @@
 enum { TMwrap=1, TMinsert=2 };
 enum { SCupdate, SCredraw };
 
-#include "config.h"
+typedef int Color;
 
-typedef int Color;
+typedef struct {
+ KeySym k;
+ char s[ESCSIZ];
+} Key;
 
 typedef struct {
         char c; /* character code */
@@ -94,6 +97,8 @@
         int ch; /* char height */
         int cw; /* char width */
 } XWindow;
+
+#include "config.h"
 
 /* Drawing Context */
 typedef struct {
@@ -992,6 +997,15 @@
         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 @@
         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';
Received on Sun Jun 21 2009 - 15:52:40 UTC