#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)
+
/* enums */
enum { BarTop, BarBot, BarOff }; /* bar position */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
struct Client {
char name[256];
int x, y, w, h;
- int rx, ry, rw, rh; /* revert geometry */
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
unsigned int border, oldborder;
- Bool isbanned, isfixed, ismax, isfloating, wasfloating;
+ Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags;
Client *next;
Client *prev;
Client *snext;
Window win;
+ int monitor;
};
typedef struct {
const char *arg;
} Key;
+typedef struct Monitor Monitor;
typedef struct {
const char *symbol;
- void (*arrange)(void);
+ void (*arrange)(Monitor *);
} Layout;
typedef struct {
const char *prop;
const char *tags;
Bool isfloating;
+ int monitor;
} Rule;
typedef struct {
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(void);
void detach(Client *c);
void detachstack(Client *c);
void drawbar(void);
-void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast]);
+void drawsquare(Monitor *, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(Monitor *, 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(void); /* default floating layout */
+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);
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(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(unsigned int monitor, unsigned int t);
Bool isprotodel(Client *c);
-Bool isvisible(Client *c);
+Bool isurgent(unsigned int monitor, unsigned int t);
+Bool isvisible(Client *c, int monitor);
void keypress(XEvent *e);
void killclient(const char *arg);
-void leavenotify(XEvent *e);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
void movemouse(Client *c);
-Client *nexttiled(Client *c);
+Client *nexttiled(Client *c, int monitor);
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(void);
void tag(const char *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
-void tile(void);
+void tile(Monitor *m);
void togglebar(const char *arg);
void togglefloating(const char *arg);
-void togglemax(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(void);
+void updatebarpos(Monitor *m);
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);
void zoom(const char *arg);
+int monitorat(void);
+void movetomonitor(const char *arg);
+void selectmonitor(const char *arg);
/* variables */
char stext[256];
-double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int mcount = 1;
+int selmonitor = 0;
+int screen;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
unsigned int blw = 0;
[ConfigureNotify] = configurenotify,
[DestroyNotify] = destroynotify,
[EnterNotify] = enternotify,
- [LeaveNotify] = leavenotify,
[Expose] = expose,
+ [FocusIn] = focusin,
[KeyPress] = keypress,
[MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
+Bool isxinerama = False;
Bool domwfact = True;
Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
-Bool selscreen = True;
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Layout *layout = NULL;
-Window barwin, root;
Regs *regs = NULL;
+Monitor *monitors;
+Window root;
/* configuration, allows nested code to access above variables */
#include "config.h"
+//Bool prevtags[LENGTH(tags)];
+
/* function implementations */
void
applyrules(Client *c) {
static char buf[512];
unsigned int i, j;
regmatch_t tmp;
- Bool matched = False;
+ Bool matched_tag = False;
+ Bool matched_monitor = False;
XClassHint ch = { 0 };
/* rule matching */
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 = True;
+ matched_tag = True;
c->tags[j] = True;
}
}
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched)
- memcpy(c->tags, seltags, sizeof seltags);
+ if(!matched_tag)
+ memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
+ if (!matched_monitor)
+ c->monitor = monitorat();
}
void
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c))
+ if(isvisible(c, c->monitor))
unban(c);
else
ban(c);
- layout->arrange();
+
+ monitors[selmonitor].layout->arrange(&monitors[selmonitor]);
focus(NULL);
restack();
}
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
c->isbanned = True;
}
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- if(barwin == ev->window) {
+ Monitor *m = &monitors[monitorat()];
+
+ if(ev->window == m->barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- if((floating == layout->arrange) || c->isfloating)
- restack();
- else
- togglefloating(NULL);
+ restack();
movemouse(c);
}
else if(ev->button == Button2) {
- if((floating != layout->arrange) && c->isfloating)
+ if((floating != m->layout->arrange) && c->isfloating)
togglefloating(NULL);
else
zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- if((floating == layout->arrange) || c->isfloating)
- restack();
- else
- togglefloating(NULL);
+ restack();
resizemouse(c);
}
}
XSetErrorHandler(xerrorstart);
/* this causes an error if some other window manager is running */
- XSelectInput(dpy, root, SubstructureRedirectMask);
+ XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
XSync(dpy, False);
if(otherwm)
eprint("dwm: another window manager is already running\n");
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);
- XDestroyWindow(dpy, barwin);
XFreeCursor(dpy, cursor[CurNormal]);
XFreeCursor(dpy, cursor[CurResize]);
XFreeCursor(dpy, cursor[CurMove]);
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+ for(i = 0; i < mcount; i++)
+ XDestroyWindow(dpy, monitors[i].barwin);
XSync(dpy, False);
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
void
void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
+ Monitor *m = &monitors[selmonitor];
- if(ev->window == root && (ev->width != sw || ev->height != sh)) {
- sw = ev->width;
- sh = ev->height;
+ 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, sw, bh, DefaultDepth(dpy, screen));
- XResizeWindow(dpy, barwin, sw, bh);
- updatebarpos();
+ dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
+ XResizeWindow(dpy, m->barwin, m->sw, bh);
+ updatebarpos(m);
arrange();
}
}
XWindowChanges wc;
if((c = getclient(ev->window))) {
- c->ismax = False;
+ Monitor *m = &monitors[c->monitor];
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == layout->arrange)) {
+ if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
if(ev->value_mask & CWX)
- c->x = ev->x;
+ c->x = m->sx+ev->x;
if(ev->value_mask & CWY)
- c->y = ev->y;
+ c->y = m->sy+ev->y;
if(ev->value_mask & CWWidth)
c->w = ev->width;
if(ev->value_mask & CWHeight)
c->h = ev->height;
- if((c->x + c->w) > sw && c->isfloating)
- c->x = sw / 2 - c->w / 2; /* center in x direction */
- if((c->y + c->h) > sh && c->isfloating)
- c->y = sh / 2 - c->h / 2; /* center in y direction */
+ 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)))
configure(c);
- if(isvisible(c))
+ if(isvisible(c, monitorat()))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
void
drawbar(void) {
- int i, x;
-
- dc.x = dc.y = 0;
- for(i = 0; i < LENGTH(tags); i++) {
- dc.w = textw(tags[i]);
- if(seltags[i]) {
- drawtext(tags[i], dc.sel);
- drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
- }
- else {
- drawtext(tags[i], dc.norm);
- drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+ int i, j, x;
+ Client *c;
+
+ for(i = 0; i < mcount; i++) {
+ Monitor *m = &monitors[i];
+ dc.x = 0;
+ for(c = stack; c && !isvisible(c, i); c = c->snext);
+ fprintf(stderr, "m%d %s\n", i, c ? c->name : "NIL");
+ for(j = 0; j < LENGTH(tags); j++) {
+ dc.w = textw(tags[j]);
+ if(m->seltags[j]) {
+ drawtext(m, tags[j], dc.sel, isurgent(i, j));
+ drawsquare(m, c && c->tags[j] && c->monitor == i,
+ isoccupied(i, j), isurgent(i, j), dc.sel);
+ }
+ else {
+ drawtext(m, tags[j], dc.norm, isurgent(i, j));
+ drawsquare(m, c && c->tags[j] && c->monitor == i,
+ isoccupied(i, j), isurgent(i, j), dc.norm);
+ }
+ dc.x += dc.w;
}
- dc.x += dc.w;
- }
- dc.w = blw;
- drawtext(layout->symbol, dc.norm);
- 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);
- if((dc.w = dc.x - x) > bh) {
- dc.x = x;
- if(sel) {
- drawtext(sel->name, dc.sel);
- drawsquare(sel->ismax, sel->isfloating, dc.sel);
+ dc.w = blw;
+ drawtext(m, m->layout->symbol, dc.norm, False);
+ x = dc.x + dc.w;
+ if(i == 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);
}
else
- drawtext(NULL, dc.norm);
+ dc.x = m->sw;
+ 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);
+ }
+ else
+ drawtext(m, NULL, dc.norm, False);
+ }
+ XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
+ XSync(dpy, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
- XSync(dpy, False);
}
void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- gcv.foreground = col[ColFG];
+ 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;
}
void
-drawtext(const char *text, unsigned long col[ColLast]) {
+drawtext(Monitor *m, 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 };
- XSetForeground(dpy, dc.gc, col[ColBG]);
+ XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
}
if(w > dc.w)
return; /* too long */
- XSetForeground(dpy, dc.gc, col[ColFG]);
+ 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
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
- return;
+ if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
+ if(!isxinerama || ev->window != root)
+ return;
+ }
if((c = getclient(ev->window)))
focus(c);
- else if(ev->window == root) {
- selscreen = True;
+ else {
+ selmonitor = monitorat();
+ fprintf(stderr, "updating selmonitor %d\n", selmonitor);
focus(NULL);
}
}
expose(XEvent *e) {
XExposeEvent *ev = &e->xexpose;
- if(0 == ev->count) {
- if(barwin == ev->window)
+ if(ev->count == 0) {
+ if(ev->window == monitors[selmonitor].barwin)
drawbar();
}
}
void
-floating(void) { /* default floating layout */
+floating(Monitor *m) { /* default floating layout */
Client *c;
domwfact = dozoom = False;
for(c = clients; c; c = c->next)
- if(isvisible(c))
+ if(isvisible(c, m->id))
resize(c, c->x, c->y, c->w, c->h, True);
}
void
focus(Client *c) {
- if((!c && selscreen) || (c && !isvisible(c)))
- for(c = stack; c && !isvisible(c); c = c->snext);
+ 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(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
}
sel = c;
drawbar();
- if(!selscreen)
- return;
if(c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+ selmonitor = c->monitor;
}
- else
+ else {
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ drawbar();
+ }
+}
+
+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+ XFocusChangeEvent *ev = &e->xfocus;
+
+ if(sel && ev->window != sel->win)
+ XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
}
void
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c); c = c->next);
+ for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
if(!c)
- for(c = clients; c && !isvisible(c); c = c->next);
+ for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
if(c) {
focus(c);
restack();
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(c); c = c->prev);
+ for(c = sel->prev; c && !isvisible(c, selmonitor); c = c->prev);
if(!c) {
for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c); c = c->prev);
+ for(; c && !isvisible(c, selmonitor); c = c->prev);
}
if(c) {
focus(c);
int n;
XTextProperty name;
- if(!text || 0 == size)
+ if(!text || size == 0)
return False;
text[0] = '\0';
XGetTextProperty(dpy, w, &name, atom);
strncpy(text, (char *)name.value, size - 1);
else {
if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
- && n > 0 && *list)
- {
+ && n > 0 && *list) {
strncpy(text, *list, size - 1);
XFreeStringList(list);
}
GrabModeAsync, GrabModeSync, None, None);
}
+void
+grabkeys(void) {
+ unsigned int i, j;
+ KeyCode code;
+ XModifierKeymap *modmap;
+
+ /* init modifier map */
+ modmap = XGetModifierMapping(dpy);
+ for(i = 0; i < 8; i++)
+ for(j = 0; j < modmap->max_keypermod; j++) {
+ if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+ numlockmask = (1 << i);
+ }
+ XFreeModifiermap(modmap);
+
+ 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) {
unsigned int i;
}
Bool
-isoccupied(unsigned int t) {
+isoccupied(unsigned int monitor, unsigned int t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t])
+ if(c->tags[t] && c->monitor == monitor)
return True;
return False;
}
}
Bool
-isvisible(Client *c) {
+isurgent(unsigned int monitor, unsigned int t) {
+ Client *c;
+
+ for(c = clients; c; c = c->next)
+ if(c->monitor == monitor && c->isurgent && c->tags[t])
+ return True;
+ return False;
+}
+
+Bool
+isvisible(Client *c, int monitor) {
unsigned int i;
+ if(c->monitor != monitor)
+ return False;
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && seltags[i])
+ if(c->tags[i] && monitors[c->monitor].seltags[i])
return True;
return False;
}
void
keypress(XEvent *e) {
- KEYS
unsigned int i;
- KeyCode code;
KeySym keysym;
XKeyEvent *ev;
- if(!e) { /* grabkeys */
- 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);
- }
- return;
- }
ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
}
void
-leavenotify(XEvent *e) {
- XCrossingEvent *ev = &e->xcrossing;
-
- if((ev->window == root) && !ev->same_screen) {
- selscreen = False;
- focus(NULL);
- }
-}
-
-void
manage(Window w, XWindowAttributes *wa) {
Client *c, *t = NULL;
- Window trans;
+ Monitor *m;
Status rettrans;
+ Window trans;
XWindowChanges wc;
c = emallocz(sizeof(Client));
- c->tags = emallocz(sizeof seltags);
+ c->tags = emallocz(sizeof initags);
c->win = w;
- c->x = wa->x;
- c->y = wa->y;
+
+ applyrules(c);
+
+ m = &monitors[c->monitor];
+
+ c->x = wa->x + m->sx;
+ c->y = wa->y + m->sy;
c->w = wa->width;
c->h = wa->height;
c->oldborder = wa->border_width;
- if(c->w == sw && c->h == sh) {
- c->x = sx;
- c->y = sy;
+
+ if(c->w == m->sw && c->h == m->sh) {
+ c->x = m->sx;
+ c->y = m->sy;
c->border = wa->border_width;
}
else {
- 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;
+ 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;
}
wc.border_width = c->border;
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
updatesizehints(c);
- XSelectInput(dpy, w,
- StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+ 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 seltags);
- applyrules(c);
+ memcpy(c->tags, t->tags, sizeof initags);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
- keypress(NULL);
+ grabkeys();
}
void
manage(ev->window, &wa);
}
+int
+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 i;
+ }
+ }
+ return 0;
+}
+
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 = &monitors[c->monitor];
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- c->ismax = False;
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- 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;
- resize(c, nx, ny, c->w, c->h, False);
+ 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((m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ togglefloating(NULL);
+ if((m->layout->arrange == floating) || c->isfloating)
+ resize(c, nx, ny, c->w, c->h, False);
break;
}
}
}
Client *
-nexttiled(Client *c) {
- for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+nexttiled(Client *c, int monitor) {
+ for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
return c;
}
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloating && (c->isfloating = (NULL != getclient(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);
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();
+}
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+ Monitor *m;
XWindowChanges wc;
+ m = &monitors[c->monitor];
+
if(sizehints) {
/* set minimum possible */
if (w < 1)
}
if(w <= 0 || h <= 0)
return;
- /* offscreen appearance fixes */
- if(x > sw)
- x = sw - w - 2 * c->border;
- if(y > 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(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(c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
+ Monitor *m;
XEvent ev;
ocx = c->x;
ocy = c->y;
+ m = &monitors[c->monitor];
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
- c->ismax = False;
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);
nw = 1;
if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
nh = 1;
- resize(c, c->x, c->y, nw, nh, True);
+ if((m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ togglefloating(NULL);
+ if((m->layout->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 || (floating == layout->arrange))
+ if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
XRaiseWindow(dpy, sel->win);
- if(floating != layout->arrange) {
+ if(monitors[selmonitor].layout->arrange != floating) {
wc.stack_mode = Below;
- wc.sibling = barwin;
+ wc.sibling = monitors[selmonitor].barwin;
if(!sel->isfloating) {
XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
wc.sibling = sel->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;
+ 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;
+ }
}
}
XSync(dpy, False);
void
run(void) {
char *p;
+ char buf[sizeof stext];
fd_set rd;
int r, xfd;
unsigned int len, offset;
readin = True;
offset = 0;
len = sizeof stext - 1;
- stext[len] = '\0'; /* 0-terminator is never touched */
+ buf[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, stext + offset, len - offset))) {
+ switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
case -1:
strncpy(stext, strerror(errno), len);
readin = False;
readin = False;
break;
default:
- stext[offset + r] = '\0';
- for(p = stext; *p && *p != '\n'; p++);
- if(*p == '\n') {
- *p = '\0';
- offset = 0;
- }
- else
- offset = (offset + r < len - 1) ? offset + r : 0;
+ for(p = buf + 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 */
+ for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+ offset = r;
+ if(r)
+ memmove(buf, p - r + 1, r);
+ break;
+ }
+ break;
}
drawbar();
}
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);
}
}
void
setlayout(const char *arg) {
unsigned int i;
+ Monitor *m = &monitors[monitorat()];
if(!arg) {
- if(++layout == &layouts[LENGTH(layouts)])
- layout = &layouts[0];
+ m->layout++;
+ if(m->layout == &layouts[LENGTH(layouts)])
+ m->layout = &layouts[0];
}
else {
for(i = 0; i < LENGTH(layouts); i++)
break;
if(i == LENGTH(layouts))
return;
- layout = &layouts[i];
+ m->layout = &layouts[i];
}
if(sel)
arrange();
setmwfact(const char *arg) {
double delta;
+ Monitor *m = &monitors[monitorat()];
+
if(!domwfact)
return;
/* arg handling, manipulate mwfact */
- if(NULL == arg)
- mwfact = MWFACT;
- else if(1 == sscanf(arg, "%lf", &delta)) {
+ if(arg == NULL)
+ m->mwfact = MWFACT;
+ else if(sscanf(arg, "%lf", &delta) == 1) {
if(arg[0] == '+' || arg[0] == '-')
- mwfact += delta;
+ m->mwfact += delta;
else
- mwfact = delta;
- if(mwfact < 0.1)
- mwfact = 0.1;
- else if(mwfact > 0.9)
- mwfact = 0.9;
+ m->mwfact = delta;
+ if(m->mwfact < 0.1)
+ m->mwfact = 0.1;
+ else if(m->mwfact > 0.9)
+ m->mwfact = 0.9;
}
arrange();
}
void
setup(void) {
- int d;
- unsigned int i, j, mask;
- Window w;
- XModifierKeymap *modmap;
+ unsigned int i;
+ Monitor *m;
XSetWindowAttributes wa;
+ XineramaScreenInfo *info = NULL;
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
- XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
/* init cursors */
- cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+ wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- /* init geometry */
- sx = sy = 0;
- sw = DisplayWidth(dpy, screen);
- sh = DisplayHeight(dpy, screen);
+ // init screens/monitors first
+ mcount = 1;
+ if((isxinerama = XineramaIsActive(dpy)))
+ info = XineramaQueryScreens(dpy, &mcount);
+ monitors = emallocz(mcount * sizeof(Monitor));
- /* init modifier map */
- modmap = XGetModifierMapping(dpy);
- for(i = 0; i < 8; i++)
- for(j = 0; j < modmap->max_keypermod; j++) {
- if(modmap->modifiermap[i * modmap->max_keypermod + j]
- == XKeysymToKeycode(dpy, XK_Num_Lock))
- numlockmask = (1 << i);
- }
- XFreeModifiermap(modmap);
-
- /* select for events */
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
- | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
- wa.cursor = cursor[CurNormal];
- XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
- XSelectInput(dpy, root, wa.event_mask);
-
- /* grab keys */
- keypress(NULL);
-
- /* init tags */
- compileregs();
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
/* init appearance */
dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
dc.h = bh = dc.font.height + 2;
-
- /* init layouts */
- mwfact = MWFACT;
- layout = &layouts[0];
- for(blw = i = 0; i < LENGTH(layouts); i++) {
- j = textw(layouts[i].symbol);
- if(j > blw)
- blw = j;
- }
-
- /* init bar */
- 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);
- dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ 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);
- /* multihead support */
- selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+ for(blw = i = 0; i < LENGTH(layouts); i++) {
+ i = textw(layouts[i].symbol);
+ if(i > blw)
+ blw = i;
+ }
+ 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);
+ }
+ if(info)
+ XFree(info);
+
+ /* grab keys */
+ grabkeys();
+
+ /* init tags */
+ compileregs();
+
+ selmonitor = monitorat();
+ fprintf(stderr, "selmonitor == %d\n", selmonitor);
}
void
return;
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
- if(0 == fork()) {
- if(0 == fork()) {
+ if(fork() == 0) {
+ if(fork() == 0) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
}
void
-tile(void) {
+tile(Monitor *m) {
unsigned int i, n, nx, ny, nw, nh, mw, th;
Client *c, *mc;
domwfact = dozoom = True;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+
+ nx = ny = nw = 0; /* gcc stupidity requires this */
+
+ for(n = 0, c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id))
n++;
/* window geoms */
- mw = (n == 1) ? waw : mwfact * waw;
- th = (n > 1) ? wah / (n - 1) : 0;
+ mw = (n == 1) ? m->waw : m->mwfact * m->waw;
+ th = (n > 1) ? m->wah / (n - 1) : 0;
if(n > 1 && th < bh)
- th = wah;
-
- nx = wax;
- ny = way;
- nw = 0; /* gcc stupidity requires this */
- for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
- c->ismax = False;
- if(0 == i) { /* master */
+ th = m->wah;
+
+ for(i = 0, c = mc = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
+ if(i == 0) { /* master */
+ nx = m->wax;
+ ny = m->way;
nw = mw - 2 * c->border;
- nh = wah - 2 * c->border;
+ nh = m->wah - 2 * c->border;
}
else { /* tile window */
if(i == 1) {
- ny = way;
+ ny = m->way;
nx += mc->w + 2 * mc->border;
- nw = waw - nx - 2 * c->border;
+ nw = m->waw - mw - 2 * c->border;
}
if(i + 1 == n) /* remainder */
- nh = (way + wah) - ny - 2 * c->border;
+ nh = (m->way + m->wah) - ny - 2 * c->border;
else
nh = th - 2 * c->border;
}
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)
+ 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();
+ updatebarpos(&monitors[monitorat()]);
arrange();
}
}
void
-togglemax(const char *arg) {
- XEvent ev;
-
- if(!sel || sel->isfixed)
- return;
- if((sel->ismax = !sel->ismax)) {
- if((floating == layout->arrange) || sel->isfloating)
- sel->wasfloating = True;
- else {
- togglefloating(NULL);
- sel->wasfloating = False;
- }
- sel->rx = sel->x;
- sel->ry = sel->y;
- sel->rw = sel->w;
- sel->rh = sel->h;
- resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
- }
- else {
- resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
- if(!sel->wasfloating)
- togglefloating(NULL);
- }
- drawbar();
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
toggletag(const char *arg) {
unsigned int i, j;
toggleview(const char *arg) {
unsigned int i, j;
+ Monitor *m = &monitors[monitorat()];
+
i = idxoftag(arg);
- seltags[i] = !seltags[i];
- for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+ m->seltags[i] = !m->seltags[i];
+ for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
if(j == LENGTH(tags))
- seltags[i] = True; /* at least one tag must be viewed */
+ m->seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
}
void
-updatebarpos(void) {
+updatebarpos(Monitor *m) {
XEvent ev;
- wax = sx;
- way = sy;
- wah = sh;
- waw = sw;
+ m->wax = m->sx;
+ m->way = m->sy;
+ m->wah = m->sh;
+ m->waw = m->sw;
switch(bpos) {
default:
- wah -= bh;
- way += bh;
- XMoveWindow(dpy, barwin, sx, sy);
+ m->wah -= bh;
+ m->way += bh;
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy);
break;
case BarBot:
- wah -= bh;
- XMoveWindow(dpy, barwin, sx, sy + wah);
+ m->wah -= bh;
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
break;
case BarOff:
- XMoveWindow(dpy, barwin, sx, sy - bh);
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
break;
}
XSync(dpy, False);
gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
}
+void
+updatewmhints(Client *c) {
+ XWMHints *wmh;
+
+ if((wmh = XGetWMHints(dpy, c->win))) {
+ c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+ XFree(wmh);
+ }
+}
+
/* 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. */
void
view(const char *arg) {
unsigned int i;
+ Bool tmp[LENGTH(tags)];
+ Monitor *m = &monitors[monitorat()];
- memcpy(prevtags, seltags, sizeof seltags);
for(i = 0; i < LENGTH(tags); i++)
- seltags[i] = (NULL == arg);
- seltags[idxoftag(arg)] = True;
- arrange();
+ 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 tmptags[sizeof tags / sizeof tags[0]];
+ static Bool tmp[LENGTH(tags)];
+
+ Monitor *m = &monitors[monitorat()];
- memcpy(tmptags, seltags, sizeof seltags);
- memcpy(seltags, prevtags, sizeof seltags);
- memcpy(prevtags, tmptags, sizeof seltags);
+ 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))
- if(!(c = nexttiled(c->next)))
+ if(c == nexttiled(clients, c->monitor))
+ if(!(c = nexttiled(c->next, c->monitor)))
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, 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\n");
+ eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "
+ "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");
setlocale(LC_CTYPE, "");
if(!(dpy = XOpenDisplay(0)))
eprint("dwm: cannot open display\n");
- screen = DefaultScreen(dpy);
- root = RootWindow(dpy, screen);
checkotherwm();
setup();
Got questions, comments, patches, etc.? Contact Jason Woofenden