updated "key" to a lookup table.

[st.git] / st.c

diff --git a/st.c b/st.c
index 661f4fb..833805f 100644 (file)
--- a/st.c
+++ b/st.c
@@ -40,12 +40,9 @@ enum { CRset=1, CRupdate=2 };
 enum { TMwrap=1, TMinsert=2 };
 enum { SCupdate, SCredraw };
 
 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  */
 
 typedef struct {
        char c;     /* character code  */


@@ -98,8 +95,6 @@ typedef struct {
        int cw; /* char width  */
 } XWindow; 
 
        int cw; /* char width  */
 } XWindow; 
 

-#include "config.h"
-

 /* Drawing Context */
 typedef struct {
        unsigned long col[LEN(colorname)];
 /* Drawing Context */
 typedef struct {
        unsigned long col[LEN(colorname)];


@@ -154,8 +149,6 @@ void xdrawc(int, int, Glyph);
 void xinit(void);
 void xscroll(void);
 
 void xinit(void);
 void xscroll(void);
 

-void cursor(int);
-

 /* Globals */
 DC dc;
 XWindow xw;
 /* Globals */
 DC dc;
 XWindow xw;


@@ -999,15 +992,6 @@ draw(int redraw_all) {
        xcursor(CSdraw);
 }
 
        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;
 void
 kpress(XKeyEvent *e) {
        KeySym ksym;


@@ -1020,7 +1004,7 @@ kpress(XKeyEvent *e) {
        meta  = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
        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';
                ttywrite(skmap, strlen(skmap));
        else if(len > 0) {
                buf[sizeof(buf)-1] = '\0';