[hackers] [st] Fixed possible segfault by reverting to the key struct (again). || Aur?lien Aptel

changeset: 67:409a2f676ac1
tag: tip
user: Aur?lien Aptel <aurelien.aptel_AT_gmail.com>
date: Mon Sep 07 21:19:29 2009 +0200
files: config.h st.c
description:
Fixed possible segfault by reverting to the key struct (again).

diff -r 4801aa121163 -r 409a2f676ac1 config.h
--- a/config.h Fri Jul 10 16:27:14 2009 +0100
+++ b/config.h Mon Sep 07 21:19:29 2009 +0200
@@ -24,16 +24,15 @@
 #define DefaultCS 1
 #define BellCol DefaultFG
 
-
 /* special keys */
-static const 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 4801aa121163 -r 409a2f676ac1 st.c
--- a/st.c Fri Jul 10 16:27:14 2009 +0100
+++ b/st.c Mon Sep 07 21:19:29 2009 +0200
@@ -93,6 +93,11 @@
         int cw; /* char width */
 } XWindow;
 
+typedef struct {
+ KeySym k;
+ char s[ESCSIZ];
+} Key;
+
 #include "config.h"
 
 /* Drawing Context */
@@ -146,6 +151,7 @@
 static void xscroll(void);
 
 static void expose(XEvent *);
+static char * kmap(KeySym);
 static void kpress(XEvent *);
 static void resize(XEvent *);
 
@@ -1005,11 +1011,21 @@
         draw(SCredraw);
 }
 
+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(XEvent *ev) {
         XKeyEvent *e = &ev->xkey;
         KeySym ksym;
         char buf[32];
+ char *customkey;
         int len;
         int meta;
         int shift;
@@ -1017,8 +1033,9 @@
         meta = e->state & Mod1Mask;
         shift = e->state & ShiftMask;
         len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
- if(key[ksym])
- ttywrite(key[ksym], strlen(key[ksym]));
+
+ if(customkey = kmap(ksym))
+ ttywrite(customkey, strlen(customkey));
         else if(len > 0) {
                 buf[sizeof(buf)-1] = '\0';
                 if(meta && len == 1)
Received on Mon Sep 07 2009 - 19:17:59 UTC