X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=9d693733249eb165526b8f7c50fa5294e1155885;hp=b369ede59c22abe8df94b646efc48790ee1e9534;hb=79cd408844c62963aa0eec45bb0414ed66f06f6f;hpb=29355bd38284ed9aec8d3ffabde61db73947c9f9 diff --git a/event.c b/event.c index b369ede..9d69373 100644 --- a/event.c +++ b/event.c @@ -2,70 +2,84 @@ * (C)opyright MMVI Anselm R. Garbe * See LICENSE file for license details. */ +#include "dwm.h" -#include -#include #include -#include -#include #include #include -#include "dwm.h" - #define ButtonMask (ButtonPressMask | ButtonReleaseMask) #define MouseMask (ButtonMask | PointerMotionMask) -/* local functions */ -static void buttonpress(XEvent *e); -static void configurerequest(XEvent *e); -static void destroynotify(XEvent *e); -static void enternotify(XEvent *e); -static void leavenotify(XEvent *e); -static void expose(XEvent *e); -static void maprequest(XEvent *e); -static void propertynotify(XEvent *e); -static void unmapnotify(XEvent *e); - -void (*handler[LASTEvent]) (XEvent *) = { - [ButtonPress] = buttonpress, - [ConfigureRequest] = configurerequest, - [DestroyNotify] = destroynotify, - [EnterNotify] = enternotify, - [LeaveNotify] = leavenotify, - [Expose] = expose, - [KeyPress] = keypress, - [MapRequest] = maprequest, - [PropertyNotify] = propertynotify, - [UnmapNotify] = unmapnotify +/* CUSTOMIZE */ +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 }; + +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 } }, + { 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_j, focusnext, { 0 } }, + { Mod1Mask, XK_k, focusprev, { 0 } }, + { Mod1Mask, XK_m, maximize, { 0 } }, + { Mod1Mask, XK_space, dotile, { 0 } }, + { Mod1Mask, 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 } }, + { 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_g, spawn, { .argv = gimp } }, + { Mod1Mask|ShiftMask, XK_l, spawn, { .argv = xlock } }, + { Mod1Mask|ShiftMask, XK_q, quit, { 0 } }, + { Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } }, + { Mod1Mask|ShiftMask, XK_w, spawn, { .argv = browse } }, + { Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } }, }; +/* static */ + static void -mresize(Client *c) +movemouse(Client *c) { XEvent ev; - int ocx, ocy; + int x1, y1, ocx, ocy, di; + unsigned int dui; + Window dummy; - ocx = c->x; - ocy = c->y; + ocx = *c->x; + ocy = *c->y; if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, - None, cursor[CurResize], CurrentTime) != GrabSuccess) + None, cursor[CurMove], CurrentTime) != GrabSuccess) return; - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); + XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); for(;;) { XMaskEvent(dpy, MouseMask | ExposureMask, &ev); - switch(ev.type) { + 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); + XSync(dpy, False); + *c->x = ocx + (ev.xmotion.x - x1); + *c->y = ocy + (ev.xmotion.y - y1); + resize(c, False, TopLeft); break; case ButtonRelease: XUngrabPointer(dpy, CurrentTime); @@ -75,31 +89,43 @@ mresize(Client *c) } static void -mmove(Client *c) +resizemouse(Client *c) { XEvent ev; - int x1, y1, ocx, ocy, di; - unsigned int dui; - Window dummy; + int ocx, ocy; + Corner sticky; - ocx = c->x; - ocy = c->y; + ocx = *c->x; + ocy = *c->y; if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, - None, cursor[CurMove], CurrentTime) != GrabSuccess) + None, cursor[CurResize], CurrentTime) != GrabSuccess) return; - XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, *c->w, *c->h); for(;;) { XMaskEvent(dpy, MouseMask | ExposureMask, &ev); - switch (ev.type) { + 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); + 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) { + if(ocy <= ev.xmotion.y) + sticky = TopLeft; + else + sticky = BottomLeft; + } else { + if(ocy <= ev.xmotion.y) + sticky = TopRight; + else + sticky = BottomRight; + } + resize(c, True, sticky); break; case ButtonRelease: XUngrabPointer(dpy, CurrentTime); @@ -117,30 +143,49 @@ buttonpress(XEvent *e) Client *c; if(barwin == ev->window) { - x = (arrange == floating) ? textw("~") : 0; - for(a.i = 0; a.i < TLast; a.i++) { - x += textw(tags[a.i]); - if(ev->x < x) { - view(&a); - break; + 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; + } } + 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; } } else if((c = getclient(ev->window))) { - if(arrange == tiling && !c->floating) - return; - craise(c); switch(ev->button) { default: break; case Button1: - mmove(c); + if(arrange == dotile && !c->isfloat) { + if((ev->state & ControlMask) && (ev->button == Button1)) + zoom(NULL); + } + else { + higher(c); + movemouse(c); + } break; case Button2: lower(c); break; case Button3: - mresize(c); + if(arrange == dofloat || c->isfloat) { + higher(c); + resizemouse(c); + } break; } } @@ -157,17 +202,17 @@ configurerequest(XEvent *e) if((c = getclient(ev->window))) { gravitate(c, True); if(ev->value_mask & CWX) - c->x = ev->x; + *c->x = ev->x; if(ev->value_mask & CWY) - c->y = ev->y; + *c->y = ev->y; if(ev->value_mask & CWWidth) - c->w = ev->width; + *c->w = ev->width; if(ev->value_mask & CWHeight) - c->h = ev->height; + *c->h = ev->height; if(ev->value_mask & CWBorderWidth) c->border = 1; gravitate(c, False); - resize(c, True); + resize(c, True, TopLeft); } wc.x = ev->x; @@ -180,7 +225,7 @@ configurerequest(XEvent *e) ev->value_mask &= ~CWStackMode; ev->value_mask |= CWBorderWidth; XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); - XFlush(dpy); + XSync(dpy, False); } static void @@ -209,15 +254,6 @@ enternotify(XEvent *e) } static void -leavenotify(XEvent *e) -{ - XCrossingEvent *ev = &e->xcrossing; - - if((ev->window == root) && !ev->same_screen) - issel = True; -} - -static void expose(XEvent *e) { XExposeEvent *ev = &e->xexpose; @@ -225,13 +261,39 @@ expose(XEvent *e) if(ev->count == 0) { if(barwin == ev->window) - draw_bar(); - else if((c = gettitle(ev->window))) - draw_client(c); + drawstatus(); + else if((c = getctitle(ev->window))) + drawtitle(c); } } 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 +leavenotify(XEvent *e) +{ + XCrossingEvent *ev = &e->xcrossing; + + if((ev->window == root) && !ev->same_screen) + issel = True; +} + +static void maprequest(XEvent *e) { XMapRequestEvent *ev = &e->xmaprequest; @@ -261,24 +323,24 @@ propertynotify(XEvent *e) return; /* ignore */ if((c = getclient(ev->window))) { - if(ev->atom == wm_atom[WMProtocols]) { - c->proto = win_proto(c->win); + 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->floating && (c->floating = (trans != 0))) + if(!c->isfloat && (c->isfloat = (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); + if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { + settitle(c); + drawtitle(c); } } } @@ -292,3 +354,33 @@ unmapnotify(XEvent *e) if((c = getclient(ev->window))) unmanage(c); } + +/* extern */ + +void (*handler[LASTEvent]) (XEvent *) = { + [ButtonPress] = buttonpress, + [ConfigureRequest] = configurerequest, + [DestroyNotify] = destroynotify, + [EnterNotify] = enternotify, + [LeaveNotify] = leavenotify, + [Expose] = expose, + [KeyPress] = keypress, + [MapRequest] = maprequest, + [PropertyNotify] = propertynotify, + [UnmapNotify] = unmapnotify +}; + +void +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); + } +}