X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=bdf4071299b4eaa30729c466119db739cdd09332;hb=d934296476be7345842fec1a2630d1752c704078;hp=5d7c8a7175f13341471505ec8a92d4c42e2145f2;hpb=4688ad181da14be36e034918580ec0ce5968ffdb;p=dwm.git diff --git a/event.c b/event.c index 5d7c8a7..ce23e41 100644 --- a/event.c +++ b/event.c @@ -1,232 +1,236 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk + * © 2006-2007 Jukka Salmi + * © 2007 Premysl Hruby + * © 2007 Szabolcs Nagy + * See LICENSE file for license details. */ #include "dwm.h" - +#include #include #include #include -#define ButtonMask (ButtonPressMask | ButtonReleaseMask) -#define MouseMask (ButtonMask | PointerMotionMask) - -/* CUSTOMIZE */ +/* static */ typedef struct { unsigned long mod; KeySym keysym; - void (*func)(Arg *arg); - Arg arg; + void (*func)(const char *arg); + const char *arg; } Key; -const char *browse[] = { "firefox", NULL }; -const char *gimp[] = { "gimp", NULL }; -const char *term[] = { - "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", - "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL -}; -const char *xlock[] = { "xlock", NULL }; - -static Key key[] = { - /* modifier key function arguments */ - { ControlMask, XK_0, appendtag, { .i = Tscratch } }, - { ControlMask, XK_1, appendtag, { .i = Tdev } }, - { ControlMask, XK_2, appendtag, { .i = Twww } }, - { ControlMask, XK_3, appendtag, { .i = Twork } }, - { MODKEY, XK_0, view, { .i = Tscratch } }, - { MODKEY, XK_1, view, { .i = Tdev } }, - { MODKEY, XK_2, view, { .i = Twww } }, - { MODKEY, XK_3, view, { .i = Twork } }, - { MODKEY, XK_j, focusnext, { 0 } }, - { MODKEY, XK_k, focusprev, { 0 } }, - { MODKEY, XK_m, togglemax, { 0 } }, - { MODKEY, XK_space, togglemode, { 0 } }, - { MODKEY, XK_Return, zoom, { 0 } }, - { ControlMask|ShiftMask,XK_0, heretag, { .i = Tscratch } }, - { ControlMask|ShiftMask,XK_1, heretag, { .i = Tdev } }, - { ControlMask|ShiftMask,XK_2, heretag, { .i = Twww } }, - { ControlMask|ShiftMask,XK_3, heretag, { .i = Twork } }, - { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tscratch } }, - { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, - { MODKEY|ShiftMask, XK_2, replacetag, { .i = Twww } }, - { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, - { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, - { MODKEY|ShiftMask, XK_g, spawn, { .argv = gimp } }, - { MODKEY|ShiftMask, XK_l, spawn, { .argv = xlock } }, - { MODKEY|ShiftMask, XK_q, quit, { 0 } }, - { MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } }, - { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, -}; +KEYS -/* static */ +#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define MOUSEMASK (BUTTONMASK | PointerMotionMask) + +static Client * +getclient(Window w) { + Client *c; + + for(c = clients; c && c->win != w; c = c->next); + return c; +} static void -movemouse(Client *c) -{ - int x1, y1, ocx, ocy, di; +movemouse(Client *c) { + int x1, y1, ocx, ocy, di, nx, ny; unsigned int dui; Window dummy; XEvent ev; - ocx = c->x; - ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, + ocx = nx = c->x; + ocy = ny = c->y; + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurMove], CurrentTime) != GrabSuccess) return; + c->ismax = False; XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); switch (ev.type) { - default: break; + case ButtonRelease: + XUngrabPointer(dpy, CurrentTime); + return; + case ConfigureRequest: case Expose: - handler[Expose](&ev); + case MapRequest: + handler[ev.type](&ev); break; case MotionNotify: XSync(dpy, False); - c->x = ocx + (ev.xmotion.x - x1); - c->y = ocy + (ev.xmotion.y - y1); - resize(c, False, TopLeft); + nx = ocx + (ev.xmotion.x - x1); + ny = ocy + (ev.xmotion.y - y1); + if(abs(wax + nx) < SNAP) + nx = wax; + else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP) + nx = wax + waw - c->w - 2 * c->border; + if(abs(way - ny) < SNAP) + ny = way; + else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP) + ny = way + wah - c->h - 2 * c->border; + resize(c, nx, ny, c->w, c->h, False); break; - case ButtonRelease: - XUngrabPointer(dpy, CurrentTime); - return; } } } static void -resizemouse(Client *c) -{ +resizemouse(Client *c) { int ocx, ocy; - Corner sticky; + int nw, nh; XEvent ev; ocx = c->x; ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, - None, cursor[CurResize], CurrentTime) != GrabSuccess) + 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); + c->ismax = False; + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1); for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev); switch(ev.type) { - default: break; + case ButtonRelease: + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, + c->w + c->border - 1, c->h + c->border - 1); + XUngrabPointer(dpy, CurrentTime); + while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); + return; + case ConfigureRequest: case Expose: - handler[Expose](&ev); + case MapRequest: + handler[ev.type](&ev); break; case MotionNotify: XSync(dpy, False); - c->w = abs(ocx - ev.xmotion.x); - 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; - if(ocx <= ev.xmotion.x) - sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft; - else - sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight; - resize(c, True, sticky); + if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0) + nw = 1; + if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0) + nh = 1; + resize(c, c->x, c->y, nw, nh, True); break; - case ButtonRelease: - XUngrabPointer(dpy, CurrentTime); - return; } } } static void -buttonpress(XEvent *e) -{ - int x; - Arg a; +buttonpress(XEvent *e) { + static char buf[32]; + unsigned int i, x; Client *c; XButtonPressedEvent *ev = &e->xbutton; + buf[0] = 0; if(barwin == ev->window) { - switch(ev->button) { - default: - x = 0; - for(a.i = 0; a.i < TLast; a.i++) { - x += textw(tags[a.i]); - if(ev->x < x) { - view(&a); - break; + x = 0; + for(i = 0; i < ntags; i++) { + x += textw(tags[i]); + if(ev->x < x) { + snprintf(buf, sizeof buf, "%d", i); + if(ev->button == Button1) { + if(ev->state & MODKEY) + tag(buf); + else + view(buf); } + else if(ev->button == Button3) { + if(ev->state & MODKEY) + toggletag(buf); + else + toggleview(buf); + } + return; } - break; - case Button4: - a.i = (tsel + 1 < TLast) ? tsel + 1 : 0; - view(&a); - break; - case Button5: - a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1; - view(&a); - break; } + if(ev->x < x + blw) + switch(ev->button) { + case Button1: + setlayout(NULL); + break; + } } else if((c = getclient(ev->window))) { - switch(ev->button) { - default: - break; - case Button1: - if(arrange == dofloat || c->isfloat) { - higher(c); - movemouse(c); - } - break; - case Button2: - lower(c); - break; - case Button3: - if(arrange == dofloat || c->isfloat) { - higher(c); - resizemouse(c); - } - break; + focus(c); + if(CLEANMASK(ev->state) != MODKEY) + return; + if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) { + restack(); + movemouse(c); + } + else if(ev->button == Button2) + zoom(NULL); + else if(ev->button == Button3 + && (lt->arrange == floating || c->isfloating) && !c->isfixed) + { + restack(); + resizemouse(c); } } } static void -configurerequest(XEvent *e) -{ +configurerequest(XEvent *e) { Client *c; XConfigureRequestEvent *ev = &e->xconfigurerequest; XWindowChanges wc; - ev->value_mask &= ~CWSibling; if((c = getclient(ev->window))) { - gravitate(c, True); - if(ev->value_mask & CWX) - c->x = ev->x; - if(ev->value_mask & CWY) - c->y = ev->y; - if(ev->value_mask & CWWidth) - c->w = ev->width; - if(ev->value_mask & CWHeight) - c->h = ev->height; + c->ismax = False; if(ev->value_mask & CWBorderWidth) - c->border = 1; - gravitate(c, False); - resize(c, True, TopLeft); + c->border = ev->border_width; + if(c->isfixed || c->isfloating || (lt->arrange == floating)) { + if(ev->value_mask & CWX) + c->x = ev->x; + if(ev->value_mask & CWY) + c->y = ev->y; + if(ev->value_mask & CWWidth) + c->w = ev->width; + if(ev->value_mask & CWHeight) + c->h = ev->height; + if((c->x + c->w) > sw && c->isfloating) + c->x = sw / 2 - c->w / 2; /* center in x direction */ + if((c->y + c->h) > sh && c->isfloating) + c->y = sh / 2 - c->h / 2; /* center in y direction */ + if((ev->value_mask & (CWX | CWY)) + && !(ev->value_mask & (CWWidth | CWHeight))) + configure(c); + if(isvisible(c)) + XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); + } + else + configure(c); + } + else { + wc.x = ev->x; + wc.y = ev->y; + wc.width = ev->width; + wc.height = ev->height; + wc.border_width = ev->border_width; + wc.sibling = ev->above; + wc.stack_mode = ev->detail; + XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); } - - wc.x = ev->x; - wc.y = ev->y; - 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); XSync(dpy, False); } static void -destroynotify(XEvent *e) -{ +configurenotify(XEvent *e) { + XConfigureEvent *ev = &e->xconfigure; + + if (ev->window == root && (ev->width != sw || ev->height != sh)) { + sw = ev->width; + sh = ev->height; + XFreePixmap(dpy, dc.drawable); + dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen)); + XResizeWindow(dpy, barwin, sw, bh); + updatebarpos(); + lt->arrange(); + } +} + +static void +destroynotify(XEvent *e) { Client *c; XDestroyWindowEvent *ev = &e->xdestroywindow; @@ -235,115 +239,109 @@ destroynotify(XEvent *e) } static void -enternotify(XEvent *e) -{ +enternotify(XEvent *e) { Client *c; XCrossingEvent *ev = &e->xcrossing; if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) return; - if((c = getclient(ev->window))) focus(c); - else if(ev->window == root) - issel = True; + else if(ev->window == root) { + selscreen = True; + focus(NULL); + } } static void -expose(XEvent *e) -{ - Client *c; +expose(XEvent *e) { XExposeEvent *ev = &e->xexpose; if(ev->count == 0) { if(barwin == ev->window) drawstatus(); - else if((c = getctitle(ev->window))) - drawtitle(c); } } static void -keypress(XEvent *e) -{ - static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; +keypress(XEvent *e) { + 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; + key[i].func(key[i].arg); } } static void -leavenotify(XEvent *e) -{ +leavenotify(XEvent *e) { XCrossingEvent *ev = &e->xcrossing; - if((ev->window == root) && !ev->same_screen) - issel = True; + if((ev->window == root) && !ev->same_screen) { + selscreen = False; + focus(NULL); + } +} + +static void +mappingnotify(XEvent *e) { + XMappingEvent *ev = &e->xmapping; + + XRefreshKeyboardMapping(ev); + if(ev->request == MappingKeyboard) + grabkeys(); } static void -maprequest(XEvent *e) -{ +maprequest(XEvent *e) { static XWindowAttributes wa; XMapRequestEvent *ev = &e->xmaprequest; if(!XGetWindowAttributes(dpy, ev->window, &wa)) return; - - if(wa.override_redirect) { - XSelectInput(dpy, ev->window, - (StructureNotifyMask | PropertyChangeMask)); + if(wa.override_redirect) return; - } - if(!getclient(ev->window)) manage(ev->window, &wa); } static void -propertynotify(XEvent *e) -{ +propertynotify(XEvent *e) { Client *c; Window trans; XPropertyEvent *ev = &e->xproperty; if(ev->state == PropertyDelete) return; /* ignore */ - if((c = getclient(ev->window))) { - if(ev->atom == wmatom[WMProtocols]) { - c->proto = getproto(c->win); - return; - } switch (ev->atom) { default: break; case XA_WM_TRANSIENT_FOR: XGetTransientForHint(dpy, c->win, &trans); - if(!c->isfloat && (c->isfloat = (trans != 0))) - arrange(NULL); + if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL))) + lt->arrange(); break; case XA_WM_NORMAL_HINTS: - setsize(c); + updatesizehints(c); break; } if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { - settitle(c); - drawtitle(c); + updatetitle(c); + if(c == sel) + drawstatus(); } } } static void -unmapnotify(XEvent *e) -{ +unmapnotify(XEvent *e) { Client *c; XUnmapEvent *ev = &e->xunmap; @@ -356,27 +354,34 @@ unmapnotify(XEvent *e) void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, [ConfigureRequest] = configurerequest, + [ConfigureNotify] = configurenotify, [DestroyNotify] = destroynotify, [EnterNotify] = enternotify, [LeaveNotify] = leavenotify, [Expose] = expose, [KeyPress] = keypress, + [MappingNotify] = mappingnotify, [MapRequest] = maprequest, [PropertyNotify] = propertynotify, [UnmapNotify] = unmapnotify }; void -grabkeys() -{ - static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; +grabkeys(void) { + static unsigned int len = sizeof key / sizeof key[0]; unsigned int i; KeyCode code; + XUngrabKey(dpy, AnyKey, AnyModifier, root); for(i = 0; i < len; i++) { code = XKeysymToKeycode(dpy, key[i].keysym); - XUngrabKey(dpy, code, key[i].mod, root); XGrabKey(dpy, code, key[i].mod, root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(dpy, code, key[i].mod | LockMask, root, True, + GrabModeAsync, GrabModeAsync); + XGrabKey(dpy, code, key[i].mod | numlockmask, root, True, + GrabModeAsync, GrabModeAsync); + XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True, + GrabModeAsync, GrabModeAsync); } }