yet another cleanup ceac8c91
The previous patches introduced some unclean space-based indentation
patterns. This patch fixes them.
Anselm R Garbe · 2017-05-08 21:08 2 file(s) · +35 −35
LICENSE +1 −1
1 1
MIT/X Consortium License
2 2
3 -
© 2006-2014 Anselm R Garbe <anselm@garbe.us>
3 +
© 2006-2017 Anselm R Garbe <anselm@garbe.us>
4 4
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
5 5
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
6 6
© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
dwm.c +34 −34
522 522
		if (cme->data.l[1] == netatom[NetWMFullscreen]
523 523
		|| cme->data.l[2] == netatom[NetWMFullscreen])
524 524
			setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
525 -
			              || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
525 +
				|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
526 526
	} else if (cme->message_type == netatom[NetActiveWindow]) {
527 527
		if (c != selmon->sel && !c->isurgent)
528 528
			seturgent(c, 1);
721 721
		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
722 722
		if (occ & 1 << i)
723 723
			drw_rect(drw, x + boxs, boxs, boxw, boxw,
724 -
			         m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
725 -
			         urg & 1 << i);
724 +
				m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
725 +
				urg & 1 << i);
726 726
		x += w;
727 727
	}
728 728
	w = blw = TEXTW(m->ltsymbol);
865 865
	Atom da, atom = None;
866 866
867 867
	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
868 -
	                      &da, &di, &dl, &dl, &p) == Success && p) {
868 +
		&da, &di, &dl, &dl, &p) == Success && p) {
869 869
		atom = *(Atom *)p;
870 870
		XFree(p);
871 871
	}
892 892
	Atom real;
893 893
894 894
	if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
895 -
	                      &real, &format, &n, &extra, (unsigned char **)&p) != Success)
895 +
		&real, &format, &n, &extra, (unsigned char **)&p) != Success)
896 896
		return -1;
897 897
	if (n != 0)
898 898
		result = *p;
936 936
		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
937 937
		if (!focused)
938 938
			XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
939 -
			            BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
939 +
				BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
940 940
		for (i = 0; i < LENGTH(buttons); i++)
941 941
			if (buttons[i].click == ClkClientWin)
942 942
				for (j = 0; j < LENGTH(modifiers); j++)
943 943
					XGrabButton(dpy, buttons[i].button,
944 -
					            buttons[i].mask | modifiers[j],
945 -
					            c->win, False, BUTTONMASK,
946 -
					            GrabModeAsync, GrabModeSync, None, None);
944 +
						buttons[i].mask | modifiers[j],
945 +
						c->win, False, BUTTONMASK,
946 +
						GrabModeAsync, GrabModeSync, None, None);
947 947
	}
948 948
}
949 949
961 961
			if ((code = XKeysymToKeycode(dpy, keys[i].keysym)))
962 962
				for (j = 0; j < LENGTH(modifiers); j++)
963 963
					XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
964 -
					         True, GrabModeAsync, GrabModeAsync);
964 +
						True, GrabModeAsync, GrabModeAsync);
965 965
	}
966 966
}
967 967
1048 1048
	c->x = MAX(c->x, c->mon->mx);
1049 1049
	/* only fix client y-offset, if the client center might cover the bar */
1050 1050
	c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
1051 -
	           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
1051 +
		&& (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
1052 1052
	c->bw = borderpx;
1053 1053
1054 1054
	wc.border_width = c->bw;
1067 1067
	attach(c);
1068 1068
	attachstack(c);
1069 1069
	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
1070 -
	                (unsigned char *) &(c->win), 1);
1070 +
		(unsigned char *) &(c->win), 1);
1071 1071
	XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
1072 1072
	setclientstate(c, NormalState);
1073 1073
	if (c->mon == selmon)
1151 1151
	ocx = c->x;
1152 1152
	ocy = c->y;
1153 1153
	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
1154 -
	    None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
1154 +
		None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
1155 1155
		return;
1156 1156
	if (!getrootptr(&x, &y))
1157 1157
		return;
1226 1226
		default: break;
1227 1227
		case XA_WM_TRANSIENT_FOR:
1228 1228
			if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
1229 -
			   (c->isfloating = (wintoclient(trans)) != NULL))
1229 +
				(c->isfloating = (wintoclient(trans)) != NULL))
1230 1230
				arrange(c->mon);
1231 1231
			break;
1232 1232
		case XA_WM_NORMAL_HINTS:
1306 1306
	ocx = c->x;
1307 1307
	ocy = c->y;
1308 1308
	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
1309 -
	                None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
1309 +
		None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
1310 1310
		return;
1311 1311
	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
1312 1312
	do {
1431 1431
	long data[] = { state, None };
1432 1432
1433 1433
	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
1434 -
	                PropModeReplace, (unsigned char *)data, 2);
1434 +
		PropModeReplace, (unsigned char *)data, 2);
