X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.c;h=c992860d03ef7302fcec372b51fac064da4db943;hb=43bb77a569843e637afcf16462f139e96f8220ae;hp=05c0199a19b86c04312adec0d9382c8f00c86b8e;hpb=1edf6a7866ebe219bfa81a1b289fa5c8d0cdfbee;p=dwm.git diff --git a/dwm.c b/dwm.c index 05c0199..c992860 100644 --- a/dwm.c +++ b/dwm.c @@ -60,7 +60,7 @@ enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle, - ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ + ClkClientWin, ClkLast }; /* clicks */ /* typedefs */ typedef unsigned int uint; @@ -312,7 +312,7 @@ buttonpress(XEvent *e) { Client *c; XButtonPressedEvent *ev = &e->xbutton; - click = ClkRootWin; + click = ClkLast; if(ev->window == barwin) { i = x = 0; do @@ -980,11 +980,6 @@ movemouse(const Arg *arg) { None, cursor[CurMove], CurrentTime) != GrabSuccess) return; XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); - if(x1 < c->x || x1 > c->x + c->w || y1 < c->y || y1 > c->y + c->h) { - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, 0, 0); - x1 = c->x + 1; - y1 = c->y + 1; - } for(;;) { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { @@ -1379,7 +1374,7 @@ setup(void) { PropModeReplace, (unsigned char *) netatom, NetLast); /* select for events */ - wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask + wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask |EnterWindowMask|LeaveWindowMask|StructureNotifyMask; XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); XSelectInput(dpy, root, wa.event_mask);