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
replaced isvisible with a macro
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
5138752
..
908c464
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-52,6
+52,7
@@
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
+#define VISIBLE(x) ((x)->tags & tagset[seltags])
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@
-61,6
+62,7
@@
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
typedef unsigned int uint;
/* 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];
@@
-68,7
+70,7
@@
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;
- uint bw, oldbw;
+ int bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
uint tags;
Client *next;
Bool isbanned, isfixed, isfloating, isurgent;
uint tags;
Client *next;
@@
-79,8
+81,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 {
@@
-93,7
+95,7
@@
typedef struct {
} DC; /* draw context */
typedef struct {
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ uint mod;
KeySym keysym;
void (*func)(const void *arg);
const void *arg;
KeySym keysym;
void (*func)(const void *arg);
const void *arg;
@@
-129,9
+131,8
@@
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(uint 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 enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
@@
-140,7
+141,7
@@
void focusin(XEvent *e);
void focusnext(const void *arg);
void focusprev(const void *arg);
Client *getclient(Window w);
void focusnext(const void *arg);
void focusprev(const void *arg);
Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused);
long getstate(Window w);
Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused);
@@
-149,14
+150,13
@@
void initfont(const char *fontstr);
Bool isoccupied(uint t);
Bool isprotodel(Client *c);
Bool isurgent(uint t);
Bool isoccupied(uint t);
Bool isprotodel(Client *c);
Bool isurgent(uint t);
-Bool isvisible(Client *c);
void keypress(XEvent *e);
void killclient(const void *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
void movemouse(Client *c);
void keypress(XEvent *e);
void killclient(const void *arg);
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 quit(const void *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
void propertynotify(XEvent *e);
void quit(const void *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
@@
-233,11
+233,10
@@
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"
-/* check if all tags will fit into a uint bitarray. */
-static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
+/* 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 */
/* function implementations */
-
void
applyrules(Client *c) {
uint i;
void
applyrules(Client *c) {
uint i;
@@
-268,7
+267,7
@@
arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c)) {
+ if(VISIBLE(c)) {
unban(c);
if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
unban(c);
if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
@@
-445,7
+444,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,7
+497,7
@@
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++) {
dc.w = textw(tags[i]);
if(tagset[seltags] & 1 << i) {
for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
if(tagset[seltags] & 1 << i) {
@@
-539,7
+538,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,7
+559,7
@@
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;
uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
int x, y, w, h;
uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@
-596,15
+595,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(uint 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
+628,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]);
@@
-673,9
+663,9
@@
focusnext(const void *arg) {
if(!sel)
return;
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();
@@
-688,10
+678,10
@@
focusprev(const void *arg) {
if(!sel)
return;
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
+697,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
+712,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],
@@
-883,11
+873,6
@@
isurgent(uint t) {
return False;
}
return False;
}
-Bool
-isvisible(Client *c) {
- return c->tags & tagset[seltags];
-}
-
void
keypress(XEvent *e) {
uint i;
void
keypress(XEvent *e) {
uint i;
@@
-931,7
+916,8
@@
manage(Window w, XWindowAttributes *wa) {
Window trans;
XWindowChanges wc;
Window trans;
XWindowChanges wc;
- c = emallocz(sizeof(Client));
+ if(!(c = calloc(1, sizeof(Client))))
+ eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
c->win = w;
/* geometry */
c->win = w;
/* geometry */
@@
-1051,8
+1037,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;
}
@@
-1216,7
+1202,7
@@
restack(void) {
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;
}
@@
-1464,12
+1450,12
@@
tile(void) {
uint i, n;
Client *c;
uint i, n;
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;
/* master */
if(n == 0)
return;
/* 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);
@@
-1487,7
+1473,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
@@
-1547,14
+1533,6
@@
togglelayout(const void *arg) {
void
toggletag(const void *arg) {
void
toggletag(const void *arg) {
- int i, m = *(int *)arg;
- for(i = 0; i < sizeof(int) * 8; i++)
- fputc(m & 1 << i ? '1' : '0', stdout);
- puts("");
- for(i = 0; i < sizeof(int) * 8; i++)
- fputc(TAGMASK & 1 << i ? '1' : '0', stdout);
- puts("aaa");
-
if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
sel->tags ^= (*(int *)arg) & TAGMASK;
arrange();
if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
sel->tags ^= (*(int *)arg) & TAGMASK;
arrange();
@@
-1789,14
+1767,14
@@
void
zoom(const void *arg) {
Client *c = sel;
zoom(const void *arg) {
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();
}