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];
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int bw, oldbw;
+ uint bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
- unsigned int tags;
+ uint tags;
Client *next;
Client *prev;
Client *snext;
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 {
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ ulong mod;
KeySym keysym;
- void (*func)(void *arg);
- void *arg;
+ void (*func)(const void *arg);
+ const void *arg;
} Key;
typedef struct {
const char *class;
const char *instance;
const char *title;
- unsigned int tags;
+ uint tags;
Bool isfloating;
} Rule;
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 *emallocz(uint size);
void enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
void focus(Client *c);
void focusin(XEvent *e);
-void focusnext(void *arg);
-void focusprev(void *arg);
+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, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused);
void grabkeys(void);
void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);
Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
+Bool isurgent(uint t);
Bool isvisible(Client *c);
void keypress(XEvent *e);
-void killclient(void *arg);
+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(void *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 setmfact(void *arg);
+void setmfact(const void *arg);
void setup(void);
-void spawn(void *arg);
-void tag(void *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);
+uint textw(const char *text);
void tile(void);
void tileresize(Client *c, int x, int y, int w, int h);
-void togglebar(void *arg);
-void togglefloating(void *arg);
-void togglelayout(void *arg);
-void toggletag(void *arg);
-void toggleview(void *arg);
+void togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
void updatetilegeom(void);
void updatetitle(Client *c);
void updatewmhints(Client *c);
-void view(void *arg);
-void viewprevtag(void *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);
-void zoom(void *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;
int mx, my, mw, mh, tx, ty, tw, th;
-unsigned int seltags = 0;
+uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int numlockmask = 0;
+uint numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
Atom wmatom[WMLast], netatom[NetLast];
Bool otherwm, readin;
Bool running = True;
-unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
+uint tagset[] = {1, 1}; /* after start, first tag is selected */
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
/* configuration, allows nested code to access above variables */
#include "config.h"
-/* check if all tags will fit into a unsigned int bitarray. */
+/* 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];
/* function implementations */
void
applyrules(Client *c) {
- unsigned int i;
+ uint i;
Rule *r;
XClassHint ch = { 0 };
void
buttonpress(XEvent *e) {
- unsigned int i, x, mask;
+ uint i, x, mask;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
}
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 };
}
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;
- unsigned int len, olen;
+ uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
}
void *
-emallocz(unsigned int size) {
+emallocz(uint size) {
void *res = calloc(1, size);
if(!res)
}
void
-focusnext(void *arg) {
+focusnext(const void *arg) {
Client *c;
if(!sel)
}
void
-focusprev(void *arg) {
+focusprev(const void *arg) {
Client *c;
if(!sel)
return c;
}
-unsigned long
+ulong
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
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],
}
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;
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);
void
grabkeys(void) {
- unsigned int i, j;
+ uint i, j;
KeyCode code;
XModifierKeymap *modmap;
}
Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
Client *c;
for(c = clients; c; c = c->next)
}
Bool
-isurgent(unsigned int t) {
+isurgent(uint t) {
Client *c;
for(c = clients; c; c = c->next)
void
keypress(XEvent *e) {
- unsigned int i;
+ uint i;
KeySym keysym;
XKeyEvent *ev;
}
void
-killclient(void *arg) {
+killclient(const void *arg) {
XEvent ev;
if(!sel)
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ uint dui;
Window dummy;
XEvent ev;
}
Client *
-nextunfloating(Client *c) {
+nexttiled(Client *c) {
for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
}
void
-quit(void *arg) {
+quit(const void *arg) {
readin = running = False;
}
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 */
void
scan(void) {
- unsigned int i, num;
+ uint i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
/* arg > 1.0 will set mfact absolutly */
void
-setmfact(void *arg) {
+setmfact(const void *arg) {
double d = *((double*) arg);
if(!d || lt->arrange != tile)
void
setup(void) {
- unsigned int i, w;
+ uint i, w;
XSetWindowAttributes wa;
/* init screen */
}
void
-spawn(void *arg) {
+spawn(const void *arg) {
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
}
void
-tag(void *arg) {
+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) {
return XTextWidth(dc.font.xfont, text, len);
}
-unsigned int
+uint
textw(const char *text) {
return textnw(text, strlen(text)) + dc.font.height;
}
void
tile(void) {
int x, y, h, w;
- unsigned int i, n;
+ 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 */
- c = nextunfloating(clients);
+ c = nexttiled(clients);
if(n == 1)
tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
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
}
void
-togglebar(void *arg) {
+togglebar(const void *arg) {
showbar = !showbar;
updategeom();
updatebar();
}
void
-togglefloating(void *arg) {
+togglefloating(const void *arg) {
if(!sel)
return;
sel->isfloating = !sel->isfloating;
}
void
-togglelayout(void *arg) {
- unsigned int i;
+togglelayout(const void *arg) {
+ uint i;
if(!arg) {
if(++lt == &layouts[LENGTH(layouts)])
}
void
-toggletag(void *arg) {
+toggletag(const void *arg) {
int i, m = *(int *)arg;
for(i = 0; i < sizeof(int) * 8; i++)
fputc(m & 1 << i ? '1' : '0', stdout);
}
void
-toggleview(void *arg) {
+toggleview(const void *arg) {
if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
tagset[seltags] ^= (*(int *)arg) & TAGMASK;
arrange();
}
void
-view(void *arg) {
+view(const void *arg) {
if(*(int *)arg & TAGMASK) {
seltags ^= 1; /* toggle sel tagset */
tagset[seltags] = *(int *)arg & TAGMASK;
}
void
-viewprevtag(void *arg) {
+viewprevtag(const void *arg) {
seltags ^= 1; /* toggle sel tagset */
arrange();
}
}
void
-zoom(void *arg) {
+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;
- if(lt->arrange == tile && !sel->isfloating) {
- detach(c);
- attach(c);
- focus(c);
- }
+ detach(c);
+ attach(c);
+ focus(c);
arrange();
}