#include <stdlib.h>
#include <string.h>
#include <X11/Xatom.h>
+#include <X11/Xutil.h>
-#include "util.h"
-#include "wm.h"
+#include "dwm.h"
+
+static void (*arrange)(void *) = floating;
void
max(void *aux)
if(!stack)
return;
stack->x = sx;
- stack->y = bh;
- stack->w = sw - 2;
- stack->h = sh - bh - 2;
+ stack->y = sy;
+ stack->w = sw - 2 * stack->border;
+ stack->h = sh - 2 * stack->border;
+ craise(stack);
resize(stack);
+ discard_events(EnterWindowMask);
+}
+
+void
+floating(void *aux)
+{
+ Client *c;
+
+ arrange = floating;
+ for(c = stack; c; c = c->snext)
+ resize(c);
+ discard_events(EnterWindowMask);
}
void
-arrange(void *aux)
+tiling(void *aux)
{
Client *c;
int n, cols, rows, gw, gh, i, j;
float rt, fd;
+ arrange = tiling;
if(!clients)
return;
for(n = 0, c = clients; c; c = c->next, n++);
else
cols = rows;
- gw = (sw - 1) / cols;
- gh = (sh - bh - 1) / rows;
+ gw = (sw - 2) / cols;
+ gh = (sh - 2) / rows;
for(i = j = 0, c = clients; c; c = c->next) {
c->x = i * gw;
- c->y = j * gh + bh;
+ c->y = j * gh;
c->w = gw;
c->h = gh;
resize(c);
i = 0;
}
}
+ discard_events(EnterWindowMask);
}
void
for(c = stack; c && c->snext; c = c->snext);
if(!c)
c = stack;
- raise(c);
+ craise(c);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
focus(c);
}
void
-kill(void *aux)
+ckill(void *aux)
{
Client *c = stack;
static void
resize_title(Client *c)
{
- c->tw = textw(&brush.font, c->name) + bh;
+ int i;
+
+ c->tw = 0;
+ for(i = 0; i < TLast; i++)
+ if(c->tags[i])
+ c->tw += textw(c->tags[i]) + dc.font.height;
+ c->tw += textw(c->name) + dc.font.height;
if(c->tw > c->w)
c->tw = c->w + 2;
c->tx = c->x + c->w - c->tw + 2;
}
else
c->minw = c->minh = 0;
+ if(c->flags & PWinGravity)
+ c->grav = size.win_gravity;
+ else
+ c->grav = NorthWestGravity;
}
void
-raise(Client *c)
+craise(Client *c)
{
XRaiseWindow(dpy, c->win);
XRaiseWindow(dpy, c->title);
old = stack;
for(l = &stack; *l && *l != c; l = &(*l)->snext);
- eassert(*l == c);
- *l = c->snext;
+ if(*l)
+ *l = c->snext;
c->snext = stack;
stack = c;
if(old && old != c) {
+ XSetWindowBorder(dpy, old->win, dc.bg);
XMapWindow(dpy, old->title);
draw_client(old);
}
XUnmapWindow(dpy, c->title);
+ XSetWindowBorder(dpy, c->win, dc.fg);
draw_client(c);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
XFlush(dpy);
+ discard_events(EnterWindowMask);
}
void
c->win = w;
c->tx = c->x = wa->x;
c->ty = c->y = wa->y;
- if(c->y < bh)
- c->ty = c->y += bh;
c->tw = c->w = wa->width;
c->h = wa->height;
- c->th = bh;
+ c->th = th;
+ c->border = 1;
update_size(c);
- XSetWindowBorderWidth(dpy, c->win, 1);
- XSetWindowBorder(dpy, c->win, brush.border);
XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
XGetTransientForHint(dpy, c->win, &c->trans);
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask;
+ c->tags[tsel] = tags[tsel];
c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
- update_name(c);
+ update_name(c);
for(l=&clients; *l; l=&(*l)->next);
c->next = *l; /* *l == nil */
*l = c;
- c->snext = stack;
- stack = c;
+ XSetWindowBorderWidth(dpy, c->win, 1);
XMapRaised(dpy, c->win);
XMapRaised(dpy, c->title);
XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
- resize(c);
+ arrange(NULL);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
focus(c);
}
+void
+gravitate(Client *c, Bool invert)
+{
+ int dx = 0, dy = 0;
+
+ switch(c->grav) {
+ case StaticGravity:
+ case NorthWestGravity:
+ case NorthGravity:
+ case NorthEastGravity:
+ dy = c->border;
+ break;
+ case EastGravity:
+ case CenterGravity:
+ case WestGravity:
+ dy = -(c->h / 2) + c->border;
+ break;
+ case SouthEastGravity:
+ case SouthGravity:
+ case SouthWestGravity:
+ dy = -c->h;
+ break;
+ default:
+ break;
+ }
+
+ switch (c->grav) {
+ case StaticGravity:
+ case NorthWestGravity:
+ case WestGravity:
+ case SouthWestGravity:
+ dx = c->border;
+ break;
+ case NorthGravity:
+ case CenterGravity:
+ case SouthGravity:
+ dx = -(c->w / 2) + c->border;
+ break;
+ case NorthEastGravity:
+ case EastGravity:
+ case SouthEastGravity:
+ dx = -(c->w + c->border);
+ break;
+ default:
+ break;
+ }
+
+ if(invert) {
+ dx = -dx;
+ dy = -dy;
+ }
+ c->x += dx;
+ c->y += dy;
+}
+
+
void
resize(Client *c)
{
XConfigureEvent e;
+ if(c->incw)
+ c->w -= (c->w - c->basew) % c->incw;
+ if(c->inch)
+ c->h -= (c->h - c->baseh) % c->inch;
+ if(c->minw && c->w < c->minw)
+ c->w = c->minw;
+ if(c->minh && c->h < c->minh)
+ c->h = c->minh;
+ if(c->maxw && c->w > c->maxw)
+ c->w = c->maxw;
+ if(c->maxh && c->h > c->maxh)
+ c->h = c->maxh;
resize_title(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
e.type = ConfigureNotify;
e.y = c->y;
e.width = c->w;
e.height = c->h;
- e.border_width = 0;
+ e.border_width = c->border;
e.above = None;
e.override_redirect = False;
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
}
static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)
{
return 0;
}
XDestroyWindow(dpy, c->title);
for(l=&clients; *l && *l != c; l=&(*l)->next);
- eassert(*l == c);
*l = c->next;
for(l=&stack; *l && *l != c; l=&(*l)->snext);
- eassert(*l == c);
*l = c->snext;
free(c);
XFlush(dpy);
XSetErrorHandler(error_handler);
XUngrabServer(dpy);
+ arrange(NULL);
if(stack)
focus(stack);
}
void
draw_client(Client *c)
{
- if(c == stack) {
- draw_bar();
+ int i;
+ if(c == stack)
return;
- }
- brush.x = brush.y = 0;
- brush.w = c->tw;
- brush.h = c->th;
+ dc.x = dc.y = 0;
+ dc.h = c->th;
- draw(dpy, &brush, True, c->name);
- XCopyArea(dpy, brush.drawable, c->title, brush.gc,
+ dc.w = 0;
+ for(i = 0; i < TLast; i++) {
+ if(c->tags[i]) {
+ dc.x += dc.w;
+ dc.w = textw(c->tags[i]) + dc.font.height;
+ draw(True, c->tags[i]);
+ }
+ }
+ dc.x += dc.w;
+ dc.w = textw(c->name) + dc.font.height;
+ draw(True, c->name);
+ XCopyArea(dpy, dc.drawable, c->title, dc.gc,
0, 0, c->tw, c->th, 0, 0);
XFlush(dpy);
}