X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/508922b90db66b88cfb66e81b8d48065d13f6bc1..e3da222c1e3bdd323a920b8e9765af23f19d80a2:/dwm.c
diff --git a/dwm.c b/dwm.c
index 48e0dd1..5f6ffe3 100644
--- a/dwm.c
+++ b/dwm.c
@@ -16,8 +16,8 @@
* 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.
+ * 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.
*
@@ -33,54 +33,72 @@
#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
/* 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 MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#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 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 { 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 */
+enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkLast }; /* clicks */
/* typedefs */
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+typedef union {
+ int i;
+ uint ui;
+ float f;
+ void *v;
+} Arg;
+
+typedef struct {
+ uint click;
+ uint mask;
+ uint button;
+ void (*func)(const Arg *arg);
+ const Arg arg;
+} Button;
+
typedef struct Client Client;
struct Client {
char name[256];
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int minax, maxax, minay, maxay;
- long flags;
- unsigned int border, oldborder;
- Bool isbanned, isfixed, isfloating, isurgent;
- Bool *tags;
+ float mina, maxa;
+ int bw, oldbw;
+ Bool isbanned, isfixed, isfloating, ismoved, isurgent;
+ uint tags;
Client *next;
- Client *prev;
Client *snext;
Window win;
- int monitor;
};
typedef struct {
int x, y, w, h;
- unsigned long norm[ColLast];
- unsigned long sel[ColLast];
+ ulong norm[ColLast];
+ ulong sel[ColLast];
Drawable drawable;
GC gc;
struct {
@@ -93,10 +111,10 @@ typedef struct {
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ uint mod;
KeySym keysym;
- void (*func)(const char *arg);
- const char *arg;
+ void (*func)(const Arg *);
+ const Arg arg;
} Key;
typedef struct {
@@ -105,122 +123,94 @@ typedef struct {
} Layout;
typedef struct {
- const char *prop;
- const char *tags;
+ const char *class;
+ const char *instance;
+ const char *title;
+ uint tags;
Bool isfloating;
- int monitor;
} Rule;
-typedef struct {
- regex_t *propregex;
- regex_t *tagregex;
-} Regs;
-
-typedef struct {
- int screen;
- Window root;
- Window barwin;
- int sx, sy, sw, sh, wax, way, wah, waw;
- DC dc;
- Bool *seltags;
- Bool *prevtags;
- Layout *layout;
- double mwfact;
-} Monitor;
-
/* 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(void);
-void drawsquare(Monitor *, Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
-void enternotify(XEvent *e);
-void eprint(const char *errstr, ...);
-void expose(XEvent *e);
-void floating(void); /* default floating layout */
-void 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, int screen);
-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(Monitor*, const char *fontstr);
-Bool isoccupied(Monitor *m, unsigned int t);
-Bool isprotodel(Client *c);
-Bool isurgent(int monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
-void keypress(XEvent *e);
-void killclient(const char *arg);
-void manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-void movemouse(Client *c);
-Client *nexttiled(Client *c, int monitor);
-void propertynotify(XEvent *e);
-void quit(const char *arg);
-void reapply(const char *arg);
-void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-void resizemouse(Client *c);
-void restack(void);
-void 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(Monitor*, const char *text, unsigned int len);
-unsigned int textw(Monitor*, const char *text);
-void tile(void);
-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(Monitor *m);
-void updatesizehints(Client *c);
-void updatetitle(Client *c);
-void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg); /* views previous selected tags */
-int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dsply, XErrorEvent *ee);
-int xerrorstart(Display *dsply, XErrorEvent *ee);
-void zoom(const char *arg);
-int monitorat(void);
-void movetomonitor(const char *arg);
-void selectmonitor(const char *arg);
+static void applyrules(Client *c);
+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 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 drawbar(void);
+static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+static void drawtext(const char *text, ulong col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+static void eprint(const char *errstr, ...);
+static void expose(XEvent *e);
+static void focus(Client *c);
+static void focusin(XEvent *e);
+static void focusstack(const Arg *arg);
+static Client *getclient(Window w);
+static ulong getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, uint size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isoccupied(uint t);
+static Bool isprotodel(Client *c);
+static Bool isurgent(uint t);
+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 movemouse(const Arg *arg);
+static Client *nexttiled(Client *c);
+static void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resizemouse(const Arg *arg);
+static void restack(void);
+static void run(void);
+static void scan(void);
+static void setclientstate(Client *c, long state);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, uint len);
+static void tile(void);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void togglelayout(const Arg *arg);
+static void togglemax(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unmanage(Client *c);
+static void unmapnotify(XEvent *e);
+static void updatebar(void);
+static void updategeom(void);
+static void updatesizehints(Client *c);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+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 mcount = 1;
-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, sx, sy, sw, sh;
+static int by, bh, blw, wx, wy, ww, wh;
+static uint seltags = 0;
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static uint numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[ConfigureNotify] = configurenotify,
@@ -234,65 +224,49 @@ void (*handler[LASTEvent]) (XEvent *) = {
[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;
-Monitor *monitors;
-int selmonitor = 0;
-
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool ismax = False;
+static Bool otherwm, readin;
+static Bool running = True;
+static uint tagset[] = {1, 1}; /* after start, first tag is selected */
+static Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc = {0};
+static Layout *lt = NULL;
+static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
-//Bool prevtags[LENGTH(tags)];
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 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;
- Bool matched_monitor = False;
+ uint 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)) {
- if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
- matched_monitor = True;
- c->monitor = rules[i].monitor;
- }
-
- c->isfloating = rules[i].isfloating;
- for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
- if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
- matched_tag = True;
- c->tags[j] = True;
- }
- }
+ 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 & TAGMASK;
}
+ }
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched_tag)
- memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
- if (!matched_monitor)
- c->monitor = monitorat();
+ if(!c->tags)
+ c->tags = tagset[seltags];
}
void
@@ -300,20 +274,28 @@ arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c, c->monitor))
- unban(c);
- else
- ban(c);
+ if(c->tags & tagset[seltags]) { /* is visible */
+ if(ismax && !c->isfixed) {
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+ c->ismoved = True;
+ }
+ else if(!lt->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h, True);
+ c->isbanned = False;
+ }
+ else if(!c->isbanned) {
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ c->isbanned = c->ismoved = True;
+ }
- monitors[selmonitor].layout->arrange();
focus(NULL);
+ if(lt->arrange && !ismax)
+ lt->arrange();
restack();
}
void
attach(Client *c) {
- if(clients)
- clients->prev = c;
c->next = clients;
clients = c;
}
@@ -324,64 +306,34 @@ attachstack(Client *c) {
stack = c;
}
-void
-ban(Client *c) {
- if(c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
- c->isbanned = True;
-}
-
void
buttonpress(XEvent *e) {
- unsigned int i, x;
+ uint i, x, click;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- Monitor *m = &monitors[monitorat()];
-
- if(ev->window == m->barwin) {
- x = 0;
- for(i = 0; i < LENGTH(tags); i++) {
- x += textw(m, 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;
- }
- }
- if((ev->x < x + blw) && ev->button == Button1)
- setlayout(NULL);
- }
- else if((c = getclient(ev->window))) {
- focus(c);
- if(CLEANMASK(ev->state) != MODKEY)
- return;
- if(ev->button == Button1) {
- restack();
- movemouse(c);
- }
- else if(ev->button == Button2) {
- if((floating != m->layout->arrange) && c->isfloating)
- togglefloating(NULL);
- else
- zoom(NULL);
- }
- else if(ev->button == Button3 && !c->isfixed) {
- restack();
- resizemouse(c);
- }
+ click = ClkLast;
+ if(ev->window == barwin) {
+ i = x = 0;
+ do
+ x += TEXTW(tags[i]);
+ while(ev->x >= x && ++i < LENGTH(tags));
+ if(i < LENGTH(tags))
+ click = i;
+ else if(ev->x < x + blw)
+ click = ClkLtSymbol;
+ else if(ev->x > wx + ww - TEXTW(stext))
+ click = ClkStatusText;
+ else
+ click = ClkWinTitle;
}
+ else if((c = getclient(ev->window)))
+ 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(&buttons[i].arg);
}
void
@@ -394,7 +346,6 @@ checkotherwm(void) {
XSync(dpy, False);
if(otherwm)
eprint("dwm: another window manager is already running\n");
- XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
@@ -402,54 +353,27 @@ checkotherwm(void) {
void
cleanup(void) {
- unsigned int i;
+ Arg a = {.i = ~0};
+ Layout foo = { "", NULL };
+
close(STDIN_FILENO);
- while(stack) {
- unban(stack);
+ view(&a);
+ lt = &foo;
+ while(stack)
unmanage(stack);
- }
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- if(m->dc.font.set)
- XFreeFontSet(dpy, m->dc.font.set);
- else
- XFreeFont(dpy, m->dc.font.xfont);
- XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
- XFreePixmap(dpy, m->dc.drawable);
- XFreeGC(dpy, m->dc.gc);
- XDestroyWindow(dpy, m->barwin);
- XFreeCursor(dpy, cursor[CurNormal]);
- XFreeCursor(dpy, cursor[CurResize]);
- XFreeCursor(dpy, cursor[CurMove]);
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- }
-}
-
-void
-compileregs(void) {
- unsigned int i;
- regex_t *reg;
-
- 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;
- }
- }
+ 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]);
+ XDestroyWindow(dpy, barwin);
+ XSync(dpy, False);
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
void
@@ -464,7 +388,7 @@ configure(Client *c) {
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);
@@ -473,15 +397,12 @@ configure(Client *c) {
void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- Monitor *m = &monitors[selmonitor];
- if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) {
- m->sw = ev->width;
- m->sh = ev->height;
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
- XResizeWindow(dpy, m->barwin, m->sw, bh);
- updatebarpos(m);
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
+ updategeom();
+ updatebar();
arrange();
}
}
@@ -493,26 +414,27 @@ configurerequest(XEvent *e) {
XWindowChanges wc;
if((c = getclient(ev->window))) {
- Monitor *m = &monitors[c->monitor];
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
+ c->bw = ev->border_width;
+ if(ismax && !c->isbanned && !c->isfixed)
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
+ else if(c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
- c->x = m->sx+ev->x;
+ c->x = sx + ev->x;
if(ev->value_mask & CWY)
- c->y = m->sy+ev->y;
+ c->y = sy + ev->y;
if(ev->value_mask & CWWidth)
c->w = ev->width;
if(ev->value_mask & CWHeight)
c->h = ev->height;
- if((c->x - m->sx + c->w) > m->sw && c->isfloating)
- c->x = m->sx + (m->sw / 2 - c->w / 2); /* center in x direction */
- if((c->y - m->sy + c->h) > m->sh && c->isfloating)
- c->y = m->sy + (m->sh / 2 - c->h / 2); /* center in y direction */
- if((ev->value_mask & (CWX | CWY))
- && !(ev->value_mask & (CWWidth | CWHeight)))
+ if((c->x - sx + c->w) > sw && c->isfloating)
+ c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
+ if((c->y - sy + c->h) > sh && c->isfloating)
+ c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+ if((ev->value_mask & (CWX|CWY))
+ && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(isvisible(c, monitorat()))
+ if(!c->isbanned)
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
@@ -542,134 +464,120 @@ destroynotify(XEvent *e) {
void
detach(Client *c) {
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
+ Client *i;
+
+ if (c != clients) {
+ for(i = clients; i->next != c; i = i->next);
+ i->next = c->next;
+ }
+ else {
clients = c->next;
- c->next = c->prev = NULL;
+ }
+ c->next = NULL;
}
void
detachstack(Client *c) {
Client **tc;
- for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
}
void
drawbar(void) {
- int i, j, x;
-
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- m->dc.x = 0;
- for(j = 0; j < LENGTH(tags); j++) {
- m->dc.w = textw(m, tags[j]);
- if(m->seltags[j]) {
- drawtext(m, tags[j], m->dc.sel, isurgent(i, j));
- drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
- }
- else {
- drawtext(m, tags[j], m->dc.norm, isurgent(i, j));
- drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
- }
- m->dc.x += m->dc.w;
+ int i, x;
+ Client *c;
+
+ dc.x = 0;
+ for(c = stack; c && c->isbanned; c = c->snext);
+ for(i = 0; i < LENGTH(tags); i++) {
+ dc.w = TEXTW(tags[i]);
+ if(tagset[seltags] & 1 << i) {
+ drawtext(tags[i], dc.sel, isurgent(i));
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
- m->dc.w = blw;
- drawtext(m, m->layout->symbol, m->dc.norm, False);
- x = m->dc.x + m->dc.w;
- m->dc.w = textw(m, stext);
- m->dc.x = m->sw - m->dc.w;
- if(m->dc.x < x) {
- m->dc.x = x;
- m->dc.w = m->sw - x;
+ else {
+ drawtext(tags[i], dc.norm, isurgent(i));
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
}
- drawtext(m, stext, m->dc.norm, False);
- if((m->dc.w = m->dc.x - x) > bh) {
- m->dc.x = x;
- if(sel && sel->monitor == selmonitor) {
- drawtext(m, sel->name, m->dc.sel, False);
- drawsquare(m, False, sel->isfloating, m->dc.sel);
- }
- else
- drawtext(m, NULL, m->dc.norm, False);
+ dc.x += dc.w;
+ }
+ if(blw > 0) {
+ dc.w = blw;
+ drawtext(lt->symbol, dc.norm, ismax);
+ x = dc.x + dc.w;
+ }
+ else
+ x = dc.x;
+ dc.w = TEXTW(stext);
+ dc.x = ww - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = ww - x;
+ }
+ drawtext(stext, dc.norm, False);
+ if((dc.w = dc.x - x) > bh) {
+ dc.x = x;
+ if(c) {
+ drawtext(c->name, dc.sel, False);
+ drawsquare(c->isfixed, c->isfloating, False, dc.sel);
}
- XCopyArea(dpy, m->dc.drawable, m->barwin, m->dc.gc, 0, 0, m->sw, bh, 0, 0);
- XSync(dpy, False);
+ else
+ drawtext(NULL, dc.norm, False);
}
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
+ XSync(dpy, False);
}
void
-drawsquare(Monitor *m, Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
int x;
XGCValues gcv;
- XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- gcv.foreground = col[ColFG];
- XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
- x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
- r.x = m->dc.x + 1;
- r.y = m->dc.y + 1;
+ 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;
+ r.y = dc.y + 1;
if(filled) {
r.width = r.height = x + 1;
- XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
else if(empty) {
r.width = r.height = x;
- XDrawRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+ XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
}
void
-drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert) {
- int x, y, w, h;
- static char buf[256];
- unsigned int len, olen;
- XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
+ int i, x, y, h, len, olen;
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ char buf[256];
- XSetForeground(dpy, m->dc.gc, col[invert ? ColFG : ColBG]);
- XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+ 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;
+ olen = strlen(text);
+ len = MIN(olen, sizeof buf);
memcpy(buf, text, len);
- buf[len] = 0;
- h = m->dc.font.ascent + m->dc.font.descent;
- y = m->dc.y + (m->dc.h / 2) - (h / 2) + m->dc.font.ascent;
- x = m->dc.x + (h / 2);
+ 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(m, buf, len)) > m->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 > m->dc.w)
- return; /* too long */
- XSetForeground(dpy, m->dc.gc, col[invert ? ColBG : ColFG]);
- if(m->dc.font.set)
- XmbDrawString(dpy, m->dc.drawable, m->dc.font.set, m->dc.gc, x, y, buf, len);
+ for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+ if(!len)
+ return;
+ 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);
else
- XDrawString(dpy, m->dc.drawable, m->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;
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
void
@@ -677,15 +585,12 @@ enternotify(XEvent *e) {
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->mode != NotifyNormal || ev->detail == NotifyInferior);
- //return;
+ if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+ return;
if((c = getclient(ev->window)))
focus(c);
- else {
- selmonitor = monitorat();
- fprintf(stderr, "updating selmonitor %d\n", selmonitor);
+ else
focus(NULL);
- }
}
void
@@ -702,50 +607,29 @@ void
expose(XEvent *e) {
XExposeEvent *ev = &e->xexpose;
- if(ev->count == 0) {
- if(ev->window == monitors[selmonitor].barwin)
- drawbar();
- }
-}
-
-void
-floating(void) { /* default floating layout */
- Client *c;
-
- domwfact = dozoom = False;
- for(c = clients; c; c = c->next)
- if(isvisible(c, selmonitor))
- resize(c, c->x, c->y, c->w, c->h, True);
+ if(ev->count == 0 && (ev->window == barwin))
+ drawbar();
}
void
focus(Client *c) {
- Monitor *m;
-
- if(c)
- selmonitor = c->monitor;
- m = &monitors[selmonitor];
- if(!c || (c && !isvisible(c, selmonitor)))
- for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
+ if(!c || c->isbanned)
+ for(c = stack; c && c->isbanned; c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
- XSetWindowBorder(dpy, sel->win, monitors[sel->monitor].dc.norm[ColBorder]);
+ XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
}
if(c) {
detachstack(c);
attachstack(c);
grabbuttons(c, True);
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+ XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
sel = c;
drawbar();
- if(c) {
- XSetWindowBorder(dpy, c->win, m->dc.sel[ColBorder]);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- selmonitor = c->monitor;
- }
- else {
- XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
- }
}
void
@@ -757,30 +641,24 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
}
void
-focusnext(const char *arg) {
- Client *c;
+focusstack(const Arg *arg) {
+ Client *c = NULL, *i;
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
- if(!c)
- for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
- if(c) {
- focus(c);
- restack();
+ if (arg->i > 0) {
+ for(c = sel->next; c && c->isbanned; c = c->next);
+ if(!c)
+ for(c = clients; c && c->isbanned; c = c->next);
}
-}
-
-void
-focusprev(const char *arg) {
- Client *c;
-
- if(!sel)
- return;
- for(c = sel->prev; c && !isvisible(c, selmonitor); c = c->prev);
- if(!c) {
- for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c, selmonitor); c = c->prev);
+ else {
+ for(i = clients; i != sel; i = i->next)
+ if (!i->isbanned)
+ c = i;
+ if(!c)
+ for(; i; i = i->next)
+ if (!i->isbanned)
+ c = i;
}
if(c) {
focus(c);
@@ -796,8 +674,8 @@ getclient(Window w) {
return c;
}
-unsigned long
-getcolor(const char *colstr, int screen) {
+ulong
+getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
@@ -811,7 +689,7 @@ getstate(Window w) {
int format, status;
long result = -1;
unsigned char *p = NULL;
- unsigned long n, extra;
+ ulong n, extra;
Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
@@ -825,7 +703,7 @@ getstate(Window w) {
}
Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+gettextprop(Window w, Atom atom, char *text, uint size) {
char **list = NULL;
int n;
XTextProperty name;
@@ -852,44 +730,24 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
void
grabbuttons(Client *c, Bool focused) {
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ int i, j;
+ uint buttons[] = { Button1, Button2, Button3 };
+ uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
- 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);
- }
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused)
+ for(i = 0; i < LENGTH(buttons); i++)
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
else
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
void
-grabkeys(void) {
- unsigned int i, j;
+grabkeys(void) {
+ uint i, j;
KeyCode code;
XModifierKeymap *modmap;
@@ -902,79 +760,66 @@ grabkeys(void) {
}
XFreeModifiermap(modmap);
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
- for(j = 0; j < LENGTH(keys); j++) {
- code = XKeysymToKeycode(dpy, keys[j].keysym);
- XGrabKey(dpy, code, keys[j].mod, m->root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[j].mod | LockMask, m->root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[j].mod | numlockmask, m->root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[j].mod | numlockmask | LockMask, m->root, True,
- GrabModeAsync, GrabModeAsync);
- }
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++) {
+ code = XKeysymToKeycode(dpy, keys[i].keysym);
+ XGrabKey(dpy, code, keys[i].mod, root, True,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
+ GrabModeAsync, GrabModeAsync);
}
}
-unsigned int
-idxoftag(const char *tag) {
- unsigned int i;
-
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
- return (i < LENGTH(tags)) ? i : 0;
-}
-
void
-initfont(Monitor *m, const char *fontstr) {
+initfont(const char *fontstr) {
char *def, **missing;
int i, n;
missing = NULL;
- if(m->dc.font.set)
- XFreeFontSet(dpy, m->dc.font.set);
- m->dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
XFreeStringList(missing);
}
- if(m->dc.font.set) {
+ if(dc.font.set) {
XFontSetExtents *font_extents;
XFontStruct **xfonts;
char **font_names;
- m->dc.font.ascent = m->dc.font.descent = 0;
- font_extents = XExtentsOfFontSet(m->dc.font.set);
- n = XFontsOfFontSet(m->dc.font.set, &xfonts, &font_names);
- for(i = 0, m->dc.font.ascent = 0, m->dc.font.descent = 0; i < n; i++) {
- if(m->dc.font.ascent < (*xfonts)->ascent)
- m->dc.font.ascent = (*xfonts)->ascent;
- if(m->dc.font.descent < (*xfonts)->descent)
- m->dc.font.descent = (*xfonts)->descent;
+ dc.font.ascent = dc.font.descent = 0;
+ 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++) {
+ dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+ dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
xfonts++;
}
}
else {
- if(m->dc.font.xfont)
- XFreeFont(dpy, m->dc.font.xfont);
- m->dc.font.xfont = NULL;
- if(!(m->dc.font.xfont = XLoadQueryFont(dpy, fontstr))
- && !(m->dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+ 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);
- m->dc.font.ascent = m->dc.font.xfont->ascent;
- m->dc.font.descent = m->dc.font.xfont->descent;
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
}
- m->dc.font.height = m->dc.font.ascent + m->dc.font.descent;
+ dc.font.height = dc.font.ascent + dc.font.descent;
}
Bool
-isoccupied(Monitor *m, unsigned int t) {
+isoccupied(uint t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t] && c->monitor == selmonitor)
+ if(c->tags & 1 << t)
return True;
return False;
}
@@ -995,28 +840,18 @@ isprotodel(Client *c) {
}
Bool
-isurgent(int monitor, unsigned int t) {
+isurgent(uint t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->monitor == monitor && c->isurgent && c->tags[t])
- return True;
- return False;
-}
-
-Bool
-isvisible(Client *c, int monitor) {
- unsigned int i;
-
- for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && monitors[c->monitor].seltags[i] && c->monitor == monitor)
+ if(c->isurgent && c->tags & 1 << t)
return True;
return False;
}
void
keypress(XEvent *e) {
- unsigned int i;
+ uint i;
KeySym keysym;
XKeyEvent *ev;
@@ -1024,15 +859,13 @@ keypress(XEvent *e) {
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
- {
- 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)
@@ -1053,59 +886,56 @@ killclient(const char *arg) {
void
manage(Window w, XWindowAttributes *wa) {
Client *c, *t = NULL;
- Monitor *m;
Status rettrans;
Window trans;
XWindowChanges wc;
- c = emallocz(sizeof(Client));
- c->tags = emallocz(sizeof initags);
+ if(!(c = calloc(1, sizeof(Client))))
+ eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
c->win = w;
- applyrules(c);
-
- m = &monitors[c->monitor];
-
- c->x = wa->x + m->sx;
- c->y = wa->y + m->sy;
+ /* geometry */
+ c->x = wa->x;
+ c->y = wa->y;
c->w = wa->width;
c->h = wa->height;
- c->oldborder = wa->border_width;
-
- if(c->w == m->sw && c->h == m->sh) {
- c->x = m->sx;
- c->y = m->sy;
- c->border = wa->border_width;
+ c->oldbw = wa->border_width;
+ if(c->w == sw && c->h == sh) {
+ c->x = sx;
+ c->y = sy;
+ c->bw = wa->border_width;
}
else {
- if(c->x + c->w + 2 * c->border > m->wax + m->waw)
- c->x = m->wax + m->waw - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > m->way + m->wah)
- c->y = m->way + m->wah - c->h - 2 * c->border;
- if(c->x < m->wax)
- c->x = m->wax;
- if(c->y < m->way)
- c->y = m->way;
- c->border = BORDERPX;
+ if(c->x + c->w + 2 * c->bw > sx + sw)
+ c->x = sx + sw - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > sy + sh)
+ c->y = sy + sh - c->h - 2 * c->bw;
+ c->x = MAX(c->x, sx);
+ c->y = MAX(c->y, by == 0 ? bh : sy);
+ c->bw = borderpx;
}
- wc.border_width = c->border;
+
+ wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, w, m->dc.norm[ColBorder]);
+ XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
updatesizehints(c);
- XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
+ 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);
+ c->tags = t->tags;
+ else
+ applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || 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);
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
arrange();
@@ -1133,40 +963,30 @@ maprequest(XEvent *e) {
manage(ev->window, &wa);
}
-int
-monitorat() {
- int i, x, y;
- Window win;
- unsigned int mask;
-
- XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
- for(i = 0; i < mcount; i++) {
- fprintf(stderr, "checking monitor[%d]: %d %d %d %d\n", i, monitors[i].sx, monitors[i].sy, monitors[i].sw, monitors[i].sh);
- if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
- && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
- fprintf(stderr, "%d,%d -> %d\n", x, y, i);
- return i;
- }
- }
- fprintf(stderr, "?,? -> 0\n");
- return 0;
-}
-
void
-movemouse(Client *c) {
+movemouse(const Arg *arg) {
int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ uint dui;
+ Client *c;
Window dummy;
XEvent ev;
+ if(!(c = sel))
+ return;
+ restack();
ocx = nx = c->x;
ocy = ny = c->y;
- if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurMove], CurrentTime) != GrabSuccess)
+ if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+ None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
- XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+ XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+ if(x1 < c->x || x1 > c->x + c->w || y1 < c->y || y1 > c->y + c->h) {
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, 0, 0);
+ x1 = c->x + 1;
+ y1 = c->y + 1;
+ }
for(;;) {
- XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch (ev.type) {
case ButtonRelease:
XUngrabPointer(dpy, CurrentTime);
@@ -1180,28 +1000,29 @@ movemouse(Client *c) {
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- Monitor *m = &monitors[monitorat()];
- if(abs(m->wax - nx) < SNAP)
- nx = m->wax;
- else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = m->wax + m->waw - c->w - 2 * c->border;
- if(abs(m->way - ny) < SNAP)
- ny = m->way;
- else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
- ny = m->way + m->wah - c->h - 2 * c->border;
- if((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
- togglefloating(NULL);
- if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+ if(snap && nx >= wx && nx <= wx + ww
+ && ny >= wy && ny <= wy + wh) {
+ if(abs(wx - nx) < snap)
+ nx = wx;
+ else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
+ nx = wx + ww - c->w - 2 * c->bw;
+ if(abs(wy - ny) < snap)
+ ny = wy;
+ else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
+ ny = wy + wh - c->h - 2 * c->bw;
+ if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ togglefloating(NULL);
+ }
+ if(!lt->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
- memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
break;
}
}
}
Client *
-nexttiled(Client *c, int monitor) {
- for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
+nexttiled(Client *c) {
+ for(; c && (c->isfloating || c->isbanned); c = c->next);
return c;
}
@@ -1215,19 +1036,19 @@ 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;
- case XA_WM_HINTS:
- updatewmhints(c);
- drawbar();
- 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();
+ break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
@@ -1238,45 +1059,29 @@ propertynotify(XEvent *e) {
}
void
-quit(const char *arg) {
+quit(const Arg *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) {
XWindowChanges wc;
- //Monitor scr = monitors[monitorat()];
-// c->monitor = monitorat();
if(sizehints) {
/* set minimum possible */
- if (w < 1)
- w = 1;
- if (h < 1)
- h = 1;
+ w = MAX(1, w);
+ h = MAX(1, h);
/* 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->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;
}
/* adjust for increment value */
@@ -1289,58 +1094,65 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
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;
+ 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);
}
if(w <= 0 || h <= 0)
return;
- /* TODO: offscreen appearance fixes */
- /*
- if(x > scr.sw)
- x = scr.sw - w - 2 * c->border;
- if(y > scr.sh)
- y = scr.sh - h - 2 * c->border;
- if(x + w + 2 * c->border < scr.sx)
- x = scr.sx;
- if(y + h + 2 * c->border < scr.sy)
- y = scr.sy;
- */
- if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ if(x > sx + sw)
+ x = sw - w - 2 * c->bw;
+ if(y > sy + sh)
+ y = sh - h - 2 * c->bw;
+ if(x + w + 2 * c->bw < sx)
+ x = sx;
+ if(y + h + 2 * c->bw < sy)
+ y = sy;
+ if(h < bh)
+ h = bh;
+ if(w < bh)
+ w = bh;
+ if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
+ c->ismoved = False;
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;
+ Client *c;
XEvent ev;
+ if(!(c = sel))
+ return;
+ restack();
ocx = c->x;
ocy = c->y;
- if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize], CurrentTime) != GrabSuccess)
+ if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+ None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 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,
- c->w + c->border - 1, c->h + c->border - 1);
+ c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return;
@@ -1351,13 +1163,16 @@ resizemouse(Client *c) {
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((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
- togglefloating(NULL);
- if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+ 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 >= wx && nw <= wx + ww
+ && nh >= wy && nh <= wy + wh) {
+ if(!c->isfloating && lt->arrange
+ && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+ togglefloating(NULL);
+ }
+ if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
@@ -1366,7 +1181,6 @@ resizemouse(Client *c) {
void
restack(void) {
- unsigned int i;
Client *c;
XEvent ev;
XWindowChanges wc;
@@ -1374,23 +1188,16 @@ restack(void) {
drawbar();
if(!sel)
return;
- if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
+ if(ismax || sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(monitors[selmonitor].layout->arrange != floating) {
+ if(!ismax && lt->arrange) {
wc.stack_mode = Below;
- wc.sibling = monitors[selmonitor].barwin;
- if(!sel->isfloating) {
- XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
- wc.sibling = sel->win;
- }
- for(i = 0; i < mcount; i++) {
- for(c = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
- if(c == sel)
- continue;
- XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+ wc.sibling = barwin;
+ for(c = stack; c; c = c->snext)
+ if(!c->isfloating && !c->isbanned) {
+ XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
- }
}
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -1399,10 +1206,10 @@ restack(void) {
void
run(void) {
char *p;
- char buf[sizeof stext];
+ char sbuf[sizeof stext];
fd_set rd;
int r, xfd;
- unsigned int len, offset;
+ uint len, offset;
XEvent ev;
/* main event loop, also reads status text from stdin */
@@ -1411,7 +1218,7 @@ run(void) {
readin = True;
offset = 0;
len = sizeof stext - 1;
- buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
+ sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
while(running) {
FD_ZERO(&rd);
if(readin)
@@ -1423,7 +1230,7 @@ run(void) {
eprint("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
+ switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
case -1:
strncpy(stext, strerror(errno), len);
readin = False;
@@ -1433,15 +1240,15 @@ run(void) {
readin = False;
break;
default:
- for(p = buf + offset; r > 0; p++, r--, offset++)
+ for(p = sbuf + 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 */
+ 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(buf, p - r + 1, r);
+ memmove(sbuf, p - r + 1, r);
break;
}
break;
@@ -1458,32 +1265,29 @@ run(void) {
void
scan(void) {
- unsigned int i, j, num;
+ uint i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
- for(i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
- wins = NULL;
- if(XQueryTree(dpy, m->root, &d1, &d2, &wins, &num)) {
- for(j = 0; j < num; j++) {
- if(!XGetWindowAttributes(dpy, wins[j], &wa)
- || wa.override_redirect || XGetTransientForHint(dpy, wins[j], &d1))
- continue;
- if(wa.map_state == IsViewable || getstate(wins[j]) == IconicState)
- manage(wins[j], &wa);
- }
- for(j = 0; j < num; j++) { /* now the transients */
- if(!XGetWindowAttributes(dpy, wins[j], &wa))
- continue;
- if(XGetTransientForHint(dpy, wins[j], &d1)
- && (wa.map_state == IsViewable || getstate(wins[j]) == IconicState))
- manage(wins[j], &wa);
- }
+ wins = NULL;
+ if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
+ for(i = 0; i < num; i++) {
+ if(!XGetWindowAttributes(dpy, wins[i], &wa)
+ || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+ continue;
+ if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+ manage(wins[i], &wa);
+ }
+ for(i = 0; i < num; i++) { /* now the transients */
+ if(!XGetWindowAttributes(dpy, wins[i], &wa))
+ continue;
+ if(XGetTransientForHint(dpy, wins[i], &d1)
+ && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+ manage(wins[i], &wa);
}
- if(wins)
- XFree(wins);
}
+ if(wins)
+ XFree(wins);
}
void
@@ -1494,60 +1298,37 @@ setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
+/* arg > 1.0 will set mfact absolutly */
void
-setlayout(const char *arg) {
- unsigned int i;
- Monitor *m = &monitors[monitorat()];
-
- if(!arg) {
- m->layout++;
- if(m->layout == &layouts[LENGTH(layouts)])
- m->layout = &layouts[0];
- }
- else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- m->layout = &layouts[i];
- }
- if(sel)
- arrange();
- else
- drawbar();
-}
-
-void
-setmwfact(const char *arg) {
- double delta;
+setmfact(const Arg *arg) {
+ float f;
- Monitor *m = &monitors[monitorat()];
-
- if(!domwfact)
+ if(!arg || !lt->arrange)
return;
- /* arg handling, manipulate mwfact */
- if(arg == NULL)
- m->mwfact = MWFACT;
- else if(sscanf(arg, "%lf", &delta) == 1) {
- if(arg[0] == '+' || arg[0] == '-')
- m->mwfact += delta;
- else
- m->mwfact = delta;
- if(m->mwfact < 0.1)
- m->mwfact = 0.1;
- else if(m->mwfact > 0.9)
- m->mwfact = 0.9;
- }
+ f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+ if(f < 0.1 || f > 0.9)
+ return;
+ mfact = f;
arrange();
}
void
setup(void) {
- unsigned int i, j, k;
- Monitor *m;
+ uint i;
+ int w;
XSetWindowAttributes wa;
- XineramaScreenInfo *info = NULL;
+
+ /* init screen */
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
+ initfont(font);
+ sx = 0;
+ sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
+ bh = dc.h = dc.font.height + 2;
+ lt = layouts;
+ updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1562,109 +1343,54 @@ setup(void) {
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- // init screens/monitors first
- mcount = 1;
- if((isxinerama = XineramaIsActive(dpy)))
- info = XineramaQueryScreens(dpy, &mcount);
- monitors = emallocz(mcount * sizeof(Monitor));
-
- for(i = 0; i < mcount; i++) {
- /* init geometry */
- m = &monitors[i];
-
- m->screen = isxinerama ? 0 : i;
- m->root = RootWindow(dpy, m->screen);
-
- if (mcount != 1 && isxinerama) {
- m->sx = info[i].x_org;
- m->sy = info[i].y_org;
- m->sw = info[i].width;
- m->sh = info[i].height;
- fprintf(stderr, "monitor[%d]: %d,%d,%d,%d\n", i, m->sx, m->sy, m->sw, m->sh);
- }
- else {
- m->sx = 0;
- m->sy = 0;
- m->sw = DisplayWidth(dpy, m->screen);
- m->sh = DisplayHeight(dpy, m->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);
+ 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);
+
+ /* init bar */
+ for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+ w = TEXTW(layouts[i].symbol);
+ blw = MAX(blw, w);
+ }
- m->seltags = emallocz(sizeof initags);
- m->prevtags = emallocz(sizeof initags);
-
- memcpy(m->seltags, initags, sizeof initags);
- memcpy(m->prevtags, initags, sizeof initags);
-
- /* init appearance */
- m->dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR, m->screen);
- m->dc.norm[ColBG] = getcolor(NORMBGCOLOR, m->screen);
- m->dc.norm[ColFG] = getcolor(NORMFGCOLOR, m->screen);
- m->dc.sel[ColBorder] = getcolor(SELBORDERCOLOR, m->screen);
- m->dc.sel[ColBG] = getcolor(SELBGCOLOR, m->screen);
- m->dc.sel[ColFG] = getcolor(SELFGCOLOR, m->screen);
- initfont(m, FONT);
- m->dc.h = bh = m->dc.font.height + 2;
-
- /* init layouts */
- m->mwfact = MWFACT;
- m->layout = &layouts[0];
- for(blw = k = 0; k < LENGTH(layouts); k++) {
- j = textw(m, layouts[k].symbol);
- if(j > blw)
- blw = j;
- }
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
- // TODO: bpos per screen?
- bpos = BARPOS;
- wa.override_redirect = 1;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ButtonPressMask | ExposureMask;
-
- /* init bars */
- m->barwin = XCreateWindow(dpy, m->root, m->sx, m->sy, m->sw, bh, 0,
- DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
- updatebarpos(m);
- XMapRaised(dpy, m->barwin);
- strcpy(stext, "dwm-"VERSION);
- m->dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
- m->dc.gc = XCreateGC(dpy, m->root, 0, 0);
- XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter);
- if(!m->dc.font.set)
- XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid);
-
- /* EWMH support per monitor */
- XChangeProperty(dpy, m->root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
-
- /* select for events */
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
- | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
- XChangeWindowAttributes(dpy, m->root, CWEventMask | CWCursor, &wa);
- XSelectInput(dpy, m->root, wa.event_mask);
- }
- if(info)
- XFree(info);
+ barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, barwin, cursor[CurNormal]);
+ XMapRaised(dpy, barwin);
+ strcpy(stext, "dwm-"VERSION);
+ drawbar();
- /* grab keys */
- grabkeys();
+ /* 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);
- /* init tags */
- compileregs();
- selmonitor = monitorat();
- fprintf(stderr, "selmonitor == %d\n", selmonitor);
+ /* grab keys */
+ grabkeys();
}
void
-spawn(const char *arg) {
- static char *shell = NULL;
-
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
- if(!arg)
- return;
+spawn(const Arg *arg) {
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
@@ -1672,8 +1398,8 @@ spawn(const char *arg) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- execl(shell, shell, "-c", arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+ execvp(((char **)arg->v)[0], (char **)arg->v);
+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
perror(" failed");
}
exit(0);
@@ -1682,145 +1408,111 @@ spawn(const char *arg) {
}
void
-tag(const char *arg) {
- unsigned int i;
-
- if(!sel)
- return;
- for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (NULL == arg);
- sel->tags[idxoftag(arg)] = True;
- arrange();
+tag(const Arg *arg) {
+ if(sel && arg->ui & TAGMASK) {
+ sel->tags = arg->ui & TAGMASK;
+ arrange();
+ }
}
-unsigned int
-textnw(Monitor *m, const char *text, unsigned int len) {
+int
+textnw(const char *text, uint len) {
XRectangle r;
- if(m->dc.font.set) {
- XmbTextExtents(m->dc.font.set, text, len, NULL, &r);
+ if(dc.font.set) {
+ XmbTextExtents(dc.font.set, text, len, NULL, &r);
return r.width;
}
- return XTextWidth(m->dc.font.xfont, text, len);
-}
-
-unsigned int
-textw(Monitor *m, const char *text) {
- return textnw(m, text, strlen(text)) + m->dc.font.height;
+ return XTextWidth(dc.font.xfont, text, len);
}
void
tile(void) {
- unsigned int i, j, n, nx, ny, nw, nh, mw, th;
- Client *c, *mc;
-
- domwfact = dozoom = True;
-
- nx = ny = nw = 0; /* gcc stupidity requires this */
-
- for (i = 0; i < mcount; i++) {
- Monitor *m = &monitors[i];
-
- for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
- n++;
-
- for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
- /* window geoms */
- mw = (n == 1) ? m->waw : m->mwfact * m->waw;
- th = (n > 1) ? m->wah / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = m->wah;
- if(j == 0) { /* master */
- nx = m->wax;
- ny = m->way;
- nw = mw - 2 * c->border;
- nh = m->wah - 2 * c->border;
- }
- else { /* tile window */
- if(j == 1) {
- ny = m->way;
- nx += mc->w + 2 * mc->border;
- nw = m->waw - mw - 2 * c->border;
- }
- if(j + 1 == n) /* remainder */
- nh = (m->way + m->wah) - ny - 2 * c->border;
- else
- nh = th - 2 * c->border;
- }
- fprintf(stderr, "tile(%d, %d, %d, %d)\n", nx, ny, nw, nh);
- resize(c, nx, ny, nw, nh, RESIZEHINTS);
- if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
- /* client doesn't accept size constraints */
- resize(c, nx, ny, nw, nh, False);
- if(n > 1 && th != m->wah)
- ny = c->y + c->h + 2 * c->border;
-
- j++;
- }
+ int x, y, h, w, mw;
+ uint i, n;
+ Client *c;
+
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ if(n == 0)
+ return;
+
+ /* master */
+ c = nexttiled(clients);
+ mw = mfact * ww;
+ resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+
+ if(--n == 0)
+ return;
+
+ /* tile stack */
+ x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
+ y = wy;
+ w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+ h = wh / n;
+ if(h < bh)
+ h = 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)
+ ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+ if(h != wh)
+ y = c->y + c->h + 2 * c->bw;
}
- fprintf(stderr, "done\n");
}
+
void
-togglebar(const char *arg) {
- if(bpos == BarOff)
- bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
- else
- bpos = BarOff;
- updatebarpos(&monitors[monitorat()]);
+togglebar(const Arg *arg) {
+ showbar = !showbar;
+ updategeom();
+ updatebar();
arrange();
}
void
-togglefloating(const char *arg) {
+togglefloating(const Arg *arg) {
if(!sel)
return;
- sel->isfloating = !sel->isfloating;
+ sel->isfloating = !sel->isfloating || sel->isfixed;
if(sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
arrange();
}
void
-toggletag(const char *arg) {
- unsigned int i, j;
+togglelayout(const Arg *arg) {
+ if(arg && arg->v)
+ lt = (Layout *)arg->v;
+ else if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
+ if(sel)
+ arrange();
+ else
+ drawbar();
+}
- if(!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] = True; /* at least one tag must be enabled */
+void
+togglemax(const Arg *arg) {
+ ismax = !ismax;
arrange();
}
void
-toggleview(const char *arg) {
- unsigned int i, j;
-
- Monitor *m = &monitors[monitorat()];
-
- i = idxoftag(arg);
- m->seltags[i] = !m->seltags[i];
- for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
- if(j == LENGTH(tags))
- m->seltags[i] = True; /* at least one tag must be viewed */
- arrange();
+toggletag(const Arg *arg) {
+ if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
+ arrange();
}
void
-unban(Client *c) {
- if(!c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
+toggleview(const Arg *arg) {
+ if((tagset[seltags] ^= (arg->ui & TAGMASK)))
+ arrange();
}
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);
@@ -1831,7 +1523,6 @@ unmanage(Client *c) {
focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
- free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
@@ -1849,29 +1540,39 @@ unmapnotify(XEvent *e) {
}
void
-updatebarpos(Monitor *m) {
- XEvent ev;
+updatebar(void) {
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
+}
+
+void
+updategeom(void) {
+#ifdef XINERAMA
+ int i;
+ XineramaScreenInfo *info = NULL;
- m->wax = m->sx;
- m->way = m->sy;
- m->wah = m->sh;
- m->waw = m->sw;
- switch(bpos) {
- default:
- m->wah -= bh;
- m->way += bh;
- XMoveWindow(dpy, m->barwin, m->sx, m->sy);
- break;
- case BarBot:
- m->wah -= bh;
- XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
- break;
- case BarOff:
- XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
- break;
+ /* window area geometry */
+ if(XineramaIsActive(dpy)) {
+ info = XineramaQueryScreens(dpy, &i);
+ wx = info[xidx].x_org;
+ wy = showbar && topbar ? info[xidx].y_org + bh : info[xidx].y_org;
+ ww = info[xidx].width;
+ wh = showbar ? info[xidx].height - bh : info[xidx].height;
+ XFree(info);
}
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+ else
+#endif
+ {
+ wx = sx;
+ wy = showbar && topbar ? sy + bh : sy;
+ ww = sw;
+ wh = showbar ? sh - bh : sh;
+ }
+
+ /* bar position */
+ by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
}
void
@@ -1879,49 +1580,45 @@ updatesizehints(Client *c) {
long msize;
XSizeHints size;
- if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
- size.flags = PSize;
- c->flags = size.flags;
- if(c->flags & PBaseSize) {
+ XGetWMNormalHints(dpy, c->win, &size, &msize);
+ 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);
}
@@ -1937,11 +1634,22 @@ updatewmhints(Client *c) {
XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) {
- c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+ if(c == sel)
+ sel->isurgent = False;
+ else
+ c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
XFree(wmh);
}
}
+void
+view(const Arg *arg) {
+ seltags ^= 1; /* toggle sel tagset */
+ if(arg && (arg->ui & TAGMASK))
+ tagset[seltags] = arg->i & TAGMASK;
+ 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. */
@@ -1953,63 +1661,36 @@ xerror(Display *dpy, XErrorEvent *ee) {
|| (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 */
}
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;
- Bool tmp[LENGTH(tags)];
- Monitor *m = &monitors[monitorat()];
-
- for(i = 0; i < LENGTH(tags); i++)
- tmp[i] = (NULL == arg);
- tmp[idxoftag(arg)] = True;
- if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
- memcpy(m->prevtags, m->seltags, sizeof initags);
- memcpy(m->seltags, tmp, sizeof initags);
- arrange();
- }
-}
-
-void
-viewprevtag(const char *arg) {
- static Bool tmp[LENGTH(tags)];
-
- Monitor *m = &monitors[monitorat()];
-
- memcpy(tmp, m->seltags, sizeof initags);
- memcpy(m->seltags, m->prevtags, sizeof initags);
- memcpy(m->prevtags, tmp, sizeof initags);
- arrange();
-}
-
-void
-zoom(const char *arg) {
- Client *c;
+zoom(const Arg *arg) {
+ Client *c = sel;
- if(!sel || !dozoom || sel->isfloating)
+ if(ismax || !lt->arrange || (sel && sel->isfloating))
return;
- if((c = sel) == nexttiled(clients, c->monitor))
- if(!(c = nexttiled(c->next, c->monitor)))
+ if(c == nexttiled(clients))
+ if(!c || !(c = nexttiled(c->next)))
return;
detach(c);
attach(c);
@@ -2017,31 +1698,10 @@ zoom(const char *arg) {
arrange();
}
-void
-movetomonitor(const char *arg) {
- if (sel) {
- sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
-
- memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
- resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
- arrange();
- }
-}
-
-void
-selectmonitor(const char *arg) {
- Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
-
- XWarpPointer(dpy, None, m->root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
- focus(NULL);
-}
-
-
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
- "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
+ eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");
@@ -2051,7 +1711,6 @@ main(int argc, char *argv[]) {
checkotherwm();
setup();
- drawbar();
scan();
run();
cleanup();