mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-11-25 07:09:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

[menu] Allow composed input.

Browse Source
This commit is contained in:
Kris Maglione 2010-07-31 19:11:45 -04:00
parent 26bd6db557
commit bd9f907d88
5 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/menu/caret.c
View File

@ -89,7 +89,7 @@ caret_find(int dir, int type) {
return p;
case CHAR:
if(p > end)
return p-1;
return prev_rune(end, p, &r);
return end;
}
}

2
cmd/menu/main.c
View File

@ -186,7 +186,7 @@ main(int argc, char *argv[]) {
int i;
long ndump;
setlocale(LC_CTYPE, "");
setlocale(LC_ALL, "");
fmtinstall('r', errfmt);
quotefmtinstall();

31
cmd/menu/menu.c
View File

@ -30,6 +30,12 @@ menu_init(void) {
wa.event_mask = ExposureMask | KeyPressMask;
barwin = createwindow(&scr.root, Rect(-1, -1, 1, 1), scr.depth, InputOutput,
&wa, CWEventMask);
if(scr.xim)
barwin->xic = XCreateIC(scr.xim,
XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, barwin->xid,
XNFocusWindow, barwin->xid,
nil);
changeprop_long(barwin, Net("WM_WINDOW_TYPE"), "ATOM",
(long[]){ TYPE("MENU") }, 1);
@ -262,12 +268,23 @@ kdown_event(Window *w, void *aux, XKeyEvent *e) {
char **action, **p;
char *key;
char buf[32];
int num;
int num, status;
KeySym ksym;
buf[0] = '\0';
num = XLookupString(e, buf, sizeof buf, &ksym, 0);
buf[num] = '\0';
if(XFilterEvent((XEvent*)e, w->xid))
return false;
status = XLookupBoth;
if(w->xic)
num = Xutf8LookupString(w->xic, e, buf, sizeof buf - 1, &ksym,
&status);
else
num = XLookupString(e, buf, sizeof buf - 1, &ksym, nil);
if(status != XLookupChars && status != XLookupKeySym && status != XLookupBoth)
return false;
if(status == XLookupKeySym || status == XLookupBoth) {
key = XKeysymToString(ksym);
if(IsKeypadKey(ksym))
if(ksym == XK_KP_Enter)
@ -281,10 +298,12 @@ kdown_event(Window *w, void *aux, XKeyEvent *e) {
|| IsPrivateKeypadKey(ksym)
|| IsPFKey(ksym))
return false;
action = find_key(key, e->state);
if(action == nil || action[0] == nil) {
}
if(status == XLookupChars || action == nil || action[0] == nil) {
if(num && !iscntrl(buf[0])) {
buf[num] = '\0';
caret_insert(buf, false);
update_filter(true);
menu_draw();

2
include/stuff/x11.h
View File

@ -146,6 +146,7 @@ struct WinHints {
struct Window {
int type;
XID xid;
XIC xic;
GC gc;
Visual* visual;
Colormap colormap;
@ -202,6 +203,7 @@ struct Screen {
Rectangle rect;
int depth;
int fd;
XIM xim;
};
#ifdef VARARGCK

2
lib/libstuff/x11/initdisplay.c
View File

@ -76,6 +76,8 @@ initdisplay(void) {
scr.root.parent = &scr.root;
scr.xim = XOpenIM(display, nil, nil, nil);
windowmap.bucket = wbucket;
windowmap.nhash = nelem(wbucket);
atommap.bucket = abucket;