X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=59c9bb947cf500c0e5570e52d102706516701204;hp=e85e11f9054a18094f4134e3020a3c54b137ca7f;hb=dba23062bad40afb1a90f60b6897cf9e1ca5035b;hpb=66da15324eef4f85c6dda13eba80430dc4cc97bb diff --git a/event.c b/event.c index e85e11f..59c9bb9 100644 --- a/event.c +++ b/event.c @@ -4,13 +4,56 @@ */ #include +#include #include #include +#include #include #include #include "dwm.h" +#define ButtonMask (ButtonPressMask | ButtonReleaseMask) +#define MouseMask (ButtonMask | PointerMotionMask) + +/********** CUSTOMIZE **********/ + +const char *term[] = { + "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "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 } }, +}; + +/********** CUSTOMIZE **********/ + /* local functions */ static void buttonpress(XEvent *e); static void configurerequest(XEvent *e); @@ -18,7 +61,7 @@ static void destroynotify(XEvent *e); static void enternotify(XEvent *e); static void leavenotify(XEvent *e); static void expose(XEvent *e); -static void keymapnotify(XEvent *e); +static void keypress(XEvent *e); static void maprequest(XEvent *e); static void propertynotify(XEvent *e); static void unmapnotify(XEvent *e); @@ -31,38 +74,144 @@ void (*handler[LASTEvent]) (XEvent *) = { [LeaveNotify] = leavenotify, [Expose] = expose, [KeyPress] = keypress, - [KeymapNotify] = keymapnotify, [MapRequest] = maprequest, [PropertyNotify] = propertynotify, [UnmapNotify] = unmapnotify }; void -discard_events(long even_mask) +grabkeys() +{ + static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; + unsigned int i; + KeyCode code; + + 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); + } +} + +static void +keypress(XEvent *e) +{ + XKeyEvent *ev = &e->xkey; + static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; + unsigned int i; + KeySym keysym; + + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); + for(i = 0; i < len; i++) + if((keysym == key[i].keysym) && (key[i].mod == ev->state)) { + if(key[i].func) + key[i].func(&key[i].arg); + return; + } +} + +static void +resizemouse(Client *c) +{ + XEvent ev; + int ocx, ocy; + + ocx = c->x; + ocy = c->y; + 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); + switch(ev.type) { + default: break; + case Expose: + handler[Expose](&ev); + break; + case MotionNotify: + XFlush(dpy); + 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; + resize(c, True); + break; + case ButtonRelease: + XUngrabPointer(dpy, CurrentTime); + return; + } + } +} + +static void +movemouse(Client *c) { XEvent ev; - while(XCheckMaskEvent(dpy, even_mask, &ev)); + int x1, y1, ocx, ocy, di; + unsigned int dui; + Window dummy; + + ocx = c->x; + ocy = c->y; + 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); + switch (ev.type) { + default: break; + case Expose: + handler[Expose](&ev); + break; + case MotionNotify: + XFlush(dpy); + c->x = ocx + (ev.xmotion.x - x1); + c->y = ocy + (ev.xmotion.y - y1); + resize(c, False); + break; + case ButtonRelease: + XUngrabPointer(dpy, CurrentTime); + return; + } + } } static void buttonpress(XEvent *e) { + int x; + Arg a; XButtonPressedEvent *ev = &e->xbutton; Client *c; - if((c = getclient(ev->window))) { - craise(c); + if(barwin == ev->window) { + x = (arrange == dofloat) ? textw("~") : 0; + for(a.i = 0; a.i < TLast; a.i++) { + x += textw(tags[a.i]); + if(ev->x < x) { + view(&a); + break; + } + } + } + else if((c = getclient(ev->window))) { + if(arrange == dotile && !c->dofloat) + return; + higher(c); switch(ev->button) { default: break; case Button1: - mmove(c); + movemouse(c); break; case Button2: lower(c); break; case Button3: - mresize(c); + resizemouse(c); break; } } @@ -87,7 +236,7 @@ configurerequest(XEvent *e) if(ev->value_mask & CWHeight) c->h = ev->height; if(ev->value_mask & CWBorderWidth) - c->border = ev->border_width; + c->border = 1; gravitate(c, False); resize(c, True); } @@ -146,18 +295,14 @@ expose(XEvent *e) Client *c; if(ev->count == 0) { - if((c = gettitle(ev->window))) - draw_client(c); + if(barwin == ev->window) + drawstatus(); + else if((c = getctitle(ev->window))) + drawtitle(c); } } static void -keymapnotify(XEvent *e) -{ - update_keys(); -} - -static void maprequest(XEvent *e) { XMapRequestEvent *ev = &e->xmaprequest; @@ -188,23 +333,23 @@ propertynotify(XEvent *e) if((c = getclient(ev->window))) { if(ev->atom == wm_atom[WMProtocols]) { - c->proto = win_proto(c->win); + c->proto = getproto(c->win); return; } switch (ev->atom) { default: break; case XA_WM_TRANSIENT_FOR: XGetTransientForHint(dpy, c->win, &trans); - if(!c->floating && (c->floating = (trans != 0))) + if(!c->dofloat && (c->dofloat = (trans != 0))) arrange(NULL); break; case XA_WM_NORMAL_HINTS: - update_size(c); + setsize(c); break; } if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) { - update_name(c); - draw_client(c); + settitle(c); + drawtitle(c); } } }