X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=95b94cc36f85151dde5b650a8550f1d2771600f6;hb=0464e42231199d7a6ea45e46cf7798f2b6cf972c;hp=2d8a728d5539577a6e16a37f7eb0fa266cb5fe66;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a;p=dwm.git diff --git a/event.c b/event.c index 2d8a728..95b94cc 100644 --- a/event.c +++ b/event.c @@ -11,82 +11,178 @@ #define ButtonMask (ButtonPressMask | ButtonReleaseMask) #define MouseMask (ButtonMask | PointerMotionMask) -/********** CUSTOMIZE **********/ +/* CUSTOMIZE */ +typedef struct { + unsigned long mod; + KeySym keysym; + void (*func)(Arg *arg); + Arg arg; +} Key; + +const char *browse[] = { "firefox", NULL }; +const char *gimp[] = { "gimp", NULL }; const char *term[] = { - "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn", - "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL + "urxvt", "-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 } }, +static Key key[] = { + /* modifier key function arguments */ + { MODKEY, XK_0, view, { .i = Tfnord } }, + { MODKEY, XK_1, view, { .i = Tdev } }, + { MODKEY, XK_2, view, { .i = Tnet } }, + { MODKEY, XK_3, view, { .i = Twork } }, + { MODKEY, XK_4, view, { .i = Tmisc} }, + { 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 } }, + { MODKEY|ControlMask, XK_0, appendtag, { .i = Tfnord } }, + { MODKEY|ControlMask, XK_1, appendtag, { .i = Tdev } }, + { MODKEY|ControlMask, XK_2, appendtag, { .i = Tnet } }, + { MODKEY|ControlMask, XK_3, appendtag, { .i = Twork } }, + { MODKEY|ControlMask, XK_4, appendtag, { .i = Tmisc } }, + { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tfnord } }, + { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, + { MODKEY|ShiftMask, XK_2, replacetag, { .i = Tnet } }, + { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, + { MODKEY|ShiftMask, XK_4, replacetag, { .i = Tmisc } }, + { 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 } }, }; -/********** CUSTOMIZE **********/ +/* END CUSTOMIZE */ -/* static functions */ +/* static */ -static void movemouse(Client *c); -static void resizemouse(Client *c); +static void +movemouse(Client *c) +{ + 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) + 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: + 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); + return; + } + } +} + +static void +resizemouse(Client *c) +{ + int ocx, ocy; + Corner sticky; + XEvent ev; + + 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: + 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); + break; + case ButtonRelease: + XUngrabPointer(dpy, CurrentTime); + return; + } + } +} static void buttonpress(XEvent *e) { int x; Arg a; - XButtonPressedEvent *ev = &e->xbutton; Client *c; + XButtonPressedEvent *ev = &e->xbutton; 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; + 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 == dotile && !c->dofloat) - return; - higher(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; } } @@ -95,9 +191,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))) { @@ -113,7 +209,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; @@ -126,7 +222,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 @@ -142,8 +238,8 @@ 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) return; @@ -157,8 +253,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) @@ -171,10 +267,10 @@ 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++) @@ -197,8 +293,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; @@ -214,51 +310,17 @@ maprequest(XEvent *e) } static void -movemouse(Client *c) -{ - XEvent 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 propertynotify(XEvent *e) { - XPropertyEvent *ev = &e->xproperty; - Window trans; Client *c; + Window trans; + XPropertyEvent *ev = &e->xproperty; if(ev->state == PropertyDelete) return; /* ignore */ if((c = getclient(ev->window))) { - if(ev->atom == wm_atom[WMProtocols]) { + if(ev->atom == wmatom[WMProtocols]) { c->proto = getproto(c->win); return; } @@ -266,14 +328,14 @@ propertynotify(XEvent *e) default: break; case XA_WM_TRANSIENT_FOR: XGetTransientForHint(dpy, c->win, &trans); - if(!c->dofloat && (c->dofloat = (trans != 0))) + if(!c->isfloat && (c->isfloat = (trans != 0))) arrange(NULL); break; case XA_WM_NORMAL_HINTS: 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); } @@ -281,40 +343,6 @@ propertynotify(XEvent *e) } 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 unmapnotify(XEvent *e) { Client *c; @@ -324,7 +352,7 @@ unmapnotify(XEvent *e) unmanage(c); } -/* extern functions */ +/* extern */ void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, @@ -342,7 +370,7 @@ 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;