} Regs;
typedef struct {
- int id;
+ int screen;
+ Window root;
Window barwin;
-//TODO: Window root;
-//TODO: int screen;
int sx, sy, sw, sh, wax, way, wah, waw;
DC dc;
Bool *seltags;
void focusnext(const char *arg);
void focusprev(const char *arg);
Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+unsigned long getcolor(const char *colstr, int screen);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused);
void initfont(Monitor*, const char *fontstr);
Bool isoccupied(Monitor *m, unsigned int t);
Bool isprotodel(Client *c);
-Bool isvisible(Client *c, Monitor *m);
+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 maximize(const char *arg);
void movemouse(Client *c);
-Client *nexttiled(Client *c, Monitor *m);
+Client *nexttiled(Client *c, int monitor);
void propertynotify(XEvent *e);
void quit(const char *arg);
void reapply(const char *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
-void updatebarpos(Monitor *s);
+void updatebarpos(Monitor *m);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void view(const char *arg);
int xerrordummy(Display *dsply, XErrorEvent *ee);
int xerrorstart(Display *dsply, XErrorEvent *ee);
void zoom(const char *arg);
-int monitorat(int, int);
+int monitorat(void);
void movetomonitor(const char *arg);
void selectmonitor(const char *arg);
/* variables */
char stext[256];
-int mcount, screen;
-//double mwfact;
-//int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int mcount = 1;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
unsigned int blw = 0;
[Expose] = expose,
[FocusIn] = focusin,
[KeyPress] = keypress,
- [LeaveNotify] = leavenotify,
[MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[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};
-Window root;
-//Layout *layout = NULL;
-//Window barwin, root;
Regs *regs = NULL;
Monitor *monitors;
int selmonitor = 0;
if(ch.res_name)
XFree(ch.res_name);
if(!matched_tag)
- memcpy(c->tags, monitors[monitorat(-1, -1)].seltags, sizeof seltags);
+ memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
if (!matched_monitor)
- c->monitor = monitorat(-1, -1);
+ c->monitor = monitorat();
}
void
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c, &monitors[c->monitor]))
+ if(isvisible(c, c->monitor))
unban(c);
else
ban(c);
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- Monitor s = monitors[monitorat(-1, -1)];
+ Monitor *m = &monitors[monitorat()];
- if(ev->window == s.barwin) {
+ if(ev->window == m->barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- x += textw(&s, tags[i]);
+ x += textw(m, tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- if((s.layout->arrange == floating) || c->isfloating)
+ if((m->layout->arrange == floating) || c->isfloating)
restack();
else
togglefloating(NULL);
movemouse(c);
}
else if(ev->button == Button2) {
- if((floating != s.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 == s.layout->arrange) || c->isfloating)
+ if((floating == m->layout->arrange) || c->isfloating)
restack();
else
togglefloating(NULL);
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");
XFreeFontSet(dpy, m->dc.font.set);
else
XFreeFont(dpy, m->dc.font.xfont);
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
XFreePixmap(dpy, m->dc.drawable);
XFreeGC(dpy, m->dc.gc);
XDestroyWindow(dpy, m->barwin);
XConfigureEvent *ev = &e->xconfigure;
Monitor *m = &monitors[selmonitor];
- if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
+ if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) {
m->sw = ev->width;
m->sh = ev->height;
XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, m->sw, bh, DefaultDepth(dpy, screen));
+ dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
XResizeWindow(dpy, m->barwin, m->sw, bh);
updatebarpos(m);
arrange();
if((ev->value_mask & (CWX | CWY))
&& !(ev->value_mask & (CWWidth | CWHeight)))
configure(c);
- if(isvisible(c, &monitors[monitorat(-1,-1)]))
+ if(isvisible(c, monitorat()))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
void
drawbar(void) {
- int i, x, s;
+ int i, j, x;
- for(s = 0; s < mcount; ++s) {
- Monitor *m = &monitors[s];
+ for(i = 0; i < mcount; i++) {
+ Monitor *m = &monitors[i];
m->dc.x = 0;
- for(i = 0; i < LENGTH(tags); i++) {
- m->dc.w = textw(m, tags[i]);
- if(m->seltags[i]) {
- drawtext(m, tags[i], m->dc.sel);
- drawsquare(m, sel && sel->tags[i] && sel->monitor == m->id, isoccupied(m, i), m->dc.sel);
+ 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);
+ drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
}
else {
- drawtext(m, tags[i], m->dc.norm);
- drawsquare(m, sel && sel->tags[i] && sel->monitor == m->id, isoccupied(m, i), m->dc.norm);
+ drawtext(m, tags[j], m->dc.norm);
+ drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
}
m->dc.x += m->dc.w;
}
drawtext(m, stext, m->dc.norm);
if((m->dc.w = m->dc.x - x) > bh) {
m->dc.x = x;
- if(sel && sel->monitor == m->id) {
+ if(sel && sel->monitor == selmonitor) {
drawtext(m, sel->name, m->dc.sel);
drawsquare(m, False, sel->isfloating, m->dc.sel);
}
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
- return;
+ if(ev->mode != NotifyNormal || ev->detail == NotifyInferior);
+ //return;
if((c = getclient(ev->window)))
focus(c);
- else if(ev->window == root) {
- selmonitor = True;
+ else {
+ selmonitor = monitorat();
+ fprintf(stderr, "updating selmonitor %d\n", selmonitor);
focus(NULL);
}
}
domwfact = dozoom = False;
for(c = clients; c; c = c->next)
- if(isvisible(c, &monitors[selmonitor]))
+ if(isvisible(c, selmonitor))
resize(c, c->x, c->y, c->w, c->h, True);
}
void
focus(Client *c) {
- Monitor *m = &monitors[monitorat(-1, -1)];
- if(!c || (c && !isvisible(c, m)))
- for(c = stack; c && !isvisible(c, m); 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, monitors[sel->monitor].dc.norm[ColBorder]);
sel = c;
drawbar();
if(c) {
- XSetWindowBorder(dpy, c->win, monitors[c->monitor].dc.sel[ColBorder]);
+ XSetWindowBorder(dpy, c->win, m->dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- selmonitor = monitorat(c->x, c->y);
+ selmonitor = c->monitor;
}
else {
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- selmonitor = monitorat(-1, -1);
+ XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
}
}
void
focusnext(const char *arg) {
Client *c;
- Monitor *m = &monitors[selmonitor];
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c, m); c = c->next);
+ for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
if(!c)
- for(c = clients; c && !isvisible(c, m); c = c->next);
+ for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
if(c) {
focus(c);
restack();
void
focusprev(const char *arg) {
Client *c;
- Monitor *m = &monitors[selmonitor];
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(c, m); 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, m); c = c->prev);
+ for(; c && !isvisible(c, selmonitor); c = c->prev);
}
if(c) {
focus(c);
}
unsigned long
-getcolor(const char *colstr) {
+getcolor(const char *colstr, int screen) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
void
grabkeys(void) {
- unsigned int i;
+ unsigned int i, j;
KeyCode code;
+ XModifierKeymap *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);
+ /* 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);
+
+ 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);
+ }
}
}
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t] && c->monitor == m->id)
+ if(c->tags[t] && c->monitor == selmonitor)
return True;
return False;
}
}
Bool
-isvisible(Client *c, Monitor *m) {
+isvisible(Client *c, int monitor) {
unsigned int i;
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && monitors[c->monitor].seltags[i] && m->id == c->monitor)
+ if(c->tags[i] && monitors[c->monitor].seltags[i] && c->monitor == monitor)
return True;
return False;
}
}
void
-leavenotify(XEvent *e) {
- XCrossingEvent *ev = &e->xcrossing;
-
- if((ev->window == root) && !ev->same_screen) {
- selmonitor = 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;
applyrules(c);
- Monitor *m = &monitors[c->monitor];
- c->x = wa->x+m->sx;
- c->y = wa->y+m->sy;
+ 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 (monitorat(c->x, c->y) != c->monitor) {
- c->x = m->sx;
- c->y = m->sy;
- }
-
if(c->w == m->sw && c->h == m->sh) {
c->x = m->sx;
c->y = m->sy;
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);
+ memcpy(c->tags, t->tags, sizeof initags);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
manage(ev->window, &wa);
}
-void
-maximize(const char *arg) {
-/*
- if(!sel || (!sel->isfloating && layout->arrange != floating))
- return;
- resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
-*/
+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
ocx = nx = c->x;
ocy = ny = c->y;
- if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+ if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+ XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
switch (ev.type) {
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- Monitor *m = &monitors[monitorat(nx, ny)];
+ 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)
else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
ny = m->way + m->wah - c->h - 2 * c->border;
resize(c, nx, ny, c->w, c->h, False);
- memcpy(c->tags, monitors[monitorat(nx, ny)].seltags, sizeof seltags);
+ memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
break;
}
}
}
Client *
-nexttiled(Client *c, Monitor *m) {
- for(; c && (c->isfloating || !isvisible(c, m)); c = c->next);
+nexttiled(Client *c, int monitor) {
+ for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
return c;
}
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
XWindowChanges wc;
- Monitor scr = monitors[monitorat(x, y)];
- c->monitor = scr.id;
+ //Monitor scr = monitors[monitorat()];
+// c->monitor = monitorat();
if(sizehints) {
/* set minimum possible */
ocx = c->x;
ocy = c->y;
- if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+ if(XGrabPointer(dpy, monitors[selmonitor].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);
void
restack(void) {
+ unsigned int i;
Client *c;
XEvent ev;
XWindowChanges wc;
- int s;
drawbar();
if(!sel)
XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
wc.sibling = sel->win;
}
- for(s = 0; s < mcount; s++) {
- for(c = nexttiled(clients, &monitors[s]); c; c = nexttiled(c->next, &monitors[s])) {
+ 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);
void
scan(void) {
- unsigned int i, num;
+ unsigned int i, j, num;
Window *wins, d1, d2;
XWindowAttributes 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);
+ 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);
+ }
}
+ if(wins)
+ XFree(wins);
}
- if(wins)
- XFree(wins);
}
void
void
setlayout(const char *arg) {
unsigned int i;
- Monitor *m = &monitors[monitorat(-1, -1)];
+ Monitor *m = &monitors[monitorat()];
if(!arg) {
m->layout++;
setmwfact(const char *arg) {
double delta;
- Monitor *m = &monitors[monitorat(-1, -1)];
+ Monitor *m = &monitors[monitorat()];
if(!domwfact)
return;
void
setup(void) {
unsigned int i, j, k;
- XModifierKeymap *modmap;
+ Monitor *m;
XSetWindowAttributes wa;
- int s = 1;
- GC g;
XineramaScreenInfo *info = NULL;
/* init atoms */
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 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 */
- grabkeys();
-
- /* init tags */
- compileregs();
-
- if (XineramaIsActive(dpy)) {
- info = XineramaQueryScreens(dpy, &s);
- }
+ for(i = 0; i < mcount; i++) {
+ /* init geometry */
+ m = &monitors[i];
- monitors = emallocz(s*sizeof(Monitor));
- mcount = s;
+ m->screen = isxinerama ? 0 : i;
+ m->root = RootWindow(dpy, m->screen);
- for(i = 0; i < s; i++) {
- /* init geometry */
- if (mcount != 1) {
- monitors[i].sx = info[i].x_org;
- monitors[i].sy = info[i].y_org;
- monitors[i].sw = info[i].width;
- monitors[i].sh = info[i].height;
+ 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 {
- monitors[i].sx = 0;
- monitors[i].sy = 0;
- monitors[i].sw = DisplayWidth(dpy, screen);
- monitors[i].sh = DisplayHeight(dpy, screen);
+ m->sx = 0;
+ m->sy = 0;
+ m->sw = DisplayWidth(dpy, m->screen);
+ m->sh = DisplayHeight(dpy, m->screen);
}
- monitors[i].id = i;
- monitors[i].seltags = emallocz(LENGTH(tags)*sizeof(char*));
- monitors[i].prevtags = emallocz(LENGTH(tags)*sizeof(char*));
+ m->seltags = emallocz(sizeof initags);
+ m->prevtags = emallocz(sizeof initags);
- memcpy(monitors[i].seltags, seltags, sizeof seltags);
- memcpy(monitors[i].prevtags, seltags, sizeof seltags);
+ memcpy(m->seltags, initags, sizeof initags);
+ memcpy(m->prevtags, initags, sizeof initags);
/* init appearance */
- monitors[i].dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
- monitors[i].dc.norm[ColBG] = getcolor(NORMBGCOLOR);
- monitors[i].dc.norm[ColFG] = getcolor(NORMFGCOLOR);
- monitors[i].dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
- monitors[i].dc.sel[ColBG] = getcolor(SELBGCOLOR);
- monitors[i].dc.sel[ColFG] = getcolor(SELFGCOLOR);
- initfont(&(monitors[i]), FONT);
- monitors[i].dc.h = bh = monitors[i].dc.font.height + 2;
+ 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 */
- monitors[i].mwfact = MWFACT;
- monitors[i].layout = &layouts[0];
+ m->mwfact = MWFACT;
+ m->layout = &layouts[0];
for(blw = k = 0; k < LENGTH(layouts); k++) {
- j = textw(&monitors[i], layouts[k].symbol);
+ j = textw(m, layouts[k].symbol);
if(j > blw)
blw = j;
}
+ // TODO: bpos per screen?
bpos = BARPOS;
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask | ExposureMask;
/* init bars */
- monitors[i].barwin = XCreateWindow(dpy, root, monitors[i].sx, monitors[i].sy, monitors[i].sw, bh, 0,
- DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
+ 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, monitors[i].barwin, cursor[CurNormal]);
- updatebarpos(&monitors[i]);
- XMapRaised(dpy, monitors[i].barwin);
+ XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
+ updatebarpos(m);
+ XMapRaised(dpy, m->barwin);
strcpy(stext, "dwm-"VERSION);
- monitors[i].dc.drawable = XCreatePixmap(dpy, root, monitors[i].sw, bh, DefaultDepth(dpy, screen));
- g = XCreateGC(dpy, root, 0, 0);
- monitors[i].dc.gc = XCreateGC(dpy, root, 0, 0);
- XSetLineAttributes(dpy, monitors[i].dc.gc, 1, LineSolid, CapButt, JoinMiter);
- if(!monitors[i].dc.font.set)
- XSetFont(dpy, monitors[i].dc.gc, monitors[i].dc.font.xfont->fid);
+ 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);
}
+ if(info)
+ XFree(info);
+
+ /* grab keys */
+ grabkeys();
+
+ /* init tags */
+ compileregs();
+
+ selmonitor = monitorat();
+ fprintf(stderr, "selmonitor == %d\n", selmonitor);
}
void
void
tile(void) {
- unsigned int i, n, nx, ny, nw, nh, mw, th;
- int s;
+ unsigned int i, j, n, nx, ny, nw, nh, mw, th;
Client *c, *mc;
domwfact = dozoom = True;
- nw = 0; /* gcc stupidity requires this */
+ nx = ny = nw = 0; /* gcc stupidity requires this */
- for (s = 0; s < mcount; s++) {
- Monitor *m = &monitors[s];
+ for (i = 0; i < mcount; i++) {
+ Monitor *m = &monitors[i];
- for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
+ for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
n++;
- for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
+ for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
/* 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;
- if(i == 0) { /* master */
+ 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(i == 1) {
+ if(j == 1) {
ny = m->way;
nx += mc->w + 2 * mc->border;
nw = m->waw - mw - 2 * c->border;
}
- if(i + 1 == n) /* remainder */
+ if(j + 1 == n) /* remainder */
nh = (m->way + m->wah) - ny - 2 * c->border;
else
nh = th - 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 */
if(n > 1 && th != m->wah)
ny = c->y + c->h + 2 * c->border;
- i++;
+ j++;
}
}
+ fprintf(stderr, "done\n");
}
void
togglebar(const char *arg) {
bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
else
bpos = BarOff;
- updatebarpos(&monitors[monitorat(-1,-1)]);
+ updatebarpos(&monitors[monitorat()]);
arrange();
}
toggleview(const char *arg) {
unsigned int i, j;
- Monitor *m = &monitors[monitorat(-1, -1)];
+ Monitor *m = &monitors[monitorat()];
i = idxoftag(arg);
m->seltags[i] = !m->seltags[i];
}
void
-updatebarpos(Monitor *s) {
+updatebarpos(Monitor *m) {
XEvent ev;
- s->wax = s->sx;
- s->way = s->sy;
- s->wah = s->sh;
- s->waw = s->sw;
+ m->wax = m->sx;
+ m->way = m->sy;
+ m->wah = m->sh;
+ m->waw = m->sw;
switch(bpos) {
default:
- s->wah -= bh;
- s->way += bh;
- XMoveWindow(dpy, s->barwin, s->sx, s->sy);
+ m->wah -= bh;
+ m->way += bh;
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy);
break;
case BarBot:
- s->wah -= bh;
- XMoveWindow(dpy, s->barwin, s->sx, s->sy + s->wah);
+ m->wah -= bh;
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
break;
case BarOff:
- XMoveWindow(dpy, s->barwin, s->sx, s->sy - bh);
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
break;
}
XSync(dpy, False);
view(const char *arg) {
unsigned int i;
- Monitor *m = &monitors[monitorat(-1, -1)];
+ Monitor *m = &monitors[monitorat()];
- memcpy(m->prevtags, seltags, sizeof seltags);
+ memcpy(m->prevtags, m->seltags, sizeof initags);
for(i = 0; i < LENGTH(tags); i++)
m->seltags[i] = (NULL == arg);
m->seltags[idxoftag(arg)] = True;
viewprevtag(const char *arg) {
static Bool tmp[LENGTH(tags)];
- Monitor *m = &monitors[monitorat(-1, -1)];
+ Monitor *m = &monitors[monitorat()];
- memcpy(tmp, m->seltags, sizeof seltags);
- memcpy(m->seltags, m->prevtags, sizeof seltags);
- memcpy(m->prevtags, tmp, sizeof seltags);
+ memcpy(tmp, m->seltags, sizeof initags);
+ memcpy(m->seltags, m->prevtags, sizeof initags);
+ memcpy(m->prevtags, tmp, sizeof initags);
arrange();
}
if(!sel || !dozoom || sel->isfloating)
return;
- if((c = sel) == nexttiled(clients, &monitors[c->monitor]))
- if(!(c = nexttiled(c->next, &monitors[c->monitor])))
+ if((c = sel) == nexttiled(clients, c->monitor))
+ if(!(c = nexttiled(c->next, c->monitor)))
return;
detach(c);
attach(c);
arrange();
}
-int
-monitorat(int x, int y) {
- int i;
-
- if(!XineramaIsActive(dpy))
- return 0;
-
- if (x < 0 || y < 0) {
- Window win;
- unsigned int mask;
- XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
- }
-
- for(i = 0; i < mcount; i++)
- if((x < 0 || (x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw))
- && (y < 0 || (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)))
- {
- return i;
- }
- return 0;
-}
-
void
movetomonitor(const char *arg) {
if (sel) {
sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
- memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof seltags);
+ 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, -1)+1) % mcount];
+ 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);
+ XWarpPointer(dpy, None, m->root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
focus(NULL);
}
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");
+ "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