Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed Layout->updategeom, unnecessary
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
2f1dbf8
..
0e4703e
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-51,6
+51,9
@@
#define LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#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)
+#define VISIBLE(x) ((x)->tags & tagset[seltags])
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@
-59,6
+62,8
@@
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
+typedef unsigned int uint;
+typedef unsigned long ulong;
typedef struct Client Client;
struct Client {
char name[256];
typedef struct Client Client;
struct Client {
char name[256];
@@
-66,9
+71,9
@@
struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int bw, oldbw;
- Bool isbanned, isfixed, isfloating, isurgent;
- Bool *tags;
+ int bw, oldbw;
+ Bool isbanned, isfixed, isfloating, ismax, isurgent;
+ uint tags;
Client *next;
Client *prev;
Client *snext;
Client *next;
Client *prev;
Client *snext;
@@
-77,8
+82,8
@@
struct Client {
typedef struct {
int x, y, w, h;
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 {
Drawable drawable;
GC gc;
struct {
@@
-91,23
+96,22
@@
typedef struct {
} DC; /* draw context */
typedef struct {
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ uint mod;
KeySym keysym;
KeySym keysym;
- void (*func)(const char *arg);
- const char *arg;
+ void (*func)(const void *arg);
+ const void *arg;
} Key;
typedef struct {
const char *symbol;
void (*arrange)(void);
} Key;
typedef struct {
const char *symbol;
void (*arrange)(void);
- void (*updategeom)(void);
} Layout;
typedef struct {
const char *class;
const char *instance;
const char *title;
} Layout;
typedef struct {
const char *class;
const char *instance;
const char *title;
- const char *tag;
+ uint tags;
Bool isfloating;
} Rule;
Bool isfloating;
} Rule;
@@
-116,7
+120,6
@@
void applyrules(Client *c);
void arrange(void);
void attach(Client *c);
void attachstack(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 buttonpress(XEvent *e);
void checkotherwm(void);
void cleanup(void);
@@
-127,80
+130,74
@@
void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
void drawbar(void);
void detach(Client *c);
void detachstack(Client *c);
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 drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+void drawtext(const char *text, ulong col[ColLast], Bool invert);
void enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
void focus(Client *c);
void focusin(XEvent *e);
void enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
void focus(Client *c);
void focusin(XEvent *e);
-void focusnext(const char *arg);
-void focusprev(const char *arg);
+void focusnext(const void *arg);
+void focusprev(const void *arg);
Client *getclient(Window w);
Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);
long getstate(Window w);
long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused);
void grabkeys(void);
void grabbuttons(Client *c, Bool focused);
void grabkeys(void);
-unsigned int idxoftag(const char *t);
void initfont(const char *fontstr);
void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);
Bool isprotodel(Client *c);
Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
+Bool isurgent(uint t);
void keypress(XEvent *e);
void keypress(XEvent *e);
-void killclient(const char *arg);
+void killclient(const void *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
void movemouse(Client *c);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
void movemouse(Client *c);
-Client *nextunfloating(Client *c);
+Client *nexttiled(Client *c);
void propertynotify(XEvent *e);
void propertynotify(XEvent *e);
-void quit(const char *arg);
+void quit(const void *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 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 setmfact(const char *arg);
+void setmfact(const void *arg);
void setup(void);
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 spawn(const void *arg);
+void tag(const void *arg);
+uint textnw(const char *text, uint len);
void tile(void);
void tileresize(Client *c, int x, int y, int w, int h);
void tile(void);
void tileresize(Client *c, int x, int y, int w, int h);
-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 togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void togglemax(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
void updatebar(void);
void updategeom(void);
void updatesizehints(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
void updatebar(void);
void updategeom(void);
void updatesizehints(Client *c);
-void updatetilegeom(void);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg);
+void view(const void *arg);
+void viewprevtag(const void *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
+void zoom(const void *arg);
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
int bx, by, bw, bh, blw, wx, wy, ww, wh;
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
int bx, by, bw, bh, blw, wx, wy, ww, wh;
-int mx, my, mw, mh, tx, ty, tw, th;
-int seltags = 0;
+uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int numlockmask = 0;
+uint numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
@@
-216,9
+213,10
@@
void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
+Bool domax = False;
Bool otherwm, readin;
Bool running = True;
Bool otherwm, readin;
Bool running = True;
-Bool *tagset[2];
+uint tagset[] = {1, 1}; /* after start, first tag is selected */
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
@@
-231,14
+229,14
@@
Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
/* configuration, allows nested code to access above variables */
#include "config.h"
-#define TAGSZ (LENGTH(tags) * sizeof(Bool))
-/* function implementations */
+/* 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) {
void
applyrules(Client *c) {
- unsigned int i;
- Bool matched = False;
+ uint i;
Rule *r;
XClassHint ch = { 0 };
Rule *r;
XClassHint ch = { 0 };
@@
-250,18
+248,15
@@
applyrules(Client *c) {
&& (!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;
&& (!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) {
- c->tags[idxoftag(r->tag)] = True;
- matched = True;
- }
+ c->tags |= r->tags & TAGMASK;
}
}
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
}
}
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched)
- memcpy(c->tags, tagset[seltags], TAGSZ);
+ if(!c->tags)
+ c->tags = tagset[seltags];
}
void
}
void
@@
-269,16
+264,17
@@
arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c)) {
- unban(c);
+ if(VISIBLE(c)) {
if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
}
if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
}
- else
- ban(c);
+ else if(!c->isbanned) {
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ c->isbanned = True;
+ }
focus(NULL);
focus(NULL);
- if(lt->arrange)
+ if(lt->arrange && !domax)
lt->arrange();
restack();
}
lt->arrange();
restack();
}
@@
-298,56
+294,49
@@
attachstack(Client *c) {
}
void
}
void
-ban(Client *c) {
- if(c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned = True;
-}
-
-void
buttonpress(XEvent *e) {
buttonpress(XEvent *e) {
- unsigned int i, x;
+ uint i, x, mask;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- x += textw(tags[i]);
+ x += TEXTW(tags[i]);
if(ev->x < x) {
if(ev->x < x) {
+ mask = 1 << i;
if(ev->button == Button1) {
if(ev->state & MODKEY)
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(tags[i]);
+ tag(&mask);
else
else
- view(tags[i]);
+ view(&mask);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(tags[i]);
+ toggletag(&mask);
else
else
- toggleview(tags[i]);
+ toggleview(&mask);
}
return;
}
}
}
return;
}
}
- if((ev->x < x + blw) && ev->button == Button1)
- togglelayout(NULL);
+ if(ev->x < x + blw) {
+ if(ev->button == Button1)
+ togglelayout(NULL);
+ else if(ev->button == Button3)
+ togglemax(NULL);
+ }
}
else if((c = getclient(ev->window))) {
focus(c);
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY)
+ if(CLEANMASK(ev->state) != MODKEY || domax)
return;
return;
- if(ev->button == Button1) {
- restack();
+ if(ev->button == Button1)
movemouse(c);
movemouse(c);
- }
else if(ev->button == Button2)
togglefloating(NULL);
else if(ev->button == Button2)
togglefloating(NULL);
- else if(ev->button == Button3 && !c->isfixed) {
- restack();
+ else if(ev->button == Button3 && !c->isfixed)
resizemouse(c);
resizemouse(c);
- }
}
}
}
}
@@
-370,10
+359,9
@@
checkotherwm(void) {
void
cleanup(void) {
close(STDIN_FILENO);
void
cleanup(void) {
close(STDIN_FILENO);
- while(stack) {
- unban(stack);
+ view(NULL);
+ while(stack)
unmanage(stack);
unmanage(stack);
- }
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
else
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
else
@@
-445,7
+433,7
@@
configurerequest(XEvent *e) {
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(isvisible(c))
+ if(VISIBLE(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
@@
-498,27
+486,27
@@
drawbar(void) {
Client *c;
dc.x = 0;
Client *c;
dc.x = 0;
- for(c = stack; c && !isvisible(c); c = c->snext);
+ for(c = stack; c && !VISIBLE(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
for(i = 0; i < LENGTH(tags); i++) {
- dc.w = textw(tags[i]);
- if(tagset[seltags][i]) {
+ dc.w = TEXTW(tags[i]);
+ if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
drawtext(tags[i], dc.sel, isurgent(i));
- drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
}
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
}
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt->symbol, dc.norm, False);
+ drawtext(lt->symbol, dc.norm, domax);
x = dc.x + dc.w;
}
else
x = dc.x;
x = dc.x + dc.w;
}
else
x = dc.x;
- dc.w = textw(stext);
+ dc.w = TEXTW(stext);
dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
@@
-539,7
+527,7
@@
drawbar(void) {
}
void
}
void
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@
-560,9
+548,9
@@
drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
}
void
}
void
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
int x, y, w, h;
int x, y, w, h;
- unsigned int len, olen;
+ uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
@@
-596,15
+584,6
@@
drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
-void *
-emallocz(unsigned int size) {
- void *res = calloc(1, size);
-
- if(!res)
- eprint("fatal: could not malloc() %u bytes\n", size);
- return res;
-}
-
void
enternotify(XEvent *e) {
Client *c;
void
enternotify(XEvent *e) {
Client *c;
@@
-638,8
+617,8
@@
expose(XEvent *e) {
void
focus(Client *c) {
void
focus(Client *c) {
- if(!c || (c && !isvisible(c)))
- for(c = stack; c && !isvisible(c); c = c->snext);
+ if(!c || (c && !VISIBLE(c)))
+ for(c = stack; c && !VISIBLE(c); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@
-651,6
+630,10
@@
focus(Client *c) {
}
sel = c;
if(c) {
}
sel = c;
if(c) {
+ if(domax) {
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+ c->ismax = True;
+ }
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
@@
-668,14
+651,14
@@
focusin(XEvent *e) { /* there are some broken focus acquiring clients */
}
void
}
void
-focusnext(const char *arg) {
+focusnext(const void *arg) {
Client *c;
if(!sel)
return;
Client *c;
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c); c = c->next);
+ for(c = sel->next; c && !VISIBLE(c); c = c->next);
if(!c)
if(!c)
- for(c = clients; c && !isvisible(c); c = c->next);
+ for(c = clients; c && !VISIBLE(c); c = c->next);
if(c) {
focus(c);
restack();
if(c) {
focus(c);
restack();
@@
-683,15
+666,15
@@
focusnext(const char *arg) {
}
void
}
void
-focusprev(const char *arg) {
+focusprev(const void *arg) {
Client *c;
if(!sel)
return;
Client *c;
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(c); c = c->prev);
+ for(c = sel->prev; c && !VISIBLE(c); c = c->prev);
if(!c) {
for(c = clients; c && c->next; c = c->next);
if(!c) {
for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c); c = c->prev);
+ for(; c && !VISIBLE(c); c = c->prev);
}
if(c) {
focus(c);
}
if(c) {
focus(c);
@@
-707,7
+690,7
@@
getclient(Window w) {
return c;
}
return c;
}
-unsigned long
+ulong
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
@@
-722,7
+705,7
@@
getstate(Window w) {
int format, status;
long result = -1;
unsigned char *p = NULL;
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],
Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
@@
-736,7
+719,7
@@
getstate(Window w) {
}
Bool
}
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;
char **list = NULL;
int n;
XTextProperty name;
@@
-764,8
+747,8
@@
gettextprop(Window w, Atom atom, char *text, unsigned int size) {
void
grabbuttons(Client *c, Bool focused) {
int i, j;
void
grabbuttons(Client *c, Bool focused) {
int i, j;
- unsigned int buttons[] = { Button1, Button2, Button3 };
- unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+ uint buttons[] = { Button1, Button2, Button3 };
+ uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
MODKEY|numlockmask|LockMask} ;
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
MODKEY|numlockmask|LockMask} ;
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@@
-781,7
+764,7
@@
grabbuttons(Client *c, Bool focused) {
void
grabkeys(void) {
void
grabkeys(void) {
- unsigned int i, j;
+ uint i, j;
KeyCode code;
XModifierKeymap *modmap;
KeyCode code;
XModifierKeymap *modmap;
@@
-808,14
+791,6
@@
grabkeys(void) {
}
}
}
}
-unsigned int
-idxoftag(const char *t) {
- unsigned int i;
-
- for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
- return (i < LENGTH(tags)) ? i : 0;
-}
-
void
initfont(const char *fontstr) {
char *def, **missing;
void
initfont(const char *fontstr) {
char *def, **missing;
@@
-857,11
+832,11
@@
initfont(const char *fontstr) {
}
Bool
}
Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
Client *c;
for(c = clients; c; c = c->next)
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t])
+ if(c->tags & 1 << t)
return True;
return False;
}
return True;
return False;
}
@@
-882,28
+857,18
@@
isprotodel(Client *c) {
}
Bool
}
Bool
-isurgent(unsigned int t) {
+isurgent(uint t) {
Client *c;
for(c = clients; c; c = c->next)
Client *c;
for(c = clients; c; c = c->next)
- if(c->isurgent && c->tags[t])
- return True;
- return False;
-}
-
-Bool
-isvisible(Client *c) {
- unsigned int i;
-
- for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && tagset[seltags][i])
+ if(c->isurgent && c->tags & 1 << t)
return True;
return False;
}
void
keypress(XEvent *e) {
return True;
return False;
}
void
keypress(XEvent *e) {
- unsigned int i;
+ uint i;
KeySym keysym;
XKeyEvent *ev;
KeySym keysym;
XKeyEvent *ev;
@@
-919,7
+884,7
@@
keypress(XEvent *e) {
}
void
}
void
-killclient(const char *arg) {
+killclient(const void *arg) {
XEvent ev;
if(!sel)
XEvent ev;
if(!sel)
@@
-944,8
+909,8
@@
manage(Window w, XWindowAttributes *wa) {
Window trans;
XWindowChanges wc;
Window trans;
XWindowChanges wc;
- c = emallocz(sizeof(Client));
- c->tags = emallocz(TAGSZ);
+ if(!(c = calloc(1, sizeof(Client))))
+ eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
c->win = w;
/* geometry */
c->win = w;
/* geometry */
@@
-980,7
+945,7
@@
manage(Window w, XWindowAttributes *wa) {
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next);
if(t)
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next);
if(t)
- memcpy(c->tags, t->tags, TAGSZ);
+ c->tags = t->tags;
else
applyrules(c);
if(!c->isfloating)
else
applyrules(c);
if(!c->isfloating)
@@
-988,7
+953,6
@@
manage(Window w, XWindowAttributes *wa) {
attach(c);
attachstack(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
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();
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
arrange();
@@
-1019,10
+983,11
@@
maprequest(XEvent *e) {
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ uint dui;
Window dummy;
XEvent ev;
Window dummy;
XEvent ev;
+ restack();
ocx = nx = c->x;
ocy = ny = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
ocx = nx = c->x;
ocy = ny = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
@@
-1065,8
+1030,8
@@
movemouse(Client *c) {
}
Client *
}
Client *
-nextunfloating(Client *c) {
- for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+nexttiled(Client *c) {
+ for(; c && (c->isfloating || !VISIBLE(c)); c = c->next);
return c;
}
return c;
}
@@
-1103,7
+1068,7
@@
propertynotify(XEvent *e) {
}
void
}
void
-quit(const char *arg) {
+quit(const void *arg) {
readin = running = False;
}
readin = running = False;
}
@@
-1158,7
+1123,8
@@
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
x = sx;
if(y + h + 2 * c->bw < sy)
y = sy;
x = sx;
if(y + h + 2 * c->bw < sy)
y = sy;
- if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
+ c->isbanned = c->ismax = False;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
@@
-1177,6
+1143,7
@@
resizemouse(Client *c) {
int nw, nh;
XEvent ev;
int nw, nh;
XEvent ev;
+ restack();
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
@@
-1224,13
+1191,13
@@
restack(void) {
drawbar();
if(!sel)
return;
drawbar();
if(!sel)
return;
- if(sel->isfloating || !lt->arrange)
+ if(domax || sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->win);
- if(lt->arrange) {
+ if(!domax && lt->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && isvisible(c)) {
+ if(!c->isfloating && VISIBLE(c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
@@
-1245,7
+1212,7
@@
run(void) {
char sbuf[sizeof stext];
fd_set rd;
int r, xfd;
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 */
XEvent ev;
/* main event loop, also reads status text from stdin */
@@
-1301,7
+1268,7
@@
run(void) {
void
scan(void) {
void
scan(void) {
- unsigned int i, num;
+ uint i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
Window *wins, d1, d2;
XWindowAttributes wa;
@@
-1334,27
+1301,23
@@
setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
PropModeReplace, (unsigned char *)data, 2);
}
+/* arg > 1.0 will set mfact absolutly */
void
void
-setmfact(const char *arg) {
- double d;
+setmfact(const void *arg) {
+ double d = *((double*) arg);
- if(!arg || lt->arrange != tile)
+ if(!d || lt->arrange != tile)
return;
return;
- else {
- d = strtod(arg, NULL);
- if(arg[0] == '-' || arg[0] == '+')
- d += mfact;
- if(d < 0.1 || d > 0.9)
- return;
- mfact = d;
- }
- updatetilegeom();
+ d = d < 1.0 ? d + mfact : d - 1.0;
+ if(d < 0.1 || d > 0.9)
+ return;
+ mfact = d;
arrange();
}
void
setup(void) {
arrange();
}
void
setup(void) {
- unsigned int i, w;
+ uint i, w;
XSetWindowAttributes wa;
/* init screen */
XSetWindowAttributes wa;
/* init screen */
@@
-1396,14
+1359,9
@@
setup(void) {
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- /* init tags */
- tagset[0] = emallocz(TAGSZ);
- tagset[1] = emallocz(TAGSZ);
- tagset[0][0] = tagset[1][0] = True;
-
/* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
/* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
- w = textw(layouts[i].symbol);
+ w = TEXTW(layouts[i].symbol);
blw = MAX(blw, w);
}
blw = MAX(blw, w);
}
@@
-1435,13
+1393,11
@@
setup(void) {
}
void
}
void
-spawn(const char *arg) {
+spawn(const void *arg) {
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
shell = "/bin/sh";
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
shell = "/bin/sh";
- if(!arg)
- return;
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
@@
-1449,8
+1405,8
@@
spawn(const char *arg) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- execl(shell, shell, "-c", arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+ execl(shell, shell, "-c", (char *)arg, (char *)NULL);
+ fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
perror(" failed");
}
exit(0);
perror(" failed");
}
exit(0);
@@
-1459,19
+1415,15
@@
spawn(const char *arg) {
}
void
}
void
-tag(const char *arg) {
- unsigned int i;
-
- if(!sel)
- return;
- for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (arg == NULL);
- sel->tags[idxoftag(arg)] = True;
- arrange();
+tag(const void *arg) {
+ if(sel && *(int *)arg & TAGMASK) {
+ sel->tags = *(int *)arg & TAGMASK;
+ arrange();
+ }
}
}
-unsigned int
-textnw(const char *text, unsigned int len) {
+uint
+textnw(const char *text, uint len) {
XRectangle r;
if(dc.font.set) {
XRectangle r;
if(dc.font.set) {
@@
-1481,23
+1433,30
@@
textnw(const char *text, unsigned int len) {
return XTextWidth(dc.font.xfont, text, len);
}
return XTextWidth(dc.font.xfont, text, len);
}
-unsigned int
-textw(const char *text) {
- return textnw(text, strlen(text)) + dc.font.height;
-}
-
void
tile(void) {
void
tile(void) {
- int x, y, h, w;
- unsigned int i, n;
+ int x, y, h, w, mx, my, mw, mh, tx, ty, tw, th;
+ uint i, n;
Client *c;
Client *c;
- for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
if(n == 0)
return;
if(n == 0)
return;
+ /* master area geometry */
+ mx = wx;
+ my = wy;
+ mw = mfact * ww;
+ mh = wh;
+
+ /* tile area geometry */
+ tx = mx + mw;
+ ty = wy;
+ tw = ww - mw;
+ th = wh;
+
/* master */
/* master */
- c = nextunfloating(clients);
+ c = nexttiled(clients);
if(n == 1)
tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
if(n == 1)
tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
@@
-1515,7
+1474,7
@@
tile(void) {
if(h < bh)
h = th;
if(h < bh)
h = th;
- for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
if(i + 1 == n) /* remainder */
tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
else
if(i + 1 == n) /* remainder */
tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
else
@@
-1534,7
+1493,7
@@
tileresize(Client *c, int x, int y, int w, int h) {
}
void
}
void
-togglebar(const char *arg) {
+togglebar(const void *arg) {
showbar = !showbar;
updategeom();
updatebar();
showbar = !showbar;
updategeom();
updatebar();
@@
-1542,7
+1501,7
@@
togglebar(const char *arg) {
}
void
}
void
-togglefloating(const char *arg) {
+togglefloating(const void *arg) {
if(!sel)
return;
sel->isfloating = !sel->isfloating;
if(!sel)
return;
sel->isfloating = !sel->isfloating;
@@
-1552,8
+1511,8
@@
togglefloating(const char *arg) {
}
void
}
void
-togglelayout(const char *arg) {
- unsigned int i;
+togglelayout(const void *arg) {
+ uint i;
if(!arg) {
if(++lt == &layouts[LENGTH(layouts)])
if(!arg) {
if(++lt == &layouts[LENGTH(layouts)])
@@
-1561,7
+1520,7
@@
togglelayout(const char *arg) {
}
else {
for(i = 0; i < LENGTH(layouts); i++)
}
else {
for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
+ if(!strcmp((char *)arg, layouts[i].symbol))
break;
if(i == LENGTH(layouts))
return;
break;
if(i == LENGTH(layouts))
return;
@@
-1574,37
+1533,25
@@
togglelayout(const char *arg) {
}
void
}
void
-toggletag(const char *arg) {
- unsigned int i, j;
-
- 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 */
+togglemax(const void *arg) {
+ domax = !domax;
arrange();
}
void
arrange();
}
void
-toggleview(const char *arg) {
- unsigned int i, j;
-
- i = idxoftag(arg);
- tagset[seltags][i] = !tagset[seltags][i];
- for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
- if(j == LENGTH(tags))
- tagset[seltags][i] = True; /* at least one tag must be viewed */
- arrange();
+toggletag(const void *arg) {
+ if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
+ sel->tags ^= (*(int *)arg) & TAGMASK;
+ arrange();
+ }
}
void
}
void
-unban(Client *c) {
- if(!c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
+toggleview(const void *arg) {
+ if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
+ tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+ arrange();
+ }
}
void
}
void
@@
-1622,7
+1569,6
@@
unmanage(Client *c) {
focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
- free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
@@
-1675,11
+1621,6
@@
updategeom(void) {
bx = wx;
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
bw = ww;
bx = wx;
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
bw = ww;
-
- /* update layout geometries */
- for(i = 0; i < LENGTH(layouts); i++)
- if(layouts[i].updategeom)
- layouts[i].updategeom();
}
void
}
void
@@
-1735,21
+1676,6
@@
updatesizehints(Client *c) {
}
void
}
void
-updatetilegeom(void) {
- /* master area geometry */
- mx = wx;
- my = wy;
- mw = mfact * ww;
- mh = wh;
-
- /* tile area geometry */
- tx = mx + mw;
- ty = wy;
- tw = ww - mw;
- th = wh;
-}
-
-void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
@@
-1769,15
+1695,16
@@
updatewmhints(Client *c) {
}
void
}
void
-view(const char *arg) {
- seltags ^= 1; /* toggle sel tagset */
- memset(tagset[seltags], (NULL == arg), TAGSZ);
- tagset[seltags][idxoftag(arg)] = True;
- arrange();
+view(const void *arg) {
+ if(*(int *)arg & TAGMASK) {
+ seltags ^= 1; /* toggle sel tagset */
+ tagset[seltags] = *(int *)arg & TAGMASK;
+ arrange();
+ }
}
void
}
void
-viewprevtag(const char *arg) {
+viewprevtag(const void *arg) {
seltags ^= 1; /* toggle sel tagset */
arrange();
}
seltags ^= 1; /* toggle sel tagset */
arrange();
}
@@
-1816,17
+1743,17
@@
xerrorstart(Display *dpy, XErrorEvent *ee) {
}
void
}
void
-zoom(const char *arg) {
+zoom(const void *arg) {
Client *c = sel;
Client *c = sel;
- if(c == nextunfloating(clients))
- if(!c || !(c = nextunfloating(c->next)))
+ if(!lt->arrange || sel->isfloating)
+ return;
+ if(c == nexttiled(clients))
+ if(!c || !(c = nexttiled(c->next)))
return;
return;
- if(lt->arrange == tile && !sel->isfloating) {
- detach(c);
- attach(c);
- focus(c);
- }
+ detach(c);
+ attach(c);
+ focus(c);
arrange();
}
arrange();
}