elal
/
ewm
mirror of https://github.com/E-Almqvist/ewm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

applied Gottox bitmask + void *arg patch

Browse Source
pull/1/head
Anselm R Garbe 17 years ago
parent 103fb58a44
commit 39d1ecd5b0
3 changed files with 138 additions and 168 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 87
      config.def.h
  2. 8
      config.mk
  3. 195
      dwm.c

87
config.def.h
Unescape View File

@ -18,7 +18,8 @@ const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
Rule rules[] = { Rule rules[] = {
/* class instance title tags ref isfloating */ /* class instance title tags ref isfloating */
{ "Gimp", NULL, NULL, NULL, True }, { "Gimp", NULL, NULL, 0, True },
{ "Firefox", NULL, NULL, 1 << 8, True },
}; };
/* layout(s) */ /* layout(s) */
@ -35,55 +36,55 @@ Layout layouts[] = {
#define MODKEY Mod1Mask #define MODKEY Mod1Mask
Key keys[] = { Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XK_p, spawn, "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" }, { MODKEY, XK_p, spawn, (char *)"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
{ MODKEY|ShiftMask, XK_Return, spawn, "exec uxterm" }, { MODKEY|ShiftMask, XK_Return, spawn, (char *)"exec uxterm" },
{ MODKEY, XK_b, togglebar, NULL }, { MODKEY, XK_b, togglebar, NULL },
{ MODKEY, XK_j, focusnext, NULL }, { MODKEY, XK_j, focusnext, NULL },
{ MODKEY, XK_k, focusprev, NULL }, { MODKEY, XK_k, focusprev, NULL },
{ MODKEY, XK_h, setmfact, "-0.05" }, { MODKEY, XK_h, setmfact, (double[]){+0.05} },
{ MODKEY, XK_l, setmfact, "+0.05" }, { MODKEY, XK_l, setmfact, (double[]){-0.05} },
{ MODKEY, XK_Return, zoom, NULL }, { MODKEY, XK_Return, zoom, NULL },
{ MODKEY, XK_Tab, viewprevtag, NULL }, { MODKEY, XK_Tab, viewprevtag, NULL },
{ MODKEY|ShiftMask, XK_c, killclient, NULL }, { MODKEY|ShiftMask, XK_c, killclient, NULL },
{ MODKEY, XK_space, togglelayout, NULL }, { MODKEY, XK_space, togglelayout, NULL },
{ MODKEY|ShiftMask, XK_space, togglefloating, NULL }, { MODKEY|ShiftMask, XK_space, togglefloating, NULL },
{ MODKEY, XK_0, view, NULL }, { MODKEY, XK_0, view, (int[]){ ~0 } },
{ MODKEY, XK_1, view, tags[0] }, { MODKEY, XK_1, view, (int[]){ 1 << 0 } },
{ MODKEY, XK_2, view, tags[1] }, { MODKEY, XK_2, view, (int[]){ 1 << 1 } },
{ MODKEY, XK_3, view, tags[2] }, { MODKEY, XK_3, view, (int[]){ 1 << 2 } },
{ MODKEY, XK_4, view, tags[3] }, { MODKEY, XK_4, view, (int[]){ 1 << 3 } },
{ MODKEY, XK_5, view, tags[4] }, { MODKEY, XK_5, view, (int[]){ 1 << 4 } },
{ MODKEY, XK_6, view, tags[5] }, { MODKEY, XK_6, view, (int[]){ 1 << 5 } },
{ MODKEY, XK_7, view, tags[6] }, { MODKEY, XK_7, view, (int[]){ 1 << 6 } },
{ MODKEY, XK_8, view, tags[7] }, { MODKEY, XK_8, view, (int[]){ 1 << 7 } },
{ MODKEY, XK_9, view, tags[8] }, { MODKEY, XK_9, view, (int[]){ 1 << 8 } },
{ MODKEY|ControlMask, XK_1, toggleview, tags[0] }, { MODKEY|ControlMask, XK_1, toggleview, (int[]){ 1 << 0 } },
{ MODKEY|ControlMask, XK_2, toggleview, tags[1] }, { MODKEY|ControlMask, XK_2, toggleview, (int[]){ 1 << 1 } },
{ MODKEY|ControlMask, XK_3, toggleview, tags[2] }, { MODKEY|ControlMask, XK_3, toggleview, (int[]){ 1 << 2 } },
{ MODKEY|ControlMask, XK_4, toggleview, tags[3] }, { MODKEY|ControlMask, XK_4, toggleview, (int[]){ 1 << 3 } },
{ MODKEY|ControlMask, XK_5, toggleview, tags[4] }, { MODKEY|ControlMask, XK_5, toggleview, (int[]){ 1 << 4 } },
{ MODKEY|ControlMask, XK_6, toggleview, tags[5] }, { MODKEY|ControlMask, XK_6, toggleview, (int[]){ 1 << 5 } },
{ MODKEY|ControlMask, XK_7, toggleview, tags[6] }, { MODKEY|ControlMask, XK_7, toggleview, (int[]){ 1 << 6 } },
{ MODKEY|ControlMask, XK_8, toggleview, tags[7] }, { MODKEY|ControlMask, XK_8, toggleview, (int[]){ 1 << 7 } },
{ MODKEY|ControlMask, XK_9, toggleview, tags[8] }, { MODKEY|ControlMask, XK_9, toggleview, (int[]){ 1 << 8 } },
{ MODKEY|ShiftMask, XK_0, tag, NULL }, { MODKEY|ShiftMask, XK_0, tag, (int[]){ ~0 } },
{ MODKEY|ShiftMask, XK_1, tag, tags[0] }, { MODKEY|ShiftMask, XK_1, tag, (int[]){ 1 << 0 } },
{ MODKEY|ShiftMask, XK_2, tag, tags[1] }, { MODKEY|ShiftMask, XK_2, tag, (int[]){ 1 << 1 } },
{ MODKEY|ShiftMask, XK_3, tag, tags[2] }, { MODKEY|ShiftMask, XK_3, tag, (int[]){ 1 << 2 } },
{ MODKEY|ShiftMask, XK_4, tag, tags[3] }, { MODKEY|ShiftMask, XK_4, tag, (int[]){ 1 << 3 } },
{ MODKEY|ShiftMask, XK_5, tag, tags[4] }, { MODKEY|ShiftMask, XK_5, tag, (int[]){ 1 << 4 } },
{ MODKEY|ShiftMask, XK_6, tag, tags[5] }, { MODKEY|ShiftMask, XK_6, tag, (int[]){ 1 << 5 } },
{ MODKEY|ShiftMask, XK_7, tag, tags[6] }, { MODKEY|ShiftMask, XK_7, tag, (int[]){ 1 << 6 } },
{ MODKEY|ShiftMask, XK_8, tag, tags[7] }, { MODKEY|ShiftMask, XK_8, tag, (int[]){ 1 << 7 } },
{ MODKEY|ShiftMask, XK_9, tag, tags[8] }, { MODKEY|ShiftMask, XK_9, tag, (int[]){ 1 << 8 } },
{ MODKEY|ControlMask|ShiftMask, XK_1, toggletag, tags[0] }, { MODKEY|ControlMask|ShiftMask, XK_1, toggletag, (int[]){ 1 << 0 } },
{ MODKEY|ControlMask|ShiftMask, XK_2, toggletag, tags[1] }, { MODKEY|ControlMask|ShiftMask, XK_2, toggletag, (int[]){ 1 << 1 } },
{ MODKEY|ControlMask|ShiftMask, XK_3, toggletag, tags[2] }, { MODKEY|ControlMask|ShiftMask, XK_3, toggletag, (int[]){ 1 << 2 } },
{ MODKEY|ControlMask|ShiftMask, XK_4, toggletag, tags[3] }, { MODKEY|ControlMask|ShiftMask, XK_4, toggletag, (int[]){ 1 << 3 } },
{ MODKEY|ControlMask|ShiftMask, XK_5, toggletag, tags[4] }, { MODKEY|ControlMask|ShiftMask, XK_5, toggletag, (int[]){ 1 << 4 } },
{ MODKEY|ControlMask|ShiftMask, XK_6, toggletag, tags[5] }, { MODKEY|ControlMask|ShiftMask, XK_6, toggletag, (int[]){ 1 << 5 } },
{ MODKEY|ControlMask|ShiftMask, XK_7, toggletag, tags[6] }, { MODKEY|ControlMask|ShiftMask, XK_7, toggletag, (int[]){ 1 << 6 } },
{ MODKEY|ControlMask|ShiftMask, XK_8, toggletag, tags[7] }, { MODKEY|ControlMask|ShiftMask, XK_8, toggletag, (int[]){ 1 << 7 } },
{ MODKEY|ControlMask|ShiftMask, XK_9, toggletag, tags[8] }, { MODKEY|ControlMask|ShiftMask, XK_9, toggletag, (int[]){ 1 << 8 } },
{ MODKEY|ShiftMask, XK_q, quit, NULL }, { MODKEY|ShiftMask, XK_q, quit, NULL },
}; };

