aboutsummaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorAurélien Aptel <aurelien.aptel@gmail.com>2009-06-21 19:37:12 +0200
committerAurélien Aptel <aurelien.aptel@gmail.com>2009-06-21 19:37:12 +0200
commit29fafafb26c76d45f6855712898f61475728e5b1 (patch)
tree22b57459f038fa06dec509a9a04c6009697cbd5f /st.c
parentb36cf286b3505844bc7dbd0fcf65c6a70212b3fb (diff)
downloadst-29fafafb26c76d45f6855712898f61475728e5b1.tar.gz
st-29fafafb26c76d45f6855712898f61475728e5b1.tar.bz2
updated "key" to a lookup table.
Diffstat (limited to 'st.c')
-rw-r--r--st.c20
1 files changed, 3 insertions, 17 deletions
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';