aw/dmenu
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add xim support

Browse Source
This commit is contained in:
Troels Henriksen 2011-10-16 17:21:33 +01:00
parent 1cf3864464
commit c8f0a37638
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dmenu.c
View File

@ -58,6 +58,7 @@ static Item *items = NULL;
static Item *matches, *matchend; static Item *matches, *matchend;
static Item *prev, *curr, *next, *sel; static Item *prev, *curr, *next, *sel;
static Window win; static Window win;
static XIC xic;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr; static char *(*fstrstr)(const char *, const char *) = strstr;
@ -230,8 +231,10 @@ void
keypress(XKeyEvent *ev) { keypress(XKeyEvent *ev) {
char buf[32]; char buf[32];
KeySym ksym; KeySym ksym;
int len;
Status status;
XLookupString(ev, buf, sizeof buf, &ksym, NULL); len = XmbLookupString(xic, ev, buf, sizeof(buf), &ksym, &status);
if(ev->state & ControlMask) { if(ev->state & ControlMask) {
KeySym lower, upper; KeySym lower, upper;
@ -273,7 +276,7 @@ keypress(XKeyEvent *ev) {
switch(ksym) { switch(ksym) {
default: default:
if(!iscntrl(*buf)) if(!iscntrl(*buf))
insert(buf, strlen(buf)); insert(buf, len);
break; break;
case XK_Delete: case XK_Delete:
if(text[cursor] == '\0') if(text[cursor] == '\0')
@ -461,7 +464,9 @@ void
run(void) { run(void) {
XEvent ev; XEvent ev;
while(!XNextEvent(dc->dpy, &ev)) while(!XNextEvent(dc->dpy, &ev)) {
if(XFilterEvent(&ev, win))
continue;
switch(ev.type) { switch(ev.type) {
case Expose: case Expose:
if(ev.xexpose.count == 0) if(ev.xexpose.count == 0)
@ -480,12 +485,14 @@ run(void) {
break; break;
} }
} }
}
void void
setup(void) { setup(void) {
int x, y, screen = DefaultScreen(dc->dpy); int x, y, screen = DefaultScreen(dc->dpy);
Window root = RootWindow(dc->dpy, screen); Window root = RootWindow(dc->dpy, screen);
XSetWindowAttributes swa; XSetWindowAttributes swa;
XIM xim;
#ifdef XINERAMA #ifdef XINERAMA
int n; int n;
XineramaScreenInfo *info; XineramaScreenInfo *info;
@ -542,6 +549,11 @@ setup(void) {
DefaultVisual(dc->dpy, screen), DefaultVisual(dc->dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
/* input methods */
xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, win, XNFocusWindow, win, NULL);
XMapRaised(dc->dpy, win); XMapRaised(dc->dpy, win);
resizedc(dc, mw, mh); resizedc(dc, mw, mh);
drawmenu(); drawmenu();