X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/5dd92c765570caa6d96ab125aa655e30cf82eb20..999d6e795f26f85e4b4b59adb7637ec067a9deee:/dwm.c?ds=sidebyside
diff --git a/dwm.c b/dwm.c
index d47da3f..e22ea7a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -11,9 +11,9 @@
* in O(1) time.
*
* Each child of the root window is called a client, except windows which have
- * set the override_redirect flag. Clients are organized in a global
- * linked client list, the focus history is remembered through a global
- * stack list. Each client contains a bit array to indicate the tags of a
+ * set the override_redirect flag. Clients are organized in a linked client
+ * list on each monitor, the focus history is remembered through a stack list
+ * on each monitor. Each client contains a bit array to indicate the tags of a
* client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
@@ -51,7 +51,7 @@
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
-#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
+#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (textnw(X, strlen(X)) + dc.font.height)
/* enums */
@@ -66,7 +66,7 @@ typedef union {
int i;
unsigned int ui;
float f;
- void *v;
+ const void *v;
} Arg;
typedef struct {
@@ -121,9 +121,9 @@ typedef struct {
} Layout;
struct Monitor {
- int screen_number;
float mfact;
- int by, btx; /* bar geometry */
+ int num;
+ int by; /* bar geometry */
int mx, my, mw, mh; /* screen size */
int wx, wy, ww, wh; /* window area */
unsigned int seltags;
@@ -136,6 +136,7 @@ struct Monitor {
Client *stack;
Monitor *next;
Window barwin;
+ const Layout *lt[2];
};
typedef struct {
@@ -144,6 +145,7 @@ typedef struct {
const char *title;
unsigned int tags;
Bool isfloating;
+ int monitor;
} Rule;
/* function declarations */
@@ -164,6 +166,7 @@ static void destroynotify(XEvent *e);
static void detach(Client *c);
static void detachstack(Client *c);
static void die(const char *errstr, ...);
+static Monitor *dirtomon(int dir);
static void drawbar(Monitor *m);
static void drawbars(void);
static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
@@ -175,12 +178,11 @@ static void focusin(XEvent *e);
static void focusmon(const Arg *arg);
static void focusstack(const Arg *arg);
static unsigned long getcolor(const char *colstr);
-static Bool getrootpointer(int *x, int *y);
+static Bool getrootptr(int *x, int *y);
static long getstate(Window w);
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
static void grabbuttons(Client *c, Bool focused);
static void grabkeys(void);
-static Monitor *idxtomon(unsigned int n);
static void initfont(const char *fontstr);
static Bool isprotodel(Client *c);
static void keypress(XEvent *e);
@@ -191,7 +193,7 @@ static void maprequest(XEvent *e);
static void monocle(Monitor *m);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
-static Monitor *pointertomon(int x, int y);
+static Monitor *ptrtomon(int x, int y);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
static void resize(Client *c, int x, int y, int w, int h, Bool interact);
@@ -235,9 +237,10 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
static void zoom(const Arg *arg);
/* variables */
-static char stext[256];
+static const char broken[] = "broken";
+static char stext[256], ntext[8];
static int screen;
-static int sw, sh; /* X display screen geometry x, y, width, height */
+static int sw, sh; /* X display screen geometry width, height */
static int bh, blw = 0; /* bar geometry */
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
@@ -261,32 +264,40 @@ static Bool running = True;
static Cursor cursor[CurLast];
static Display *dpy;
static DC dc;
-static Layout *lt[] = { NULL, NULL };
static Monitor *mons = NULL, *selmon = NULL;
static Window root;
+
/* configuration, allows nested code to access above variables */
#include "config.h"
/* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
+struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
/* function implementations */
void
applyrules(Client *c) {
+ const char *class, *instance;
unsigned int i;
- Rule *r;
+ const Rule *r;
+ Monitor *m;
XClassHint ch = { 0 };
/* rule matching */
c->isfloating = c->tags = 0;
if(XGetClassHint(dpy, c->win, &ch)) {
+ class = ch.res_class ? ch.res_class : broken;
+ instance = ch.res_name ? ch.res_name : broken;
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
if((!r->title || strstr(c->name, r->title))
- && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
- && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+ && (!r->class || strstr(class, r->class))
+ && (!r->instance || strstr(instance, r->instance)))
+ {
c->isfloating = r->isfloating;
c->tags |= r->tags;
+ for(m = mons; m && m->num != r->monitor; m = m->next);
+ if(m)
+ c->mon = m;
}
}
if(ch.res_class)
@@ -305,7 +316,6 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
/* set minimum possible */
*w = MAX(1, *w);
*h = MAX(1, *h);
-
if(interact) {
if(*x > sw)
*x = sw - WIDTH(c);
@@ -340,9 +350,9 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
/* adjust for aspect limits */
if(c->mina > 0 && c->maxa > 0) {
if(c->maxa < (float)*w / *h)
- *w = *h * c->maxa;
+ *w = *h * c->maxa + 0.5;
else if(c->mina < (float)*h / *w)
- *h = *w * c->mina;
+ *h = *w * c->mina + 0.5;
}
if(baseismin) { /* increment calculation requires this */
*w -= c->basew;
@@ -370,13 +380,12 @@ void
arrange(void) {
Monitor *m;
- /* optimise two loops into one, check focus(NULL) */
for(m = mons; m; m = m->next)
showhide(m->stack);
focus(NULL);
for(m = mons; m; m = m->next) {
- if(lt[m->sellt]->arrange)
- lt[m->sellt]->arrange(m);
+ if(m->lt[m->sellt]->arrange)
+ m->lt[m->sellt]->arrange(m);
restack(m);
}
}
@@ -408,12 +417,11 @@ buttonpress(XEvent *e) {
selmon = m;
focus(NULL);
}
- if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
- i = 0;
- x = selmon->btx;
- do
+ if(ev->window == selmon->barwin) {
+ i = x = 0;
+ do {
x += TEXTW(tags[i]);
- while(ev->x >= x && ++i < LENGTH(tags));
+ } while(ev->x >= x && ++i < LENGTH(tags));
if(i < LENGTH(tags)) {
click = ClkTagBar;
arg.ui = 1 << i;
@@ -431,7 +439,7 @@ buttonpress(XEvent *e) {
}
for(i = 0; i < LENGTH(buttons); i++)
if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
- && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
}
@@ -455,7 +463,7 @@ cleanup(void) {
Monitor *m;
view(&a);
- lt[selmon->sellt] = &foo;
+ selmon->lt[selmon->sellt] = &foo;
for(m = mons; m; m = m->next)
while(m->stack)
unmanage(m->stack);
@@ -546,7 +554,7 @@ configurerequest(XEvent *e) {
if((c = wintoclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- else if(c->isfloating || !lt[selmon->sellt]->arrange) {
+ else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
m = c->mon;
if(ev->value_mask & CWX)
c->x = m->mx + ev->x;
@@ -621,25 +629,38 @@ die(const char *errstr, ...) {
exit(EXIT_FAILURE);
}
+Monitor *
+dirtomon(int dir) {
+ Monitor *m = NULL;
+
+ if(dir > 0) {
+ if(!(m = selmon->next))
+ m = mons;
+ }
+ else {
+ if(selmon == mons)
+ for(m = mons; m->next; m = m->next);
+ else
+ for(m = mons; m->next != selmon; m = m->next);
+ }
+ return m;
+}
+
void
drawbar(Monitor *m) {
int x;
- unsigned int i, occ = 0, urg = 0;
+ unsigned int i, n = 0, occ = 0, urg = 0;
unsigned long *col;
Client *c;
for(c = m->clients; c; c = c->next) {
+ if(ISVISIBLE(c))
+ n++;
occ |= c->tags;
if(c->isurgent)
urg |= c->tags;
}
dc.x = 0;
- if(mons->next) { /* more than a single monitor */
- dc.w = TEXTW(monsyms[m->screen_number]);
- drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);
- dc.x += dc.w;
- }
- m->btx = dc.x;
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
@@ -650,11 +671,13 @@ drawbar(Monitor *m) {
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt[m->sellt]->symbol, dc.norm, False);
- x = dc.x + dc.w;
+ drawtext(m->lt[m->sellt]->symbol, dc.norm, False);
+ dc.x += dc.w;
}
- else
- x = dc.x;
+ snprintf(ntext, sizeof ntext, "%u", n);
+ dc.w = TEXTW(ntext);
+ drawtext(ntext, dc.norm, False);
+ x = (dc.x += dc.w);
if(m == selmon) { /* status is only drawn on selected monitor */
dc.w = TEXTW(stext);
dc.x = m->ww - dc.w;
@@ -797,10 +820,11 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
void
focusmon(const Arg *arg) {
- Monitor *m;
+ Monitor *m = NULL;
- if(!(m = idxtomon(arg->ui)) || m == selmon)
+ if(!mons->next)
return;
+ m = dirtomon(arg->i);
unfocus(selmon->sel);
selmon = m;
focus(NULL);
@@ -843,7 +867,7 @@ getcolor(const char *colstr) {
}
Bool
-getrootpointer(int *x, int *y) {
+getrootptr(int *x, int *y) {
int di;
unsigned int dui;
Window dummy;
@@ -860,7 +884,7 @@ getstate(Window w) {
Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
- &real, &format, &n, &extra, (unsigned char **)&p);
+ &real, &format, &n, &extra, (unsigned char **)&p);
if(status != Success)
return -1;
if(n != 0)
@@ -884,8 +908,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
if(name.encoding == XA_STRING)
strncpy(text, (char *)name.value, size - 1);
else {
- if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
- && n > 0 && *list) {
+ if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
strncpy(text, *list, size - 1);
XFreeStringList(list);
}
@@ -910,7 +933,8 @@ grabbuttons(Client *c, Bool focused) {
buttons[i].mask | modifiers[j],
c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- } else
+ }
+ else
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
@@ -934,15 +958,6 @@ grabkeys(void) {
}
}
-Monitor *
-idxtomon(unsigned int n) {
- unsigned int i;
- Monitor *m;
-
- for(m = mons, i = 0; m && i != n; m = m->next, i++);
- return m;
-}
-
void
initfont(const char *fontstr) {
char *def, **missing;
@@ -959,6 +974,7 @@ initfont(const char *fontstr) {
XFontSetExtents *font_extents;
XFontStruct **xfonts;
char **font_names;
+
dc.font.ascent = dc.font.descent = 0;
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
@@ -1003,8 +1019,8 @@ keypress(XEvent *e) {
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
- && keys[i].func)
+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+ && keys[i].func)
keys[i].func(&(keys[i].arg));
}
@@ -1038,6 +1054,7 @@ manage(Window w, XWindowAttributes *wa) {
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
*c = cz;
c->win = w;
+ updatetitle(c);
if(XGetTransientForHint(dpy, w, &trans))
t = wintoclient(trans);
if(t) {
@@ -1077,7 +1094,6 @@ manage(Window w, XWindowAttributes *wa) {
updatesizehints(c);
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False);
- updatetitle(c);
if(!c->isfloating)
c->isfloating = trans != None || c->isfixed;
if(c->isfloating)
@@ -1135,7 +1151,7 @@ movemouse(const Arg *arg) {
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- if(!getrootpointer(&x, &y))
+ if(!getrootptr(&x, &y))
return;
do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
@@ -1149,7 +1165,7 @@ movemouse(const Arg *arg) {
nx = ocx + (ev.xmotion.x - x);
ny = ocy + (ev.xmotion.y - y);
if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
- && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+ && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
if(abs(selmon->wx - nx) < snap)
nx = selmon->wx;
else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
@@ -1158,18 +1174,17 @@ movemouse(const Arg *arg) {
ny = selmon->wy;
else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
ny = selmon->wy + selmon->wh - HEIGHT(c);
- if(!c->isfloating && lt[selmon->sellt]->arrange
- && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
+ && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
}
- if(!lt[selmon->sellt]->arrange || c->isfloating)
+ if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, True);
break;
}
- }
- while(ev.type != ButtonRelease);
+ } while(ev.type != ButtonRelease);
XUngrabPointer(dpy, CurrentTime);
- if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+ if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
sendmon(c, m);
selmon = m;
focus(NULL);
@@ -1183,7 +1198,7 @@ nexttiled(Client *c) {
}
Monitor *
-pointertomon(int x, int y) {
+ptrtomon(int x, int y) {
Monitor *m;
for(m = mons; m; m = m->next)
@@ -1261,7 +1276,7 @@ resizemouse(const Arg *arg) {
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize], CurrentTime) != GrabSuccess)
+ None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
do {
@@ -1276,21 +1291,21 @@ resizemouse(const Arg *arg) {
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
- && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
- if(!c->isfloating && lt[selmon->sellt]->arrange
- && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+ && nh >= selmon->wy && nh <= selmon->wy + selmon->wh)
+ {
+ if(!c->isfloating && selmon->lt[selmon->sellt]->arrange
+ && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
togglefloating(NULL);
}
- if(!lt[selmon->sellt]->arrange || c->isfloating)
+ if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
- }
- while(ev.type != ButtonRelease);
+ } while(ev.type != ButtonRelease);
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
- if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+ if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
sendmon(c, m);
selmon = m;
focus(NULL);
@@ -1306,9 +1321,9 @@ restack(Monitor *m) {
drawbars();
if(!m->sel)
return;
- if(m->sel->isfloating || !lt[m->sellt]->arrange)
+ if(m->sel->isfloating || !m->lt[m->sellt]->arrange)
XRaiseWindow(dpy, m->sel->win);
- if(lt[m->sellt]->arrange) {
+ if(m->lt[m->sellt]->arrange) {
wc.stack_mode = Below;
wc.sibling = m->barwin;
for(c = m->stack; c; c = c->snext)
@@ -1327,10 +1342,9 @@ run(void) {
/* main event loop */
XSync(dpy, False);
- while(running && !XNextEvent(dpy, &ev)) {
+ while(running && !XNextEvent(dpy, &ev))
if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
+ handler[ev.type](&ev); /* call handler */
}
void
@@ -1376,7 +1390,7 @@ sendmon(Client *c, Monitor *m) {
void
setclientstate(Client *c, long state) {
- long data[] = {state, None};
+ long data[] = { state, None };
XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
PropModeReplace, (unsigned char *)data, 2);
@@ -1384,10 +1398,10 @@ setclientstate(Client *c, long state) {
void
setlayout(const Arg *arg) {
- if(!arg || !arg->v || arg->v != lt[selmon->sellt])
+ if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
selmon->sellt ^= 1;
if(arg && arg->v)
- lt[selmon->sellt] = (Layout *)arg->v;
+ selmon->lt[selmon->sellt] = (Layout *)arg->v;
if(selmon->sel)
arrange();
else
@@ -1399,7 +1413,7 @@ void
setmfact(const Arg *arg) {
float f;
- if(!arg || !lt[selmon->sellt]->arrange)
+ if(!arg || !selmon->lt[selmon->sellt]->arrange)
return;
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
if(f < 0.1 || f > 0.9)
@@ -1421,8 +1435,6 @@ setup(void) {
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.h = dc.font.height + 2;
- lt[0] = &layouts[0];
- lt[1] = &layouts[1 % LENGTH(layouts)];
updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1459,8 +1471,8 @@ setup(void) {
/* select for events */
wa.cursor = cursor[CurNormal];
wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
- |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
- |PropertyChangeMask;
+ |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+ |PropertyChangeMask;
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask);
grabkeys();
@@ -1472,7 +1484,7 @@ showhide(Client *c) {
return;
if(ISVISIBLE(c)) { /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y);
- if(!lt[c->mon->sellt]->arrange || c->isfloating)
+ if(!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, False);
showhide(c->snext);
}
@@ -1512,11 +1524,9 @@ tag(const Arg *arg) {
void
tagmon(const Arg *arg) {
- Monitor *m;
-
- if(!selmon->sel || !(m = idxtomon(arg->ui)))
+ if(!selmon->sel || !mons->next)
return;
- sendmon(selmon->sel, m);
+ sendmon(selmon->sel, dirtomon(arg->i));
}
int
@@ -1675,7 +1685,7 @@ void
updategeom(void) {
int i, n = 1;
Client *c;
- Monitor *newmons = NULL, *m, *tm;
+ Monitor *newmons = NULL, *m = NULL, *tm;
#ifdef XINERAMA
XineramaScreenInfo *info = NULL;
@@ -1685,7 +1695,8 @@ updategeom(void) {
#endif /* XINERAMA */
/* allocate monitor(s) for the new geometry setup */
for(i = 0; i < n; i++) {
- m = (Monitor *)malloc(sizeof(Monitor));
+ if(!(m = (Monitor *)malloc(sizeof(Monitor))))
+ die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
m->next = newmons;
newmons = m;
}
@@ -1693,7 +1704,7 @@ updategeom(void) {
#ifdef XINERAMA
if(XineramaIsActive(dpy)) {
for(i = 0, m = newmons; m; m = m->next, i++) {
- m->screen_number = info[i].screen_number;
+ m->num = info[i].screen_number;
m->mx = m->wx = info[i].x_org;
m->my = m->wy = info[i].y_org;
m->mw = m->ww = info[i].width;
@@ -1705,7 +1716,7 @@ updategeom(void) {
#endif /* XINERAMA */
/* default monitor setup */
{
- m->screen_number = 0;
+ m->num = 0;
m->mx = m->wx = 0;
m->my = m->wy = 0;
m->mw = m->ww = sw;
@@ -1718,8 +1729,10 @@ updategeom(void) {
m->sellt = 0;
m->tagset[0] = m->tagset[1] = 1;
m->mfact = mfact;
- m->showbar = SHOWBAR;
- m->topbar = TOPBAR;
+ m->showbar = showbar;
+ m->topbar = topbar;
+ m->lt[0] = &layouts[0];
+ m->lt[1] = &layouts[1 % LENGTH(layouts)];
updatebarpos(m);
}
/* reassign left over clients of disappeared monitors */
@@ -1794,8 +1807,8 @@ updatesizehints(Client *c) {
else
c->minw = c->minh = 0;
if(size.flags & PAspect) {
- c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
- c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
+ c->mina = (float)size.min_aspect.y / size.min_aspect.x;
+ c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
}
else
c->maxa = c->mina = 0.0;
@@ -1807,6 +1820,8 @@ void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+ if(c->name[0] == '\0') /* hack to mark broken clients */
+ strcpy(c->name, broken);
}
void
@@ -1859,8 +1874,8 @@ wintomon(Window w) {
Client *c;
Monitor *m;
- if(w == root && getrootpointer(&x, &y))
- return pointertomon(x, y);
+ if(w == root && getrootptr(&x, &y))
+ return ptrtomon(x, y);
for(m = mons; m; m = m->next)
if(w == m->barwin)
return m;
@@ -1906,8 +1921,8 @@ void
zoom(const Arg *arg) {
Client *c = selmon->sel;
- if(!lt[selmon->sellt]->arrange
- || lt[selmon->sellt]->arrange == monocle
+ if(!selmon->lt[selmon->sellt]->arrange
+ || selmon->lt[selmon->sellt]->arrange == monocle
|| (selmon->sel && selmon->sel->isfloating))
return;
if(c == nexttiled(selmon->clients))