*/
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <X11/Xatom.h>
+#include <X11/Xutil.h>
-#include "util.h"
-#include "wm.h"
+#include "dwm.h"
+
+static Rule rule[] = {
+ /* class instance tags floating */
+ { "Firefox-bin", "Gecko", { [Twww] = "www" }, False },
+};
+
+Client *
+getnext(Client *c)
+{
+ for(; c && !c->tags[tsel]; c = c->next);
+ return c;
+}
+
+void
+ban(Client *c)
+{
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+}
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]);
+ c->tw += textw(c->name);
if(c->tw > c->w)
c->tw = c->w + 2;
c->tx = c->x + c->w - c->tw + 2;
}
void
-update_name(Client *c)
+settitle(Client *c)
{
XTextProperty name;
int n;
}
void
-update_size(Client *c)
+setsize(Client *c)
{
XSizeHints size;
long msize;
}
else
c->minw = c->minh = 0;
+ if(c->flags & PWinGravity)
+ c->grav = size.win_gravity;
+ else
+ c->grav = NorthWestGravity;
}
void
-raise(Client *c)
+higher(Client *c)
{
XRaiseWindow(dpy, c->win);
XRaiseWindow(dpy, c->title);
void
focus(Client *c)
{
- Client **l, *old;
-
- old = stack;
- for(l = &stack; *l && *l != c; l = &(*l)->snext);
- eassert(*l == c);
- *l = c->snext;
- c->snext = stack;
- stack = c;
- if(old && old != c) {
- XMapWindow(dpy, old->title);
- draw_client(old);
- }
- XUnmapWindow(dpy, c->title);
- draw_client(old);
+ Client *old = sel;
+ XEvent ev;
+
+ XFlush(dpy);
+ sel = c;
+ if(old && old != c)
+ drawtitle(old);
+ drawtitle(c);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
XFlush(dpy);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+static void
+init_tags(Client *c)
+{
+ XClassHint ch;
+ static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+ unsigned int i, j;
+ Bool matched = False;
+
+ if(!len) {
+ c->tags[tsel] = tags[tsel];
+ return;
+ }
+
+ if(XGetClassHint(dpy, c->win, &ch)) {
+ if(ch.res_class && ch.res_name) {
+ for(i = 0; i < len; i++)
+ if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
+ && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
+ {
+ for(j = 0; j < TLast; j++)
+ c->tags[j] = rule[i].tags[j];
+ c->floating = rule[i].floating;
+ matched = True;
+ break;
+ }
+ }
+ if(ch.res_class)
+ XFree(ch.res_class);
+ if(ch.res_name)
+ XFree(ch.res_name);
+ }
+
+ if(!matched)
+ c->tags[tsel] = tags[tsel];
}
void
{
Client *c, **l;
XSetWindowAttributes twa;
+ Window trans;
c = emallocz(sizeof(Client));
c->win = w;
c->tw = c->w = wa->width;
c->h = wa->height;
c->th = bh;
- update_size(c);
- XSetWindowBorderWidth(dpy, c->win, 1);
- XSetWindowBorder(dpy, c->win, brush.border);
+ c->border = 1;
+ c->proto = proto(c->win);
+ setsize(c);
XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
- XGetTransientForHint(dpy, c->win, &c->trans);
+ XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask;
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
- update_name(c);
- for(l=&clients; *l; l=&(*l)->next);
+ settitle(c);
+ init_tags(c);
+
+ for(l = &clients; *l; l = &(*l)->next);
c->next = *l; /* *l == nil */
*l = c;
- c->snext = stack;
- stack = c;
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
+
XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
- resize(c);
- focus(c);
+
+ if(!c->floating)
+ c->floating = trans
+ || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
+ arrange(NULL);
+ /* mapping the window now prevents flicker */
+ if(c->tags[tsel]) {
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
+ focus(c);
+ }
+ else {
+ ban(c);
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
+ }
+}
+
+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)
+resize(Client *c, Bool inc)
{
XConfigureEvent e;
+ if(inc) {
+ if(c->incw)
+ c->w -= (c->w - c->basew) % c->incw;
+ if(c->inch)
+ c->h -= (c->h - c->baseh) % c->inch;
+ }
+ if(c->x > sw) /* might happen on restart */
+ c->x = sw - c->w;
+ if(c->y > sh)
+ c->ty = c->y = sh - c->h;
+ 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);
+ XSetWindowBorderWidth(dpy, c->win, 1);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
e.type = ConfigureNotify;
e.event = c->win;
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_xerror(Display *dsply, XErrorEvent *err)
{
return 0;
}
Client **l;
XGrabServer(dpy);
- XSetErrorHandler(dummy_error_handler);
+ XSetErrorHandler(dummy_xerror);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->title);
- for(l=&clients; *l && *l != c; l=&(*l)->next);
- eassert(*l == c);
+ for(l = &clients; *l && *l != c; l = &(*l)->next);
*l = c->next;
- for(l=&stack; *l && *l != c; l=&(*l)->snext);
- eassert(*l == c);
- *l = c->snext;
+ for(l = &clients; *l; l = &(*l)->next)
+ if((*l)->revert == c)
+ (*l)->revert = NULL;
+ if(sel == c)
+ sel = sel->revert ? sel->revert : clients;
+
free(c);
XFlush(dpy);
- XSetErrorHandler(error_handler);
+ XSetErrorHandler(xerror);
XUngrabServer(dpy);
- if(stack)
- focus(stack);
+ arrange(NULL);
+ if(sel)
+ focus(sel);
}
Client *
return c;
return NULL;
}
-
-void
-draw_client(Client *c)
-{
- if(c == stack) {
- draw_bar();
- return;
- }
-
- brush.x = brush.y = 0;
- brush.w = c->tw;
- brush.h = c->th;
-
- draw(dpy, &brush, True, c->name);
- XCopyArea(dpy, brush.drawable, c->title, brush.gc,
- 0, 0, c->tw, c->th, 0, 0);
- XFlush(dpy);
-}