* set the override_redirect flag. Clients are organized in a global
* doubly-linked client list, the focus history is remembered through a global
* stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.
+ * global tags array to indicate the tags of a client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
#include <sys/select.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <regex.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
-//#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-//#endif
/* macros */
-#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
-#define LENGTH(x) (sizeof x / sizeof x[0])
-#define MAXTAGLEN 16
-#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
-
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define LENGTH(x) (sizeof x / sizeof x[0])
+#define MAXTAGLEN 16
+#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
/* enums */
-enum { BarTop, BarBot, BarOff }; /* bar position */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+enum { BarTop, BarBot, BarOff, BarLast }; /* bar appearance */
+enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
+enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
-typedef struct Monitor Monitor;
typedef struct Client Client;
struct Client {
char name[256];
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int border, oldborder;
+ unsigned int bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags;
Client *next;
Client *prev;
Client *snext;
Window win;
- Monitor *monitor;
};
typedef struct {
typedef struct {
const char *symbol;
- void (*arrange)(Monitor *);
+ void (*arrange)(void);
+ void (*updategeom)(void);
} Layout;
typedef struct {
- const char *prop;
- const char *tags;
+ const char *class;
+ const char *instance;
+ const char *title;
+ const char *tag;
Bool isfloating;
- int monitor;
} Rule;
-typedef struct {
- regex_t *propregex;
- regex_t *tagregex;
-} Regs;
-
-struct Monitor {
- unsigned int id;
- int sx, sy, sw, sh, wax, way, wah, waw;
- double mwfact;
- Bool *seltags;
- Bool *prevtags;
- Layout *layout;
- Window barwin;
-};
-
-
/* function declarations */
void applyrules(Client *c);
-void arrange(Monitor *m);
+void arrange(void);
void attach(Client *c);
void attachstack(Client *c);
void ban(Client *c);
void buttonpress(XEvent *e);
void checkotherwm(void);
void cleanup(void);
-void compileregs(void);
void configure(Client *c);
void configurenotify(XEvent *e);
void configurerequest(XEvent *e);
void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
-void drawbar(Monitor *m);
-void drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert);
+void drawbar(void);
+void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
void *emallocz(unsigned int size);
void enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
-void floating(Monitor *m); /* default floating layout */
void focus(Client *c);
void focusin(XEvent *e);
void focusnext(const char *arg);
void focusprev(const char *arg);
Client *getclient(Window w);
unsigned long getcolor(const char *colstr);
-Monitor *getmonitor(Window barwin);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused);
void grabkeys(void);
-unsigned int idxoftag(const char *tag);
+unsigned int idxoftag(const char *t);
void initfont(const char *fontstr);
-Bool isoccupied(Monitor *monitor, unsigned int t);
+Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
-Bool isurgent(Monitor *monitor, unsigned int t);
-Bool isvisible(Client *c, Monitor *m);
+Bool isurgent(unsigned int t);
+Bool isvisible(Client *c);
void keypress(XEvent *e);
void killclient(const char *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
-Monitor *monitorat(void);
void movemouse(Client *c);
-Client *nexttiled(Client *c, Monitor *monitor);
+Client *nextunfloating(Client *c);
void propertynotify(XEvent *e);
void quit(const char *arg);
-void reapply(const char *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
void resizemouse(Client *c);
-void restack(Monitor *m);
+void restack(void);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
-void setmwfact(const char *arg);
void setup(void);
void spawn(const char *arg);
void tag(const char *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
-void tile(Monitor *m);
void togglebar(const char *arg);
void togglefloating(const char *arg);
+void togglelayout(const char *arg);
void toggletag(const char *arg);
void toggleview(const char *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
-void updatebarpos(Monitor *m);
+void updatebar(void);
+void updategeom(void);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const char *arg);
-void viewprevtag(const char *arg); /* views previous selected tags */
+void viewprevtag(const char *arg);
int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dsply, XErrorEvent *ee);
-int xerrorstart(Display *dsply, XErrorEvent *ee);
+int xerrordummy(Display *dpy, XErrorEvent *ee);
+int xerrorstart(Display *dpy, XErrorEvent *ee);
void zoom(const char *arg);
-void movetomonitor(const char *arg);
-void selectmonitor(const char *arg);
/* variables */
char stext[256];
-int mcount = 1;
-Monitor *selmonitor;
-int screen;
+int screen, sx, sy, sw, sh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool isxinerama = False;
-Bool domwfact = True;
-Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
+Bool *tagset[2];
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Regs *regs = NULL;
-Monitor *monitors;
-Window root;
+Layout layouts[];
+Layout *lt = layouts;
+Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
-
-//Bool prevtags[LENGTH(tags)];
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
/* function implementations */
+
void
applyrules(Client *c) {
- static char buf[512];
- unsigned int i, j;
- regmatch_t tmp;
- Bool matched_tag = False;
- Bool matched_monitor = False;
+ unsigned int i;
+ Bool matched = False;
+ Rule *r;
XClassHint ch = { 0 };
/* rule matching */
XGetClassHint(dpy, c->win, &ch);
- snprintf(buf, sizeof buf, "%s:%s:%s",
- ch.res_class ? ch.res_class : "",
- ch.res_name ? ch.res_name : "", c->name);
- for(i = 0; i < LENGTH(rules); i++)
- if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
- if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
- matched_monitor = True;
- c->monitor = &monitors[rules[i].monitor];
- }
-
- c->isfloating = rules[i].isfloating;
- for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
- if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
- matched_tag = True;
- c->tags[j] = True;
- }
+ for(i = 0; i < LENGTH(rules); i++) {
+ r = &rules[i];
+ if((!r->title || strstr(c->name, r->title))
+ && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+ && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+ c->isfloating = r->isfloating;
+ if(r->tag) {
+ c->tags[idxoftag(r->tag)] = True;
+ matched = True;
}
}
+ }
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched_tag)
- memcpy(c->tags, monitorat()->seltags, sizeof initags);
- if (!matched_monitor)
- c->monitor = monitorat();
+ if(!matched)
+ memcpy(c->tags, tagset[seltags], TAGSZ);
}
void
-arrange(Monitor *m) {
- unsigned int i;
+arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c, c->monitor))
+ if(isvisible(c)) {
unban(c);
+ if(!lt->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h, True);
+ }
else
ban(c);
- if(m)
- m->layout->arrange(m);
- else
- for(i = 0; i < mcount; i++)
- monitors[i].layout->arrange(&monitors[i]);
focus(NULL);
- restack(m);
+ if(lt->arrange)
+ lt->arrange();
+ restack();
}
void
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 3 * c->monitor->sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
c->isbanned = True;
}
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- Monitor *m = monitorat();
-
- if(ev->window == m->barwin) {
+ if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
return;
}
}
- if((ev->x < x + blw) && ev->button == Button1)
- setlayout(NULL);
+ if((ev->x < x + blw) && ev->button == Button1)
+ togglelayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- restack(c->monitor);
+ restack();
movemouse(c);
}
else if(ev->button == Button2) {
- if((floating != m->layout->arrange) && c->isfloating)
+ if(lt->arrange && c->isfloating)
togglefloating(NULL);
- else
- zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- restack(c->monitor);
+ restack();
resizemouse(c);
}
}
void
cleanup(void) {
- unsigned int i;
close(STDIN_FILENO);
while(stack) {
unban(stack);
XFreeFontSet(dpy, dc.font.set);
else
XFreeFont(dpy, dc.font.xfont);
-
XUngrabKey(dpy, AnyKey, AnyModifier, root);
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XFreeCursor(dpy, cursor[CurNormal]);
XFreeCursor(dpy, cursor[CurResize]);
XFreeCursor(dpy, cursor[CurMove]);
- for(i = 0; i < mcount; i++)
- XDestroyWindow(dpy, monitors[i].barwin);
+ XDestroyWindow(dpy, barwin);
XSync(dpy, False);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
-void
-compileregs(void) {
- unsigned int i;
- regex_t *reg;
-
- if(regs)
- return;
- regs = emallocz(LENGTH(rules) * sizeof(Regs));
- for(i = 0; i < LENGTH(rules); i++) {
- if(rules[i].prop) {
- reg = emallocz(sizeof(regex_t));
- if(regcomp(reg, rules[i].prop, REG_EXTENDED))
- free(reg);
- else
- regs[i].propregex = reg;
- }
- if(rules[i].tags) {
- reg = emallocz(sizeof(regex_t));
- if(regcomp(reg, rules[i].tags, REG_EXTENDED))
- free(reg);
- else
- regs[i].tagregex = reg;
- }
- }
-}
-
void
configure(Client *c) {
XConfigureEvent ce;
ce.y = c->y;
ce.width = c->w;
ce.height = c->h;
- ce.border_width = c->border;
+ ce.border_width = c->bw;
ce.above = None;
ce.override_redirect = False;
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- Monitor *m = selmonitor;
- if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
- /* TODO -- update Xinerama dimensions here */
- m->sw = ev->width;
- m->sh = ev->height;
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
- XResizeWindow(dpy, m->barwin, m->sw, bh);
- updatebarpos(m);
- arrange(m);
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
+ updategeom();
+ updatebar();
+ arrange();
}
}
XWindowChanges wc;
if((c = getclient(ev->window))) {
- Monitor *m = c->monitor;
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
+ c->bw = ev->border_width;
+ if(c->isfixed || c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
- c->x = m->sx+ev->x;
+ c->x = sx + ev->x;
if(ev->value_mask & CWY)
- c->y = m->sy+ev->y;
+ c->y = sy + ev->y;
if(ev->value_mask & CWWidth)
c->w = ev->width;
if(ev->value_mask & CWHeight)
c->h = ev->height;
- if((c->x - m->sx + c->w) > m->sw && c->isfloating)
- c->x = m->sx + (m->sw / 2 - c->w / 2); /* center in x direction */
- if((c->y - m->sy + c->h) > m->sh && c->isfloating)
- c->y = m->sy + (m->sh / 2 - c->h / 2); /* center in y direction */
- if((ev->value_mask & (CWX | CWY))
- && !(ev->value_mask & (CWWidth | CWHeight)))
+ if((c->x - sx + c->w) > sw && c->isfloating)
+ c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
+ if((c->y - sy + c->h) > sh && c->isfloating)
+ c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+ if((ev->value_mask & (CWX|CWY))
+ && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(isvisible(c, monitorat()))
+ if(isvisible(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
detachstack(Client *c) {
Client **tc;
- for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
}
void
-drawbar(Monitor *m) {
- int j, x;
+drawbar(void) {
+ int i, x;
Client *c;
dc.x = 0;
- for(c = stack; c && !isvisible(c, m); c = c->snext);
- for(j = 0; j < LENGTH(tags); j++) {
- dc.w = textw(tags[j]);
- if(m->seltags[j]) {
- drawtext(m, tags[j], dc.sel, isurgent(m, j));
- drawsquare(m, c && c->tags[j] && c->monitor == m,
- isoccupied(m, j), isurgent(m, j), dc.sel);
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ for(i = 0; i < LENGTH(tags); i++) {
+ dc.w = textw(tags[i]);
+ if(tagset[seltags][i]) {
+ drawtext(tags[i], dc.sel, isurgent(i));
+ drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
}
else {
- drawtext(m, tags[j], dc.norm, isurgent(m, j));
- drawsquare(m, c && c->tags[j] && c->monitor == m,
- isoccupied(m, j), isurgent(m, j), dc.norm);
+ drawtext(tags[i], dc.norm, isurgent(i));
+ drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
}
dc.x += dc.w;
}
- dc.w = blw;
- drawtext(m, m->layout->symbol, dc.norm, False);
- x = dc.x + dc.w;
- if(m == selmonitor) {
- dc.w = textw(stext);
- dc.x = m->sw - dc.w;
- if(dc.x < x) {
- dc.x = x;
- dc.w = m->sw - x;
- }
- drawtext(m, stext, dc.norm, False);
+ if(blw > 0) {
+ dc.w = blw;
+ drawtext(lt->symbol, dc.norm, False);
+ x = dc.x + dc.w;
}
else
- dc.x = m->sw;
+ x = dc.x;
+ dc.w = textw(stext);
+ dc.x = bw - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = bw - x;
+ }
+ drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
if(c) {
- drawtext(m, c->name, dc.sel, False);
- drawsquare(m, False, c->isfloating, False, dc.sel);
+ drawtext(c->name, dc.sel, False);
+ drawsquare(False, c->isfloating, False, dc.sel);
}
else
- drawtext(m, NULL, dc.norm, False);
+ drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
}
void
-drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
}
void
-drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
int x, y, w, h;
- static char buf[256];
unsigned int len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ char buf[256];
XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
- w = 0;
- olen = len = strlen(text);
- if(len >= sizeof buf)
- len = sizeof buf - 1;
+ olen = strlen(text);
+ len = MIN(olen, sizeof buf);
memcpy(buf, text, len);
- buf[len] = 0;
+ w = 0;
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- while(len && (w = textnw(buf, len)) > dc.w - h)
- buf[--len] = 0;
+ for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+ if(!len)
+ return;
if(len < olen) {
if(len > 1)
buf[len - 1] = '.';
if(len > 3)
buf[len - 3] = '.';
}
- if(w > dc.w)
- return; /* too long */
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
if(dc.font.set)
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
- if(!isxinerama || ev->window != root)
- return;
- }
+ if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+ return;
if((c = getclient(ev->window)))
focus(c);
- else {
- selmonitor = monitorat();
- fprintf(stderr, "updating selmonitor %d\n", selmonitor - monitors);
+ else
focus(NULL);
- }
}
void
void
expose(XEvent *e) {
- Monitor *m;
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0 && (m = getmonitor(ev->window)))
- drawbar(m);
-}
-
-void
-floating(Monitor *m) { /* default floating layout */
- Client *c;
-
- domwfact = dozoom = False;
- for(c = clients; c; c = c->next)
- if(isvisible(c, m))
- resize(c, c->x, c->y, c->w, c->h, True);
+ if(ev->count == 0 && (ev->window == barwin))
+ drawbar();
}
void
focus(Client *c) {
- if(c)
- selmonitor = c->monitor;
- if(!c || (c && !isvisible(c, selmonitor)))
- for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
+ if(!c || (c && !isvisible(c)))
+ for(c = stack; c && !isvisible(c); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
if(c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- selmonitor = c->monitor;
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- drawbar(selmonitor);
+ drawbar();
}
void
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
+ for(c = sel->next; c && !isvisible(c); c = c->next);
if(!c)
- for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
+ for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
- restack(c->monitor);
+ restack();
}
}
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(c, selmonitor); c = c->prev);
+ for(c = sel->prev; c && !isvisible(c); c = c->prev);
if(!c) {
for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c, selmonitor); c = c->prev);
+ for(; c && !isvisible(c); c = c->prev);
}
if(c) {
focus(c);
- restack(c->monitor);
+ restack();
}
}
return color.pixel;
}
-Monitor *
-getmonitor(Window barwin) {
- unsigned int i;
-
- for(i = 0; i < mcount; i++)
- if(monitors[i].barwin == barwin)
- return &monitors[i];
- return NULL;
-}
-
long
getstate(Window w) {
int format, status;
void
grabbuttons(Client *c, Bool focused) {
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ int i, j;
+ unsigned int buttons[] = { Button1, Button2, Button3 };
+ unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+ MODKEY|numlockmask|LockMask} ;
- if(focused) {
- XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
-
- XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
-
- XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- }
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused)
+ for(i = 0; i < LENGTH(buttons); i++)
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
else
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
void
-grabkeys(void) {
+grabkeys(void) {
unsigned int i, j;
KeyCode code;
XModifierKeymap *modmap;
code = XKeysymToKeycode(dpy, keys[i].keysym);
XGrabKey(dpy, code, keys[i].mod, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+ XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+ XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+ XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
GrabModeAsync, GrabModeAsync);
}
}
unsigned int
-idxoftag(const char *tag) {
+idxoftag(const char *t) {
unsigned int i;
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
+ for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
return (i < LENGTH(tags)) ? i : 0;
}
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
- if(dc.font.ascent < (*xfonts)->ascent)
- dc.font.ascent = (*xfonts)->ascent;
- if(dc.font.descent < (*xfonts)->descent)
- dc.font.descent = (*xfonts)->descent;
+ dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+ dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
xfonts++;
}
}
}
Bool
-isoccupied(Monitor *monitor, unsigned int t) {
+isoccupied(unsigned int t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t] && c->monitor == monitor)
+ if(c->tags[t])
return True;
return False;
}
}
Bool
-isurgent(Monitor *monitor, unsigned int t) {
+isurgent(unsigned int t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->monitor == monitor && c->isurgent && c->tags[t])
+ if(c->isurgent && c->tags[t])
return True;
return False;
}
Bool
-isvisible(Client *c, Monitor *m) {
+isvisible(Client *c) {
unsigned int i;
- if(c->monitor != m)
- return False;
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && c->monitor->seltags[i])
+ if(c->tags[i] && tagset[seltags][i])
return True;
return False;
}
void
manage(Window w, XWindowAttributes *wa) {
Client *c, *t = NULL;
- Monitor *m;
Status rettrans;
Window trans;
XWindowChanges wc;
c = emallocz(sizeof(Client));
- c->tags = emallocz(sizeof initags);
+ c->tags = emallocz(TAGSZ);
c->win = w;
- applyrules(c);
-
- m = c->monitor;
-
- c->x = wa->x + m->sx;
- c->y = wa->y + m->sy;
+ /* geometry */
+ c->x = wa->x;
+ c->y = wa->y;
c->w = wa->width;
c->h = wa->height;
- c->oldborder = wa->border_width;
-
- if(c->w == m->sw && c->h == m->sh) {
- c->x = m->sx;
- c->y = m->sy;
- c->border = wa->border_width;
+ c->oldbw = wa->border_width;
+ if(c->w == sw && c->h == sh) {
+ c->x = sx;
+ c->y = sy;
+ c->bw = wa->border_width;
}
else {
- if(c->x + c->w + 2 * c->border > m->wax + m->waw)
- c->x = m->wax + m->waw - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > m->way + m->wah)
- c->y = m->way + m->wah - c->h - 2 * c->border;
- if(c->x < m->wax)
- c->x = m->wax;
- if(c->y < m->way)
- c->y = m->way;
- c->border = BORDERPX;
+ if(c->x + c->w + 2 * c->bw > wx + ww)
+ c->x = wx + ww - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > wy + wh)
+ c->y = wy + wh - c->h - 2 * c->bw;
+ c->x = MAX(c->x, wx);
+ c->y = MAX(c->y, wy);
+ c->bw = borderpx;
}
- wc.border_width = c->border;
+
+ wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
updatesizehints(c);
- XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
+ XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False);
updatetitle(c);
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next);
if(t)
- memcpy(c->tags, t->tags, sizeof initags);
+ memcpy(c->tags, t->tags, TAGSZ);
+ else
+ applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
ban(c);
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
- arrange(m);
+ arrange();
}
void
manage(ev->window, &wa);
}
-Monitor *
-monitorat() {
- int i, x, y;
- Window win;
- unsigned int mask;
-
- XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
- for(i = 0; i < mcount; i++) {
- if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
- && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
- return &monitors[i];
- }
- }
- return NULL;
-}
-
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
- Monitor *m;
Window dummy;
XEvent ev;
ocx = nx = c->x;
ocy = ny = c->y;
- m = c->monitor;
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(;;) {
- XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
case ButtonRelease:
XUngrabPointer(dpy, CurrentTime);
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- if(abs(m->wax - nx) < SNAP)
- nx = m->wax;
- else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = m->wax + m->waw - c->w - 2 * c->border;
- if(abs(m->way - ny) < SNAP)
- ny = m->way;
- else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
- ny = m->way + m->wah - c->h - 2 * c->border;
- if(!c->isfloating && (m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ if(abs(wx - nx) < snap)
+ nx = wx;
+ else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
+ nx = wx + ww - c->w - 2 * c->bw;
+ if(abs(wy - ny) < snap)
+ ny = wy;
+ else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
+ ny = wy + wh - c->h - 2 * c->bw;
+ if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
- if((m->layout->arrange == floating) || c->isfloating)
+ if(!lt->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
}
Client *
-nexttiled(Client *c, Monitor *monitor) {
- for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
+nextunfloating(Client *c) {
+ for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
- arrange(c->monitor);
+ arrange();
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);
break;
case XA_WM_HINTS:
updatewmhints(c);
- drawbar(c->monitor);
+ drawbar();
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
if(c == sel)
- drawbar(c->monitor);
+ drawbar();
}
}
}
readin = running = False;
}
-void
-reapply(const char *arg) {
- static Bool zerotags[LENGTH(tags)] = { 0 };
- Client *c;
-
- for(c = clients; c; c = c->next) {
- memcpy(c->tags, zerotags, sizeof zerotags);
- applyrules(c);
- }
- arrange(NULL);
-}
-
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
- Monitor *m;
XWindowChanges wc;
- m = c->monitor;
-
if(sizehints) {
/* set minimum possible */
- if (w < 1)
- w = 1;
- if (h < 1)
- h = 1;
+ w = MAX(1, w);
+ h = MAX(1, h);
/* temporarily remove base dimensions */
w -= c->basew;
h -= c->baseh;
/* adjust for aspect limits */
- if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
- if (w * c->maxay > h * c->maxax)
+ if(c->minax != c->maxax && c->minay != c->maxay
+ && c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0) {
+ if(w * c->maxay > h * c->maxax)
w = h * c->maxax / c->maxay;
- else if (w * c->minay < h * c->minax)
+ else if(w * c->minay < h * c->minax)
h = w * c->minay / c->minax;
}
w += c->basew;
h += c->baseh;
- if(c->minw > 0 && w < c->minw)
- w = c->minw;
- if(c->minh > 0 && h < c->minh)
- h = c->minh;
- if(c->maxw > 0 && w > c->maxw)
- w = c->maxw;
- if(c->maxh > 0 && h > c->maxh)
- h = c->maxh;
+ w = MAX(w, c->minw);
+ h = MAX(h, c->minh);
+
+ if (c->maxw)
+ w = MIN(w, c->maxw);
+
+ if (c->maxh)
+ h = MIN(h, c->maxh);
}
if(w <= 0 || h <= 0)
return;
- if(x > m->sw)
- x = m->sw - w - 2 * c->border;
- if(y > m->sh)
- y = m->sh - h - 2 * c->border;
- if(x + w + 2 * c->border < m->sx)
- x = m->sx;
- if(y + h + 2 * c->border < m->sy)
- y = m->sy;
+ if(x > sx + sw)
+ x = sw - w - 2 * c->bw;
+ if(y > sy + sh)
+ y = sh - h - 2 * c->bw;
+ if(x + w + 2 * c->bw < sx)
+ x = sx;
+ if(y + h + 2 * c->bw < sy)
+ y = sy;
if(c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
c->h = wc.height = h;
- wc.border_width = c->border;
- XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+ wc.border_width = c->bw;
+ XConfigureWindow(dpy, c->win,
+ CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
XSync(dpy, False);
}
resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
- Monitor *m;
XEvent ev;
ocx = c->x;
ocy = c->y;
- m = c->monitor;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize], CurrentTime) != GrabSuccess)
+ None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
for(;;) {
- XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
switch(ev.type) {
case ButtonRelease:
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
- c->w + c->border - 1, c->h + c->border - 1);
+ c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return;
break;
case MotionNotify:
XSync(dpy, False);
- if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
- nw = 1;
- if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
- nh = 1;
- if(!c->isfloating && (m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+ nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+ if(!c->isfloating && lt->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) {
togglefloating(NULL);
- if((m->layout->arrange == floating) || c->isfloating)
+ }
+ if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
}
void
-restack(Monitor *m) {
+restack(void) {
Client *c;
XEvent ev;
XWindowChanges wc;
- drawbar(m);
+ drawbar();
if(!sel)
return;
- if(sel->isfloating || (m->layout->arrange == floating))
+ if(sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(m->layout->arrange != floating) {
+ if(lt->arrange) {
wc.stack_mode = Below;
- wc.sibling = m->barwin;
- if(!sel->isfloating) {
- XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
- wc.sibling = sel->win;
- }
- for(c = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
- if(c == sel)
- continue;
- XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
- wc.sibling = c->win;
- }
+ wc.sibling = barwin;
+ for(c = stack; c; c = c->snext)
+ if(!c->isfloating && isvisible(c)) {
+ XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+ wc.sibling = c->win;
+ }
}
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
void
run(void) {
char *p;
- char buf[sizeof stext];
+ char sbuf[sizeof stext];
fd_set rd;
int r, xfd;
unsigned int len, offset;
readin = True;
offset = 0;
len = sizeof stext - 1;
- buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
+ sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
while(running) {
FD_ZERO(&rd);
if(readin)
eprint("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
+ switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
case -1:
strncpy(stext, strerror(errno), len);
readin = False;
readin = False;
break;
default:
- for(p = buf + offset; r > 0; p++, r--, offset++)
+ for(p = sbuf + offset; r > 0; p++, r--, offset++)
if(*p == '\n' || *p == '\0') {
*p = '\0';
- strncpy(stext, buf, len);
- p += r - 1; /* p is buf + offset + r - 1 */
+ strncpy(stext, sbuf, len);
+ p += r - 1; /* p is sbuf + offset + r - 1 */
for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
offset = r;
if(r)
- memmove(buf, p - r + 1, r);
+ memmove(sbuf, p - r + 1, r);
break;
}
break;
}
- drawbar(selmonitor);
+ drawbar();
}
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa)
- || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+ || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
continue;
if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
manage(wins[i], &wa);
if(!XGetWindowAttributes(dpy, wins[i], &wa))
continue;
if(XGetTransientForHint(dpy, wins[i], &d1)
- && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+ && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
manage(wins[i], &wa);
}
}
PropModeReplace, (unsigned char *)data, 2);
}
-void
-setlayout(const char *arg) {
- unsigned int i;
- Monitor *m = monitorat();
-
- if(!arg) {
- m->layout++;
- if(m->layout == &layouts[LENGTH(layouts)])
- m->layout = &layouts[0];
- }
- else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- m->layout = &layouts[i];
- }
- if(sel)
- arrange(m);
- else
- drawbar(m);
-}
-
-void
-setmwfact(const char *arg) {
- double delta;
-
- Monitor *m = monitorat();
-
- if(!domwfact)
- return;
- /* arg handling, manipulate mwfact */
- if(arg == NULL)
- m->mwfact = MWFACT;
- else if(sscanf(arg, "%lf", &delta) == 1) {
- if(arg[0] == '+' || arg[0] == '-')
- m->mwfact += delta;
- else
- m->mwfact = delta;
- if(m->mwfact < 0.1)
- m->mwfact = 0.1;
- else if(m->mwfact > 0.9)
- m->mwfact = 0.9;
- }
- arrange(m);
-}
-
void
setup(void) {
- unsigned int i;
- Monitor *m;
+ unsigned int i, w;
XSetWindowAttributes wa;
- XineramaScreenInfo *info = NULL;
+
+ /* init screen */
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
+ initfont(FONT);
+ sx = 0;
+ sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
+ bh = dc.font.height + 2;
+ updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- // init screens/monitors first
- if((isxinerama = XineramaIsActive(dpy)))
- info = XineramaQueryScreens(dpy, &mcount);
- selmonitor = monitors = emallocz(mcount * sizeof(Monitor));
-
- screen = DefaultScreen(dpy);
- root = RootWindow(dpy, screen);
-
/* init appearance */
dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
dc.sel[ColBG] = getcolor(SELBGCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
- dc.h = bh = dc.font.height + 2;
+ dc.h = bh;
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- for(blw = i = 0; i < LENGTH(layouts); i++) {
- i = textw(layouts[i].symbol);
- if(i > blw)
- blw = i;
+ /* init tags */
+ tagset[0] = emallocz(TAGSZ);
+ tagset[1] = emallocz(TAGSZ);
+ tagset[0][0] = tagset[1][0] = True;
+
+ /* init bar */
+ for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+ w = textw(layouts[i].symbol);
+ blw = MAX(blw, w);
}
- for(i = 0; i < mcount; i++) {
- /* init geometry */
- m = &monitors[i];
- m->id = i;
-
- if (mcount != 1 && isxinerama) {
- m->sx = info[i].x_org;
- m->sy = info[i].y_org;
- m->sw = info[i].width;
- m->sh = info[i].height;
- fprintf(stderr, "monitor[%d]: %d,%d,%d,%d\n", i, m->sx, m->sy, m->sw, m->sh);
- }
- else {
- m->sx = 0;
- m->sy = 0;
- m->sw = DisplayWidth(dpy, screen);
- m->sh = DisplayHeight(dpy, screen);
- }
- m->seltags = emallocz(sizeof initags);
- m->prevtags = emallocz(sizeof initags);
-
- memcpy(m->seltags, initags, sizeof initags);
- memcpy(m->prevtags, initags, sizeof initags);
-
- /* init layouts */
- m->mwfact = MWFACT;
- m->layout = &layouts[0];
-
- // TODO: bpos per screen?
- bpos = BARPOS;
- wa.override_redirect = 1;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ButtonPressMask | ExposureMask;
-
- /* init bars */
- m->barwin = XCreateWindow(dpy, root, m->sx, m->sy, m->sw, bh, 0,
- DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
- updatebarpos(m);
- XMapRaised(dpy, m->barwin);
- strcpy(stext, "dwm-"VERSION);
-
- /* EWMH support per monitor */
- XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
-
- /* select for events */
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
- | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
- XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
- XSelectInput(dpy, root, wa.event_mask);
-
- drawbar(m);
- }
- if(info)
- XFree(info);
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
- /* grab keys */
- grabkeys();
+ barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, barwin, cursor[CurNormal]);
+ XMapRaised(dpy, barwin);
+ strcpy(stext, "dwm-"VERSION);
+ drawbar();
- /* init tags */
- compileregs();
+ /* EWMH support per view */
+ XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+ PropModeReplace, (unsigned char *) netatom, NetLast);
+
+ /* select for events */
+ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+ |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+ XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+ XSelectInput(dpy, root, wa.event_mask);
- selmonitor = monitorat();
- fprintf(stderr, "selmonitor == %d\n", selmonitor - monitors);
+
+ /* grab keys */
+ grabkeys();
}
void
if(!sel)
return;
for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (NULL == arg);
+ sel->tags[i] = (arg == NULL);
sel->tags[idxoftag(arg)] = True;
- arrange(sel->monitor);
+ arrange();
}
unsigned int
return textnw(text, strlen(text)) + dc.font.height;
}
-void
-tile(Monitor *m) {
- unsigned int i, n, nx, ny, nw, nh, mw, th;
- Client *c, *mc;
-
- domwfact = dozoom = True;
-
- nx = ny = nw = 0; /* gcc stupidity requires this */
-
- for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
- n++;
-
- /* window geoms */
- mw = (n == 1) ? m->waw : m->mwfact * m->waw;
- th = (n > 1) ? m->wah / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = m->wah;
-
- for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
- if(i == 0) { /* master */
- nx = m->wax;
- ny = m->way;
- nw = mw - 2 * c->border;
- nh = m->wah - 2 * c->border;
- }
- else { /* tile window */
- if(i == 1) {
- ny = m->way;
- nx += mc->w + 2 * mc->border;
- nw = m->waw - mw - 2 * c->border;
- }
- if(i + 1 == n) /* remainder */
- nh = (m->way + m->wah) - ny - 2 * c->border;
- else
- nh = th - 2 * c->border;
- }
- resize(c, nx, ny, nw, nh, RESIZEHINTS);
- if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
- /* client doesn't accept size constraints */
- resize(c, nx, ny, nw, nh, False);
- if(n > 1 && th != m->wah)
- ny = c->y + c->h + 2 * c->border;
-
- i++;
- }
-}
void
togglebar(const char *arg) {
- if(bpos == BarOff)
- bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
- else
- bpos = BarOff;
- updatebarpos(monitorat());
- arrange(monitorat());
+ showbar = !showbar;
+ updategeom();
+ updatebar();
+ arrange();
}
void
sel->isfloating = !sel->isfloating;
if(sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
- arrange(sel->monitor);
+ arrange();
+}
+
+void
+togglelayout(const char *arg) {
+ unsigned int i;
+
+ if(!arg) {
+ if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
+ }
+ else {
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(!strcmp(arg, layouts[i].symbol))
+ break;
+ if(i == LENGTH(layouts))
+ return;
+ lt = &layouts[i];
+ }
+ if(sel)
+ arrange();
+ else
+ drawbar();
}
void
for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
if(j == LENGTH(tags))
sel->tags[i] = True; /* at least one tag must be enabled */
- arrange(sel->monitor);
+ arrange();
}
void
toggleview(const char *arg) {
unsigned int i, j;
- Monitor *m = monitorat();
i = idxoftag(arg);
- m->seltags[i] = !m->seltags[i];
- for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
+ tagset[seltags][i] = !tagset[seltags][i];
+ for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
if(j == LENGTH(tags))
- m->seltags[i] = True; /* at least one tag must be viewed */
- arrange(m);
+ tagset[seltags][i] = True; /* at least one tag must be viewed */
+ arrange();
}
void
unmanage(Client *c) {
XWindowChanges wc;
- wc.border_width = c->oldborder;
+ wc.border_width = c->oldbw;
/* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange(NULL);
+ arrange();
}
void
}
void
-updatebarpos(Monitor *m) {
- XEvent ev;
+updatebar(void) {
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+}
- m->wax = m->sx;
- m->way = m->sy;
- m->wah = m->sh;
- m->waw = m->sw;
- switch(bpos) {
- default:
- m->wah -= bh;
- m->way += bh;
- XMoveWindow(dpy, m->barwin, m->sx, m->sy);
- break;
- case BarBot:
- m->wah -= bh;
- XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
- break;
- case BarOff:
- XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
- break;
- }
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+void
+updategeom(void) {
+ unsigned int i;
+
+#ifdef DEFGEOM /* define your own if you are Xinerama user */
+ DEFGEOM
+#else
+ /* bar geometry*/
+ bx = 0;
+ by = showbar ? (topbar ? 0 : sh - bh) : -bh;
+ bw = sw;
+
+ /* window area geometry */
+ wx = sx;
+ wy = showbar && topbar ? sy + bh : sy;
+ ww = sw;
+ wh = showbar ? sh - bh : sh;
+#endif
+
+ /* update layout geometries */
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(layouts[i].updategeom)
+ layouts[i].updategeom();
}
void
XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) {
- c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+ if(c == sel)
+ sel->isurgent = False;
+ else
+ c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
XFree(wmh);
}
}
+void
+view(const char *arg) {
+ seltags ^= 1; /* toggle sel tagset */
+ memset(tagset[seltags], (NULL == arg), TAGSZ);
+ tagset[seltags][idxoftag(arg)] = True;
+ arrange();
+}
+
+void
+viewprevtag(const char *arg) {
+ seltags ^= 1; /* toggle sel tagset */
+ arrange();
+}
+
/* There's no way to check accesses to destroyed windows, thus those cases are
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
* default error handler, which may call exit. */
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+ || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
- ee->request_code, ee->error_code);
+ ee->request_code, ee->error_code);
return xerrorxlib(dpy, ee); /* may call exit */
}
int
-xerrordummy(Display *dsply, XErrorEvent *ee) {
+xerrordummy(Display *dpy, XErrorEvent *ee) {
return 0;
}
/* Startup Error handler to check if another window manager
* is already running. */
int
-xerrorstart(Display *dsply, XErrorEvent *ee) {
+xerrorstart(Display *dpy, XErrorEvent *ee) {
otherwm = True;
return -1;
}
-void
-view(const char *arg) {
- unsigned int i;
- Bool tmp[LENGTH(tags)];
- Monitor *m = monitorat();
-
- for(i = 0; i < LENGTH(tags); i++)
- tmp[i] = (NULL == arg);
- tmp[idxoftag(arg)] = True;
- if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
- memcpy(m->prevtags, m->seltags, sizeof initags);
- memcpy(m->seltags, tmp, sizeof initags);
- arrange(m);
- }
-}
-
-void
-viewprevtag(const char *arg) {
- static Bool tmp[LENGTH(tags)];
-
- Monitor *m = monitorat();
-
- memcpy(tmp, m->seltags, sizeof initags);
- memcpy(m->seltags, m->prevtags, sizeof initags);
- memcpy(m->prevtags, tmp, sizeof initags);
- arrange(m);
-}
-
-void
-zoom(const char *arg) {
- Client *c = sel;
-
- if(!sel || !dozoom || sel->isfloating)
- return;
- if(c == nexttiled(clients, c->monitor))
- if(!(c = nexttiled(c->next, c->monitor)))
- return;
- detach(c);
- attach(c);
- focus(c);
- arrange(c->monitor);
-}
-
-void
-movetomonitor(const char *arg) {
- int i;
-
- if (sel)
- return;
- if(arg)
- i = atoi(arg);
- else {
- for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
- i++;
- }
- sel->monitor = &monitors[i % mcount];
-
- memcpy(sel->tags, sel->monitor->seltags, sizeof initags);
- resize(sel, sel->monitor->wax, sel->monitor->way, sel->w, sel->h, True);
- arrange(sel->monitor);
-}
-
-void
-selectmonitor(const char *arg) {
- int i;
- Monitor *m;
-
- if(arg)
- i = atoi(arg);
- else {
- for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
- i++;
- }
- m = &monitors[i % mcount];
- XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
- focus(NULL);
-}
-
-
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "
- "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
+ eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");