tonitch/st
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Fixed possible segfault by reverting to the key struct (again).

Browse Source
This commit is contained in:
Aurélien Aptel
2009-09-07 21:19:29 +02:00
parent be0878960e
commit 7958b41040
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config.h
View File

@ -24,16 +24,15 @@ static const char *colorname[] = {
#define DefaultCS 1 #define DefaultCS 1
#define BellCol DefaultFG #define BellCol DefaultFG
/* special keys */ /* special keys */
static const char *key[] = { static Key key[] = {
[XK_Delete] = "\033[3~", { XK_Delete, "\033[3~" },
[XK_Home] = "\033[1~", { XK_Home, "\033[1~" },
[XK_End] = "\033[4~", { XK_End, "\033[4~" },
[XK_Prior] = "\033[5~", { XK_Prior, "\033[5~" },
[XK_Next] = "\033[6~", { XK_Next, "\033[6~" },
[XK_Left] = "\033[D", { XK_Left, "\033[D" },
[XK_Right] = "\033[C", { XK_Right, "\033[C" },
[XK_Up] = "\033[A", { XK_Up, "\033[A" },
[XK_Down] = "\033[B", { XK_Down, "\033[B" },
}; };

21
st.c
View File

@ -93,6 +93,11 @@ typedef struct {
int cw; /* char width */ int cw; /* char width */
} XWindow; } XWindow;
typedef struct {
KeySym k;
char s[ESCSIZ];
} Key;
#include "config.h" #include "config.h"
/* Drawing Context */ /* Drawing Context */
@ -146,6 +151,7 @@ static void xinit(void);
static void xscroll(void); static void xscroll(void);
static void expose(XEvent *); static void expose(XEvent *);
static char * kmap(KeySym);
static void kpress(XEvent *); static void kpress(XEvent *);
static void resize(XEvent *); static void resize(XEvent *);
@ -1005,11 +1011,21 @@ expose(XEvent *ev) {
draw(SCredraw); 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 void
kpress(XEvent *ev) { kpress(XEvent *ev) {
XKeyEvent *e = &ev->xkey; XKeyEvent *e = &ev->xkey;
KeySym ksym; KeySym ksym;
char buf[32]; char buf[32];
char *customkey;
int len; int len;
int meta; int meta;
int shift; int shift;
@ -1017,8 +1033,9 @@ kpress(XEvent *ev) {
meta = e->state & Mod1Mask; meta = e->state & Mod1Mask;
shift = e->state & ShiftMask; shift = e->state & ShiftMask;
len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); 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) { else if(len > 0) {
buf[sizeof(buf)-1] = '\0'; buf[sizeof(buf)-1] = '\0';
if(meta && len == 1) if(meta && len == 1)