git.stevedylan.dev

some more polishing/consistency changes a62630ae

anselm@anselm1 · 2007-12-22 14:40 1 file(s) · +39 −40

dwm.c +39 −40

void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
void updatebarpos(Monitor *s);
void updatebarpos(Monitor *m);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void view(const char *arg);

	Client *c;
	XButtonPressedEvent *ev = &e->xbutton;

	Monitor s = monitors[monitorat(-1, -1)];
	Monitor *m = &monitors[monitorat(-1, -1)];

	if(ev->window == s.barwin) {
	if(ev->window == m->barwin) {
		x = 0;
		for(i = 0; i < LENGTH(tags); i++) {
			x += textw(&s, tags[i]);
			x += textw(m, tags[i]);
			if(ev->x < x) {
				if(ev->button == Button1) {
					if(ev->state & MODKEY)

		if(CLEANMASK(ev->state) != MODKEY)
			return;
		if(ev->button == Button1) {
			if((s.layout->arrange == floating) || c->isfloating)
			if((m->layout->arrange == floating) || c->isfloating)
				restack();
			else
				togglefloating(NULL);
			movemouse(c);
		}
		else if(ev->button == Button2) {
			if((floating != s.layout->arrange) && c->isfloating)
			if((floating != m->layout->arrange) && c->isfloating)
				togglefloating(NULL);
			else
				zoom(NULL);
		}
		else if(ev->button == Button3 && !c->isfixed) {
			if((floating == s.layout->arrange) || c->isfloating)
			if((floating == m->layout->arrange) || c->isfloating)
				restack();
			else
				togglefloating(NULL);


void
drawbar(void) {
	int i, x, s;
	int i, j, x;

	for(s = 0; s < mcount; ++s) {
		Monitor *m = &monitors[s];
	for(i = 0; i < mcount; i++) {
		Monitor *m = &monitors[i];
		m->dc.x = 0;
		for(i = 0; i < LENGTH(tags); i++) {
			m->dc.w = textw(m, tags[i]);
			if(m->seltags[i]) {
				drawtext(m, tags[i], m->dc.sel);
				drawsquare(m, sel && sel->tags[i] && sel->monitor == selmonitor, isoccupied(m, i), m->dc.sel);
		for(j = 0; j < LENGTH(tags); j++) {
			m->dc.w = textw(m, tags[j]);
			if(m->seltags[j]) {
				drawtext(m, tags[j], m->dc.sel);
				drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
			}
			else {
				drawtext(m, tags[i], m->dc.norm);
				drawsquare(m, sel && sel->tags[i] && sel->monitor == selmonitor, isoccupied(m, i), m->dc.norm);
				drawtext(m, tags[j], m->dc.norm);
				drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
			}
			m->dc.x += m->dc.w;
		}


void
restack(void) {
	unsigned int i;
	Client *c;
	XEvent ev;
	XWindowChanges wc;
	int s;

	drawbar();
	if(!sel)

			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
			wc.sibling = sel->win;
		}
		for(s = 0; s < mcount; s++) {
			for(c = nexttiled(clients, &monitors[s]); c; c = nexttiled(c->next, &monitors[s])) {
		for(i = 0; i < mcount; i++) {
			for(c = nexttiled(clients, &monitors[i]); c; c = nexttiled(c->next, &monitors[i])) {
				if(c == sel)
					continue;
				XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);


void
tile(void) {
	unsigned int i, n, nx, ny, nw, nh, mw, th;
	int s;
	unsigned int i, j, n, nx, ny, nw, nh, mw, th;
	Client *c, *mc;

	domwfact = dozoom = True;

	nw = 0; /* gcc stupidity requires this */

	for (s = 0; s < mcount; s++) {
		Monitor *m = &monitors[s];
	for (i = 0; i < mcount; i++) {
		Monitor *m = &monitors[i];

		for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
			n++;

		for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
		for(j = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
			/* window geoms */
			mw = (n == 1) ? m->waw : m->mwfact * m->waw;
			th = (n > 1) ? m->wah / (n - 1) : 0;
			if(n > 1 && th < bh)
				th = m->wah;
			if(i == 0) { /* master */
			if(j == 0) { /* master */
				nx = m->wax;
				ny = m->way;
				nw = mw - 2 * c->border;
				nh = m->wah - 2 * c->border;
			}
			else {  /* tile window */
				if(i == 1) {
				if(j == 1) {
					ny = m->way;
					nx += mc->w + 2 * mc->border;
					nw = m->waw - mw - 2 * c->border;
				}
				if(i + 1 == n) /* remainder */
				if(j + 1 == n) /* remainder */
					nh = (m->way + m->wah) - ny - 2 * c->border;
				else
					nh = th - 2 * c->border;

			if(n > 1 && th != m->wah)
				ny = c->y + c->h + 2 * c->border;

			i++;
			j++;
		}
	}
}

}

void
updatebarpos(Monitor *s) {
updatebarpos(Monitor *m) {
	XEvent ev;

	s->wax = s->sx;
	s->way = s->sy;
	s->wah = s->sh;
	s->waw = s->sw;
	m->wax = m->sx;
	m->way = m->sy;
	m->wah = m->sh;
	m->waw = m->sw;
	switch(bpos) {
	default:
		s->wah -= bh;
		s->way += bh;
		XMoveWindow(dpy, s->barwin, s->sx, s->sy);
		m->wah -= bh;
		m->way += bh;
		XMoveWindow(dpy, m->barwin, m->sx, m->sy);
		break;
	case BarBot:
		s->wah -= bh;
		XMoveWindow(dpy, s->barwin, s->sx, s->sy + s->wah);
		m->wah -= bh;
		XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
		break;
	case BarOff:
		XMoveWindow(dpy, s->barwin, s->sx, s->sy - bh);
		XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
		break;
	}
	XSync(dpy, False);

198	198		void unban(Client *c);
199	199		void unmanage(Client *c);
200	200		void unmapnotify(XEvent *e);
201		-	void updatebarpos(Monitor *s);
	201	+	void updatebarpos(Monitor *m);
202	202		void updatesizehints(Client *c);
203	203		void updatetitle(Client *c);
204	204		void view(const char *arg);

336	336		Client *c;
337	337		XButtonPressedEvent *ev = &e->xbutton;
338	338
339		-	Monitor s = monitors[monitorat(-1, -1)];
	339	+	Monitor *m = &monitors[monitorat(-1, -1)];
340	340
341		-	if(ev->window == s.barwin) {
	341	+	if(ev->window == m->barwin) {
342	342		x = 0;
343	343		for(i = 0; i < LENGTH(tags); i++) {
344		-	x += textw(&s, tags[i]);
	344	+	x += textw(m, tags[i]);
345	345		if(ev->x < x) {
346	346		if(ev->button == Button1) {
347	347		if(ev->state & MODKEY)

366	366		if(CLEANMASK(ev->state) != MODKEY)
367	367		return;
368	368		if(ev->button == Button1) {
369		-	if((s.layout->arrange == floating) \|\| c->isfloating)
	369	+	if((m->layout->arrange == floating) \|\| c->isfloating)
370	370		restack();
371	371		else
372	372		togglefloating(NULL);
373	373		movemouse(c);
374	374		}
375	375		else if(ev->button == Button2) {
376		-	if((floating != s.layout->arrange) && c->isfloating)
	376	+	if((floating != m->layout->arrange) && c->isfloating)
377	377		togglefloating(NULL);
378	378		else
379	379		zoom(NULL);
380	380		}
381	381		else if(ev->button == Button3 && !c->isfixed) {
382		-	if((floating == s.layout->arrange) \|\| c->isfloating)
	382	+	if((floating == m->layout->arrange) \|\| c->isfloating)
383	383		restack();
384	384		else
385	385		togglefloating(NULL);

565	565
566	566		void
567	567		drawbar(void) {
568		-	int i, x, s;
	568	+	int i, j, x;
569	569
570		-	for(s = 0; s < mcount; ++s) {
571		-	Monitor *m = &monitors[s];
	570	+	for(i = 0; i < mcount; i++) {
	571	+	Monitor *m = &monitors[i];
572	572		m->dc.x = 0;
573		-	for(i = 0; i < LENGTH(tags); i++) {
574		-	m->dc.w = textw(m, tags[i]);
575		-	if(m->seltags[i]) {
576		-	drawtext(m, tags[i], m->dc.sel);
577		-	drawsquare(m, sel && sel->tags[i] && sel->monitor == selmonitor, isoccupied(m, i), m->dc.sel);
	573	+	for(j = 0; j < LENGTH(tags); j++) {
	574	+	m->dc.w = textw(m, tags[j]);
	575	+	if(m->seltags[j]) {
	576	+	drawtext(m, tags[j], m->dc.sel);
	577	+	drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
578	578		}
579	579		else {
580		-	drawtext(m, tags[i], m->dc.norm);
581		-	drawsquare(m, sel && sel->tags[i] && sel->monitor == selmonitor, isoccupied(m, i), m->dc.norm);
	580	+	drawtext(m, tags[j], m->dc.norm);
	581	+	drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
582	582		}
583	583		m->dc.x += m->dc.w;
584	584		}

1336	1336
1337	1337		void
1338	1338		restack(void) {
	1339	+	unsigned int i;
1339	1340		Client *c;
1340	1341		XEvent ev;
1341	1342		XWindowChanges wc;
1342		-	int s;
1343	1343
1344	1344		drawbar();
1345	1345		if(!sel)

1353	1353		XConfigureWindow(dpy, sel->win, CWSibling \| CWStackMode, &wc);
1354	1354		wc.sibling = sel->win;
1355	1355		}
1356		-	for(s = 0; s < mcount; s++) {
1357		-	for(c = nexttiled(clients, &monitors[s]); c; c = nexttiled(c->next, &monitors[s])) {
	1356	+	for(i = 0; i < mcount; i++) {
	1357	+	for(c = nexttiled(clients, &monitors[i]); c; c = nexttiled(c->next, &monitors[i])) {
1358	1358		if(c == sel)
1359	1359		continue;
1360	1360		XConfigureWindow(dpy, c->win, CWSibling \| CWStackMode, &wc);

1676	1676
1677	1677		void
1678	1678		tile(void) {
1679		-	unsigned int i, n, nx, ny, nw, nh, mw, th;
1680		-	int s;
	1679	+	unsigned int i, j, n, nx, ny, nw, nh, mw, th;
1681	1680		Client c, mc;
1682	1681
1683	1682		domwfact = dozoom = True;
1684	1683
1685	1684		nw = 0; /* gcc stupidity requires this */
1686	1685
1687		-	for (s = 0; s < mcount; s++) {
1688		-	Monitor *m = &monitors[s];
	1686	+	for (i = 0; i < mcount; i++) {
	1687	+	Monitor *m = &monitors[i];
1689	1688
1690	1689		for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
1691	1690		n++;
1692	1691
1693		-	for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
	1692	+	for(j = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
1694	1693		/* window geoms */
1695	1694		mw = (n == 1) ? m->waw : m->mwfact * m->waw;
1696	1695		th = (n > 1) ? m->wah / (n - 1) : 0;
1697	1696		if(n > 1 && th < bh)
1698	1697		th = m->wah;
1699		-	if(i == 0) { /* master */
	1698	+	if(j == 0) { /* master */
1700	1699		nx = m->wax;
1701	1700		ny = m->way;
1702	1701		nw = mw - 2 * c->border;
1703	1702		nh = m->wah - 2 * c->border;
1704	1703		}
1705	1704		else { /* tile window */
1706		-	if(i == 1) {
	1705	+	if(j == 1) {
1707	1706		ny = m->way;
1708	1707		nx += mc->w + 2 * mc->border;
1709	1708		nw = m->waw - mw - 2 * c->border;
1710	1709		}
1711		-	if(i + 1 == n) /* remainder */
	1710	+	if(j + 1 == n) /* remainder */
1712	1711		nh = (m->way + m->wah) - ny - 2 * c->border;
1713	1712		else
1714	1713		nh = th - 2 * c->border;

1720	1719		if(n > 1 && th != m->wah)
1721	1720		ny = c->y + c->h + 2 * c->border;
1722	1721
1723		-	i++;
	1722	+	j++;
1724	1723		}
1725	1724		}
1726	1725		}

1813	1812		}
1814	1813
1815	1814		void
1816		-	updatebarpos(Monitor *s) {
	1815	+	updatebarpos(Monitor *m) {
1817	1816		XEvent ev;
1818	1817
1819		-	s->wax = s->sx;
1820		-	s->way = s->sy;
1821		-	s->wah = s->sh;
1822		-	s->waw = s->sw;
	1818	+	m->wax = m->sx;
	1819	+	m->way = m->sy;
	1820	+	m->wah = m->sh;
	1821	+	m->waw = m->sw;
1823	1822		switch(bpos) {
1824	1823		default:
1825		-	s->wah -= bh;
1826		-	s->way += bh;
1827		-	XMoveWindow(dpy, s->barwin, s->sx, s->sy);
	1824	+	m->wah -= bh;
	1825	+	m->way += bh;
	1826	+	XMoveWindow(dpy, m->barwin, m->sx, m->sy);
1828	1827		break;
1829	1828		case BarBot:
1830		-	s->wah -= bh;
1831		-	XMoveWindow(dpy, s->barwin, s->sx, s->sy + s->wah);
	1829	+	m->wah -= bh;
	1830	+	XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
1832	1831		break;
1833	1832		case BarOff:
1834		-	XMoveWindow(dpy, s->barwin, s->sx, s->sy - bh);
	1833	+	XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
1835	1834		break;
1836	1835		}
1837	1836		XSync(dpy, False);