#include <X11/keysym.h>
#include <X11/Xatom.h>
-#define ButtonMask (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask (ButtonMask | PointerMotionMask)
-
-/* CUSTOMIZE */
+/* static */
typedef struct {
unsigned long mod;
Arg arg;
} Key;
-/*
-const char *browse[] = { "firefox", NULL };
-const char *gimp[] = { "gimp", NULL };
-*/
-const char *term[] = { "xterm", NULL };
-/*
- "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
- "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
-};
-coonst char *xlock[] = { "xlock", NULL };
-*/
-
-static 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 } },
- { MODKEY, XK_0, view, { .i = Tscratch } },
- { MODKEY, XK_1, view, { .i = Tdev } },
- { MODKEY, XK_2, view, { .i = Twww } },
- { MODKEY, XK_3, view, { .i = Twork } },
- { MODKEY, XK_j, focusnext, { 0 } },
- { MODKEY, XK_k, focusprev, { 0 } },
- { MODKEY, XK_m, maximize, { 0 } },
- { MODKEY, XK_space, dotile, { 0 } },
- { MODKEY, 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 } },
- { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
- { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } },
- { MODKEY|ShiftMask, XK_2, replacetag, { .i = Twww } },
- { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } },
- { 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_space, dofloat, { 0 } },
- /*{ MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } },*/
- { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } },
-};
+CMDS
+KEYS
-/* static */
+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)
+ None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) {
static void
resizemouse(Client *c)
{
- XEvent ev;
int ocx, ocy;
Corner sticky;
+ XEvent ev;
ocx = c->x;
ocy = c->y;
{
int x;
Arg a;
- XButtonPressedEvent *ev = &e->xbutton;
Client *c;
+ XButtonPressedEvent *ev = &e->xbutton;
if(barwin == ev->window) {
switch(ev->button) {
}
}
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);
}
lower(c);
break;
case Button3:
- if(arrange == dofloat || c->isfloat) {
+ if(!c->ismax && (arrange == dofloat || c->isfloat)) {
higher(c);
resizemouse(c);
}
static void
configurerequest(XEvent *e)
{
+ Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
- Client *c;
ev->value_mask &= ~CWSibling;
if((c = getclient(ev->window))) {
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)))
static void
expose(XEvent *e)
{
- XExposeEvent *ev = &e->xexpose;
Client *c;
+ XExposeEvent *ev = &e->xexpose;
if(ev->count == 0) {
if(barwin == ev->window)
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;
static void
maprequest(XEvent *e)
{
- XMapRequestEvent *ev = &e->xmaprequest;
static XWindowAttributes wa;
+ XMapRequestEvent *ev = &e->xmaprequest;
if(!XGetWindowAttributes(dpy, ev->window, &wa))
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 */
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);
}
}
Got questions, comments, patches, etc.? Contact Jason Woofenden