* 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 <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
-//#ifdef XINERAMA
+#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
-//#endif
+#endif
/* macros */
-#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#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 MOUSEMASK (BUTTONMASK|PointerMotionMask)
/* enums */
Client *prev;
Client *snext;
Window win;
- int monitor;
};
typedef struct {
typedef struct {
const char *prop;
- const char *tags;
+ const char *tag;
Bool isfloating;
- int monitor;
} Rule;
-typedef struct {
- regex_t *propregex;
- regex_t *tagregex;
-} Regs;
-
-typedef struct {
- int screen;
- Window root;
- Window barwin;
- int sx, sy, sw, sh, wax, way, wah, waw;
- DC dc;
- Bool *seltags;
- Bool *prevtags;
- Layout *layout;
- double mwfact;
-} Monitor;
-
/* function declarations */
void applyrules(Client *c);
void arrange(void);
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 detach(Client *c);
void detachstack(Client *c);
void drawbar(void);
-void drawsquare(Monitor *, Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert);
+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 focusnext(const char *arg);
void focusprev(const char *arg);
Client *getclient(Window w);
-unsigned long getcolor(const char *colstr, int screen);
+unsigned long getcolor(const char *colstr);
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);
-void initfont(Monitor*, const char *fontstr);
-Bool isoccupied(Monitor *m, unsigned int t);
+unsigned int idxoftag(const char *t);
+void initfont(const char *fontstr);
+Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
-Bool isurgent(int monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
+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);
void movemouse(Client *c);
-Client *nexttiled(Client *c, int monitor);
+Client *nexttiled(Client *c);
void propertynotify(XEvent *e);
void quit(const char *arg);
void reapply(const char *arg);
void setup(void);
void spawn(const char *arg);
void tag(const char *arg);
-unsigned int textnw(Monitor*, const char *text, unsigned int len);
-unsigned int textw(Monitor*, const char *text);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
void tile(void);
void togglebar(const char *arg);
void togglefloating(const char *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
-void updatebarpos(Monitor *m);
+void updatebarpos(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 */
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);
-int monitorat(void);
-void movetomonitor(const char *arg);
-void selectmonitor(const char *arg);
+void selectview(const char *arg);
/* variables */
-char stext[256];
-int mcount = 1;
+char stext[256], buf[256];
+double mwfact;
+int screen, sx, sy, sw, sh, wax, way, waw, wah, xscreens;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
unsigned int blw = 0;
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool isxinerama = False;
Bool domwfact = True;
Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
+Bool *prevtags;
+Bool *seltags;
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Regs *regs = NULL;
-Monitor *monitors;
-int selmonitor = 0;
+Layout *lt;
+Window root, barwin;
+#ifdef XINERAMA
+XineramaScreenInfo *info = NULL;
+#endif
/* configuration, allows nested code to access above variables */
#include "config.h"
-
-//Bool prevtags[LENGTH(tags)];
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
+static Bool tmp[LENGTH(tags)];
/* 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 = 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(strstr(c->name, r->prop)
+ || (ch.res_class && strstr(ch.res_class, r->prop))
+ || (ch.res_name && strstr(ch.res_name, r->prop)))
+ {
+ 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, monitors[monitorat()].seltags, sizeof initags);
- if (!matched_monitor)
- c->monitor = monitorat();
+ if(!matched)
+ memcpy(c->tags, seltags, TAGSZ);
}
void
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c, c->monitor))
+ if(isvisible(c))
unban(c);
else
ban(c);
- monitors[selmonitor].layout->arrange();
focus(NULL);
+ lt->arrange();
restack();
}
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
c->isbanned = True;
}
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- Monitor *m = &monitors[monitorat()];
-
- if(ev->window == m->barwin) {
+ if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- x += textw(m, tags[i]);
+ x += textw(tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
movemouse(c);
}
else if(ev->button == Button2) {
- if((floating != m->layout->arrange) && c->isfloating)
+ if((floating != lt->arrange) && c->isfloating)
togglefloating(NULL);
else
zoom(NULL);
void
cleanup(void) {
- unsigned int i;
+
close(STDIN_FILENO);
while(stack) {
unban(stack);
unmanage(stack);
}
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- if(m->dc.font.set)
- XFreeFontSet(dpy, m->dc.font.set);
- else
- XFreeFont(dpy, m->dc.font.xfont);
- XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
- XFreePixmap(dpy, m->dc.drawable);
- XFreeGC(dpy, m->dc.gc);
- XDestroyWindow(dpy, m->barwin);
- XFreeCursor(dpy, cursor[CurNormal]);
- XFreeCursor(dpy, cursor[CurResize]);
- XFreeCursor(dpy, cursor[CurMove]);
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- }
-}
-
-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;
- }
- }
+ if(dc.font.set)
+ 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]);
+ XDestroyWindow(dpy, barwin);
+#if XINERAMA
+ if(info)
+ XFree(info);
+#endif
+ XSync(dpy, False);
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
void
void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- Monitor *m = &monitors[selmonitor];
- if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) {
- m->sw = ev->width;
- m->sh = ev->height;
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ /* TODO -- use Xinerama dimensions here ? */
+ sw = ev->width;
+ sh = ev->height;
XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
- XResizeWindow(dpy, m->barwin, m->sw, bh);
- updatebarpos(m);
+ dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
+ XResizeWindow(dpy, barwin, sw, bh);
+ updatebarpos();
arrange();
}
}
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
+ /* TODO -- consider Xinerama if necessary when centering */
if((c = getclient(ev->window))) {
- Monitor *m = &monitors[c->monitor];
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
+ if(c->isfixed || c->isfloating || (floating == 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
XSync(dpy, False);
}
+Bool
+conflicts(Client *c, unsigned int tidx) {
+ unsigned int i;
+
+ for(i = 0; i < LENGTH(tags); i++)
+ if(c->tags[i])
+ return True; /* conflict */
+ return False;
+}
+
void
destroynotify(XEvent *e) {
Client *c;
void
drawbar(void) {
- int i, j, x;
-
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- m->dc.x = 0;
- for(j = 0; j < LENGTH(tags); j++) {
- m->dc.w = textw(m, tags[j]);
- if(m->seltags[j]) {
- drawtext(m, tags[j], m->dc.sel, isurgent(i, j));
- drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
- }
- else {
- drawtext(m, tags[j], m->dc.norm, isurgent(i, j));
- drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
- }
- m->dc.x += m->dc.w;
+ int i, x;
+ Client *c;
+
+ dc.x = 0;
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ for(i = 0; i < LENGTH(tags); i++) {
+ dc.w = textw(tags[i]);
+ if(seltags[i]) {
+ drawtext(tags[i], dc.sel, isurgent(i));
+ drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
}
- m->dc.w = blw;
- drawtext(m, m->layout->symbol, m->dc.norm, False);
- x = m->dc.x + m->dc.w;
- m->dc.w = textw(m, stext);
- m->dc.x = m->sw - m->dc.w;
- if(m->dc.x < x) {
- m->dc.x = x;
- m->dc.w = m->sw - x;
+ else {
+ drawtext(tags[i], dc.norm, isurgent(i));
+ drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
}
- drawtext(m, stext, m->dc.norm, False);
- if((m->dc.w = m->dc.x - x) > bh) {
- m->dc.x = x;
- if(sel && sel->monitor == selmonitor) {
- drawtext(m, sel->name, m->dc.sel, False);
- drawsquare(m, False, sel->isfloating, m->dc.sel);
- }
- else
- drawtext(m, NULL, m->dc.norm, False);
+ dc.x += dc.w;
+ }
+ dc.w = blw;
+ drawtext(lt->symbol, dc.norm, False);
+ x = dc.x + dc.w;
+ dc.w = textw(stext);
+ dc.x = sw - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = sw - x;
+ }
+ drawtext(stext, dc.norm, False);
+ if((dc.w = dc.x - x) > bh) {
+ dc.x = x;
+ if(c) {
+ drawtext(c->name, dc.sel, False);
+ drawsquare(False, c->isfloating, False, dc.sel);
}
- XCopyArea(dpy, m->dc.drawable, m->barwin, m->dc.gc, 0, 0, m->sw, bh, 0, 0);
- XSync(dpy, False);
+ else
+ drawtext(NULL, dc.norm, False);
}
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+ XSync(dpy, False);
}
void
-drawsquare(Monitor *m, Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x;
XGCValues gcv;
- XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- gcv.foreground = col[ColFG];
- XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
- x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
- r.x = m->dc.x + 1;
- r.y = m->dc.y + 1;
+ gcv.foreground = col[invert ? ColBG : ColFG];
+ XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+ x = (dc.font.ascent + dc.font.descent + 2) / 4;
+ r.x = dc.x + 1;
+ r.y = dc.y + 1;
if(filled) {
r.width = r.height = x + 1;
- XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
else if(empty) {
r.width = r.height = x;
- XDrawRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+ XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
}
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 = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- XSetForeground(dpy, m->dc.gc, col[invert ? ColFG : ColBG]);
- XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+ XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
w = 0;
len = sizeof buf - 1;
memcpy(buf, text, len);
buf[len] = 0;
- h = m->dc.font.ascent + m->dc.font.descent;
- y = m->dc.y + (m->dc.h / 2) - (h / 2) + m->dc.font.ascent;
- x = m->dc.x + (h / 2);
+ 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(m, buf, len)) > m->dc.w - h)
+ while(len && (w = textnw(buf, len)) > dc.w - h)
buf[--len] = 0;
if(len < olen) {
if(len > 1)
if(len > 3)
buf[len - 3] = '.';
}
- if(w > m->dc.w)
+ if(w > dc.w)
return; /* too long */
- XSetForeground(dpy, m->dc.gc, col[invert ? ColBG : ColFG]);
- if(m->dc.font.set)
- XmbDrawString(dpy, m->dc.drawable, m->dc.font.set, m->dc.gc, x, y, buf, len);
+ 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);
else
- XDrawString(dpy, m->dc.drawable, m->dc.gc, x, y, buf, len);
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
void *
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->mode != NotifyNormal || ev->detail == NotifyInferior);
- //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);
+ else
focus(NULL);
- }
}
void
expose(XEvent *e) {
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0) {
- if(ev->window == monitors[selmonitor].barwin)
- drawbar();
- }
+ if(ev->count == 0 && (ev->window == barwin))
+ drawbar();
}
void
domwfact = dozoom = False;
for(c = clients; c; c = c->next)
- if(isvisible(c, selmonitor))
+ if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
}
void
focus(Client *c) {
- Monitor *m;
-
- if(c)
- selmonitor = c->monitor;
- m = &monitors[selmonitor];
- 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, monitors[sel->monitor].dc.norm[ColBorder]);
+ XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
}
if(c) {
detachstack(c);
grabbuttons(c, True);
}
sel = c;
- drawbar();
if(c) {
- XSetWindowBorder(dpy, c->win, m->dc.sel[ColBorder]);
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- selmonitor = c->monitor;
- }
- else {
- XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ 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();
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);
}
unsigned long
-getcolor(const char *colstr, int screen) {
+getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
if(focused) {
XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ 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,
+ XGrabButton(dpy, Button2, MODKEY|LockMask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ 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,
+ XGrabButton(dpy, Button3, MODKEY|LockMask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
}
else
}
XFreeModifiermap(modmap);
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
- for(j = 0; j < LENGTH(keys); j++) {
- code = XKeysymToKeycode(dpy, keys[j].keysym);
- XGrabKey(dpy, code, keys[j].mod, m->root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[j].mod | LockMask, m->root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[j].mod | numlockmask, m->root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[j].mod | numlockmask | LockMask, m->root, True,
- GrabModeAsync, GrabModeAsync);
- }
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++) {
+ 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,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
+ GrabModeAsync, GrabModeAsync);
+ 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)) && (tags[i] != t); i++);
return (i < LENGTH(tags)) ? i : 0;
}
void
-initfont(Monitor *m, const char *fontstr) {
+initfont(const char *fontstr) {
char *def, **missing;
int i, n;
missing = NULL;
- if(m->dc.font.set)
- XFreeFontSet(dpy, m->dc.font.set);
- m->dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
XFreeStringList(missing);
}
- if(m->dc.font.set) {
+ if(dc.font.set) {
XFontSetExtents *font_extents;
XFontStruct **xfonts;
char **font_names;
- m->dc.font.ascent = m->dc.font.descent = 0;
- font_extents = XExtentsOfFontSet(m->dc.font.set);
- n = XFontsOfFontSet(m->dc.font.set, &xfonts, &font_names);
- for(i = 0, m->dc.font.ascent = 0, m->dc.font.descent = 0; i < n; i++) {
- if(m->dc.font.ascent < (*xfonts)->ascent)
- m->dc.font.ascent = (*xfonts)->ascent;
- if(m->dc.font.descent < (*xfonts)->descent)
- m->dc.font.descent = (*xfonts)->descent;
+ dc.font.ascent = dc.font.descent = 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;
xfonts++;
}
}
else {
- if(m->dc.font.xfont)
- XFreeFont(dpy, m->dc.font.xfont);
- m->dc.font.xfont = NULL;
- if(!(m->dc.font.xfont = XLoadQueryFont(dpy, fontstr))
- && !(m->dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+ if(dc.font.xfont)
+ XFreeFont(dpy, dc.font.xfont);
+ dc.font.xfont = NULL;
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+ && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
eprint("error, cannot load font: '%s'\n", fontstr);
- m->dc.font.ascent = m->dc.font.xfont->ascent;
- m->dc.font.descent = m->dc.font.xfont->descent;
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
}
- m->dc.font.height = m->dc.font.ascent + m->dc.font.descent;
+ dc.font.height = dc.font.ascent + dc.font.descent;
}
Bool
-isoccupied(Monitor *m, unsigned int t) {
+isoccupied(unsigned int t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t] && c->monitor == selmonitor)
+ if(c->tags[t])
return True;
return False;
}
}
Bool
-isurgent(int 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, int monitor) {
+isvisible(Client *c) {
unsigned int i;
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && monitors[c->monitor].seltags[i] && c->monitor == monitor)
+ if(c->tags[i] && 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 = &monitors[c->monitor];
-
- c->x = wa->x + m->sx;
- c->y = wa->y + m->sy;
+ c->x = wa->x + sx;
+ c->y = wa->y + sy;
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;
+ if(c->w == sw && c->h == sh) {
+ c->x = sx;
+ c->y = sy;
c->border = 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;
+ if(c->x + c->w + 2 * c->border > wax + waw)
+ c->x = wax + waw - c->w - 2 * c->border;
+ if(c->y + c->h + 2 * c->border > way + wah)
+ c->y = way + wah - c->h - 2 * c->border;
+ if(c->x < wax)
+ c->x = wax;
+ if(c->y < way)
+ c->y = way;
c->border = BORDERPX;
}
wc.border_width = c->border;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, w, m->dc.norm[ColBorder]);
+ 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);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
manage(ev->window, &wa);
}
-int
-monitorat() {
- int i, x, y;
- Window win;
- unsigned int mask;
-
- XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
- for(i = 0; i < mcount; i++) {
- fprintf(stderr, "checking monitor[%d]: %d %d %d %d\n", i, monitors[i].sx, monitors[i].sy, monitors[i].sw, monitors[i].sh);
- if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
- && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
- fprintf(stderr, "%d,%d -> %d\n", x, y, i);
- return i;
- }
- }
- fprintf(stderr, "?,? -> 0\n");
- return 0;
-}
-
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
ocx = nx = c->x;
ocy = ny = c->y;
- if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+ if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+ 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);
- Monitor *m = &monitors[monitorat()];
- 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((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ if(abs(wax - nx) < SNAP)
+ nx = wax;
+ else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+ nx = wax + waw - c->w - 2 * c->border;
+ if(abs(way - ny) < SNAP)
+ ny = way;
+ else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+ ny = way + wah - c->h - 2 * c->border;
+ if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
- if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+ if((lt->arrange == floating) || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
- memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
break;
}
}
}
Client *
-nexttiled(Client *c, int monitor) {
- for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
+nexttiled(Client *c) {
+ for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
return; /* ignore */
if((c = getclient(ev->window))) {
switch (ev->atom) {
- default: break;
- case XA_WM_TRANSIENT_FOR:
- XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
- arrange();
- break;
- case XA_WM_NORMAL_HINTS:
- updatesizehints(c);
- break;
- case XA_WM_HINTS:
- updatewmhints(c);
- drawbar();
- break;
+ default: break;
+ case XA_WM_TRANSIENT_FOR:
+ XGetTransientForHint(dpy, c->win, &trans);
+ if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+ arrange();
+ break;
+ case XA_WM_NORMAL_HINTS:
+ updatesizehints(c);
+ break;
+ case XA_WM_HINTS:
+ updatewmhints(c);
+ drawbar();
+ break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
XWindowChanges wc;
- //Monitor scr = monitors[monitorat()];
-// c->monitor = monitorat();
if(sizehints) {
/* set minimum possible */
}
if(w <= 0 || h <= 0)
return;
- /* TODO: offscreen appearance fixes */
- /*
- if(x > scr.sw)
- x = scr.sw - w - 2 * c->border;
- if(y > scr.sh)
- y = scr.sh - h - 2 * c->border;
- if(x + w + 2 * c->border < scr.sx)
- x = scr.sx;
- if(y + h + 2 * c->border < scr.sy)
- y = scr.sy;
- */
+ if(x > sx + sw)
+ x = sw - w - 2 * c->border;
+ if(y > sy + sh)
+ y = sh - h - 2 * c->border;
+ if(x + w + 2 * c->border < sx)
+ x = sx;
+ if(y + h + 2 * c->border < 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);
+ XConfigureWindow(dpy, c->win,
+ CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
XSync(dpy, False);
}
ocx = c->x;
ocy = c->y;
- if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+ 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->border - 1, c->h + c->border - 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,
nw = 1;
if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
nh = 1;
- if((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL);
- if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+ if((lt->arrange == floating) || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
void
restack(void) {
- unsigned int i;
Client *c;
XEvent ev;
XWindowChanges wc;
drawbar();
if(!sel)
return;
- if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
+ if(sel->isfloating || (lt->arrange == floating))
XRaiseWindow(dpy, sel->win);
- if(monitors[selmonitor].layout->arrange != floating) {
+ if(lt->arrange != floating) {
wc.stack_mode = Below;
- wc.sibling = monitors[selmonitor].barwin;
+ wc.sibling = barwin;
if(!sel->isfloating) {
- XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+ XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
wc.sibling = sel->win;
}
- for(i = 0; i < mcount; i++) {
- for(c = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
- if(c == sel)
- continue;
- XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
- wc.sibling = c->win;
- }
+ for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ if(c == sel)
+ continue;
+ XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+ wc.sibling = c->win;
}
}
XSync(dpy, False);
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;
void
scan(void) {
- unsigned int i, j, num;
+ unsigned int i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- wins = NULL;
- if(XQueryTree(dpy, m->root, &d1, &d2, &wins, &num)) {
- for(j = 0; j < num; j++) {
- if(!XGetWindowAttributes(dpy, wins[j], &wa)
- || wa.override_redirect || XGetTransientForHint(dpy, wins[j], &d1))
- continue;
- if(wa.map_state == IsViewable || getstate(wins[j]) == IconicState)
- manage(wins[j], &wa);
- }
- for(j = 0; j < num; j++) { /* now the transients */
- if(!XGetWindowAttributes(dpy, wins[j], &wa))
- continue;
- if(XGetTransientForHint(dpy, wins[j], &d1)
- && (wa.map_state == IsViewable || getstate(wins[j]) == IconicState))
- manage(wins[j], &wa);
- }
+ wins = NULL;
+ 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))
+ continue;
+ if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+ manage(wins[i], &wa);
+ }
+ for(i = 0; i < num; i++) { /* now the transients */
+ if(!XGetWindowAttributes(dpy, wins[i], &wa))
+ continue;
+ if(XGetTransientForHint(dpy, wins[i], &d1)
+ && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+ manage(wins[i], &wa);
}
- if(wins)
- XFree(wins);
}
+ if(wins)
+ XFree(wins);
}
void
void
setlayout(const char *arg) {
unsigned int i;
- Monitor *m = &monitors[monitorat()];
if(!arg) {
- m->layout++;
- if(m->layout == &layouts[LENGTH(layouts)])
- m->layout = &layouts[0];
+ lt++;
+ if(lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
}
else {
for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
+ if(arg == layouts[i].symbol)
break;
if(i == LENGTH(layouts))
return;
- m->layout = &layouts[i];
+ lt = &layouts[i];
}
if(sel)
arrange();
setmwfact(const char *arg) {
double delta;
- Monitor *m = &monitors[monitorat()];
-
if(!domwfact)
return;
/* arg handling, manipulate mwfact */
if(arg == NULL)
- m->mwfact = MWFACT;
+ mwfact = MWFACT;
else if(sscanf(arg, "%lf", &delta) == 1) {
if(arg[0] == '+' || arg[0] == '-')
- m->mwfact += delta;
+ 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;
+ mwfact = delta;
+ if(mwfact < 0.1)
+ mwfact = 0.1;
+ else if(mwfact > 0.9)
+ mwfact = 0.9;
}
arrange();
}
void
setup(void) {
- unsigned int i, j, k;
- Monitor *m;
+ unsigned int i;
XSetWindowAttributes wa;
- XineramaScreenInfo *info = NULL;
+
+ /* init screen */
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
+ sx = 0;
+ sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
/* 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
- mcount = 1;
- if((isxinerama = XineramaIsActive(dpy)))
- info = XineramaQueryScreens(dpy, &mcount);
- monitors = emallocz(mcount * sizeof(Monitor));
-
- for(i = 0; i < mcount; i++) {
- /* init geometry */
- m = &monitors[i];
-
- m->screen = isxinerama ? 0 : i;
- m->root = RootWindow(dpy, m->screen);
-
- 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, m->screen);
- m->sh = DisplayHeight(dpy, m->screen);
- }
-
- m->seltags = emallocz(sizeof initags);
- m->prevtags = emallocz(sizeof initags);
-
- memcpy(m->seltags, initags, sizeof initags);
- memcpy(m->prevtags, initags, sizeof initags);
-
- /* init appearance */
- m->dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR, m->screen);
- m->dc.norm[ColBG] = getcolor(NORMBGCOLOR, m->screen);
- m->dc.norm[ColFG] = getcolor(NORMFGCOLOR, m->screen);
- m->dc.sel[ColBorder] = getcolor(SELBORDERCOLOR, m->screen);
- m->dc.sel[ColBG] = getcolor(SELBGCOLOR, m->screen);
- m->dc.sel[ColFG] = getcolor(SELFGCOLOR, m->screen);
- initfont(m, FONT);
- m->dc.h = bh = m->dc.font.height + 2;
-
- /* init layouts */
- m->mwfact = MWFACT;
- m->layout = &layouts[0];
- for(blw = k = 0; k < LENGTH(layouts); k++) {
- j = textw(m, layouts[k].symbol);
- if(j > blw)
- blw = j;
- }
+#ifdef XINERAMA
+ if(XineramaIsActive(dpy))
+ info = XineramaQueryScreens(dpy, &xscreens);
+#endif
+
+ /* init appearance */
+ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
+ dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+ dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+ dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
+ dc.sel[ColBG] = getcolor(SELBGCOLOR);
+ dc.sel[ColFG] = getcolor(SELFGCOLOR);
+ initfont(FONT);
+ dc.h = bh = dc.font.height + 2;
+ 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);
- // 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, m->root, m->sx, m->sy, m->sw, bh, 0,
- DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
- updatebarpos(m);
- XMapRaised(dpy, m->barwin);
- strcpy(stext, "dwm-"VERSION);
- m->dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
- m->dc.gc = XCreateGC(dpy, m->root, 0, 0);
- XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter);
- if(!m->dc.font.set)
- XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid);
-
- /* EWMH support per monitor */
- XChangeProperty(dpy, m->root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
-
- /* select for events */
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
- | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
- XChangeWindowAttributes(dpy, m->root, CWEventMask | CWCursor, &wa);
- XSelectInput(dpy, m->root, wa.event_mask);
+ /* init tags */
+ seltags = emallocz(TAGSZ);
+ prevtags = emallocz(TAGSZ);
+ seltags[0] = prevtags[0] = True;
+
+ /* init layouts */
+ mwfact = MWFACT;
+ lt = &layouts[0];
+
+ /* TODO: Xinerama hints ? */
+ /* init bar */
+ for(blw = i = 0; i < LENGTH(layouts); i++) {
+ i = textw(layouts[i].symbol);
+ if(i > blw)
+ blw = i;
}
- if(info)
- XFree(info);
- /* grab keys */
- grabkeys();
+ bpos = BARPOS;
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
+
+ barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, barwin, cursor[CurNormal]);
+ updatebarpos();
+ 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);
+
+ /* grab keys */
+ grabkeys();
}
void
}
unsigned int
-textnw(Monitor *m, const char *text, unsigned int len) {
+textnw(const char *text, unsigned int len) {
XRectangle r;
- if(m->dc.font.set) {
- XmbTextExtents(m->dc.font.set, text, len, NULL, &r);
+ if(dc.font.set) {
+ XmbTextExtents(dc.font.set, text, len, NULL, &r);
return r.width;
}
- return XTextWidth(m->dc.font.xfont, text, len);
+ return XTextWidth(dc.font.xfont, text, len);
}
unsigned int
-textw(Monitor *m, const char *text) {
- return textnw(m, text, strlen(text)) + m->dc.font.height;
+textw(const char *text) {
+ return textnw(text, strlen(text)) + dc.font.height;
}
void
tile(void) {
- unsigned int i, j, n, nx, ny, nw, nh, mw, th;
+ 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 (i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
-
- for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
- 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(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
- if(j == 0) { /* master */
- nx = m->wax;
- ny = m->way;
- nw = mw - 2 * c->border;
- nh = m->wah - 2 * c->border;
- }
- else { /* tile window */
- if(j == 1) {
- ny = m->way;
- nx += mc->w + 2 * mc->border;
- nw = m->waw - mw - 2 * c->border;
- }
- if(j + 1 == n) /* remainder */
- nh = (m->way + m->wah) - ny - 2 * c->border;
- else
- nh = th - 2 * c->border;
+ nx = wax;
+ ny = way;
+ nw = 0;
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+ n++;
+
+ /* window geoms */
+ mw = (n == 1) ? waw : mwfact * waw;
+ th = (n > 1) ? wah / (n - 1) : 0;
+ if(n > 1 && th < bh)
+ th = wah;
+
+ for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
+ if(i == 0) { /* master */
+ nw = mw - 2 * c->border;
+ nh = wah - 2 * c->border;
+ }
+ else { /* tile window */
+ if(i == 1) {
+ ny = way;
+ nx += mc->w + 2 * mc->border;
+ nw = waw - mw - 2 * c->border;
}
- fprintf(stderr, "tile(%d, %d, %d, %d)\n", nx, ny, nw, nh);
- 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;
-
- j++;
+ if(i + 1 == n) /* remainder */
+ nh = (way + 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 != wah)
+ ny = c->y + c->h + 2 * c->border;
+ i++;
}
- fprintf(stderr, "done\n");
}
+
void
togglebar(const char *arg) {
if(bpos == BarOff)
bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
else
bpos = BarOff;
- updatebarpos(&monitors[monitorat()]);
+ updatebarpos();
arrange();
}
if(!sel)
return;
i = idxoftag(arg);
+ if(conflicts(sel, i))
+ return;
sel->tags[i] = !sel->tags[i];
for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
if(j == LENGTH(tags))
toggleview(const char *arg) {
unsigned int i, j;
- Monitor *m = &monitors[monitorat()];
-
i = idxoftag(arg);
- m->seltags[i] = !m->seltags[i];
- for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
+ seltags[i] = !seltags[i];
+ for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
if(j == LENGTH(tags))
- m->seltags[i] = True; /* at least one tag must be viewed */
+ seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
}
void
-updatebarpos(Monitor *m) {
+updatebarpos(void) {
XEvent ev;
- m->wax = m->sx;
- m->way = m->sy;
- m->wah = m->sh;
- m->waw = m->sw;
+ wax = sx;
+ way = sy;
+ wah = sh;
+ waw = sw;
switch(bpos) {
default:
- m->wah -= bh;
- m->way += bh;
- XMoveWindow(dpy, m->barwin, m->sx, m->sy);
+ wah -= bh;
+ way += bh;
+ XMoveWindow(dpy, barwin, sx, sy);
break;
case BarBot:
- m->wah -= bh;
- XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
+ wah -= bh;
+ XMoveWindow(dpy, barwin, sx, sy + wah);
break;
case BarOff:
- XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
+ XMoveWindow(dpy, barwin, sx, sy - bh);
break;
}
XSync(dpy, False);
}
}
+
+void
+view(const char *arg) {
+ unsigned int i;
+
+ for(i = 0; i < LENGTH(tags); i++)
+ tmp[i] = (NULL == arg);
+ tmp[idxoftag(arg)] = True;
+
+ if(memcmp(seltags, tmp, TAGSZ) != 0) {
+ memcpy(prevtags, seltags, TAGSZ);
+ memcpy(seltags, tmp, TAGSZ);
+ arrange();
+ }
+}
+
+void
+viewprevtag(const char *arg) {
+
+ memcpy(tmp, seltags, TAGSZ);
+ memcpy(seltags, prevtags, TAGSZ);
+ memcpy(prevtags, tmp, TAGSZ);
+ 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. */
}
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 = &monitors[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();
- }
-}
-
-void
-viewprevtag(const char *arg) {
- static Bool tmp[LENGTH(tags)];
-
- Monitor *m = &monitors[monitorat()];
-
- memcpy(tmp, m->seltags, sizeof initags);
- memcpy(m->seltags, m->prevtags, sizeof initags);
- memcpy(m->prevtags, tmp, sizeof initags);
- arrange();
-}
-
-void
zoom(const char *arg) {
- Client *c;
+ Client *c = sel;
if(!sel || !dozoom || sel->isfloating)
return;
- if((c = sel) == nexttiled(clients, c->monitor))
- if(!(c = nexttiled(c->next, c->monitor)))
+ if(c == nexttiled(clients))
+ if(!(c = nexttiled(c->next)))
return;
detach(c);
attach(c);
arrange();
}
-void
-movetomonitor(const char *arg) {
- if (sel) {
- sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
-
- memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
- resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
- arrange();
- }
-}
-
-void
-selectmonitor(const char *arg) {
- Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
-
- XWarpPointer(dpy, None, m->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-2007 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");
checkotherwm();
setup();
- drawbar();
scan();
run();
cleanup();
Got questions, comments, patches, etc.? Contact Jason Woofenden