#define ButtonMask (ButtonPressMask | ButtonReleaseMask)
#define MouseMask (ButtonMask | PointerMotionMask)
-/********** CUSTOMIZE **********/
-
+/* CUSTOMIZE */
+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
+ "urxvtc", "-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 } },
+ { 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|ShiftMask, XK_space, dofloat, { 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_Return, spawn, { .argv = term } },
+ { Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } },
{ 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 } },
+ { Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } },
};
-/********** CUSTOMIZE **********/
-
-/* static functions */
+/* static */
static void
movemouse(Client *c)
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[CurMove], CurrentTime) != GrabSuccess)
return;
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->x = ocx + (ev.xmotion.x - x1);
+ *c->y = ocy + (ev.xmotion.y - y1);
+ resize(c, False, TopLeft);
break;
case ButtonRelease:
XUngrabPointer(dpy, CurrentTime);
{
XEvent ev;
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[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);
switch(ev.type) {
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->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);
Client *c;
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(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:
- resizemouse(c);
+ if(arrange == dofloat || c->isfloat) {
+ higher(c);
+ resizemouse(c);
+ }
break;
}
}
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;
ev->value_mask &= ~CWStackMode;
ev->value_mask |= CWBorderWidth;
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
- XFlush(dpy);
+ XSync(dpy, False);
}
static void
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:
unmanage(c);
}
-/* extern functions */
+/* extern */
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
Got questions, comments, patches, etc.? Contact Jason Woofenden