8
config.mk
Unescape View File

@ -20,10 +20,10 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
# flags # flags
CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
CFLAGS = -Os ${INCS} ${CPPFLAGS} #CFLAGS = -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS} #LDFLAGS = -s ${LIBS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS} CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
#LDFLAGS = -g ${LIBS} LDFLAGS = -g ${LIBS}
# Solaris # Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

195
dwm.c
Unescape View File

@ -51,6 +51,7 @@
#define LENGTH(x) (sizeof x / sizeof x[0]) #define LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16 #define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
/* enums */ /* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@ -68,7 +69,7 @@ struct Client {
long flags; long flags;
unsigned int bw, oldbw; unsigned int bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent; Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags; unsigned int tags;
Client *next; Client *next;
Client *prev; Client *prev;
Client *snext; Client *snext;
@ -93,8 +94,8 @@ typedef struct {
typedef struct { typedef struct {
unsigned long mod; unsigned long mod;
KeySym keysym; KeySym keysym;
void (*func)(const char *arg); void (*func)(void *arg);
const char *arg; void *arg;
} Key; } Key;
typedef struct { typedef struct {
@ -107,7 +108,7 @@ typedef struct {
const char *class; const char *class;
const char *instance; const char *instance;
const char *title; const char *title;
const char *tag; unsigned int tags;
Bool isfloating; Bool isfloating;
} Rule; } Rule;
@ -135,48 +136,47 @@ void eprint(const char *errstr, ...);
void expose(XEvent *e); void expose(XEvent *e);
void focus(Client *c); void focus(Client *c);
void focusin(XEvent *e); void focusin(XEvent *e);
void focusnext(const char *arg); void focusnext(void *arg);
void focusprev(const char *arg); void focusprev(void *arg);
Client *getclient(Window w); Client *getclient(Window w);
unsigned long getcolor(const char *colstr); unsigned long 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, unsigned int size);
void grabbuttons(Client *c, Bool focused); void grabbuttons(Client *c, Bool focused);
void grabkeys(void); 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(unsigned int t);
Bool isprotodel(Client *c); Bool isprotodel(Client *c);
Bool isurgent(unsigned int t); Bool isurgent(unsigned int t);
Bool isvisible(Client *c); Bool isvisible(Client *c);
void keypress(XEvent *e); void keypress(XEvent *e);
void killclient(const char *arg); void killclient(void *arg);
void manage(Window w, XWindowAttributes *wa); void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e); void mappingnotify(XEvent *e);
void maprequest(XEvent *e); void maprequest(XEvent *e);
void movemouse(Client *c); void movemouse(Client *c);
Client *nextunfloating(Client *c); Client *nextunfloating(Client *c);
void propertynotify(XEvent *e); void propertynotify(XEvent *e);
void quit(const char *arg); void quit(void *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints); void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
void resizemouse(Client *c); void resizemouse(Client *c);
void restack(void); void restack(void);
void run(void); void run(void);
void scan(void); void scan(void);
void setclientstate(Client *c, long state); void setclientstate(Client *c, long state);
void setmfact(const char *arg); void setmfact(void *arg);
void setup(void); void setup(void);
void spawn(const char *arg); void spawn(void *arg);
void tag(const char *arg); void tag(void *arg);
unsigned int textnw(const char *text, unsigned int len); unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text); unsigned int textw(const char *text);
void tile(void); void tile(void);
void tileresize(Client *c, int x, int y, int w, int h); void tileresize(Client *c, int x, int y, int w, int h);
void togglebar(const char *arg); void togglebar(void *arg);
void togglefloating(const char *arg); void togglefloating(void *arg);
void togglelayout(const char *arg); void togglelayout(void *arg);
void toggletag(const char *arg); void toggletag(void *arg);
void toggleview(const char *arg); void toggleview(void *arg);
void unban(Client *c); void unban(Client *c);
void unmanage(Client *c); void unmanage(Client *c);
void unmapnotify(XEvent *e); void unmapnotify(XEvent *e);
@ -186,19 +186,19 @@ void updatesizehints(Client *c);
void updatetilegeom(void); void updatetilegeom(void);
void updatetitle(Client *c); void updatetitle(Client *c);
void updatewmhints(Client *c); void updatewmhints(Client *c);
void view(const char *arg); void view(void *arg);
void viewprevtag(const char *arg); void viewprevtag(void *arg);
int xerror(Display *dpy, XErrorEvent *ee); int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee); int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee); int xerrorstart(Display *dpy, XErrorEvent *ee);
void zoom(const char *arg); void zoom(void *arg);
/* variables */ /* variables */
char stext[256]; char stext[256];
int screen, sx, sy, sw, sh; int screen, sx, sy, sw, sh;
int bx, by, bw, bh, blw, wx, wy, ww, wh; int bx, by, bw, bh, blw, wx, wy, ww, wh;
int mx, my, mw, mh, tx, ty, tw, th; int mx, my, mw, mh, tx, ty, tw, th;
int seltags = 0; unsigned int seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *); int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int numlockmask = 0; unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = { void (*handler[LASTEvent]) (XEvent *) = {
@ -218,7 +218,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
Atom wmatom[WMLast], netatom[NetLast]; Atom wmatom[WMLast], netatom[NetLast];
Bool otherwm, readin; Bool otherwm, readin;
Bool running = True; Bool running = True;
Bool *tagset[2]; unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
Client *clients = NULL; Client *clients = NULL;
Client *sel = NULL; Client *sel = NULL;
Client *stack = NULL; Client *stack = NULL;
@ -231,14 +231,15 @@ Window root, barwin;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
#define TAGSZ (LENGTH(tags) * sizeof(Bool))
/* check if all tags will fit into a unsigned int bitarray. */
static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
/* function implementations */ /* function implementations */
void void
applyrules(Client *c) { applyrules(Client *c) {
unsigned int i; unsigned int i;
Bool matched = False;
Rule *r; Rule *r;
XClassHint ch = { 0 }; XClassHint ch = { 0 };
@ -250,18 +251,15 @@ applyrules(Client *c) {
&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class))) && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) { && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
if(r->tag) { c->tags |= r->tags & TAGMASK;
c->tags[idxoftag(r->tag)] = True;
matched = True;
}
} }
} }
if(ch.res_class) if(ch.res_class)
XFree(ch.res_class); XFree(ch.res_class);
if(ch.res_name) if(ch.res_name)
XFree(ch.res_name); XFree(ch.res_name);
if(!matched) if(!c->tags)
memcpy(c->tags, tagset[seltags], TAGSZ); c->tags = tagset[seltags];
} }
void void
@ -307,7 +305,7 @@ ban(Client *c) {
void void
buttonpress(XEvent *e) { buttonpress(XEvent *e) {
unsigned int i, x; unsigned int i, x, mask;
Client *c; Client *c;
XButtonPressedEvent *ev = &e->xbutton; XButtonPressedEvent *ev = &e->xbutton;
@ -316,17 +314,18 @@ buttonpress(XEvent *e) {
for(i = 0; i < LENGTH(tags); i++) { 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->button == Button1) {
if(ev->state & MODKEY) if(ev->state & MODKEY)
tag(tags[i]); tag(&mask);
else else
view(tags[i]); view(&mask);
} }
else if(ev->button == Button3) { else if(ev->button == Button3) {
if(ev->state & MODKEY) if(ev->state & MODKEY)
toggletag(tags[i]); toggletag(&mask);
else else
toggleview(tags[i]); toggleview(&mask);
} }
return; return;
} }
@ -501,13 +500,13 @@ drawbar(void) {
for(c = stack; c && !isvisible(c); c = c->snext); for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) { for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]); dc.w = textw(tags[i]);
if(tagset[seltags][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 { else {
drawtext(tags[i], dc.norm, isurgent(i)); 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; dc.x += dc.w;
} }
@ -668,7 +667,7 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
} }
void void
focusnext(const char *arg) { focusnext(void *arg) {
Client *c; Client *c;
if(!sel) if(!sel)
@ -683,7 +682,7 @@ focusnext(const char *arg) {
} }
void void
focusprev(const char *arg) { focusprev(void *arg) {
Client *c; Client *c;
if(!sel) if(!sel)
@ -808,14 +807,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 void
initfont(const char *fontstr) { initfont(const char *fontstr) {
char *def, **missing; char *def, **missing;
@ -861,7 +852,7 @@ isoccupied(unsigned int t) {
Client *c; Client *c;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
if(c->tags[t]) if(c->tags & 1 << t)
return True; return True;
return False; return False;
} }
@ -886,19 +877,14 @@ isurgent(unsigned int t) {
Client *c; Client *c;
for(c = clients; c; c = c->next) for(c = clients; c; c = c->next)
if(c->isurgent && c->tags[t]) if(c->isurgent && c->tags & 1 << t)
return True; return True;
return False; return False;
} }
Bool Bool
isvisible(Client *c) { isvisible(Client *c) {
unsigned int i; return c->tags & tagset[seltags];
for(i = 0; i < LENGTH(tags); i++)
if(c->tags[i] && tagset[seltags][i])
return True;
return False;
} }
void void
@ -919,7 +905,7 @@ keypress(XEvent *e) {
} }
void void
killclient(const char *arg) { killclient(void *arg) {
XEvent ev; XEvent ev;
if(!sel) if(!sel)
@ -945,7 +931,6 @@ manage(Window w, XWindowAttributes *wa) {
XWindowChanges wc; XWindowChanges wc;
c = emallocz(sizeof(Client)); c = emallocz(sizeof(Client));
c->tags = emallocz(TAGSZ);
c->win = w; c->win = w;
/* geometry */ /* geometry */
@ -980,7 +965,7 @@ manage(Window w, XWindowAttributes *wa) {
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next); for(t = clients; t && t->win != trans; t = t->next);
if(t) if(t)
memcpy(c->tags, t->tags, TAGSZ); c->tags = t->tags;
else else
applyrules(c); applyrules(c);
if(!c->isfloating) if(!c->isfloating)
@ -1103,7 +1088,7 @@ propertynotify(XEvent *e) {
} }
void void
quit(const char *arg) { quit(void *arg) {
readin = running = False; readin = running = False;
} }
@ -1334,20 +1319,17 @@ 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) { setmfact(void *arg) {
double d; double d = *((double*) arg);
if(!arg || lt->arrange != tile) if(!d || lt->arrange != tile)
return; return;
else { d = d < 1.0 ? d + mfact : d - 1.0;
d = strtod(arg, NULL);
if(arg[0] == '-' || arg[0] == '+')
d += mfact;
if(d < 0.1 || d > 0.9) if(d < 0.1 || d > 0.9)
return; return;
mfact = d; mfact = d;
}
updatetilegeom(); updatetilegeom();
arrange(); arrange();
} }
@ -1396,11 +1378,6 @@ setup(void) {
if(!dc.font.set) if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid); 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 */ /* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) { for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
w = textw(layouts[i].symbol); w = textw(layouts[i].symbol);
@ -1435,13 +1412,11 @@ setup(void) {
} }
void void
spawn(const char *arg) { spawn(void *arg) {
static char *shell = NULL; static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL"))) if(!shell && !(shell = getenv("SHELL")))
shell = "/bin/sh"; shell = "/bin/sh";
if(!arg)
return;
/* The double-fork construct avoids zombie processes and keeps the code /* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */ * clean from stupid signal handlers. */
if(fork() == 0) { if(fork() == 0) {
@ -1449,8 +1424,8 @@ spawn(const char *arg) {
if(dpy) if(dpy)
close(ConnectionNumber(dpy)); close(ConnectionNumber(dpy));
setsid(); setsid();
execl(shell, shell, "-c", arg, (char *)NULL); execl(shell, shell, "-c", (char *)arg, (char *)NULL);
fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg); fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
perror(" failed"); perror(" failed");
} }
exit(0); exit(0);
@ -1459,16 +1434,12 @@ spawn(const char *arg) {
} }
void void
tag(const char *arg) { tag(void *arg) {
unsigned int i; if(sel && *(int *)arg & TAGMASK) {
sel->tags = *(int *)arg & TAGMASK;
if(!sel)
return;
for(i = 0; i < LENGTH(tags); i++)
sel->tags[i] = (arg == NULL);
sel->tags[idxoftag(arg)] = True;
arrange(); arrange();
} }
}
unsigned int unsigned int
textnw(const char *text, unsigned int len) { textnw(const char *text, unsigned int len) {
@ -1534,7 +1505,7 @@ tileresize(Client *c, int x, int y, int w, int h) {
} }
void void
togglebar(const char *arg) { togglebar(void *arg) {
showbar = !showbar; showbar = !showbar;
updategeom(); updategeom();
updatebar(); updatebar();
@ -1542,7 +1513,7 @@ togglebar(const char *arg) {
} }
void void
togglefloating(const char *arg) { togglefloating(void *arg) {
if(!sel) if(!sel)
return; return;
sel->isfloating = !sel->isfloating; sel->isfloating = !sel->isfloating;
@ -1552,7 +1523,7 @@ togglefloating(const char *arg) {
} }
void void
togglelayout(const char *arg) { togglelayout(void *arg) {
unsigned int i; unsigned int i;
if(!arg) { if(!arg) {
@ -1561,7 +1532,7 @@ togglelayout(const char *arg) {
} }
else { else {
for(i = 0; i < LENGTH(layouts); i++) for(i = 0; i < LENGTH(layouts); i++)
if(!strcmp(arg, layouts[i].symbol)) if(!strcmp((char *)arg, layouts[i].symbol))
break; break;
if(i == LENGTH(layouts)) if(i == LENGTH(layouts))
return; return;
@ -1574,30 +1545,28 @@ togglelayout(const char *arg) {
} }
void void
toggletag(const char *arg) { toggletag(void *arg) {
unsigned int i, j; 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) if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
return; sel->tags ^= (*(int *)arg) & TAGMASK;
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 */
arrange(); arrange();
} }
}
void void
toggleview(const char *arg) { toggleview(void *arg) {
unsigned int i, j; if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
tagset[seltags] ^= (*(int *)arg) & TAGMASK;
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(); arrange();
} }
}
void void
unban(Client *c) { unban(Client *c) {
@ -1622,7 +1591,6 @@ unmanage(Client *c) {
focus(NULL); focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState); setclientstate(c, WithdrawnState);
free(c->tags);
free(c); free(c);
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(xerror); XSetErrorHandler(xerror);
@ -1769,15 +1737,16 @@ updatewmhints(Client *c) {
} }
void void
view(const char *arg) { view(void *arg) {
if(*(int *)arg & TAGMASK) {
seltags ^= 1; /* toggle sel tagset */ seltags ^= 1; /* toggle sel tagset */
memset(tagset[seltags], (NULL == arg), TAGSZ); tagset[seltags] = *(int *)arg & TAGMASK;
tagset[seltags][idxoftag(arg)] = True;
arrange(); arrange();
} }
}
void void
viewprevtag(const char *arg) { viewprevtag(void *arg) {
seltags ^= 1; /* toggle sel tagset */ seltags ^= 1; /* toggle sel tagset */
arrange(); arrange();
} }
@ -1816,7 +1785,7 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
} }
void void
zoom(const char *arg) { zoom(void *arg) {
Client *c = sel; Client *c = sel;
if(c == nextunfloating(clients)) if(c == nextunfloating(clients))

Write Preview
Loading…
Cancel
Save