X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=9a13eee5e79faecc71608568fc0de0ef69a04063;hb=f60c597d653bd7eab6c620fc53d732ca75f6a880;hp=59c9bb947cf500c0e5570e52d102706516701204;hpb=dba23062bad40afb1a90f60b6897cf9e1ca5035b;p=dwm.git diff --git a/event.c b/event.c index 59c9bb9..9a13eee 100644 --- a/event.c +++ b/event.c @@ -2,17 +2,12 @@ * (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) @@ -54,89 +49,34 @@ Key key[] = { /********** CUSTOMIZE **********/ -/* 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 keypress(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 -}; - -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); - } -} - -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 functions */ static void -resizemouse(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; 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); + c->x = ocx + (ev.xmotion.x - x1); + c->y = ocy + (ev.xmotion.y - y1); + resize(c, False); break; case ButtonRelease: XUngrabPointer(dpy, CurrentTime); @@ -146,31 +86,31 @@ resizemouse(Client *c) } static void -movemouse(Client *c) +resizemouse(Client *c) { XEvent ev; - int x1, y1, ocx, ocy, di; - unsigned int dui; - Window dummy; + int ocx, ocy; 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); + 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); @@ -188,7 +128,7 @@ buttonpress(XEvent *e) Client *c; if(barwin == ev->window) { - x = (arrange == dofloat) ? textw("~") : 0; + x = 0; for(a.i = 0; a.i < TLast; a.i++) { x += textw(tags[a.i]); if(ev->x < x) { @@ -280,15 +220,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; @@ -303,6 +234,32 @@ expose(XEvent *e) } 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; @@ -332,7 +289,7 @@ propertynotify(XEvent *e) return; /* ignore */ if((c = getclient(ev->window))) { - if(ev->atom == wm_atom[WMProtocols]) { + if(ev->atom == wmatom[WMProtocols]) { c->proto = getproto(c->win); return; } @@ -347,7 +304,7 @@ propertynotify(XEvent *e) setsize(c); break; } - if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) { + if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { settitle(c); drawtitle(c); } @@ -363,3 +320,33 @@ unmapnotify(XEvent *e) if((c = getclient(ev->window))) unmanage(c); } + +/* extern functions */ + +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); + } +}