X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/b098c94ed44495957de11a6160fa0560abbe944f..4b0328f2097dedd70bbb36ea2b5159ac55b7cbcb:/event.c?ds=inline diff --git a/event.c b/event.c index 69a628e..0f984f2 100644 --- a/event.c +++ b/event.c @@ -127,14 +127,15 @@ buttonpress(XEvent *e) default: break; case Button1: - if(!c->ismax && (arrange == dofloat || c->isfloat)) { - higher(c); - movemouse(c); + if(!c->ismax) { + if(arrange == dofloat || c->isfloat) { + higher(c); + movemouse(c); + } + else + zoom(NULL); } break; - case Button2: - lower(c); - break; case Button3: if(!c->ismax && (arrange == dofloat || c->isfloat)) { higher(c); @@ -223,7 +224,7 @@ enternotify(XEvent *e) Client *c; XCrossingEvent *ev = &e->xcrossing; - if(ev->detail == NotifyInferior) + if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) return; if((c = getclient(ev->window)) || (c = getctitle(ev->window))) @@ -359,20 +360,12 @@ grabkeys() for(i = 0; i < len; i++) { code = XKeysymToKeycode(dpy, key[i].keysym); - /* normal */ - XUngrabKey(dpy, code, key[i].mod, root); XGrabKey(dpy, code, key[i].mod, root, True, GrabModeAsync, GrabModeAsync); - /* capslock */ - XUngrabKey(dpy, code, key[i].mod | LockMask, root); XGrabKey(dpy, code, key[i].mod | LockMask, root, True, GrabModeAsync, GrabModeAsync); - /* numlock */ - XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root); XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True, GrabModeAsync, GrabModeAsync); - /* capslock & numlock */ - XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root); XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True, GrabModeAsync, GrabModeAsync); }