aewl: dwm.c comparison

comparison dwm.c @ 756:bff1012527b3

removed unnecessary Arg* parametersadded decnmaster

author	meillo@marmaro.de
date	Fri, 30 May 2008 00:30:57 +0200
parents	cdd895c163bd
children	bc512840e5a5

comparison

equal deleted inserted replaced

-:cdd895c163bd
+:bff1012527b3
 /* client.c */
 void configure(Client *c);		/* send synthetic configure event */
 void focus(Client *c);			/* focus c, c may be NULL */
 Client *getclient(Window w);		/* return client of w */
 Bool isprotodel(Client *c);		/* returns True if c->win supports wmatom[WMDelete] */
-void killclient(Arg *arg);		/* kill c nicely */
+void killclient();		/* kill c nicely */
 void manage(Window w, XWindowAttributes *wa);	/* manage new client */
 void resize(Client *c, Bool sizehints);	/* resize c*/
 void updatesizehints(Client *c);		/* update the size hint variables of c */
 void updatetitle(Client *c);		/* update the name of c */
 void unmanage(Client *c);		/* destroy c */
 /* event.c */
 void grabkeys(void);			/* grab all keys defined in config.h */
 void procevent(void);			/* process pending X events */
 /* main.c */
-void quit(Arg *arg);			/* quit dwm nicely */
+void quit();			/* quit dwm nicely */
 void sendevent(Window w, Atom a, long value);	/* send synthetic event to w */
 int xerror(Display *dsply, XErrorEvent *ee);	/* dwm's X error handler */
 /* tag.c */
 void initrregs(void);			/* initialize regexps of rules defined in config.h */
 Client *getnext(Client *c);		/* returns next visible client */
 void settags(Client *c, Client *trans);	/* sets tags of c */
-void toggletag(Arg *arg);		/* toggles c tags with arg's index */
+void toggletag();		/* toggles c tags with arg's index */
 /* util.c */
 void *emallocz(unsigned int size);	/* allocates zero-initialized memory, exits on error */
 void eprint(const char *errstr, ...);	/* prints errstr and exits with 1 */
 void spawn(Arg *arg);			/* forks a new subprocess with to arg's cmd */
 /* view.c */
 void detach(Client *c);			/* detaches c from global client list */
 void dofloat(void);			/* arranges all windows floating */
 void dotile(void);			/* arranges all windows tiled */
 void domax(void);            /* arranges all windows fullscreen */
-void focusnext(Arg *arg);		/* focuses next visible client, arg is ignored  */
+void focusnext();		/* focuses next visible client, arg is ignored  */
-void incnmaster(Arg *arg);		/* increments nmaster with arg's index value */
+void incnmaster();		/* increments nmaster */
+void decnmaster();		/* decrements nmaster */
 Bool isvisible(Client *c);		/* returns True if client is visible */
 void restack(void);			/* restores z layers of all clients */
-void togglefloat(Arg *arg);		/* toggles focusesd client between floating/non-floating state */
+void togglefloat();		/* toggles focusesd client between floating/non-floating state */
-void togglemode(Arg *arg);		/* toggles global arrange function (dotile/dofloat) */
+void togglemode();		/* toggles global arrange function (dotile/dofloat) */
 void toggleview();			/* views the tag with arg's index */
-void zoom(Arg *arg);			/* zooms the focused client to master area, arg is ignored */
+void zoom();			/* zooms the focused client to master area, arg is ignored */
 restack();
 }
 /* end code by mitch */
 void
-focusnext(Arg *arg) {
+focusnext() {
 	Client *c;
 	if(!sel)
 		return;
 	if(!(c = getnext(sel->next)))
 		restack();
 	}
 }
 void
-incnmaster(Arg *arg) {
+incnmaster() {
-	if((arrange == dofloat) || (nmaster + arg->i < 1)
+	if((arrange == dofloat) || (wah / (nmaster + 1) <= 2 * BORDERPX))
-		|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
+		return;
-		return;
+	nmaster++;
-	nmaster += arg->i;
+	if(sel)
+		arrange();
+	else
+		drawstatus();
+}
+void
+decnmaster() {
+	if((arrange == dofloat) || (nmaster <= 1))
+		return;
+	nmaster--;
 	if(sel)
 		arrange();
 	else
 		drawstatus();
 }
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 void
-togglefloat(Arg *arg) {
+togglefloat() {
 	if (!sel || arrange == dofloat)
 		return;
 	sel->isfloat = !sel->isfloat;
 	arrange();
 }
 void
-togglemode(Arg *arg) {
+togglemode() {
 /* only toggle between tile and max - float is just available through togglefloat */
 arrange = (arrange == dotile) ? domax : dotile;
 	if(sel)
 		arrange();
 	else
 	seltag = !seltag;
 	arrange();
 }
 void
-zoom(Arg *arg) {
+zoom() {
 	unsigned int n;
 	Client *c;
 	if(!sel)
 		return;
 }
 void
 settags(Client *c, Client *trans) {
 	char prop[512];
-	unsigned int i, j;
+	unsigned int i;
 	regmatch_t tmp;
 	Bool matched = trans != NULL;
 	XClassHint ch = { 0 };
 	if(matched) {
 		c->tag = seltag;
 	}
 }
 void
-toggletag(Arg *arg) {
+toggletag() {
 	if(!sel)
 		return;
 	sel->tag = !sel->tag;
 	toggleview();
 }
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < len; i++) {
-		if(keysym == key[i].keysym
+		if(keysym == key[i].keysym && CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
-			&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
-		{
 			if(key[i].func)
 				key[i].func(&key[i].arg);
 		}
 	}
 }
 void
 drawstatus(void) {
-	int i, x;
+	int x;
+	unsigned int i;
 	dc.x = dc.y = 0;
 	for(i = 0; i < ntags; i++) {
 		dc.w = textw(tags[i]);
-		drawtext(tags[i], ( (i == 0 && seltag || i == 1 && !seltag) ? dc.sel : dc.norm));
+		drawtext(tags[i], ( ((i == 0 && seltag) || (i == 1 && !seltag)) ? dc.sel : dc.norm));
 		dc.x += dc.w + 1;
 	}
 	dc.w = bmw;
 	drawtext("", dc.norm);
 	x = dc.x + dc.w;
 	}
 	return ret;
 }
 void
-killclient(Arg *arg) {
+killclient() {
 	if(!sel)
 		return;
 	if(isprotodel(sel))
 		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 	XSendEvent(dpy, w, False, NoEventMask, &e);
 	XSync(dpy, False);
 }
 void
-quit(Arg *arg) {
+quit() {
 	readin = running = False;
 }
 /* There's no way to check accesses to destroyed windows, thus those cases are
 * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs

Mercurial > aewl

comparison dwm.c @ 756:bff1012527b3