 |
revert IME support - dmenu - dynamic menu |
 |
git clone git://git.suckless.org/dmenu |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit db6093f6ec1bb884f7540f2512935b5254750b30 |
|
parent a9b1de384ae1ad30805e893af5cd6ea9b87c89da |
|
Author: Hiltjo Posthuma <[email protected]> |
|
Date: Sun, 3 Mar 2019 13:08:54 +0100 |
|
|
|
revert IME support |
|
|
|
dmenu will not handle IME support (st will, atleast for now). |
|
|
|
revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22 |
|
this commit also broke input focus. |
|
|
|
Diffstat: |
|
M dmenu.c | 15 +++------------ |
|
|
|
1 file changed, 3 insertions(+), 12 deletions(-) |
|
--- |
|
diff --git a/dmenu.c b/dmenu.c |
|
@@ -553,7 +553,7 @@ run(void) |
|
XEvent ev; |
|
|
|
while (!XNextEvent(dpy, &ev)) { |
|
- if (XFilterEvent(&ev, None)) |
|
+ if (XFilterEvent(&ev, win)) |
|
continue; |
|
switch(ev.type) { |
|
case DestroyNotify: |
|
@@ -666,20 +666,13 @@ setup(void) |
|
|
|
|
|
/* input methods */ |
|
- if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) { |
|
- XSetLocaleModifiers("@im=local"); |
|
- if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) { |
|
- XSetLocaleModifiers("@im="); |
|
- if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) |
|
- die("XOpenIM failed: could not open input devi… |
|
- } |
|
- } |
|
+ if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) |
|
+ die("XOpenIM failed: could not open input device"); |
|
|
|
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothin… |
|
XNClientWindow, win, XNFocusWindow, win, NULL); |
|
|
|
XMapRaised(dpy, win); |
|
- XSetInputFocus(dpy, win, RevertToParent, CurrentTime); |
|
if (embed) { |
|
XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNot… |
|
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { |
|
@@ -745,8 +738,6 @@ main(int argc, char *argv[]) |
|
|
|
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) |
|
fputs("warning: no locale support\n", stderr); |
|
- if (!XSetLocaleModifiers("")) |
|
- fputs("warning: no locale modifiers support\n", stderr); |
|
if (!(dpy = XOpenDisplay(NULL))) |
|
die("cannot open display"); |
|
screen = DefaultScreen(dpy); |
