git.stevedylan.dev

applied nsz's style.diff patch d7cc0f64

Anselm R Garbe · 2008-05-13 14:33 1 file(s) · +13 −14

dwm.c +13 −14

	x = dc.x + (h / 2);
	/* shorten text if necessary */
	for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
	if (!len)
	if(!len)
		return;
	if(len < olen) {
		if(len > 1)

	int i, j;
	unsigned int buttons[]   = { Button1, Button2, Button3 };
	unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
	                             MODKEY|numlockmask|LockMask} ;
				MODKEY|numlockmask|LockMask} ;

	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
	if(focused)
		for(i = 0; i < LENGTH(buttons); i++)
			for(j = 0; j < LENGTH(modifiers); j++)
				XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
				            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
					BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
	else
		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
		            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
			BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}

void
grabkeys(void)  {
grabkeys(void) {
	unsigned int i, j;
	KeyCode code;
	XModifierKeymap *modmap;

	Client *c;

	for(c = clients; c; c = c->next)
		if((lt->isfloating || !c->isfloating) &&  isvisible(c, NULL))
		if((lt->isfloating || !c->isfloating) && isvisible(c, NULL))
			resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
}


	ocx = nx = c->x;
	ocy = ny = c->y;
	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
			None, cursor[CurMove], CurrentTime) != GrabSuccess)
	None, cursor[CurMove], CurrentTime) != GrabSuccess)
		return;
	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
	for(;;) {

	ocx = c->x;
	ocy = c->y;
	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
			None, cursor[CurResize], CurrentTime) != GrabSuccess)
	None, cursor[CurResize], CurrentTime) != GrabSuccess)
		return;
	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
	for(;;) {

	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
		for(i = 0; i < num; i++) {
			if(!XGetWindowAttributes(dpy, wins[i], &wa)
					|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
				continue;
			if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
				manage(wins[i], &wa);

			if(!XGetWindowAttributes(dpy, wins[i], &wa))
				continue;
			if(XGetTransientForHint(dpy, wins[i], &d1)
					&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
			&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
				manage(wins[i], &wa);
		}
	}

	wa.event_mask = ButtonPressMask|ExposureMask;

	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
				CopyFromParent, DefaultVisual(dpy, screen),
				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
			CopyFromParent, DefaultVisual(dpy, screen),
			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
	XDefineCursor(dpy, barwin, cursor[CurNormal]);
	XMapRaised(dpy, barwin);
	strcpy(stext, "dwm-"VERSION);


void
updatebar(void) {

	if(dc.drawable != 0)
		XFreePixmap(dpy, dc.drawable);
	dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));

	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
		return 0;
	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
		ee->request_code, ee->error_code);
			ee->request_code, ee->error_code);
	return xerrorxlib(dpy, ee); /* may call exit */
}


595	595		x = dc.x + (h / 2);
596	596		/* shorten text if necessary */
597	597		for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
598		-	if (!len)
	598	+	if(!len)
599	599		return;
600	600		if(len < olen) {
601	601		if(len > 1)

782	782		int i, j;
783	783		unsigned int buttons[] = { Button1, Button2, Button3 };
784	784		unsigned int modifiers[] = { MODKEY, MODKEY\|LockMask, MODKEY\|numlockmask,
785		-	MODKEY\|numlockmask\|LockMask} ;
	785	+	MODKEY\|numlockmask\|LockMask} ;
786	786
787	787		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
788	788		if(focused)
789	789		for(i = 0; i < LENGTH(buttons); i++)
790	790		for(j = 0; j < LENGTH(modifiers); j++)
791	791		XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
792		-	BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
	792	+	BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
793	793		else
794	794		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
795		-	BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
	795	+	BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
796	796		}
797	797
798	798		void
799		-	grabkeys(void) {
	799	+	grabkeys(void) {
800	800		unsigned int i, j;
801	801		KeyCode code;
802	802		XModifierKeymap *modmap;

1041	1041		Client *c;
1042	1042
1043	1043		for(c = clients; c; c = c->next)
1044		-	if((lt->isfloating \|\| !c->isfloating) && isvisible(c, NULL))
	1044	+	if((lt->isfloating \|\| !c->isfloating) && isvisible(c, NULL))
1045	1045		resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
1046	1046		}
1047	1047

1055	1055		ocx = nx = c->x;
1056	1056		ocy = ny = c->y;
1057	1057		if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
1058		-	None, cursor[CurMove], CurrentTime) != GrabSuccess)
	1058	+	None, cursor[CurMove], CurrentTime) != GrabSuccess)
1059	1059		return;
1060	1060		XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
1061	1061		for(;;) {

1221	1221		ocx = c->x;
1222	1222		ocy = c->y;
1223	1223		if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
1224		-	None, cursor[CurResize], CurrentTime) != GrabSuccess)
	1224	+	None, cursor[CurResize], CurrentTime) != GrabSuccess)
1225	1225		return;
1226	1226		XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
1227	1227		for(;;) {

1351	1351		if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
1352	1352		for(i = 0; i < num; i++) {
1353	1353		if(!XGetWindowAttributes(dpy, wins[i], &wa)
1354		-	\|\| wa.override_redirect \|\| XGetTransientForHint(dpy, wins[i], &d1))
	1354	+	\|\| wa.override_redirect \|\| XGetTransientForHint(dpy, wins[i], &d1))
1355	1355		continue;
1356	1356		if(wa.map_state == IsViewable \|\| getstate(wins[i]) == IconicState)
1357	1357		manage(wins[i], &wa);

1360	1360		if(!XGetWindowAttributes(dpy, wins[i], &wa))
1361	1361		continue;
1362	1362		if(XGetTransientForHint(dpy, wins[i], &d1)
1363		-	&& (wa.map_state == IsViewable \|\| getstate(wins[i]) == IconicState))
	1363	+	&& (wa.map_state == IsViewable \|\| getstate(wins[i]) == IconicState))
1364	1364		manage(wins[i], &wa);
1365	1365		}
1366	1366		}

1479	1479		wa.event_mask = ButtonPressMask\|ExposureMask;
1480	1480
1481	1481		barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
1482		-	CopyFromParent, DefaultVisual(dpy, screen),
1483		-	CWOverrideRedirect\|CWBackPixmap\|CWEventMask, &wa);
	1482	+	CopyFromParent, DefaultVisual(dpy, screen),
	1483	+	CWOverrideRedirect\|CWBackPixmap\|CWEventMask, &wa);
1484	1484		XDefineCursor(dpy, barwin, cursor[CurNormal]);
1485	1485		XMapRaised(dpy, barwin);
1486	1486		strcpy(stext, "dwm-"VERSION);

1704	1704
1705	1705		void
1706	1706		updatebar(void) {
1707		-
1708	1707		if(dc.drawable != 0)
1709	1708		XFreePixmap(dpy, dc.drawable);
1710	1709		dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));

1839	1838		\|\| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
1840	1839		return 0;
1841	1840		fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
1842		-	ee->request_code, ee->error_code);
	1841	+	ee->request_code, ee->error_code);
1843	1842		return xerrorxlib(dpy, ee); /* may call exit */
1844	1843		}
1845	1844