git.stevedylan.dev

next version will be 5.6, shortened some very long lines 7df39f3f

Anselm R Garbe · 2009-04-20 11:03 2 file(s) · +11 −5

config.mk +1 −1

# dwm version
VERSION = 5.5
VERSION = 5.6

# Customize below to fit your system


dwm.c +10 −4

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

			c->y = sy + sh - HEIGHT(c);
		c->x = MAX(c->x, sx);
		/* only fix client y-offset, if the client center might cover the bar */
		c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
		c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx)
		                            && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
		c->bw = borderpx;
	}


					ny = wy;
				else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
					ny = wy + wh - HEIGHT(c);
				if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
				if(!c->isfloating && lt[sellt]->arrange
				                  && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
					togglefloating(NULL);
			}
			if(!lt[sellt]->arrange || c->isfloating)

	modmap = XGetModifierMapping(dpy);
	for(i = 0; i < 8; i++)
		for(j = 0; j < modmap->max_keypermod; j++)
			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
			if(modmap->modifiermap[i * modmap->max_keypermod + j]
			   == XKeysymToKeycode(dpy, XK_Num_Lock))
				numlockmask = (1 << i);
	XFreeModifiermap(modmap);
}

797	797		for(i = 0; i < LENGTH(buttons); i++)
798	798		if(buttons[i].click == ClkClientWin)
799	799		for(j = 0; j < LENGTH(modifiers); j++)
800		-	XGrabButton(dpy, buttons[i].button, buttons[i].mask \| modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
	800	+	XGrabButton(dpy, buttons[i].button,
	801	+	buttons[i].mask \| modifiers[j],
	802	+	c->win, False, BUTTONMASK,
	803	+	GrabModeAsync, GrabModeSync, None, None);
801	804		} else
802	805		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
803	806		BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);

936	939		c->y = sy + sh - HEIGHT(c);
937	940		c->x = MAX(c->x, sx);
938	941		/* only fix client y-offset, if the client center might cover the bar */
939		-	c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
	942	+	c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx)
	943	+	&& (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
940	944		c->bw = borderpx;
941	945		}
942	946

1035	1039		ny = wy;
1036	1040		else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
1037	1041		ny = wy + wh - HEIGHT(c);
1038		-	if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap \|\| abs(ny - c->y) > snap))
	1042	+	if(!c->isfloating && lt[sellt]->arrange
	1043	+	&& (abs(nx - c->x) > snap \|\| abs(ny - c->y) > snap))
1039	1044		togglefloating(NULL);
1040	1045		}
1041	1046		if(!lt[sellt]->arrange \|\| c->isfloating)

1540	1545		modmap = XGetModifierMapping(dpy);
1541	1546		for(i = 0; i < 8; i++)
1542	1547		for(j = 0; j < modmap->max_keypermod; j++)
1543		-	if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
	1548	+	if(modmap->modifiermap[i * modmap->max_keypermod + j]
	1549	+	== XKeysymToKeycode(dpy, XK_Num_Lock))
1544	1550		numlockmask = (1 << i);
1545	1551		XFreeModifiermap(modmap);
1546	1552		}

1	1		# dwm version
2		-	VERSION = 5.5
	2	+	VERSION = 5.6
3	3
4	4		# Customize below to fit your system
5	5