#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
-#include <X11/extensions/Xinerama.h>
-//#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)
/* 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 { BarTop, BarBot, BarOff, BarLast }; /* bar appearance */
+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;
typedef struct Client Client;
struct Client {
char name[256];
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int border, oldborder;
+ unsigned int bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags;
- View *view;
Client *next;
Client *prev;
Client *snext;
typedef struct {
const char *symbol;
- void (*arrange)(View *);
+ void (*arrange)(void);
+ void (*updategeom)(void);
} Layout;
typedef struct {
- const char *prop;
+ const char *class;
+ const char *instance;
+ const char *title;
const char *tag;
Bool isfloating;
} Rule;
-struct View {
- unsigned int id;
- int x, y, w, h, wax, way, wah, waw;
- double mwfact;
- Layout *layout;
- Window barwin;
-};
-
/* function declarations */
-void addtag(Client *c, const char *t);
void applyrules(Client *c);
void arrange(void);
void attach(Client *c);
void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
-void drawbar(View *v);
+void drawbar(void);
void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
void drawtext(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);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused);
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);
+Client *nextunfloating(Client *c);
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 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(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 togglelayout(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 updatebar(void);
+void updategeom(void);
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 */
+void viewprevtag(const char *arg);
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);
/* variables */
-char stext[256], buf[256];
-int nviews = 1;
-int screen;
+char stext[256];
+int screen, sx, sy, sw, sh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool domwfact = True;
-Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
-Bool *prevtags;
-Bool *seltags;
+Bool *tagset[2];
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-View *views;
-View *selview;
-Window root;
+Layout layouts[];
+Layout *lt = layouts;
+Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
#define TAGSZ (LENGTH(tags) * sizeof(Bool))
/* function implementations */
-void
-addtag(Client *c, const char *t) {
- unsigned int i, tidx = idxoftag(t);
-
- for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && vtags[i] != vtags[tidx])
- return; /* conflict */
- c->tags[tidx] = True;
- c->view = &views[vtags[tidx]];
-}
void
applyrules(Client *c) {
XGetClassHint(dpy, c->win, &ch);
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
- if(strstr(c->name, r->prop)
- || (ch.res_class && strstr(ch.res_class, r->prop))
- || (ch.res_name && strstr(ch.res_name, r->prop)))
- {
+ 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;
if(r->tag) {
- addtag(c, r->tag);
+ c->tags[idxoftag(r->tag)] = True;
matched = True;
}
}
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched) {
- memcpy(c->tags, seltags, TAGSZ);
- c->view = selview;
- }
+ if(!matched)
+ memcpy(c->tags, tagset[seltags], TAGSZ);
}
void
arrange(void) {
- unsigned int i;
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c))
+ if(isvisible(c)) {
unban(c);
+ if(!lt->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h, True);
+ }
else
ban(c);
- for(i = 0; i < nviews; i++) {
- views[i].layout->arrange(&views[i]);
- restack(&views[i]);
- }
focus(NULL);
+ if(lt->arrange)
+ lt->arrange();
+ restack();
}
void
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 3 * c->view->w, c->y);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
c->isbanned = True;
}
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- if(ev->window == selview->barwin) {
+ if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- if(&views[vtags[i]] != selview)
- continue;
x += textw(tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
return;
}
}
- if((ev->x < x + blw) && ev->button == Button1)
- setlayout(NULL);
+ if((ev->x < x + blw) && ev->button == Button1)
+ togglelayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- restack(c->view);
+ restack();
movemouse(c);
}
else if(ev->button == Button2) {
- if((floating != c->view->layout->arrange) && c->isfloating)
+ if(lt->arrange && c->isfloating)
togglefloating(NULL);
- else
- zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- restack(c->view);
+ restack();
resizemouse(c);
}
}
void
cleanup(void) {
- unsigned int i;
close(STDIN_FILENO);
while(stack) {
unban(stack);
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);
+ XDestroyWindow(dpy, barwin);
XSync(dpy, False);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
}
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) {
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(selview);
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
+ updategeom();
+ updatebar();
arrange();
}
}
XWindowChanges wc;
if((c = getclient(ev->window))) {
- View *v = c->view;
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == v->layout->arrange)) {
+ c->bw = ev->border_width;
+ if(c->isfixed || c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
- c->x = v->x + ev->x;
+ c->x = sx + ev->x;
if(ev->value_mask & CWY)
- c->y = v->y + 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 - 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((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);
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(View *v) {
+drawbar(void) {
int i, x;
Client *c;
dc.x = 0;
- for(c = stack; c && (!isvisible(c) || c->view != v); c = c->snext);
+ for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
- if(&views[vtags[i]] != v)
- continue;
dc.w = textw(tags[i]);
- if(seltags[i]) {
+ if(tagset[seltags][i]) {
drawtext(tags[i], dc.sel, isurgent(i));
drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
}
}
dc.x += dc.w;
}
- dc.w = blw;
- drawtext(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(dc.x < x) {
- dc.x = x;
- dc.w = v->w - x;
- }
- drawtext(stext, dc.norm, False);
+ if(blw > 0) {
+ dc.w = blw;
+ drawtext(lt->symbol, dc.norm, False);
+ x = dc.x + dc.w;
}
else
- dc.x = v->w;
+ x = dc.x;
+ dc.w = textw(stext);
+ dc.x = bw - dc.w;
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = bw - x;
+ }
+ drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
if(c) {
else
drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
}
int x, y, w, h;
unsigned int len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ char buf[256];
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;
+ w = 0;
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;
+ for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+ if(!len)
+ return;
if(len < olen) {
if(len > 1)
buf[len - 1] = '.';
if(len > 3)
buf[len - 3] = '.';
}
- if(w > dc.w)
- return; /* too long */
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);
void
expose(XEvent *e) {
- View *v;
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 && (ev->window == barwin))
+ drawbar();
}
void
focus(Client *c) {
- View *v = selview;
- if(c)
- selview = c->view;
- else
- selview = viewat();
- if(selview != v)
- drawbar(v);
if(!c || (c && !isvisible(c)))
- for(c = stack; c && (!isvisible(c) || c->view != selview); c = c->snext);
+ 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) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- selview = c->view;
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- drawbar(selview);
+ drawbar();
}
void
for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
- restack(c->view);
+ restack();
}
}
}
if(c) {
focus(c);
- restack(c->view);
+ restack();
}
}
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;
-}
-
long
getstate(Window w) {
int format, status;
void
grabbuttons(Client *c, Bool focused) {
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ int i, j;
+ unsigned int buttons[] = { Button1, Button2, Button3 };
+ unsigned int 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) {
+grabkeys(void) {
unsigned int i, j;
KeyCode code;
XModifierKeymap *modmap;
idxoftag(const char *t) {
unsigned int i;
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
+ for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
return (i < LENGTH(tags)) ? i : 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++) {
- 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++;
}
}
unsigned int i;
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && seltags[i])
+ if(c->tags[i] && tagset[seltags][i])
return True;
return False;
}
void
manage(Window w, XWindowAttributes *wa) {
Client *c, *t = NULL;
- View *v;
Status rettrans;
Window trans;
XWindowChanges wc;
c->tags = emallocz(TAGSZ);
c->win = w;
- applyrules(c);
-
- v = c->view;
-
- c->x = wa->x + v->x;
- c->y = wa->y + v->y;
+ /* 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 == 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 == sw && c->h == sh) {
+ c->x = sx;
+ c->y = sy;
+ c->bw = wa->border_width;
}
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;
+ if(c->x + c->w + 2 * c->bw > wx + ww)
+ c->x = wx + ww - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > wy + wh)
+ c->y = wy + wh - c->h - 2 * c->bw;
+ c->x = MAX(c->x, wx);
+ c->y = MAX(c->y, wy);
+ c->bw = borderpx;
}
- wc.border_width = c->border;
+
+ 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 */
for(t = clients; t && t->win != trans; t = t->next);
if(t)
memcpy(c->tags, t->tags, TAGSZ);
+ else
+ applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
attach(c);
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
- View *v;
Window dummy;
XEvent ev;
ocx = nx = c->x;
ocy = ny = c->y;
- v = c->view;
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(;;) {
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))
+ 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((v->layout->arrange == floating) || c->isfloating)
+ if(!lt->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
}
Client *
-nexttiled(Client *c, View *v) {
- for(; c && (c->isfloating || c->view != v || !isvisible(c)); c = c->next);
+nextunfloating(Client *c) {
+ for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
break;
case XA_WM_HINTS:
updatewmhints(c);
- drawbar(c->view);
+ drawbar();
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
if(c == sel)
- drawbar(selview);
+ drawbar();
}
}
}
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) {
- View *v;
XWindowChanges wc;
- v = c->view;
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)
+ if(c->minax != c->maxax && c->minay != c->maxay
+ && c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0) {
+ if(w * c->maxay > h * c->maxax)
w = h * c->maxax / c->maxay;
- else if (w * c->minay < h * c->minax)
+ else if(w * c->minay < h * c->minax)
h = w * c->minay / c->minax;
}
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;
- 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(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(c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
c->h = wc.height = h;
- wc.border_width = c->border;
+ wc.border_width = c->bw;
XConfigureWindow(dpy, c->win,
CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
- View *v;
XEvent ev;
ocx = c->x;
ocy = c->y;
- v = c->view;
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);
+ 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);
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;
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))
+ nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+ nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+ if(!c->isfloating && lt->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) {
togglefloating(NULL);
- if((v->layout->arrange == floating) || c->isfloating)
+ }
+ if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
}
void
-restack(View *v) {
+restack(void) {
Client *c;
XEvent ev;
XWindowChanges wc;
- drawbar(v);
+ drawbar();
if(!sel)
return;
- if(sel->isfloating || (v->layout->arrange == floating))
+ if(sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(v->layout->arrange != floating) {
+ if(lt->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 = barwin;
+ for(c = 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));
}
break;
}
- drawbar(selview);
+ drawbar();
}
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
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);
}
}
PropModeReplace, (unsigned char *)data, 2);
}
-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)
- arrange();
- else
- drawbar(selview);
-}
-
-void
-setmwfact(const char *arg) {
- double delta;
- View *v = selview;
-
- if(!domwfact)
- 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;
- }
- arrange();
-}
-
void
setup(void) {
- unsigned int i, j;
- View *v;
+ unsigned int i, 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.font.height + 2;
+ updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- if(XineramaIsActive(dpy))
- info = XineramaQueryScreens(dpy, &nviews);
-
-#if defined(AIM_XINERAMA)
-nviews = 2; /* aim Xinerama */
-#endif
- 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.sel[ColBG] = getcolor(SELBGCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
- dc.h = bh = dc.font.height + 2;
+ dc.h = bh;
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);
- for(blw = i = 0; i < LENGTH(layouts); i++) {
- i = textw(layouts[i].symbol);
- if(i > blw)
- blw = i;
- }
+ /* init tags */
+ tagset[0] = emallocz(TAGSZ);
+ tagset[1] = emallocz(TAGSZ);
+ tagset[0][0] = tagset[1][0] = True;
- seltags = emallocz(TAGSZ);
- prevtags = emallocz(TAGSZ);
-
- /* check, if vtags need assistance, because there is only 1 view */
- if(nviews == 1)
- for(i = 0; i < LENGTH(tags); i++)
- vtags[i] = 0;
-
- for(i = 0; i < nviews; i++) {
- /* init geometry */
- v = &views[i];
-
- /* select first tag in each view */
- for(j = 0; j < LENGTH(tags); j++)
- if(vtags[j] == i) {
- seltags[j] = prevtags[j] = True;
- break;
- }
+ /* init bar */
+ for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+ w = textw(layouts[i].symbol);
+ blw = MAX(blw, w);
+ }
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask|ExposureMask;
- if(info) {
+ barwin = XCreateWindow(dpy, root, bx, by, bw, 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();
-#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);
- }
+ /* EWMH support per view */
+ XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+ PropModeReplace, (unsigned char *) netatom, NetLast);
- /* init layouts */
- v->mwfact = MWFACT;
- v->layout = &layouts[0];
-
- // TODO: bpos per screen?
- bpos = BARPOS;
- wa.override_redirect = 1;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ButtonPressMask|ExposureMask;
-
- /* init bars */
- v->barwin = XCreateWindow(dpy, root, v->x, v->y, v->w, bh, 0,
- DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- XDefineCursor(dpy, v->barwin, cursor[CurNormal]);
- updatebarpos(v);
- XMapRaised(dpy, v->barwin);
- strcpy(stext, "dwm-"VERSION);
-
- /* EWMH support per view */
- XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
-
- /* select for events */
- wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
- |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
- XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
- XSelectInput(dpy, root, wa.event_mask);
-
- drawbar(v);
- }
- if(info)
- XFree(info);
+ /* select for events */
+ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+ |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+ XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+ XSelectInput(dpy, root, wa.event_mask);
- selview = viewat();
/* grab keys */
grabkeys();
if(!sel)
return;
for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (NULL == arg);
+ sel->tags[i] = (arg == NULL);
sel->tags[idxoftag(arg)] = True;
arrange();
}
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;
-
- domwfact = dozoom = True;
- nx = v->wax;
- ny = v->way;
- nw = 0;
- for(n = 0, c = nexttiled(clients, v); c; c = nexttiled(c->next, v))
- n++;
-
- /* window geoms */
- mw = (n == 1) ? v->waw : v->mwfact * v->waw;
- th = (n > 1) ? v->wah / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = v->wah;
-
- for(i = 0, c = mc = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
- if(i == 0) { /* master */
- 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;
- }
- 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++;
- }
-}
-
void
togglebar(const char *arg) {
- if(bpos == BarOff)
- bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
- else
- bpos = BarOff;
- updatebarpos(selview);
+ showbar = !showbar;
+ updategeom();
+ updatebar();
arrange();
}
arrange();
}
+void
+togglelayout(const char *arg) {
+ unsigned int i;
+
+ if(!arg) {
+ if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
+ }
+ else {
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(!strcmp(arg, layouts[i].symbol))
+ break;
+ if(i == LENGTH(layouts))
+ return;
+ lt = &layouts[i];
+ }
+ if(sel)
+ arrange();
+ else
+ drawbar();
+}
+
void
toggletag(const char *arg) {
unsigned int i, j;
unsigned int i, j;
i = idxoftag(arg);
- seltags[i] = !seltags[i];
- for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+ tagset[seltags][i] = !tagset[seltags][i];
+ for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
if(j == LENGTH(tags))
- seltags[i] = True; /* at least one tag must be viewed */
+ tagset[seltags][i] = True; /* at least one tag must be viewed */
arrange();
}
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);
}
void
-updatebarpos(View *v) {
- XEvent ev;
+updatebar(void) {
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+}
- 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;
- }
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+void
+updategeom(void) {
+ unsigned int i;
+
+#ifdef DEFGEOM /* define your own if you are Xinerama user */
+ DEFGEOM
+#else
+ /* bar geometry*/
+ bx = 0;
+ by = showbar ? (topbar ? 0 : sh - bh) : -bh;
+ bw = sw;
+
+ /* window area geometry */
+ wx = sx;
+ wy = showbar && topbar ? sy + bh : sy;
+ ww = sw;
+ wh = showbar ? sh - bh : sh;
+#endif
+
+ /* update layout geometries */
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(layouts[i].updategeom)
+ layouts[i].updategeom();
}
void
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 char *arg) {
- unsigned int i;
- Bool tmp[LENGTH(tags)];
-
- for(i = 0; i < LENGTH(tags); i++)
- tmp[i] = (NULL == arg);
- tmp[idxoftag(arg)] = True;
-
- if(memcmp(seltags, tmp, TAGSZ) != 0) {
- memcpy(prevtags, seltags, TAGSZ);
- memcpy(seltags, tmp, TAGSZ);
- arrange();
- }
-}
-
-View *
-viewat() {
- int i, x, y;
- Window win;
- unsigned int mask;
-
- XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
- for(i = 0; i < nviews; i++) {
- if((x >= views[i].x && x < views[i].x + views[i].w)
- && (y >= views[i].y && y < views[i].y + views[i].h))
- return &views[i];
- }
- return NULL;
+ seltags ^= 1; /* toggle sel tagset */
+ memset(tagset[seltags], (NULL == arg), TAGSZ);
+ tagset[seltags][idxoftag(arg)] = True;
+ arrange();
}
void
viewprevtag(const char *arg) {
- static Bool tmp[LENGTH(tags)];
-
- memcpy(tmp, seltags, TAGSZ);
- memcpy(seltags, prevtags, TAGSZ);
- memcpy(prevtags, tmp, TAGSZ);
+ seltags ^= 1; /* toggle sel tagset */
arrange();
}
|| (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 */
}
return -1;
}
-void
-zoom(const char *arg) {
- Client *c = sel;
-
- if(!sel || !dozoom || sel->isfloating)
- return;
- if(c == nexttiled(clients, c->view))
- if(!(c = nexttiled(c->next, c->view)))
- return;
- detach(c);
- attach(c);
- focus(c);
- arrange();
-}
-
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))