1435 1435
}
1436 1436
1437 1437
int
1465 1465
	if (!c->neverfocus) {
1466 1466
		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
1467 1467
		XChangeProperty(dpy, root, netatom[NetActiveWindow],
1468 -
		                XA_WINDOW, 32, PropModeReplace,
1469 -
		                (unsigned char *) &(c->win), 1);
1468 +
			XA_WINDOW, 32, PropModeReplace,
1469 +
			(unsigned char *) &(c->win), 1);
1470 1470
	}
1471 1471
	sendevent(c, wmatom[WMTakeFocus]);
1472 1472
}
1476 1476
{
1477 1477
	if (fullscreen && !c->isfullscreen) {
1478 1478
		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
1479 -
		                PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
1479 +
			PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
1480 1480
		c->isfullscreen = 1;
1481 1481
		c->oldstate = c->isfloating;
1482 1482
		c->oldbw = c->bw;
1486 1486
		XRaiseWindow(dpy, c->win);
1487 1487
	} else if (!fullscreen && c->isfullscreen){
1488 1488
		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
1489 -
		                PropModeReplace, (unsigned char*)0, 0);
1489 +
			PropModeReplace, (unsigned char*)0, 0);
1490 1490
		c->isfullscreen = 0;
1491 1491
		c->isfloating = c->oldstate;
1492 1492
		c->bw = c->oldbw;
1578 1578
	/* supporting window for NetWMCheck */
1579 1579
	wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
1580 1580
	XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
1581 -
	                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
1581 +
		PropModeReplace, (unsigned char *) &wmcheckwin, 1);
1582 1582
	XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
1583 -
	                PropModeReplace, (unsigned char *) "dwm", 4);
1583 +
		PropModeReplace, (unsigned char *) "dwm", 4);
1584 1584
	XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
1585 -
	                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
1585 +
		PropModeReplace, (unsigned char *) &wmcheckwin, 1);
1586 1586
	/* EWMH support per view */
1587 1587
	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
1588 -
	                PropModeReplace, (unsigned char *) netatom, NetLast);
1588 +
		PropModeReplace, (unsigned char *) netatom, NetLast);
1589 1589
	XDeleteProperty(dpy, root, netatom[NetClientList]);
1590 1590
	/* select events */
1591 1591
	wa.cursor = cursor[CurNormal]->cursor;
1592 1592
	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
1593 -
	                |ButtonPressMask|PointerMotionMask|EnterWindowMask
1594 -
	                |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
1593 +
		|ButtonPressMask|PointerMotionMask|EnterWindowMask
1594 +
		|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
1595 1595
	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
1596 1596
	XSelectInput(dpy, root, wa.event_mask);
1597 1597
	grabkeys();
1717 1717
	selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
1718 1718
	if (selmon->sel->isfloating)
1719 1719
		resize(selmon->sel, selmon->sel->x, selmon->sel->y,
1720 -
		       selmon->sel->w, selmon->sel->h, 0);
1720 +
			selmon->sel->w, selmon->sel->h, 0);
1721 1721
	arrange(selmon);
1722 1722
}
1723 1723
1813 1813
		if (m->barwin)
1814 1814
			continue;
1815 1815
		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
1816 -
		                          CopyFromParent, DefaultVisual(dpy, screen),
1817 -
		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
1816 +
				CopyFromParent, DefaultVisual(dpy, screen),
1817 +
				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
1818 1818
		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
1819 1819
		XMapRaised(dpy, m->barwin);
1820 1820
	}
1843 1843
	for (m = mons; m; m = m->next)
1844 1844
		for (c = m->clients; c; c = c->next)
1845 1845
			XChangeProperty(dpy, root, netatom[NetClientList],
1846 -
			                XA_WINDOW, 32, PropModeAppend,
1847 -
			                (unsigned char *) &(c->win), 1);
1846 +
				XA_WINDOW, 32, PropModeAppend,
1847 +
				(unsigned char *) &(c->win), 1);
1848 1848
}
1849 1849
1850 1850
int
1936 1936
	for (i = 0; i < 8; i++)
1937 1937
		for (j = 0; j < modmap->max_keypermod; j++)
1938 1938
			if (modmap->modifiermap[i * modmap->max_keypermod + j]
1939 -
			   == XKeysymToKeycode(dpy, XK_Num_Lock))
1939 +
				== XKeysymToKeycode(dpy, XK_Num_Lock))
1940 1940
				numlockmask = (1 << i);
1941 1941
	XFreeModifiermap(modmap);
1942 1942
}
1982 1982
	} else
1983 1983
		c->maxa = c->mina = 0.0;
1984 1984
	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
1985 -
	              && c->maxw == c->minw && c->maxh == c->minh);
1985 +
		&& c->maxw == c->minw && c->maxh == c->minh);
1986 1986
}
1987 1987
1988 1988
void
2092 2092
	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
2093 2093
		return 0;
2094 2094
	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
2095 -
	        ee->request_code, ee->error_code);
2095 +
		ee->request_code, ee->error_code);
2096 2096
	return xerrorxlib(dpy, ee); /* may call exit */
2097 2097
}
2098 2098