X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/1f9614f82e14fa3a46e0db05346b41d6be611f88..080a38d62d18be2ab98f66ed190d3d9e3463fec9:/event.c
diff --git a/event.c b/event.c
index 6f99ea2..1aed904 100644
--- a/event.c
+++ b/event.c
@@ -8,59 +8,35 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
-#define ButtonMask (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask (ButtonMask | PointerMotionMask)
-
-/* CUSTOMIZE */
-const char *term[] = { "xterm", 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_q, quit, { 0 } },
- { Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } },
- { Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } },
-};
-
/* static */
+typedef struct {
+ unsigned long mod;
+ KeySym keysym;
+ void (*func)(Arg *arg);
+ Arg arg;
+} Key;
+
+KEYS
+
+static unsigned int valid_mask = 255 & ~(NUMLOCKMASK | LockMask);
+
static void
movemouse(Client *c)
{
- XEvent ev;
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)
+ 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);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch (ev.type) {
default: break;
case Expose:
@@ -68,8 +44,8 @@ movemouse(Client *c)
break;
case MotionNotify:
XSync(dpy, False);
- *c->x = ocx + (ev.xmotion.x - x1);
- *c->y = ocy + (ev.xmotion.y - y1);
+ c->x = ocx + (ev.xmotion.x - x1);
+ c->y = ocy + (ev.xmotion.y - y1);
resize(c, False, TopLeft);
break;
case ButtonRelease:
@@ -82,18 +58,18 @@ movemouse(Client *c)
static void
resizemouse(Client *c)
{
- XEvent ev;
int ocx, ocy;
Corner sticky;
+ XEvent ev;
- ocx = *c->x;
- ocy = *c->y;
- if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+ 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);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
for(;;) {
- XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch(ev.type) {
default: break;
case Expose:
@@ -101,10 +77,10 @@ resizemouse(Client *c)
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;
+ 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
@@ -123,8 +99,8 @@ buttonpress(XEvent *e)
{
int x;
Arg a;
- XButtonPressedEvent *ev = &e->xbutton;
Client *c;
+ XButtonPressedEvent *ev = &e->xbutton;
if(barwin == ev->window) {
switch(ev->button) {
@@ -139,25 +115,20 @@ buttonpress(XEvent *e)
}
break;
case Button4:
- a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
- view(&a);
+ viewnext(&a);
break;
case Button5:
- a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
- view(&a);
+ viewprev(&a);
break;
}
}
else if((c = getclient(ev->window))) {
+ focus(c);
switch(ev->button) {
default:
break;
case Button1:
- if(arrange == dotile && !c->isfloat) {
- if((ev->state & ControlMask) && (ev->button == Button1))
- zoom(NULL);
- }
- else {
+ if(!c->ismax && (arrange == dofloat || c->isfloat)) {
higher(c);
movemouse(c);
}
@@ -166,7 +137,7 @@ buttonpress(XEvent *e)
lower(c);
break;
case Button3:
- if(arrange == dofloat || c->isfloat) {
+ if(!c->ismax && (arrange == dofloat || c->isfloat)) {
higher(c);
resizemouse(c);
}
@@ -178,21 +149,21 @@ 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))) {
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);
@@ -225,10 +196,10 @@ 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)
+ if(ev->detail == NotifyInferior)
return;
if((c = getclient(ev->window)))
@@ -240,8 +211,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)
@@ -254,14 +225,15 @@ 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;
+ ev->state &= valid_mask;
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) && ((key[i].mod & valid_mask) == ev->state)) {
if(key[i].func)
key[i].func(&key[i].arg);
return;
@@ -280,8 +252,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;
@@ -299,9 +271,9 @@ maprequest(XEvent *e)
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 */
@@ -357,14 +329,20 @@ 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;
for(i = 0; i < len; i++) {
code = XKeysymToKeycode(dpy, key[i].keysym);
XUngrabKey(dpy, code, key[i].mod, root);
+ XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
+ XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
XGrabKey(dpy, code, key[i].mod, 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);
}
}