* events about window (dis-)appearance. Only one X connection at a time is
* allowed to select for this event mask.
*
- * Calls to fetch an X event from the event queue are blocking. Due reading
- * status text from standard input, a select()-driven main loop has been
- * implemented which selects for reads on the X connection and STDIN_FILENO to
- * handle all data smoothly. The event handlers of dwm are organized in an
- * array which is accessed whenever a new event has been fetched. This allows
- * event dispatching in O(1) time.
+ * The event handlers of dwm are organized in an array which is accessed
+ * whenever a new event has been fetched. This allows event dispatching
+ * 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
- * 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.
+ * 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
+ * client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
#include <errno.h>
#include <locale.h>
#include <stdarg.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/select.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <regex.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
-//#ifdef XINERAMA
+#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
-//#endif
+#endif /* XINERAMA */
/* macros */
-#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x) (sizeof x / sizeof x[0])
-#define MAXTAGLEN 16
-#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
-
+#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
+#define LENGTH(X) (sizeof X / sizeof X[0])
+#define MAX(A, B) ((A) > (B) ? (A) : (B))
+#define MIN(A, B) ((A) < (B) ? (A) : (B))
+#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 TEXTW(X) (textnw(X, strlen(X)) + dc.font.height)
/* enums */
-enum { BarTop, BarBot, BarOff }; /* bar position */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
-
-/* typedefs */
-typedef struct View View;
+enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
+enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+
+typedef union {
+ int i;
+ unsigned int ui;
+ float f;
+ void *v;
+} Arg;
+
+typedef struct {
+ unsigned int click;
+ unsigned int mask;
+ unsigned int button;
+ void (*func)(const Arg *arg);
+ const Arg arg;
+} Button;
+
+typedef struct Monitor Monitor;
typedef struct Client Client;
struct Client {
char name[256];
+ float mina, maxa;
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int minax, maxax, minay, maxay;
- int *tags;
- long flags;
- unsigned int border, oldborder;
- Bool isbanned, isfixed, isfloating, isurgent;
+ int bw, oldbw;
+ unsigned int tags;
+ Bool isfixed, isfloating, isurgent;
Client *next;
- Client *prev;
Client *snext;
+ Monitor *mon;
Window win;
};
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ unsigned int mod;
KeySym keysym;
- void (*func)(const char *arg);
- const char *arg;
+ void (*func)(const Arg *);
+ const Arg arg;
} Key;
typedef struct {
const char *symbol;
- void (*arrange)(View *);
+ void (*arrange)(Monitor *);
} Layout;
+struct Monitor {
+ int screen_number;
+ float mfact;
+ int by, btx; /* bar geometry */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
+ unsigned int seltags;
+ unsigned int sellt;
+ unsigned int tagset[2];
+ Bool showbar;
+ Bool topbar;
+ Client *clients;
+ Client *sel;
+ Client *stack;
+ Monitor *next;
+ Window barwin;
+};
+
typedef struct {
- const char *prop;
- const char *tags;
+ const char *class;
+ const char *instance;
+ const char *title;
+ unsigned int tags;
Bool isfloating;
} Rule;
-typedef struct {
- regex_t *propregex;
- regex_t *tagregex;
-} Regs;
-
-struct View {
- int id;
- int x, y, w, h, wax, way, wah, waw;
- double mwfact;
- Layout *layout;
- Window barwin;
-};
-
/* function declarations */
-void applyrules(Client *c);
-void arrange(void);
-void attach(Client *c);
-void attachstack(Client *c);
-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(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(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);
-void grabkeys(void);
-unsigned int idxoftag(const char *tag);
-void initfont(const char *fontstr);
-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 manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-View *viewat(void);
-void movemouse(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(View *v);
-void run(void);
-void scan(void);
-void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
-void setmwfact(const char *arg);
-void setup(void);
-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(View *v);
-void togglebar(const char *arg);
-void togglefloating(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(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 *dpy, XErrorEvent *ee);
-int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
-void selectview(const char *arg);
+static void applyrules(Client *c);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
+static void arrange(void);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(void);
+static void cleanupmons(void);
+static void clearurgent(Client *c);
+static void configure(Client *c);
+static void configurenotify(XEvent *e);
+static void configurerequest(XEvent *e);
+static void destroynotify(XEvent *e);
+static void detach(Client *c);
+static void detachstack(Client *c);
+static void die(const char *errstr, ...);
+static void drawbar(Monitor *m);
+static void drawbars(void);
+static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+static void expose(XEvent *e);
+static void focus(Client *c);
+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 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);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+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 void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h);
+static void resizemouse(const Arg *arg);
+static void restack(Monitor *m);
+static void run(void);
+static void scan(void);
+static void sendmon(Client *c, Monitor *m);
+static void setclientstate(Client *c, long state);
+static void setlayout(const Arg *arg);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void showhide(Client *c);
+static void sigchld(int signal);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static void tagmon(const Arg *arg);
+static int textnw(const char *text, unsigned int len);
+static void tile(Monitor *);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unfocus(Client *c);
+static void unmanage(Client *c);
+static void unmapnotify(XEvent *e);
+static void updategeom(void);
+static void updatebarpos(Monitor *m);
+static void updatebars(void);
+static void updatenumlockmask(void);
+static void updatesizehints(Client *c);
+static void updatestatus(void);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+static Client *wintoclient(Window w);
+static Monitor *wintomon(Window w);
+static int xerror(Display *dpy, XErrorEvent *ee);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);
/* variables */
-char stext[256];
-int nviews = 1;
-View *selview;
-int screen;
-int *seltags;
-int *prevtags;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
-unsigned int numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+static char stext[256];
+static int screen;
+static int sw, sh; /* X display screen geometry x, y, width, height */
+static int bh, blw = 0; /* bar geometry */
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[ConfigureNotify] = configurenotify,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
};
-Atom wmatom[WMLast], netatom[NetLast];
-Bool isxinerama = False;
-Bool domwfact = True;
-Bool dozoom = True;
-Bool otherwm, readin;
-Bool running = True;
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-Regs *regs = NULL;
-View *views;
-Window root;
-
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool otherwm;
+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]; };
+
/* function implementations */
void
applyrules(Client *c) {
- static char buf[512];
- unsigned int i, j;
- regmatch_t tmp;
- Bool matched_tag = False;
+ unsigned int i;
+ Rule *r;
XClassHint ch = { 0 };
/* rule matching */
- XGetClassHint(dpy, c->win, &ch);
- snprintf(buf, sizeof buf, "%s:%s:%s",
- ch.res_class ? ch.res_class : "",
- ch.res_name ? ch.res_name : "", c->name);
- for(i = 0; i < LENGTH(rules); i++)
- if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
- c->isfloating = rules[i].isfloating;
- for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
- if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
- matched_tag = True;
- c->tags[j] = selview->id;
- }
+ c->isfloating = c->tags = 0;
+ if(XGetClassHint(dpy, c->win, &ch)) {
+ 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)))) {
+ c->isfloating = r->isfloating;
+ c->tags |= r->tags;
}
}
- if(ch.res_class)
- XFree(ch.res_class);
- if(ch.res_name)
- XFree(ch.res_name);
- if(!matched_tag)
- memcpy(c->tags, seltags, sizeof initags);
+ if(ch.res_class)
+ XFree(ch.res_class);
+ if(ch.res_name)
+ XFree(ch.res_name);
+ }
+ c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
}
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+ Bool baseismin;
+ Monitor *m = c->mon;
+
+ /* set minimum possible */
+ *w = MAX(1, *w);
+ *h = MAX(1, *h);
+
+ if(*x > m->mx + m->mw)
+ *x = m->mx + m->mw - WIDTH(c);
+ if(*y > m->my + m->mh)
+ *y = m->my + m->mh - HEIGHT(c);
+ if(*x + *w + 2 * c->bw < m->mx)
+ *x = m->mx;
+ if(*y + *h + 2 * c->bw < m->my)
+ *y = m->my;
+ if(*h < bh)
+ *h = bh;
+ if(*w < bh)
+ *w = bh;
+
+ if(resizehints || c->isfloating) {
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+ if(!baseismin) { /* temporarily remove base dimensions */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+ /* adjust for aspect limits */
+ if(c->mina > 0 && c->maxa > 0) {
+ if(c->maxa < (float)*w / *h)
+ *w = *h * c->maxa;
+ else if(c->mina < (float)*h / *w)
+ *h = *w * c->mina;
+ }
-void
-arrange(void) {
- unsigned int i;
- Client *c;
+ if(baseismin) { /* increment calculation requires this */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
- for(c = clients; c; c = c->next)
- if(isvisible(c))
- unban(c);
- else
- ban(c);
+ /* 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;
- for(i = 0; i < nviews; i++) {
- views[i].layout->arrange(&views[i]);
- restack(&views[i]);
+ *w = MAX(*w, c->minw);
+ *h = MAX(*h, c->minh);
+
+ if(c->maxw)
+ *w = MIN(*w, c->maxw);
+
+ if(c->maxh)
+ *h = MIN(*h, c->maxh);
}
- focus(NULL);
+ return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
}
void
-attach(Client *c) {
- if(clients)
- clients->prev = c;
- c->next = clients;
- clients = c;
+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);
+ restack(m);
+ }
}
void
-attachstack(Client *c) {
- c->snext = stack;
- stack = c;
+attach(Client *c) {
+ c->next = c->mon->clients;
+ c->mon->clients = c;
}
void
-ban(Client *c) {
- if(c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x + 3 * getview(c)->w, c->y);
- c->isbanned = True;
+attachstack(Client *c) {
+ c->snext = c->mon->stack;
+ c->mon->stack = c;
}
void
buttonpress(XEvent *e) {
- unsigned int i, x;
+ unsigned int i, x, click;
+ Arg arg = {0};
Client *c;
+ Monitor *m;
XButtonPressedEvent *ev = &e->xbutton;
- View *v = selview;
-
- if(ev->window == v->barwin) {
- x = 0;
- for(i = 0; i < LENGTH(tags); i++) {
- x += textw(tags[i]);
- if(ev->x < x) {
- if(ev->button == Button1) {
- if(ev->state & MODKEY)
- tag(tags[i]);
- else
- view(tags[i]);
- }
- else if(ev->button == Button3) {
- if(ev->state & MODKEY)
- toggletag(tags[i]);
- else
- toggleview(tags[i]);
- }
- return;
- }
+ click = ClkRootWin;
+ /* focus monitor if necessary */
+ if((m = wintomon(ev->window)) && m != selmon) {
+ unfocus(selmon->sel);
+ selmon = m;
+ focus(NULL);
+ }
+ if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
+ i = 0;
+ x = selmon->btx;
+ do
+ x += TEXTW(tags[i]);
+ while(ev->x >= x && ++i < LENGTH(tags));
+ if(i < LENGTH(tags)) {
+ click = ClkTagBar;
+ arg.ui = 1 << i;
}
- if((ev->x < x + blw) && ev->button == Button1)
- setlayout(NULL);
+ else if(ev->x < x + blw)
+ click = ClkLtSymbol;
+ else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))
+ click = ClkStatusText;
+ else
+ click = ClkWinTitle;
}
- else if((c = getclient(ev->window))) {
+ else if((c = wintoclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY)
- return;
- if(ev->button == Button1) {
- restack(getview(c));
- movemouse(c);
- }
- else if(ev->button == Button2) {
- if((floating != v->layout->arrange) && c->isfloating)
- togglefloating(NULL);
- else
- zoom(NULL);
- }
- else if(ev->button == Button3 && !c->isfixed) {
- restack(getview(c));
- resizemouse(c);
- }
+ click = ClkClientWin;
}
+
+ 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))
+ buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
}
void
checkotherwm(void) {
otherwm = False;
- XSetErrorHandler(xerrorstart);
+ xerrorxlib = XSetErrorHandler(xerrorstart);
/* this causes an error if some other window manager is running */
XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
XSync(dpy, False);
if(otherwm)
- eprint("dwm: another window manager is already running\n");
- XSync(dpy, False);
- XSetErrorHandler(NULL);
- xerrorxlib = XSetErrorHandler(xerror);
+ die("dwm: another window manager is already running\n");
+ XSetErrorHandler(xerror);
XSync(dpy, False);
}
void
cleanup(void) {
- unsigned int i;
- close(STDIN_FILENO);
- while(stack) {
- unban(stack);
- unmanage(stack);
- }
+ Arg a = {.ui = ~0};
+ Layout foo = { "", NULL };
+ Monitor *m;
+
+ view(&a);
+ lt[selmon->sellt] = &foo;
+ for(m = mons; m; m = m->next)
+ while(m->stack)
+ unmanage(m->stack);
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
else
XFreeFont(dpy, dc.font.xfont);
-
XUngrabKey(dpy, AnyKey, AnyModifier, root);
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XFreeCursor(dpy, cursor[CurNormal]);
XFreeCursor(dpy, cursor[CurResize]);
XFreeCursor(dpy, cursor[CurMove]);
- for(i = 0; i < nviews; i++)
- XDestroyWindow(dpy, views[i].barwin);
+ cleanupmons();
XSync(dpy, False);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
void
-compileregs(void) {
- unsigned int i;
- regex_t *reg;
+cleanupmons(void) {
+ Monitor *m;
- if(regs)
- return;
- regs = emallocz(LENGTH(rules) * sizeof(Regs));
- for(i = 0; i < LENGTH(rules); i++) {
- if(rules[i].prop) {
- reg = emallocz(sizeof(regex_t));
- if(regcomp(reg, rules[i].prop, REG_EXTENDED))
- free(reg);
- else
- regs[i].propregex = reg;
- }
- if(rules[i].tags) {
- reg = emallocz(sizeof(regex_t));
- if(regcomp(reg, rules[i].tags, REG_EXTENDED))
- free(reg);
- else
- regs[i].tagregex = reg;
- }
+ while(mons) {
+ m = mons->next;
+ XUnmapWindow(dpy, mons->barwin);
+ XDestroyWindow(dpy, mons->barwin);
+ free(mons);
+ mons = m;
}
}
+void
+clearurgent(Client *c) {
+ XWMHints *wmh;
+
+ c->isurgent = False;
+ if(!(wmh = XGetWMHints(dpy, c->win)))
+ return;
+ wmh->flags &= ~XUrgencyHint;
+ XSetWMHints(dpy, c->win, wmh);
+ XFree(wmh);
+}
+
void
configure(Client *c) {
XConfigureEvent ce;
ce.y = c->y;
ce.width = c->w;
ce.height = c->h;
- ce.border_width = c->border;
+ ce.border_width = c->bw;
ce.above = None;
ce.override_redirect = False;
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
void
configurenotify(XEvent *e) {
+ Monitor *m;
XConfigureEvent *ev = &e->xconfigure;
- View *v = selview;
-
- 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, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
- XResizeWindow(dpy, v->barwin, v->w, bh);
- updatebarpos(v);
+
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
+ updategeom();
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ updatebars();
+ for(m = mons; m; m = m->next)
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
arrange();
}
}
void
configurerequest(XEvent *e) {
Client *c;
+ Monitor *m;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
- if((c = getclient(ev->window))) {
- View *v = getview(c);
+ if((c = wintoclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == v->layout->arrange)) {
+ c->bw = ev->border_width;
+ else if(c->isfloating || !lt[selmon->sellt]->arrange) {
+ m = c->mon;
if(ev->value_mask & CWX)
- c->x = v->x + ev->x;
+ c->x = m->mx + ev->x;
if(ev->value_mask & CWY)
- c->y = v->y + ev->y;
+ c->y = m->my + ev->y;
if(ev->value_mask & CWWidth)
c->w = ev->width;
if(ev->value_mask & CWHeight)
c->h = ev->height;
- 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)))
+ if((c->x - m->mx + c->w) > m->mw && c->isfloating)
+ c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
+ if((c->y - m->my + c->h) > m->mh && c->isfloating)
+ c->y = m->my + (m->mh / 2 - c->h / 2); /* center in y direction */
+ if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(isvisible(c))
+ if(ISVISIBLE(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
- if((c = getclient(ev->window)))
+ if((c = wintoclient(ev->window)))
unmanage(c);
}
void
detach(Client *c) {
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
- clients = c->next;
- c->next = c->prev = NULL;
+ Client **tc;
+
+ for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
+ *tc = c->next;
}
void
detachstack(Client *c) {
- Client **tc;
+ Client **tc, *t;
- for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
+
+ if(c == c->mon->sel) {
+ for(t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
+ c->mon->sel = t;
+ }
}
void
-drawbar(View *v) {
- int i, x;
+die(const char *errstr, ...) {
+ va_list ap;
+
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
+ exit(EXIT_FAILURE);
+}
+
+void
+drawbar(Monitor *m) {
+ int x;
+ unsigned int i, occ = 0, urg = 0;
+ unsigned long *col;
Client *c;
+ for(c = m->clients; c; c = c->next) {
+ occ |= c->tags;
+ if(c->isurgent)
+ urg |= c->tags;
+ }
+
dc.x = 0;
- for(c = stack; c && !isvisible(c); c = c->snext);
+ if(mons->next) { /* more than a single monitor */
+ char buf[2];
+ buf[0] = m->screen_number + '0';
+ buf[1] = '\0';
+ dc.w = TEXTW(buf);
+ drawtext(buf, selmon == m ? dc.sel : dc.norm, True);
+ dc.x += dc.w;
+ }
+ m->btx = dc.x;
for(i = 0; i < LENGTH(tags); i++) {
- dc.w = textw(tags[i]);
- if(seltags[i]) {
- drawtext(v, tags[i], dc.sel, isurgent(i));
- drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
- }
- else {
- drawtext(v, tags[i], dc.norm, isurgent(i));
- drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
- }
+ dc.w = TEXTW(tags[i]);
+ col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
+ drawtext(tags[i], col, urg & 1 << i);
+ drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+ occ & 1 << i, urg & 1 << i, col);
dc.x += dc.w;
}
- dc.w = blw;
- drawtext(v, v->layout->symbol, dc.norm, False);
- x = dc.x + dc.w;
- if(v == selview) {
- dc.w = textw(stext);
- dc.x = v->w - dc.w;
+ if(blw > 0) {
+ dc.w = blw;
+ drawtext(lt[m->sellt]->symbol, dc.norm, False);
+ x = dc.x + dc.w;
+ }
+ else
+ x = dc.x;
+ if(m == selmon) { /* status is only drawn on selected monitor */
+ dc.w = TEXTW(stext);
+ dc.x = m->ww - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = v->w - x;
+ dc.w = m->ww - x;
}
- drawtext(v, stext, dc.norm, False);
+ drawtext(stext, dc.norm, False);
+ }
+ else {
+ dc.x = m->ww;
}
- else
- dc.x = v->w;
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(c) {
- drawtext(v, c->name, dc.sel, False);
- drawsquare(v, False, c->isfloating, False, dc.sel);
+ if(m->sel) {
+ col = m == selmon ? dc.sel : dc.norm;
+ drawtext(m->sel->name, col, False);
+ drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);
}
else
- drawtext(v, NULL, dc.norm, False);
+ drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
XSync(dpy, False);
}
void
-drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawbars(void) {
+ Monitor *m;
+
+ for(m = mons; m; m = m->next)
+ drawbar(m);
+}
+
+void
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
}
void
-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;
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+ char buf[256];
+ int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
- w = 0;
- olen = len = strlen(text);
- if(len >= sizeof buf)
- len = sizeof buf - 1;
- memcpy(buf, text, len);
- buf[len] = 0;
+ olen = strlen(text);
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- while(len && (w = textnw(buf, len)) > dc.w - h)
- buf[--len] = 0;
- if(len < olen) {
- if(len > 1)
- buf[len - 1] = '.';
- if(len > 2)
- buf[len - 2] = '.';
- if(len > 3)
- buf[len - 3] = '.';
- }
- if(w > dc.w)
- return; /* too long */
+ for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+ if(!len)
+ return;
+ memcpy(buf, text, len);
+ if(len < olen)
+ for(i = len; i && i > len - 3; buf[--i] = '.');
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);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
-void *
-emallocz(unsigned int size) {
- void *res = calloc(1, size);
-
- if(!res)
- eprint("fatal: could not malloc() %u bytes\n", size);
- return res;
-}
-
void
enternotify(XEvent *e) {
Client *c;
+ Monitor *m;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
- if(!isxinerama || ev->window != root)
- return;
+ if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+ return;
+ if((m = wintomon(ev->window)) && m != selmon) {
+ unfocus(selmon->sel);
+ selmon = m;
}
- if((c = getclient(ev->window)))
+ if((c = wintoclient(ev->window)))
focus(c);
else
focus(NULL);
}
-void
-eprint(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
-
void
expose(XEvent *e) {
- View *v;
+ Monitor *m;
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0 && (v = getviewbar(ev->window)))
- drawbar(v);
-}
-
-void
-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);
+ if(ev->count == 0 && (m = wintomon(ev->window)))
+ drawbar(m);
}
void
focus(Client *c) {
- 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); c = c->snext);
- if(sel && sel != c) {
- grabbuttons(sel, False);
- XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
- }
+ if(!c || !ISVISIBLE(c))
+ for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+ if(selmon->sel)
+ unfocus(selmon->sel);
if(c) {
+ if(c->mon != selmon)
+ selmon = c->mon;
+ if(c->isurgent)
+ clearurgent(c);
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- }
- sel = c;
- 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);
+ selmon->sel = c;
+ drawbars();
}
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);
+ if(selmon->sel && ev->window != selmon->sel->win)
+ XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
}
void
-focusnext(const char *arg) {
- Client *c;
+focusmon(const Arg *arg) {
+ Monitor *m;
- if(!sel)
+ if(!(m = idxtomon(arg->ui)) || m == selmon)
return;
- for(c = sel->next; c && !isvisible(c); c = c->next);
- if(!c)
- for(c = clients; c && !isvisible(c); c = c->next);
- if(c) {
- focus(c);
- restack(getview(c));
- }
+ unfocus(selmon->sel);
+ selmon = m;
+ focus(NULL);
}
void
-focusprev(const char *arg) {
- Client *c;
+focusstack(const Arg *arg) {
+ Client *c = NULL, *i;
- if(!sel)
+ if(!selmon->sel)
return;
- for(c = sel->prev; c && !isvisible(c); c = c->prev);
- if(!c) {
- for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c); c = c->prev);
+ if(arg->i > 0) {
+ for(c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
+ if(!c)
+ for(c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
+ }
+ else {
+ for(i = selmon->clients; i != selmon->sel; i = i->next)
+ if(ISVISIBLE(i))
+ c = i;
+ if(!c)
+ for(; i; i = i->next)
+ if(ISVISIBLE(i))
+ c = i;
}
if(c) {
focus(c);
- restack(getview(c));
+ restack(selmon);
}
}
-Client *
-getclient(Window w) {
- Client *c;
-
- for(c = clients; c && c->win != w; c = c->next);
- return c;
-}
-
unsigned long
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
- eprint("error, cannot allocate color '%s'\n", colstr);
+ die("error, cannot allocate color '%s'\n", 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 */
+Bool
+getrootpointer(int *x, int *y) {
+ int di;
+ unsigned int dui;
+ Window dummy;
+ return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
}
long
void
grabbuttons(Client *c, Bool focused) {
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-
- if(focused) {
- XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- 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,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- 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,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
+ updatenumlockmask();
+ {
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused) {
+ for(i = 0; i < LENGTH(buttons); i++)
+ if(buttons[i].click == ClkClientWin)
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(dpy, buttons[i].button,
+ buttons[i].mask | modifiers[j],
+ c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ } else
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
- else
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
}
void
-grabkeys(void) {
- unsigned int i, j;
- KeyCode code;
- XModifierKeymap *modmap;
+grabkeys(void) {
+ updatenumlockmask();
+ { /* grab keys */
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ KeyCode code;
- /* 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);
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++) {
+ if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+ True, GrabModeAsync, GrabModeAsync);
}
- 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) {
+Monitor *
+idxtomon(unsigned int n) {
unsigned int i;
+ Monitor *m;
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
- return (i < LENGTH(tags)) ? i : 0;
+ for(m = mons, i = 0; m && i != n; m = m->next, i++);
+ return m;
}
void
int i, n;
missing = NULL;
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
- if(dc.font.ascent < (*xfonts)->ascent)
- dc.font.ascent = (*xfonts)->ascent;
- if(dc.font.descent < (*xfonts)->descent)
- dc.font.descent = (*xfonts)->descent;
+ dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+ dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
xfonts++;
}
}
else {
- if(dc.font.xfont)
- XFreeFont(dpy, dc.font.xfont);
- dc.font.xfont = NULL;
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
- eprint("error, cannot load font: '%s'\n", fontstr);
+ die("error, cannot load font: '%s'\n", fontstr);
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
}
dc.font.height = dc.font.ascent + dc.font.descent;
}
-Bool
-isoccupied(unsigned int t) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->tags[t])
- return True;
- return False;
-}
-
Bool
isprotodel(Client *c) {
int i, n;
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 < LENGTH(tags); i++)
- if(c->tags[i] && seltags[i])
- return True;
- return False;
-}
-
void
keypress(XEvent *e) {
unsigned int i;
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))
- {
- if(keys[i].func)
- keys[i].func(keys[i].arg);
- }
+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+ && keys[i].func)
+ keys[i].func(&(keys[i].arg));
}
void
-killclient(const char *arg) {
+killclient(const Arg *arg) {
XEvent ev;
- if(!sel)
+ if(!selmon->sel)
return;
- if(isprotodel(sel)) {
+ if(isprotodel(selmon->sel)) {
ev.type = ClientMessage;
- ev.xclient.window = sel->win;
+ ev.xclient.window = selmon->sel->win;
ev.xclient.message_type = wmatom[WMProtocols];
ev.xclient.format = 32;
ev.xclient.data.l[0] = wmatom[WMDelete];
ev.xclient.data.l[1] = CurrentTime;
- XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+ XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
}
else
- XKillClient(dpy, sel->win);
+ XKillClient(dpy, selmon->sel->win);
}
void
manage(Window w, XWindowAttributes *wa) {
+ static Client cz;
Client *c, *t = NULL;
- View *v;
- Status rettrans;
- Window trans;
+ Window trans = None;
XWindowChanges wc;
- c = emallocz(sizeof(Client));
- c->tags = emallocz(sizeof initags);
+ if(!(c = malloc(sizeof(Client))))
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+ *c = cz;
c->win = w;
- applyrules(c);
-
- v = getview(c);
+ if(XGetTransientForHint(dpy, w, &trans))
+ t = wintoclient(trans);
+ if(t) {
+ c->mon = t->mon;
+ c->tags = t->tags;
+ }
+ else {
+ c->mon = selmon;
+ applyrules(c);
+ }
- c->x = wa->x + v->x;
- c->y = wa->y + v->y;
+ /* geometry */
+ c->x = wa->x + c->mon->wx;
+ c->y = wa->y + c->mon->wy;
c->w = wa->width;
c->h = wa->height;
- c->oldborder = wa->border_width;
-
- if(c->w == v->w && c->h == v->h) {
- c->x = v->x;
- c->y = v->y;
- c->border = wa->border_width;
+ c->oldbw = wa->border_width;
+ if(c->w == c->mon->mw && c->h == c->mon->mh) {
+ c->x = c->mon->mx;
+ c->y = c->mon->my;
+ c->bw = 0;
}
else {
- 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;
+ if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+ c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+ if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+ c->y = c->mon->my + c->mon->mh - HEIGHT(c);
+ c->x = MAX(c->x, c->mon->mx);
+ /* only fix client y-offset, if the client center might cover the bar */
+ c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
+ c->bw = borderpx;
+ }
+
+ wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, False);
updatetitle(c);
- if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
- for(t = clients; t && t->win != trans; t = t->next);
- if(t)
- memcpy(c->tags, t->tags, sizeof initags);
if(!c->isfloating)
- c->isfloating = (rettrans == Success) || c->isfixed;
+ c->isfloating = trans != None || c->isfixed;
+ if(c->isfloating)
+ XRaiseWindow(dpy, c->win);
attach(c);
attachstack(c);
- XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
- ban(c);
+ XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
arrange();
return;
if(wa.override_redirect)
return;
- if(!getclient(ev->window))
+ if(!wintoclient(ev->window))
manage(ev->window, &wa);
}
-View *
-viewat() {
- int i, x, y;
- Window win;
- unsigned int mask;
+void
+monocle(Monitor *m) {
+ Client *c;
- 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;
+ for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
}
void
-movemouse(Client *c) {
- int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
- View *v;
- Window dummy;
+movemouse(const Arg *arg) {
+ int x, y, ocx, ocy, nx, ny;
+ Client *c;
+ Monitor *m;
XEvent ev;
- ocx = nx = c->x;
- ocy = ny = c->y;
- v = getview(c);
+ if(!(c = selmon->sel))
+ return;
+ restack(selmon);
+ ocx = c->x;
+ ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurMove], CurrentTime) != GrabSuccess)
+ None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
- for(;;) {
+ if(!getrootpointer(&x, &y))
+ return;
+ do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
case ConfigureRequest:
case Expose:
case MapRequest:
handler[ev.type](&ev);
break;
case MotionNotify:
- XSync(dpy, False);
- nx = ocx + (ev.xmotion.x - x1);
- ny = ocy + (ev.xmotion.y - y1);
- 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);
+ 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) {
+ if(abs(selmon->wx - nx) < snap)
+ nx = selmon->wx;
+ else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+ nx = selmon->wx + selmon->ww - WIDTH(c);
+ if(abs(selmon->wy - ny) < snap)
+ 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))
+ togglefloating(NULL);
+ }
+ if(!lt[selmon->sellt]->arrange || c->isfloating)
+ resize(c, nx, ny, c->w, c->h);
break;
}
}
+ while(ev.type != ButtonRelease);
+ XUngrabPointer(dpy, CurrentTime);
+ if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+ sendmon(c, m);
+ selmon = m;
+ focus(NULL);
+ }
}
Client *
-nexttiled(Client *c, View *v) {
- for(; c && (c->isfloating || getview(c) != v || !isvisible(c)); c = c->next);
+nexttiled(Client *c) {
+ for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
return c;
}
+Monitor *
+pointertomon(int x, int y) {
+ Monitor *m;
+
+ for(m = mons; m; m = m->next)
+ if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
+ return m;
+ return selmon;
+}
+
void
propertynotify(XEvent *e) {
Client *c;
Window trans;
XPropertyEvent *ev = &e->xproperty;
- if(ev->state == PropertyDelete)
+ if((ev->window == root) && (ev->atom == XA_WM_NAME))
+ updatestatus();
+ else if(ev->state == PropertyDelete)
return; /* ignore */
- if((c = getclient(ev->window))) {
+ else if((c = wintoclient(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)))
+ if(!c->isfloating && (c->isfloating = (wintoclient(trans) != NULL)))
arrange();
break;
case XA_WM_NORMAL_HINTS:
break;
case XA_WM_HINTS:
updatewmhints(c);
- drawbar(getview(c));
+ drawbars();
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
- if(c == sel)
- drawbar(selview);
+ if(c == selmon->sel)
+ drawbars();
}
}
}
void
-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();
+quit(const Arg *arg) {
+ running = False;
}
void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
- View *v;
+resize(Client *c, int x, int y, int w, int h) {
XWindowChanges wc;
- v = getview(c);
- if(sizehints) {
- /* 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;
- }
-
- /* 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 > 0 && h < c->minh)
- h = c->minh;
- if(c->maxw > 0 && w > c->maxw)
- w = c->maxw;
- if(c->maxh > 0 && h > c->maxh)
- h = c->maxh;
- }
- if(w <= 0 || h <= 0)
- return;
- 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) {
+ if(applysizehints(c, &x, &y, &w, &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);
+ wc.border_width = c->bw;
+ XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
XSync(dpy, False);
}
}
void
-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {
int ocx, ocy;
int nw, nh;
- View *v;
+ Client *c;
+ Monitor *m;
XEvent ev;
+ if(!(c = selmon->sel))
+ return;
+ restack(selmon);
ocx = c->x;
ocy = c->y;
- v = getview(c);
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->border - 1, c->h + c->border - 1);
- for(;;) {
- XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+ do {
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch(ev.type) {
- case ButtonRelease:
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
- c->w + c->border - 1, c->h + c->border - 1);
- XUngrabPointer(dpy, CurrentTime);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
- return;
case ConfigureRequest:
case Expose:
case MapRequest:
handler[ev.type](&ev);
break;
case MotionNotify:
- XSync(dpy, False);
- if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
- nw = 1;
- if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
- nh = 1;
- 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);
+ 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))
+ togglefloating(NULL);
+ }
+ if(!lt[selmon->sellt]->arrange || c->isfloating)
+ resize(c, c->x, c->y, nw, nh);
break;
}
}
+ 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) {
+ sendmon(c, m);
+ selmon = m;
+ focus(NULL);
+ }
}
void
-restack(View *v) {
+restack(Monitor *m) {
Client *c;
XEvent ev;
XWindowChanges wc;
- drawbar(v);
- if(!sel)
+ drawbars();
+ if(!m->sel)
return;
- if(sel->isfloating || (v->layout->arrange == floating))
- XRaiseWindow(dpy, sel->win);
- if(v->layout->arrange != floating) {
+ if(m->sel->isfloating || !lt[m->sellt]->arrange)
+ XRaiseWindow(dpy, m->sel->win);
+ if(lt[m->sellt]->arrange) {
wc.stack_mode = Below;
- wc.sibling = v->barwin;
- if(!sel->isfloating) {
- XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
- wc.sibling = sel->win;
- }
- for(c = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
- if(c == sel)
- continue;
- XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
- wc.sibling = c->win;
- }
+ wc.sibling = m->barwin;
+ for(c = m->stack; c; c = c->snext)
+ if(!c->isfloating && ISVISIBLE(c)) {
+ XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+ wc.sibling = c->win;
+ }
}
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
void
run(void) {
- char *p;
- char buf[sizeof stext];
- fd_set rd;
- int r, xfd;
- unsigned int len, offset;
XEvent ev;
- /* main event loop, also reads status text from stdin */
+ /* main event loop */
XSync(dpy, False);
- xfd = ConnectionNumber(dpy);
- readin = True;
- offset = 0;
- len = sizeof stext - 1;
- buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
- while(running) {
- FD_ZERO(&rd);
- if(readin)
- FD_SET(STDIN_FILENO, &rd);
- FD_SET(xfd, &rd);
- if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
- if(errno == EINTR)
- continue;
- eprint("select failed\n");
- }
- if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
- case -1:
- strncpy(stext, strerror(errno), len);
- readin = False;
- break;
- case 0:
- strncpy(stext, "EOF", 4);
- readin = False;
- break;
- default:
- for(p = buf + offset; r > 0; p++, r--, offset++)
- if(*p == '\n' || *p == '\0') {
- *p = '\0';
- strncpy(stext, buf, len);
- p += r - 1; /* p is buf + offset + r - 1 */
- for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
- offset = r;
- if(r)
- memmove(buf, p - r + 1, r);
- break;
- }
- break;
- }
- drawbar(selview);
- }
- while(XPending(dpy)) {
- XNextEvent(dpy, &ev);
- if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
+ while(running && !XNextEvent(dpy, &ev)) {
+ if(handler[ev.type])
+ (handler[ev.type])(&ev); /* call handler */
}
}
void
scan(void) {
unsigned int i, num;
- Window *wins, d1, d2;
+ Window d1, d2, *wins = NULL;
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))
+ || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
continue;
if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
manage(wins[i], &wa);
if(!XGetWindowAttributes(dpy, wins[i], &wa))
continue;
if(XGetTransientForHint(dpy, wins[i], &d1)
- && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+ && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
manage(wins[i], &wa);
}
+ if(wins)
+ XFree(wins);
}
- if(wins)
- XFree(wins);
+}
+
+void
+sendmon(Client *c, Monitor *m) {
+ if(c->mon == m)
+ return;
+ unfocus(c);
+ detach(c);
+ detachstack(c);
+ c->mon = m;
+ c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+ attach(c);
+ attachstack(c);
+ focus(NULL);
+ arrange();
}
void
}
void
-setlayout(const char *arg) {
- unsigned int i;
- View *v = selview;
-
- if(!arg) {
- v->layout++;
- if(v->layout == &layouts[LENGTH(layouts)])
- v->layout = &layouts[0];
- }
- else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- v->layout = &layouts[i];
- }
- if(sel)
+setlayout(const Arg *arg) {
+ if(!arg || !arg->v || arg->v != lt[selmon->sellt])
+ selmon->sellt ^= 1;
+ if(arg && arg->v)
+ lt[selmon->sellt] = (Layout *)arg->v;
+ if(selmon->sel)
arrange();
else
- drawbar(v);
+ drawbars();
}
+/* arg > 1.0 will set mfact absolutly */
void
-setmwfact(const char *arg) {
- double delta;
-
- View *v = selview;
+setmfact(const Arg *arg) {
+ float f;
- if(!domwfact)
+ if(!arg || !lt[selmon->sellt]->arrange)
return;
- /* arg handling, manipulate mwfact */
- if(arg == NULL)
- v->mwfact = MWFACT;
- else if(sscanf(arg, "%lf", &delta) == 1) {
- if(arg[0] == '+' || arg[0] == '-')
- v->mwfact += delta;
- else
- v->mwfact = delta;
- if(v->mwfact < 0.1)
- v->mwfact = 0.1;
- else if(v->mwfact > 0.9)
- v->mwfact = 0.9;
- }
+ f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+ if(f < 0.1 || f > 0.9)
+ return;
+ selmon->mfact = f;
arrange();
}
void
setup(void) {
unsigned int i;
- View *v;
+ int w;
XSetWindowAttributes wa;
- XineramaScreenInfo *info = NULL;
+
+ /* init screen */
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
+ initfont(font);
+ 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);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
/* init cursors */
- wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+ cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- 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));
-
- screen = DefaultScreen(dpy);
- root = RootWindow(dpy, screen);
-
/* init appearance */
- dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
- dc.norm[ColBG] = getcolor(NORMBGCOLOR);
- dc.norm[ColFG] = getcolor(NORMFGCOLOR);
- dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
- dc.sel[ColBG] = getcolor(SELBGCOLOR);
- dc.sel[ColFG] = getcolor(SELFGCOLOR);
- initfont(FONT);
- dc.h = bh = dc.font.height + 2;
+ dc.norm[ColBorder] = getcolor(normbordercolor);
+ dc.norm[ColBG] = getcolor(normbgcolor);
+ dc.norm[ColFG] = getcolor(normfgcolor);
+ dc.sel[ColBorder] = getcolor(selbordercolor);
+ dc.sel[ColBG] = getcolor(selbgcolor);
+ dc.sel[ColFG] = getcolor(selfgcolor);
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
+ dc.gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- 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];
- v->id = i + 1;
-
- 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 bars */
+ for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+ w = TEXTW(layouts[i].symbol);
+ blw = MAX(blw, w);
+ }
+ updatebars();
+ updatestatus();
- /* 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);
- /* EWMH support per view */
- XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
+ /* select for events */
+ wa.cursor = cursor[CurNormal];
+ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
+ |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+ |PropertyChangeMask;
+ XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+ XSelectInput(dpy, root, wa.event_mask);
- /* select for events */
- wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
- |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
- XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
- XSelectInput(dpy, root, wa.event_mask);
+ grabkeys();
+}
- drawbar(v);
+void
+showhide(Client *c) {
+ if(!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)
+ resize(c, c->x, c->y, c->w, c->h);
+ showhide(c->snext);
}
- if(info)
- XFree(info);
-
- /* grab keys */
- grabkeys();
+ else { /* hide clients bottom up */
+ showhide(c->snext);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ }
+}
- /* init tags */
- compileregs();
- selview = &views[0];
+void
+sigchld(int signal) {
+ while(0 < waitpid(-1, NULL, WNOHANG));
}
void
-spawn(const char *arg) {
- static char *shell = NULL;
-
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
- if(!arg)
- return;
- /* The double-fork construct avoids zombie processes and keeps the code
- * clean from stupid signal handlers. */
+spawn(const Arg *arg) {
+ signal(SIGCHLD, sigchld);
if(fork() == 0) {
- if(fork() == 0) {
- if(dpy)
- close(ConnectionNumber(dpy));
- setsid();
- execl(shell, shell, "-c", arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
- perror(" failed");
- }
+ if(dpy)
+ close(ConnectionNumber(dpy));
+ setsid();
+ execvp(((char **)arg->v)[0], (char **)arg->v);
+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
+ perror(" failed");
exit(0);
}
- wait(0);
}
void
-tag(const char *arg) {
- unsigned int i;
+tag(const Arg *arg) {
+ if(selmon->sel && arg->ui & TAGMASK) {
+ selmon->sel->tags = arg->ui & TAGMASK;
+ arrange();
+ }
+}
+
+void
+tagmon(const Arg *arg) {
+ Monitor *m;
- if(!sel)
+ if(!selmon->sel || !(m = idxtomon(arg->ui)))
return;
- for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (NULL == arg) ? selview->id : 0;
- sel->tags[idxoftag(arg)] = selview->id;
- arrange();
+ sendmon(selmon->sel, m);
}
-unsigned int
+int
textnw(const char *text, unsigned int len) {
XRectangle r;
return XTextWidth(dc.font.xfont, text, len);
}
-unsigned int
-textw(const char *text) {
- return textnw(text, strlen(text)) + dc.font.height;
-}
-
void
-tile(View *v) {
- unsigned int i, n, nx, ny, nw, nh, mw, th;
- Client *c, *mc;
+tile(Monitor *m) {
+ int x, y, h, w, mw;
+ unsigned int i, n;
+ Client *c;
- 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++;
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+ if(n == 0)
+ return;
- /* window geoms */
- mw = (n == 1) ? v->waw : v->mwfact * v->waw;
- th = (n > 1) ? v->wah / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = v->wah;
+ /* master */
+ c = nexttiled(m->clients);
+ mw = m->mfact * m->ww;
+ resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
- 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 = v->wah - 2 * c->border;
- }
- else { /* tile window */
- if(i == 1) {
- ny = v->way;
- nx += mc->w + 2 * mc->border;
- nw = v->waw - mw - 2 * c->border;
- }
- if(i + 1 == n) /* remainder */
- nh = (v->way + v->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 */
- resize(c, nx, ny, nw, nh, False);
- if(n > 1 && th != v->wah)
- ny = c->y + c->h + 2 * c->border;
- i++;
+ if(--n == 0)
+ return;
+
+ /* tile stack */
+ x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
+ y = m->wy;
+ w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
+ h = m->wh / n;
+ if(h < bh)
+ h = m->wh;
+
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+ ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+ if(h != m->wh)
+ y = c->y + HEIGHT(c);
}
}
void
-togglebar(const char *arg) {
- if(bpos == BarOff)
- bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
- else
- bpos = BarOff;
- updatebarpos(selview);
+togglebar(const Arg *arg) {
+ selmon->showbar = !selmon->showbar;
+ updatebarpos(selmon);
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
arrange();
}
void
-togglefloating(const char *arg) {
- if(!sel)
+togglefloating(const Arg *arg) {
+ if(!selmon->sel)
return;
- sel->isfloating = !sel->isfloating;
- if(sel->isfloating)
- resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+ selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+ if(selmon->sel->isfloating)
+ resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
arrange();
}
void
-toggletag(const char *arg) {
- unsigned int i, j;
+toggletag(const Arg *arg) {
+ unsigned int mask;
- if(!sel)
+ if(!selmon->sel)
return;
- i = idxoftag(arg);
- sel->tags[i] = !sel->tags[i];
- for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
- if(j == LENGTH(tags))
- sel->tags[i] = selview->id; /* at least one tag must be enabled */
- arrange();
+
+ mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
+ if(mask) {
+ selmon->sel->tags = mask;
+ arrange();
+ }
}
void
-toggleview(const char *arg) {
- unsigned int i, j;
+toggleview(const Arg *arg) {
+ unsigned int mask = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
- i = idxoftag(arg);
- seltags[i] = !seltags[i];
- for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
- if(j == LENGTH(tags))
- seltags[i] = selview->id; /* at least one tag must be viewed */
- arrange();
+ if(mask) {
+ selmon->tagset[selmon->seltags] = mask;
+ arrange();
+ }
}
void
-unban(Client *c) {
- if(!c->isbanned)
+unfocus(Client *c) {
+ if(!c)
return;
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
+ grabbuttons(c, False);
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
void
unmanage(Client *c) {
XWindowChanges wc;
- wc.border_width = c->oldborder;
+ wc.border_width = c->oldbw;
/* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
detach(c);
detachstack(c);
- if(sel == c)
- focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
- free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
+ focus(NULL);
arrange();
}
Client *c;
XUnmapEvent *ev = &e->xunmap;
- if((c = getclient(ev->window)))
+ if((c = wintoclient(ev->window)))
unmanage(c);
}
void
-updatebarpos(View *v) {
- XEvent ev;
+updatebars(void) {
+ Monitor *m;
+ XSetWindowAttributes wa;
+
+ wa.override_redirect = True;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
+
+ for(m = mons; m; m = m->next) {
+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
- v->wax = v->x;
- v->way = v->y;
- v->wah = v->h;
- v->waw = v->w;
- switch(bpos) {
- default:
- v->wah -= bh;
- v->way += bh;
- XMoveWindow(dpy, v->barwin, v->x, v->y);
- break;
- case BarBot:
- v->wah -= bh;
- XMoveWindow(dpy, v->barwin, v->x, v->y + v->wah);
- break;
- case BarOff:
- XMoveWindow(dpy, v->barwin, v->x, v->y - bh);
- break;
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
+ XMapRaised(dpy, m->barwin);
}
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+updatebarpos(Monitor *m) {
+ m->wy = m->my;
+ m->wh = m->mh;
+ if(m->showbar) {
+ m->wh -= bh;
+ m->by = m->topbar ? m->wy : m->wy + m->wh;
+ m->wy = m->topbar ? m->wy + bh : m->wy;
+ }
+ else
+ m->by = -bh;
+}
+
+void
+updategeom(void) {
+ int i, n = 1;
+ Client *c;
+ Monitor *newmons = NULL, *m, *tm;
+
+#ifdef XINERAMA
+ XineramaScreenInfo *info = NULL;
+
+ if(XineramaIsActive(dpy))
+ info = XineramaQueryScreens(dpy, &n);
+#endif /* XINERAMA */
+ /* allocate monitor(s) for the new geometry setup */
+ for(i = 0; i < n; i++) {
+ m = (Monitor *)malloc(sizeof(Monitor));
+ m->next = newmons;
+ newmons = m;
+ }
+
+ /* initialise monitor(s) */
+#ifdef XINERAMA
+ if(XineramaIsActive(dpy)) {
+ for(i = 0, m = newmons; m; m = m->next, i++) {
+ m->screen_number = 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;
+ m->mh = m->wh = info[i].height;
+ }
+ XFree(info);
+ }
+ else
+#endif /* XINERAMA */
+ /* default monitor setup */
+ {
+ m->screen_number = 0;
+ m->mx = m->wx = 0;
+ m->my = m->wy = 0;
+ m->mw = m->ww = sw;
+ m->mh = m->wh = sh;
+ }
+
+ /* bar geometry setup */
+ for(m = newmons; m; m = m->next) {
+ m->sel = m->stack = m->clients = NULL;
+ m->seltags = 0;
+ m->sellt = 0;
+ m->tagset[0] = m->tagset[1] = 1;
+ m->mfact = mfact;
+ m->showbar = SHOWBAR;
+ m->topbar = TOPBAR;
+ updatebarpos(m);
+ }
+
+ /* reassign left over clients of disappeared monitors */
+ for(tm = mons; tm; tm = tm->next)
+ while(tm->clients) {
+ c = tm->clients;
+ tm->clients = c->next;
+ detachstack(c);
+ c->mon = newmons;
+ attach(c);
+ attachstack(c);
+ }
+
+ /* select focused monitor */
+ cleanupmons();
+ selmon = mons = newmons;
+ selmon = wintomon(root);
+}
+
+void
+updatenumlockmask(void) {
+ unsigned int i, j;
+ XModifierKeymap *modmap;
+
+ numlockmask = 0;
+ 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);
}
void
long msize;
XSizeHints size;
- if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+ if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+ /* size is uninitialized, ensure that size.flags aren't used */
size.flags = PSize;
- c->flags = size.flags;
- if(c->flags & PBaseSize) {
+ if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
}
- else if(c->flags & PMinSize) {
+ else if(size.flags & PMinSize) {
c->basew = size.min_width;
c->baseh = size.min_height;
}
else
c->basew = c->baseh = 0;
- if(c->flags & PResizeInc) {
+ if(size.flags & PResizeInc) {
c->incw = size.width_inc;
c->inch = size.height_inc;
}
else
c->incw = c->inch = 0;
- if(c->flags & PMaxSize) {
+ if(size.flags & PMaxSize) {
c->maxw = size.max_width;
c->maxh = size.max_height;
}
else
c->maxw = c->maxh = 0;
- if(c->flags & PMinSize) {
+ if(size.flags & PMinSize) {
c->minw = size.min_width;
c->minh = size.min_height;
}
- else if(c->flags & PBaseSize) {
+ else if(size.flags & PBaseSize) {
c->minw = size.base_width;
c->minh = size.base_height;
}
else
c->minw = c->minh = 0;
- if(c->flags & PAspect) {
- c->minax = size.min_aspect.x;
- c->maxax = size.max_aspect.x;
- c->minay = size.min_aspect.y;
- c->maxay = size.max_aspect.y;
+ 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;
}
else
- c->minax = c->maxax = c->minay = c->maxay = 0;
+ c->maxa = c->mina = 0.0;
c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
- && c->maxw == c->minw && c->maxh == c->minh);
+ && c->maxw == c->minw && c->maxh == c->minh);
}
void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
- gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+ gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+}
+
+void
+updatestatus(void) {
+ if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+ strcpy(stext, "dwm-"VERSION);
+ drawbar(selmon);
}
void
XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) {
- c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+ if(c == selmon->sel && wmh->flags & XUrgencyHint) {
+ wmh->flags &= ~XUrgencyHint;
+ XSetWMHints(dpy, c->win, wmh);
+ }
+ else
+ c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+
XFree(wmh);
}
}
+void
+view(const Arg *arg) {
+ if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+ return;
+ selmon->seltags ^= 1; /* toggle sel tagset */
+ if(arg->ui & TAGMASK)
+ selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+ arrange();
+}
+
+Client *
+wintoclient(Window w) {
+ Client *c;
+ Monitor *m;
+
+ for(m = mons; m; m = m->next)
+ for(c = m->clients; c; c = c->next)
+ if(c->win == w)
+ return c;
+ return NULL;
+}
+
+Monitor *
+wintomon(Window w) {
+ int x, y;
+ Client *c;
+ Monitor *m;
+
+ if(w == root && getrootpointer(&x, &y))
+ return pointertomon(x, y);
+ for(m = mons; m; m = m->next)
+ if(w == m->barwin)
+ return m;
+ if((c = wintoclient(w)))
+ return c->mon;
+ return selmon;
+}
+
/* 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. */
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+ || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
- ee->request_code, ee->error_code);
+ ee->request_code, ee->error_code);
return xerrorxlib(dpy, ee); /* may call exit */
}
}
void
-view(const char *arg) {
- unsigned int i;
- int tmp[LENGTH(tags)];
-
- for(i = 0; i < LENGTH(tags); i++)
- tmp[i] = (NULL == arg) ? selview->id : 0;
- tmp[idxoftag(arg)] = selview->id;
- if(memcmp(seltags, tmp, sizeof initags) != 0) {
- memcpy(prevtags, seltags, sizeof initags);
- memcpy(seltags, tmp, sizeof initags);
- arrange();
- }
-}
-
-void
-viewprevtag(const char *arg) {
- static Bool tmp[LENGTH(tags)];
+zoom(const Arg *arg) {
+ Client *c = selmon->sel;
- memcpy(tmp, seltags, sizeof initags);
- memcpy(seltags, prevtags, sizeof initags);
- memcpy(prevtags, tmp, sizeof initags);
- arrange();
-}
-
-void
-zoom(const char *arg) {
- Client *c = sel;
-
- if(!sel || !dozoom || sel->isfloating)
+ if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
return;
- if(c == nexttiled(clients, getview(c)))
- if(!(c = nexttiled(c->next, getview(c))))
+ if(c == nexttiled(selmon->clients))
+ if(!c || !(c = nexttiled(c->next)))
return;
detach(c);
attach(c);
arrange();
}
-void
-selectview(const char *arg) {
- int i;
- View *v;
-
- if(!arg)
- return;
- if(arg)
- i = atoi(arg);
- v = &views[i % nviews];
- XWarpPointer(dpy, None, root, 0, 0, 0, 0, v->wax+v->waw/2, v->way+v->wah/2);
- focus(NULL);
-}
-
-
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+ die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
- eprint("usage: dwm [-v]\n");
+ die("usage: dwm [-v]\n");
+
+ if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ fputs("warning: no locale support\n", stderr);
- setlocale(LC_CTYPE, "");
- if(!(dpy = XOpenDisplay(0)))
- eprint("dwm: cannot open display\n");
+ if(!(dpy = XOpenDisplay(NULL)))
+ die("dwm: cannot open display\n");
checkotherwm();
setup();