X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/2fc8a13588eee7b39bcda21838c88ed2f7be42c9..00ca643bd7ccba6efd001cc679525a53a3c75586:/dwm.c?ds=sidebyside
diff --git a/dwm.c b/dwm.c
index 277f561..f7253d1 100644
--- a/dwm.c
+++ b/dwm.c
@@ -17,9 +17,7 @@
* 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. For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * global tags array to indicate the tags of a client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
@@ -42,11 +40,17 @@
#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 MOUSEMASK (BUTTONMASK | PointerMotionMask)
+#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 */
@@ -56,16 +60,16 @@ enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
+typedef struct View View;
typedef struct Client Client;
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;
+ long flags;
unsigned int border, oldborder;
- Bool isbanned, isfixed, ismax, isfloating, wasfloating;
+ Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags;
Client *next;
Client *prev;
@@ -97,21 +101,29 @@ typedef struct {
typedef struct {
const char *symbol;
- void (*arrange)(void);
+ void (*arrange)(View *);
} Layout;
typedef struct {
const char *prop;
- const char *tags;
+ const char *tag;
Bool isfloating;
} Rule;
typedef struct {
- regex_t *propregex;
- regex_t *tagregex;
-} Regs;
+ const char name[MAXTAGLEN];
+ unsigned int view;
+} Tag;
+
+struct View {
+ int x, y, w, h, wax, way, wah, waw;
+ double mwfact;
+ Layout *layout;
+ Window barwin;
+};
-/* forward declarations */
+/* function declarations */
+void addtag(Client *c, const char *t);
void applyrules(Client *c);
void arrange(void);
void attach(Client *c);
@@ -120,48 +132,52 @@ void ban(Client *c);
void buttonpress(XEvent *e);
void checkotherwm(void);
void cleanup(void);
-void compileregs(void);
void configure(Client *c);
void configurenotify(XEvent *e);
void configurerequest(XEvent *e);
void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
-void drawbar(void);
-void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast]);
+void drawbar(View *v);
+void drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(View *v, 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(View *v); /* default floating layout */
void focus(Client *c);
+void focusin(XEvent *e);
void focusnext(const char *arg);
void focusprev(const char *arg);
Client *getclient(Window w);
unsigned long getcolor(const char *colstr);
+View *getviewbar(Window barwin);
+View *getview(Client *c);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused);
-unsigned int idxoftag(const char *tag);
+void grabkeys(void);
+unsigned int idxoftag(const char *t);
void initfont(const char *fontstr);
-Bool isarrange(void (*func)());
Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
+Bool isurgent(unsigned int t);
Bool isvisible(Client *c);
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);
+View *viewat(void);
void movemouse(Client *c);
-Client *nexttiled(Client *c);
+Client *nexttiled(Client *c, View *v);
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 restack(View *v);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
@@ -172,34 +188,34 @@ void spawn(const char *arg);
void tag(const char *arg);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
-void tile(void);
+void tile(View *v);
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(View *v);
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);
+void selectview(const char *arg);
/* variables */
-char stext[256];
-double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah;
+char stext[256], buf[256];
+int nviews = 1;
+View *selview;
+int screen;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos, ntags;
+unsigned int bh, bpos;
unsigned int blw = 0;
-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@ -207,8 +223,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
[ConfigureNotify] = configurenotify,
[DestroyNotify] = destroynotify,
[EnterNotify] = enternotify,
- [LeaveNotify] = leavenotify,
[Expose] = expose,
+ [FocusIn] = focusin,
[KeyPress] = keypress,
[MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
@@ -216,57 +232,71 @@ void (*handler[LASTEvent]) (XEvent *) = {
[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;
-Bool selscreen = True;
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Window barwin, root;
-Regs *regs = NULL;
+View *views;
+Window root;
/* configuration, allows nested code to access above variables */
#include "config.h"
-/* functions*/
+/* function implementations */
+void
+addtag(Client *c, const char *t) {
+ unsigned int i, tidx = idxoftag(t);
+
+ for(i = 0; i < LENGTH(tags); i++)
+ if(c->tags[i] && vtags[i] != vtags[tidx])
+ return; /* conflict */
+ c->tags[tidx] = True;
+}
+
void
applyrules(Client *c) {
- static char buf[512];
- unsigned int i, j;
- regmatch_t tmp;
+ 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 < nrules; i++)
- if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
- c->isfloating = rules[i].isfloating;
- for(j = 0; regs[i].tagregex && j < ntags; j++) {
- if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
- matched = 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) {
+ addtag(c, r->tag);
+ matched = True;
}
}
+ }
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
if(!matched)
- for(i = 0; i < ntags; i++)
- c->tags[i] = seltags[i];
+ memcpy(c->tags, seltags, sizeof initags);
}
+
+
void
arrange(void) {
+ unsigned int i;
Client *c;
for(c = clients; c; c = c->next)
@@ -274,9 +304,12 @@ arrange(void) {
unban(c);
else
ban(c);
- layouts[ltidx].arrange();
+
+ for(i = 0; i < nviews; i++) {
+ views[i].layout->arrange(&views[i]);
+ restack(&views[i]);
+ }
focus(NULL);
- restack();
}
void
@@ -297,7 +330,7 @@ void
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 3 * getview(c)->w, c->y);
c->isbanned = True;
}
@@ -307,9 +340,11 @@ buttonpress(XEvent *e) {
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- if(barwin == ev->window) {
+ View *v = selview;
+
+ if(ev->window == v->barwin) {
x = 0;
- for(i = 0; i < ntags; i++) {
+ for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
@@ -335,23 +370,17 @@ buttonpress(XEvent *e) {
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- if(isarrange(floating) || c->isfloating)
- restack();
- else
- togglefloating(NULL);
+ restack(getview(c));
movemouse(c);
}
else if(ev->button == Button2) {
- if(ISTILE && !c->isfixed && c->isfloating)
+ if((floating != v->layout->arrange) && c->isfloating)
togglefloating(NULL);
else
zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- if(isarrange(floating) || c->isfloating)
- restack();
- else
- togglefloating(NULL);
+ restack(getview(c));
resizemouse(c);
}
}
@@ -363,7 +392,7 @@ checkotherwm(void) {
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");
@@ -375,6 +404,7 @@ checkotherwm(void) {
void
cleanup(void) {
+ unsigned int i;
close(STDIN_FILENO);
while(stack) {
unban(stack);
@@ -384,43 +414,17 @@ cleanup(void) {
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 < nviews; i++)
+ XDestroyWindow(dpy, views[i].barwin);
XSync(dpy, False);
- free(seltags);
-}
-
-void
-compileregs(void) {
- unsigned int i;
- regex_t *reg;
-
- if(regs)
- return;
- nrules = sizeof rules / sizeof rules[0];
- regs = emallocz(nrules * sizeof(Regs));
- for(i = 0; i < nrules; 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;
- }
- }
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
void
@@ -444,14 +448,16 @@ configure(Client *c) {
void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
+ View *v = selview;
- if(ev->window == root && (ev->width != sw || ev->height != sh)) {
- sw = ev->width;
- sh = ev->height;
+ if(ev->window == root && (ev->width != v->w || ev->height != v->h)) {
+ /* TODO -- update Xinerama dimensions here */
+ v->w = ev->width;
+ v->h = 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, v->barwin, v->w, bh);
+ updatebarpos(v);
arrange();
}
}
@@ -463,24 +469,24 @@ configurerequest(XEvent *e) {
XWindowChanges wc;
if((c = getclient(ev->window))) {
- c->ismax = False;
+ View *v = getview(c);
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating || isarrange(floating)) {
+ if(c->isfixed || c->isfloating || (floating == v->layout->arrange)) {
if(ev->value_mask & CWX)
- c->x = ev->x;
+ c->x = v->x + ev->x;
if(ev->value_mask & CWY)
- c->y = ev->y;
+ c->y = v->y + 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((ev->value_mask & (CWX | CWY))
- && !(ev->value_mask & (CWWidth | CWHeight)))
+ if((c->x - v->x + c->w) > v->w && c->isfloating)
+ c->x = v->x + (v->w / 2 - c->w / 2); /* center in x direction */
+ if((c->y - v->y + c->h) > v->h && c->isfloating)
+ c->y = v->y + (v->h / 2 - c->h / 2); /* center in y direction */
+ if((ev->value_mask & (CWX|CWY))
+ && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
if(isvisible(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
@@ -530,52 +536,58 @@ detachstack(Client *c) {
}
void
-drawbar(void) {
+drawbar(View *v) {
int i, x;
+ Client *c;
- dc.x = dc.y = 0;
- for(i = 0; i < ntags; i++) {
+ dc.x = 0;
+ for(c = stack; c && (!isvisible(c) || getview(c) != v); c = c->snext);
+ 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);
+ drawtext(v, tags[i], dc.sel, isurgent(i));
+ drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
}
else {
- drawtext(tags[i], dc.norm);
- drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+ drawtext(v, tags[i], dc.norm, isurgent(i));
+ drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
}
dc.x += dc.w;
}
dc.w = blw;
- drawtext(layouts[ltidx].symbol, dc.norm);
+ drawtext(v, v->layout->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;
+ if(v == selview) {
+ dc.w = textw(stext);
+ dc.x = v->w - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = v->w - x;
+ }
+ drawtext(v, stext, dc.norm, False);
}
- drawtext(stext, dc.norm);
+ else
+ dc.x = v->w;
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(sel) {
- drawtext(sel->name, dc.sel);
- drawsquare(sel->ismax, sel->isfloating, dc.sel);
+ if(c) {
+ drawtext(v, c->name, dc.sel, False);
+ drawsquare(v, False, c->isfloating, False, dc.sel);
}
else
- drawtext(NULL, dc.norm);
+ drawtext(v, NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0);
XSync(dpy, False);
}
void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(View *v, 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;
@@ -591,13 +603,12 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
}
void
-drawtext(const char *text, unsigned long col[ColLast]) {
+drawtext(View *v, 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;
@@ -623,7 +634,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
}
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
@@ -644,14 +655,14 @@ enternotify(XEvent *e) {
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
focus(NULL);
- }
}
void
@@ -666,18 +677,18 @@ eprint(const char *errstr, ...) {
void
expose(XEvent *e) {
+ View *v;
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0) {
- if(barwin == ev->window)
- drawbar();
- }
+ if(ev->count == 0 && (v = getviewbar(ev->window)))
+ drawbar(v);
}
void
-floating(void) { /* default floating layout */
+floating(View *v) { /* default floating layout */
Client *c;
+ domwfact = dozoom = False;
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
@@ -685,8 +696,15 @@ floating(void) { /* default floating layout */
void
focus(Client *c) {
- if((!c && selscreen) || (c && !isvisible(c)))
- for(c = stack; c && !isvisible(c); c = c->snext);
+ View *v = selview;
+ if(c)
+ selview = getview(c);
+ else
+ selview = viewat();
+ if(selview != v)
+ drawbar(v);
+ if(!c || (c && !isvisible(c)))
+ for(c = stack; c && (!isvisible(c) || getview(c) != selview); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -697,15 +715,22 @@ focus(Client *c) {
grabbuttons(c, True);
}
sel = c;
- drawbar();
- if(!selscreen)
- return;
if(c) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+ selview = getview(c);
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ drawbar(selview);
+}
+
+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
@@ -719,7 +744,7 @@ focusnext(const char *arg) {
for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
- restack();
+ restack(getview(c));
}
}
@@ -736,7 +761,7 @@ focusprev(const char *arg) {
}
if(c) {
focus(c);
- restack();
+ restack(getview(c));
}
}
@@ -758,6 +783,26 @@ getcolor(const char *colstr) {
return color.pixel;
}
+View *
+getviewbar(Window barwin) {
+ unsigned int i;
+
+ for(i = 0; i < nviews; i++)
+ if(views[i].barwin == barwin)
+ return &views[i];
+ return NULL;
+}
+
+View *
+getview(Client *c) {
+ unsigned int i;
+
+ for(i = 0; i < LENGTH(tags); i++)
+ if(c->tags[i])
+ return &views[c->tags[i] - 1];
+ return &views[0]; /* fallback */
+}
+
long
getstate(Window w) {
int format, status;
@@ -792,8 +837,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
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);
}
@@ -810,29 +854,29 @@ grabbuttons(Client *c, Bool focused) {
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
@@ -840,14 +884,41 @@ grabbuttons(Client *c, Bool focused) {
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) {
+idxoftag(const char *t) {
unsigned int i;
- for(i = 0; i < ntags; i++)
- if(tags[i] == tag)
- return i;
- return 0;
+ for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
+ return (i < LENGTH(tags)) ? i : 0;
}
void
@@ -892,12 +963,6 @@ initfont(const char *fontstr) {
dc.font.height = dc.font.ascent + dc.font.descent;
}
-Bool
-isarrange(void (*func)())
-{
- return func == layouts[ltidx].arrange;
-}
-
Bool
isoccupied(unsigned int t) {
Client *c;
@@ -923,11 +988,21 @@ isprotodel(Client *c) {
return ret;
}
+Bool
+isurgent(unsigned int t) {
+ Client *c;
+
+ for(c = clients; c; c = c->next)
+ if(c->isurgent && c->tags[t])
+ return True;
+ return False;
+}
+
Bool
isvisible(Client *c) {
unsigned int i;
- for(i = 0; i < ntags; i++)
+ for(i = 0; i < LENGTH(tags); i++)
if(c->tags[i] && seltags[i])
return True;
return False;
@@ -935,31 +1010,13 @@ isvisible(Client *c) {
void
keypress(XEvent *e) {
- KEYS
- unsigned int len = sizeof keys / sizeof keys[0];
unsigned int i;
- KeyCode code;
KeySym keysym;
XKeyEvent *ev;
- if(!e) { /* grabkeys */
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- for(i = 0; i < len; 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 < len; i++)
+ for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
{
@@ -987,46 +1044,42 @@ killclient(const char *arg) {
XKillClient(dpy, sel->win);
}
-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) {
- unsigned int i;
Client *c, *t = NULL;
- Window trans;
+ View *v;
Status rettrans;
+ Window trans;
XWindowChanges wc;
c = emallocz(sizeof(Client));
- c->tags = emallocz(ntags * sizeof(Bool));
+ c->tags = emallocz(sizeof initags);
c->win = w;
- c->x = wa->x;
- c->y = wa->y;
+
+ applyrules(c);
+
+ v = getview(c);
+
+ c->x = wa->x + v->x;
+ c->y = wa->y + v->y;
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 == v->w && c->h == v->h) {
+ c->x = v->x;
+ c->y = v->y;
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 > v->wax + v->waw)
+ c->x = v->wax + v->waw - c->w - 2 * c->border;
+ if(c->y + c->h + 2 * c->border > v->way + v->wah)
+ c->y = v->way + v->wah - c->h - 2 * c->border;
+ if(c->x < v->wax)
+ c->x = v->wax;
+ if(c->y < v->way)
+ c->y = v->way;
c->border = BORDERPX;
}
wc.border_width = c->border;
@@ -1034,16 +1087,13 @@ manage(Window w, XWindowAttributes *wa) {
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)
- for(i = 0; i < ntags; i++)
- c->tags[i] = t->tags[i];
- applyrules(c);
+ memcpy(c->tags, t->tags, sizeof initags);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
@@ -1061,7 +1111,7 @@ mappingnotify(XEvent *e) {
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
- keypress(NULL);
+ grabkeys();
}
void
@@ -1081,18 +1131,19 @@ void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
+ View *v;
Window dummy;
XEvent ev;
ocx = nx = c->x;
ocy = ny = c->y;
+ v = getview(c);
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);
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
case ButtonRelease:
XUngrabPointer(dpy, CurrentTime);
@@ -1106,23 +1157,26 @@ movemouse(Client *c) {
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(v->wax - nx) < SNAP)
+ nx = v->wax;
+ else if(abs((v->wax + v->waw) - (nx + c->w + 2 * c->border)) < SNAP)
+ nx = v->wax + v->waw - c->w - 2 * c->border;
+ if(abs(v->way - ny) < SNAP)
+ ny = v->way;
+ else if(abs((v->way + v->wah) - (ny + c->h + 2 * c->border)) < SNAP)
+ ny = v->way + v->wah - c->h - 2 * c->border;
+ if(!c->isfloating && (v->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ togglefloating(NULL);
+ if((v->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, View *v) {
+ for(; c && (c->isfloating || getview(c) != v || !isvisible(c)); c = c->next);
return c;
}
@@ -1136,20 +1190,24 @@ propertynotify(XEvent *e) {
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;
+ 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(getview(c));
+ break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
if(c == sel)
- drawbar();
+ drawbar(selview);
}
}
}
@@ -1159,64 +1217,80 @@ quit(const char *arg) {
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) {
- double dx, dy, max, min, ratio;
- XWindowChanges wc;
+ View *v;
+ XWindowChanges wc;
+ v = getview(c);
if(sizehints) {
- if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
- dx = (double)(w - c->basew);
- dy = (double)(h - c->baseh);
- min = (double)(c->minax) / (double)(c->minay);
- max = (double)(c->maxax) / (double)(c->maxay);
- ratio = dx / dy;
- if(max > 0 && min > 0 && ratio > 0) {
- if(ratio < min) {
- dy = (dx * min + dy) / (min * min + 1);
- dx = dy * min;
- w = (int)dx + c->basew;
- h = (int)dy + c->baseh;
- }
- else if(ratio > max) {
- dy = (dx * min + dy) / (max * max + 1);
- dx = dy * min;
- w = (int)dx + c->basew;
- h = (int)dy + c->baseh;
- }
- }
+ /* set minimum possible */
+ if (w < 1)
+ w = 1;
+ if (h < 1)
+ h = 1;
+
+ /* temporarily remove base dimensions */
+ w -= c->basew;
+ h -= c->baseh;
+
+ /* adjust for aspect limits */
+ if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+ if (w * c->maxay > h * c->maxax)
+ w = h * c->maxax / c->maxay;
+ else if (w * c->minay < h * c->minax)
+ h = w * c->minay / c->minax;
}
- if(c->minw && w < c->minw)
+
+ /* adjust for increment value */
+ if(c->incw)
+ w -= w % c->incw;
+ if(c->inch)
+ h -= h % c->inch;
+
+ /* restore base dimensions */
+ w += c->basew;
+ h += c->baseh;
+
+ if(c->minw > 0 && w < c->minw)
w = c->minw;
- if(c->minh && h < c->minh)
+ if(c->minh > 0 && h < c->minh)
h = c->minh;
- if(c->maxw && w > c->maxw)
+ if(c->maxw > 0 && w > c->maxw)
w = c->maxw;
- if(c->maxh && h > c->maxh)
+ if(c->maxh > 0 && h > c->maxh)
h = c->maxh;
- if(c->incw)
- w -= (w - c->basew) % c->incw;
- if(c->inch)
- h -= (h - c->baseh) % c->inch;
}
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 > v->x + v->w)
+ x = v->w - w - 2 * c->border;
+ if(y > v->y + v->h)
+ y = v->h - h - 2 * c->border;
+ if(x + w + 2 * c->border < v->x)
+ x = v->x;
+ if(y + h + 2 * c->border < v->y)
+ y = v->y;
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);
}
@@ -1226,17 +1300,18 @@ void
resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
+ View *v;
XEvent ev;
ocx = c->x;
ocy = c->y;
+ v = getview(c);
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);
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
switch(ev.type) {
case ButtonRelease:
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
@@ -1255,34 +1330,37 @@ resizemouse(Client *c) {
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(!c->isfloating && (v->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ togglefloating(NULL);
+ if((v->layout->arrange == floating) || c->isfloating)
+ resize(c, c->x, c->y, nw, nh, True);
break;
}
}
}
void
-restack(void) {
+restack(View *v) {
Client *c;
XEvent ev;
XWindowChanges wc;
- drawbar();
+ drawbar(v);
if(!sel)
return;
- if(sel->isfloating || isarrange(floating))
+ if(sel->isfloating || (v->layout->arrange == floating))
XRaiseWindow(dpy, sel->win);
- if(!isarrange(floating)) {
+ if(v->layout->arrange != floating) {
wc.stack_mode = Below;
- wc.sibling = barwin;
+ wc.sibling = v->barwin;
if(!sel->isfloating) {
- XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+ XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
wc.sibling = sel->win;
}
- for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ for(c = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
if(c == sel)
continue;
- XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+ XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
}
@@ -1293,14 +1371,19 @@ restack(void) {
void
run(void) {
char *p;
- int r, xfd;
+ char sbuf[sizeof stext];
fd_set rd;
+ int r, xfd;
+ unsigned int len, offset;
XEvent ev;
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
xfd = ConnectionNumber(dpy);
readin = True;
+ offset = 0;
+ len = sizeof stext - 1;
+ sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
while(running) {
FD_ZERO(&rd);
if(readin)
@@ -1312,10 +1395,9 @@ run(void) {
eprint("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+ switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
case -1:
- strncpy(stext, strerror(errno), sizeof stext - 1);
- stext[sizeof stext - 1] = '\0';
+ strncpy(stext, strerror(errno), len);
readin = False;
break;
case 0:
@@ -1323,12 +1405,20 @@ run(void) {
readin = False;
break;
default:
- for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
- for(; p >= stext && *p != '\n'; --p);
- if(p > stext)
- strncpy(stext, p + 1, sizeof stext);
+ for(p = sbuf + offset; r > 0; p++, r--, offset++)
+ if(*p == '\n' || *p == '\0') {
+ *p = '\0';
+ 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(sbuf, p - r + 1, r);
+ break;
+ }
+ break;
}
- drawbar();
+ drawbar(selview);
}
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
@@ -1348,7 +1438,7 @@ scan(void) {
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);
@@ -1357,7 +1447,7 @@ scan(void) {
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);
}
}
@@ -1376,54 +1466,57 @@ setclientstate(Client *c, long state) {
void
setlayout(const char *arg) {
unsigned int i;
+ View *v = selview;
if(!arg) {
- if(++ltidx == nlayouts)
- ltidx = 0;;
+ v->layout++;
+ if(v->layout == &layouts[LENGTH(layouts)])
+ v->layout = &layouts[0];
}
else {
- for(i = 0; i < nlayouts; i++)
+ for(i = 0; i < LENGTH(layouts); i++)
if(!strcmp(arg, layouts[i].symbol))
break;
- if(i == nlayouts)
+ if(i == LENGTH(layouts))
return;
- ltidx = i;
+ v->layout = &layouts[i];
}
if(sel)
arrange();
else
- drawbar();
+ drawbar(v);
}
void
setmwfact(const char *arg) {
double delta;
- if(!ISTILE)
+ View *v = selview;
+
+ if(!domwfact)
return;
/* arg handling, manipulate mwfact */
if(arg == NULL)
- mwfact = MWFACT;
- else if(1 == sscanf(arg, "%lf", &delta)) {
+ v->mwfact = MWFACT;
+ else if(sscanf(arg, "%lf", &delta) == 1) {
if(arg[0] == '+' || arg[0] == '-')
- mwfact += delta;
+ v->mwfact += delta;
else
- mwfact = delta;
- if(mwfact < 0.1)
- mwfact = 0.1;
- else if(mwfact > 0.9)
- mwfact = 0.9;
+ v->mwfact = delta;
+ if(v->mwfact < 0.1)
+ v->mwfact = 0.1;
+ else if(v->mwfact > 0.9)
+ v->mwfact = 0.9;
}
arrange();
}
void
setup(void) {
- int d;
- unsigned int i, j, mask;
- Window w;
- XModifierKeymap *modmap;
+ unsigned int i;
+ View *v;
XSetWindowAttributes wa;
+ XineramaScreenInfo *info = NULL;
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1432,44 +1525,22 @@ setup(void) {
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 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);
+ if((isxinerama = XineramaIsActive(dpy)))
+ info = XineramaQueryScreens(dpy, &nviews);
+#if defined(AIM_XINERAMA)
+isxinerama = True;
+nviews = 2; /* aim Xinerama */
+#endif
+ selview = views = emallocz(nviews * sizeof(View));
- /* 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();
- for(ntags = 0; tags[ntags]; ntags++);
- seltags = emallocz(sizeof(Bool) * ntags);
- seltags[0] = True;
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
/* init appearance */
dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
@@ -1480,36 +1551,86 @@ setup(void) {
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
dc.h = bh = dc.font.height + 2;
-
- /* init layouts */
- mwfact = MWFACT;
- nlayouts = sizeof layouts / sizeof layouts[0];
- for(blw = i = 0; i < nlayouts; 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;
+ }
+
+ seltags = emallocz(sizeof initags);
+ prevtags = emallocz(sizeof initags);
+ memcpy(seltags, initags, sizeof initags);
+ memcpy(prevtags, initags, sizeof initags);
+
+ for(i = 0; i < nviews; i++) {
+ /* init geometry */
+ v = &views[i];
+
+ if(nviews != 1 && isxinerama) {
+
+#if defined(AIM_XINERAMA)
+v->w = DisplayWidth(dpy, screen) / 2;
+v->x = (i == 0) ? 0 : v->w;
+v->y = 0;
+v->h = DisplayHeight(dpy, screen);
+#else
+ v->x = info[i].x_org;
+ v->y = info[i].y_org;
+ v->w = info[i].width;
+ v->h = info[i].height;
+#endif
+ }
+ else {
+ v->x = 0;
+ v->y = 0;
+ v->w = DisplayWidth(dpy, screen);
+ v->h = DisplayHeight(dpy, screen);
+ }
+
+ /* init layouts */
+ v->mwfact = MWFACT;
+ v->layout = &layouts[0];
+
+ // TODO: bpos per screen?
+ bpos = BARPOS;
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
+
+ /* init bars */
+ v->barwin = XCreateWindow(dpy, root, v->x, v->y, v->w, bh, 0,
+ DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, v->barwin, cursor[CurNormal]);
+ updatebarpos(v);
+ XMapRaised(dpy, v->barwin);
+ strcpy(stext, "dwm-"VERSION);
+
+ /* 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);
+
+ drawbar(v);
+ }
+ if(info)
+ XFree(info);
+
+ /* grab keys */
+ grabkeys();
+
+ selview = &views[0];
}
void
@@ -1542,11 +1663,9 @@ tag(const char *arg) {
if(!sel)
return;
- for(i = 0; i < ntags; i++)
- sel->tags[i] = arg == NULL;
- i = idxoftag(arg);
- if(i >= 0 && i < ntags)
- sel->tags[i] = True;
+ for(i = 0; i < LENGTH(tags); i++)
+ sel->tags[i] = (NULL == arg);
+ sel->tags[idxoftag(arg)] = True;
arrange();
}
@@ -1567,41 +1686,48 @@ textw(const char *text) {
}
void
-tile(void) {
+tile(View *v) {
unsigned int i, n, nx, ny, nw, nh, mw, th;
- Client *c;
+ Client *c, *mc;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+ domwfact = dozoom = True;
+ nx = v->wax;
+ ny = v->way;
+ nw = 0;
+ for(n = 0, c = nexttiled(clients, v); c; c = nexttiled(c->next, v))
n++;
/* window geoms */
- mw = (n == 1) ? waw : mwfact * waw;
- th = (n > 1) ? wah / (n - 1) : 0;
+ mw = (n == 1) ? v->waw : v->mwfact * v->waw;
+ th = (n > 1) ? v->wah / (n - 1) : 0;
if(n > 1 && th < bh)
- th = wah;
+ th = v->wah;
- nx = wax;
- ny = way;
- for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
- c->ismax = False;
+ for(i = 0, c = mc = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
if(i == 0) { /* master */
+ nx = v->wax;
+ ny = v->way;
nw = mw - 2 * c->border;
- nh = wah - 2 * c->border;
+ nh = v->wah - 2 * c->border;
}
else { /* tile window */
if(i == 1) {
- ny = way;
- nx += mw;
+ ny = v->way;
+ nx += mc->w + 2 * mc->border;
+ nw = v->waw - mw - 2 * c->border;
}
- nw = waw - mw - 2 * c->border;
if(i + 1 == n) /* remainder */
- nh = (way + wah) - ny - 2 * c->border;
+ nh = (v->way + v->wah) - ny - 2 * c->border;
else
nh = th - 2 * c->border;
}
resize(c, nx, ny, nw, nh, RESIZEHINTS);
- if(n > 1 && th != wah)
- ny += nh + 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 != v->wah)
+ ny = c->y + c->h + 2 * c->border;
+ i++;
}
}
@@ -1611,7 +1737,7 @@ togglebar(const char *arg) {
bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
else
bpos = BarOff;
- updatebarpos();
+ updatebarpos(selview);
arrange();
}
@@ -1625,34 +1751,6 @@ togglefloating(const char *arg) {
arrange();
}
-void
-togglemax(const char *arg) {
- XEvent ev;
-
- if(!sel || sel->isfixed)
- return;
- if((sel->ismax = !sel->ismax)) {
- if(isarrange(floating) || 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;
@@ -1661,9 +1759,9 @@ toggletag(const char *arg) {
return;
i = idxoftag(arg);
sel->tags[i] = !sel->tags[i];
- for(j = 0; j < ntags && !sel->tags[j]; j++);
- if(j == ntags)
- sel->tags[i] = True;
+ for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+ if(j == LENGTH(tags))
+ sel->tags[i] = True; /* at least one tag must be enabled */
arrange();
}
@@ -1673,8 +1771,8 @@ toggleview(const char *arg) {
i = idxoftag(arg);
seltags[i] = !seltags[i];
- for(j = 0; j < ntags && !seltags[j]; j++);
- if(j == ntags)
+ for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+ if(j == LENGTH(tags))
seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
@@ -1720,25 +1818,25 @@ unmapnotify(XEvent *e) {
}
void
-updatebarpos(void) {
+updatebarpos(View *v) {
XEvent ev;
- wax = sx;
- way = sy;
- wah = sh;
- waw = sw;
+ v->wax = v->x;
+ v->way = v->y;
+ v->wah = v->h;
+ v->waw = v->w;
switch(bpos) {
default:
- wah -= bh;
- way += bh;
- XMoveWindow(dpy, barwin, sx, sy);
+ v->wah -= bh;
+ v->way += bh;
+ XMoveWindow(dpy, v->barwin, v->x, v->y);
break;
case BarBot:
- wah -= bh;
- XMoveWindow(dpy, barwin, sx, sy + wah);
+ v->wah -= bh;
+ XMoveWindow(dpy, v->barwin, v->x, v->y + v->wah);
break;
case BarOff:
- XMoveWindow(dpy, barwin, sx, sy - bh);
+ XMoveWindow(dpy, v->barwin, v->x, v->y - bh);
break;
}
XSync(dpy, False);
@@ -1803,6 +1901,57 @@ updatetitle(Client *c) {
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);
+ }
+}
+
+void
+view(const char *arg) {
+ unsigned int i;
+ Bool tmp[LENGTH(tags)];
+
+ for(i = 0; i < LENGTH(tags); i++)
+ tmp[i] = (NULL == arg);
+ tmp[idxoftag(arg)] = True;
+
+ if(memcmp(seltags, tmp, sizeof initags) != 0) {
+ memcpy(prevtags, seltags, sizeof initags);
+ memcpy(seltags, tmp, sizeof initags);
+ arrange();
+ }
+}
+
+View *
+viewat() {
+ int i, x, y;
+ Window win;
+ unsigned int mask;
+
+ XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
+ for(i = 0; i < nviews; i++) {
+ if((x >= views[i].x && x < views[i].x + views[i].w)
+ && (y >= views[i].y && y < views[i].y + views[i].h))
+ return &views[i];
+ }
+ return NULL;
+}
+
+void
+viewprevtag(const char *arg) {
+ static Bool tmp[LENGTH(tags)];
+
+ memcpy(tmp, seltags, sizeof initags);
+ memcpy(seltags, prevtags, sizeof initags);
+ memcpy(prevtags, tmp, sizeof initags);
+ 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. */
@@ -1823,38 +1972,26 @@ xerror(Display *dpy, XErrorEvent *ee) {
}
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;
-
- for(i = 0; i < ntags; i++)
- seltags[i] = arg == NULL;
- i = idxoftag(arg);
- if(i >= 0 && i < ntags)
- seltags[i] = True;
- arrange();
-}
-
void
zoom(const char *arg) {
- Client *c;
+ Client *c = sel;
- if(!sel || !ISTILE || sel->isfloating)
+ if(!sel || !dozoom || sel->isfloating)
return;
- if((c = sel) == nexttiled(clients))
- if(!(c = nexttiled(c->next)))
+ if(c == nexttiled(clients, getview(c)))
+ if(!(c = nexttiled(c->next, getview(c))))
return;
detach(c);
attach(c);
@@ -1865,19 +2002,16 @@ zoom(const char *arg) {
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+ eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\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();
- drawbar();
scan();
run();
cleanup();