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

reverted back to the old Key struct.

Browse Source
This commit is contained in:
Aurélien Aptel
2009-06-21 19:52:06 +02:00
parent 4d794b3479
commit 0a5e510209
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config.h
View File

@ -24,15 +24,16 @@ static char* colorname[] = {
#define DefaultCS 1 #define DefaultCS 1
#define BellCol DefaultFG #define BellCol DefaultFG
/* special keys */ /* special keys */
static 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" },
}; };

20
st.c
View File

@ -40,10 +40,13 @@ enum { CRset=1, CRupdate=2 };
enum { TMwrap=1, TMinsert=2 }; enum { TMwrap=1, TMinsert=2 };
enum { SCupdate, SCredraw }; enum { SCupdate, SCredraw };
#include "config.h"
typedef int Color; typedef int Color;
typedef struct {
KeySym k;
char s[ESCSIZ];
} Key;
typedef struct { typedef struct {
char c; /* character code */ char c; /* character code */
char mode; /* attribute flags */ char mode; /* attribute flags */
@ -95,6 +98,8 @@ typedef struct {
int cw; /* char width */ int cw; /* char width */
} XWindow; } XWindow;
#include "config.h"
/* Drawing Context */ /* Drawing Context */
typedef struct { typedef struct {
unsigned long col[LEN(colorname)]; unsigned long col[LEN(colorname)];
@ -992,6 +997,15 @@ 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 void
kpress(XKeyEvent *e) { kpress(XKeyEvent *e) {
KeySym ksym; KeySym ksym;
@ -1004,7 +1018,7 @@ kpress(XKeyEvent *e) {
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(skmap = key[ksym]) if(skmap = kmap(ksym))
ttywrite(skmap, strlen(skmap)); ttywrite(skmap, strlen(skmap));
else if(len > 0) { else if(len > 0) {
buf[sizeof(buf)-1] = '\0'; buf[sizeof(buf)-1] = '\0';