X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=faee103607c9e45dacc0c99a081171e027794495;hb=a55f0e12fe5c1205f4d3e40c164fd087224fad7a;hp=ecbb8d285d7109caa0591a1d49ff39296f82a23d;hpb=901b3ed9b7e3e4c7542797301ae2442938bcea20;p=dwm.git diff --git a/event.c b/event.c index ecbb8d2..faee103 100644 --- a/event.c +++ b/event.c @@ -8,65 +8,35 @@ #include #include -#define ButtonMask (ButtonPressMask | ButtonReleaseMask) -#define MouseMask (ButtonMask | PointerMotionMask) +/* static */ -/********** CUSTOMIZE **********/ - -const char *term[] = { - "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", - "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL -}; -const char *browse[] = { "firefox", NULL }; -const char *xlock[] = { "xlock", NULL }; - -Key key[] = { - /* modifier key function arguments */ - { Mod1Mask, XK_Return, zoom, { 0 } }, - { Mod1Mask, XK_k, focusprev, { 0 } }, - { Mod1Mask, XK_j, focusnext, { 0 } }, - { Mod1Mask, XK_m, maximize, { 0 } }, - { Mod1Mask, XK_0, view, { .i = Tscratch } }, - { Mod1Mask, XK_1, view, { .i = Tdev } }, - { Mod1Mask, XK_2, view, { .i = Twww } }, - { Mod1Mask, XK_3, view, { .i = Twork } }, - { Mod1Mask, XK_space, dotile, { 0 } }, - { Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } }, - { Mod1Mask|ShiftMask, XK_0, replacetag, { .i = Tscratch } }, - { Mod1Mask|ShiftMask, XK_1, replacetag, { .i = Tdev } }, - { Mod1Mask|ShiftMask, XK_2, replacetag, { .i = Twww } }, - { Mod1Mask|ShiftMask, XK_3, replacetag, { .i = Twork } }, - { Mod1Mask|ShiftMask, XK_c, killclient, { 0 } }, - { Mod1Mask|ShiftMask, XK_q, quit, { 0 } }, - { Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } }, - { Mod1Mask|ShiftMask, XK_w, spawn, { .argv = browse } }, - { Mod1Mask|ShiftMask, XK_l, spawn, { .argv = xlock } }, - { ControlMask, XK_0, appendtag, { .i = Tscratch } }, - { ControlMask, XK_1, appendtag, { .i = Tdev } }, - { ControlMask, XK_2, appendtag, { .i = Twww } }, - { ControlMask, XK_3, appendtag, { .i = Twork } }, -}; +typedef struct { + unsigned long mod; + KeySym keysym; + void (*func)(Arg *arg); + Arg arg; +} Key; -/********** CUSTOMIZE **********/ +KEYS -/* static functions */ +#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask)) static void movemouse(Client *c) { - XEvent ev; int x1, y1, ocx, ocy, di; unsigned int dui; Window dummy; + XEvent ev; ocx = c->x; ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, - None, cursor[CurMove], CurrentTime) != GrabSuccess) + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, + None, cursor[CurMove], CurrentTime) != GrabSuccess) return; XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); switch (ev.type) { default: break; case Expose: @@ -76,7 +46,7 @@ movemouse(Client *c) XSync(dpy, False); c->x = ocx + (ev.xmotion.x - x1); c->y = ocy + (ev.xmotion.y - y1); - resize(c, False); + resize(c, False, TopLeft); break; case ButtonRelease: XUngrabPointer(dpy, CurrentTime); @@ -88,17 +58,18 @@ movemouse(Client *c) static void resizemouse(Client *c) { - XEvent ev; int ocx, ocy; + Corner sticky; + XEvent ev; ocx = c->x; ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurResize], CurrentTime) != GrabSuccess) return; XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); switch(ev.type) { default: break; case Expose: @@ -110,7 +81,11 @@ resizemouse(Client *c) c->h = abs(ocy - ev.xmotion.y); c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w; c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h; - resize(c, True); + if(ocx <= ev.xmotion.x) + sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft; + else + sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight; + resize(c, True, sticky); break; case ButtonRelease: XUngrabPointer(dpy, CurrentTime); @@ -124,8 +99,8 @@ buttonpress(XEvent *e) { int x; Arg a; - XButtonPressedEvent *ev = &e->xbutton; Client *c; + XButtonPressedEvent *ev = &e->xbutton; if(barwin == ev->window) { switch(ev->button) { @@ -140,34 +115,32 @@ buttonpress(XEvent *e) } break; case Button4: - a.i = (tsel + 1 < TLast) ? tsel + 1 : 0; - view(&a); + viewnext(&a); break; case Button5: - a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1; - view(&a); + viewprev(&a); break; } } else if((c = getclient(ev->window))) { - if(arrange == dotile && !c->isfloat) { - if((ev->state & ControlMask) && (ev->button == Button1)) - zoom(NULL); - return; - } - /* floating windows */ - higher(c); + focus(c); switch(ev->button) { default: break; case Button1: - movemouse(c); + if(!c->ismax && (arrange == dofloat || c->isfloat)) { + higher(c); + movemouse(c); + } break; case Button2: lower(c); break; case Button3: - resizemouse(c); + if(!c->ismax && (arrange == dofloat || c->isfloat)) { + higher(c); + resizemouse(c); + } break; } } @@ -176,9 +149,9 @@ buttonpress(XEvent *e) static void configurerequest(XEvent *e) { + Client *c; XConfigureRequestEvent *ev = &e->xconfigurerequest; XWindowChanges wc; - Client *c; ev->value_mask &= ~CWSibling; if((c = getclient(ev->window))) { @@ -194,7 +167,7 @@ configurerequest(XEvent *e) if(ev->value_mask & CWBorderWidth) c->border = 1; gravitate(c, False); - resize(c, True); + resize(c, True, TopLeft); } wc.x = ev->x; @@ -202,11 +175,8 @@ configurerequest(XEvent *e) wc.width = ev->width; wc.height = ev->height; wc.border_width = 1; - wc.sibling = None; - wc.stack_mode = Above; - ev->value_mask &= ~CWStackMode; - ev->value_mask |= CWBorderWidth; - XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); + XConfigureWindow(dpy, ev->window, + CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); XSync(dpy, False); } @@ -223,13 +193,13 @@ destroynotify(XEvent *e) static void enternotify(XEvent *e) { - XCrossingEvent *ev = &e->xcrossing; Client *c; + XCrossingEvent *ev = &e->xcrossing; - if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) + if(ev->detail == NotifyInferior) return; - if((c = getclient(ev->window))) + if((c = getclient(ev->window)) || (c = getctitle(ev->window))) focus(c); else if(ev->window == root) issel = True; @@ -238,8 +208,8 @@ enternotify(XEvent *e) static void expose(XEvent *e) { - XExposeEvent *ev = &e->xexpose; Client *c; + XExposeEvent *ev = &e->xexpose; if(ev->count == 0) { if(barwin == ev->window) @@ -252,14 +222,15 @@ expose(XEvent *e) static void keypress(XEvent *e) { - XKeyEvent *ev = &e->xkey; - static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; + static unsigned int len = sizeof(key) / sizeof(key[0]); unsigned int i; KeySym keysym; + XKeyEvent *ev = &e->xkey; keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); for(i = 0; i < len; i++) - if((keysym == key[i].keysym) && (key[i].mod == ev->state)) { + if(keysym == key[i].keysym && + CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) { if(key[i].func) key[i].func(&key[i].arg); return; @@ -278,8 +249,8 @@ leavenotify(XEvent *e) static void maprequest(XEvent *e) { - XMapRequestEvent *ev = &e->xmaprequest; static XWindowAttributes wa; + XMapRequestEvent *ev = &e->xmaprequest; if(!XGetWindowAttributes(dpy, ev->window, &wa)) return; @@ -297,9 +268,9 @@ maprequest(XEvent *e) static void propertynotify(XEvent *e) { - XPropertyEvent *ev = &e->xproperty; - Window trans; Client *c; + Window trans; + XPropertyEvent *ev = &e->xproperty; if(ev->state == PropertyDelete) return; /* ignore */ @@ -337,7 +308,7 @@ unmapnotify(XEvent *e) unmanage(c); } -/* extern functions */ +/* extern */ void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, @@ -355,14 +326,27 @@ void (*handler[LASTEvent]) (XEvent *) = { void grabkeys() { - static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; + static unsigned int len = sizeof(key) / sizeof(key[0]); unsigned int i; KeyCode code; 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); } }