git.stevedylan.dev

implemented exact focus next, if arg != NULL to focus{next,prev} 5602f44b

Anselm R Garbe · 2008-05-11 14:40 4 file(s) · +27 −17

config.def.h +2 −0

		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec uxterm" },
	{ MODKEY,			XK_j,		focusnext,	NULL },
	{ MODKEY|ShiftMask,		XK_j,		focusnext,	"exact" },
	{ MODKEY,			XK_k,		focusprev,	NULL },
	{ MODKEY|ShiftMask,		XK_k,		focusprev,	"exact" },
	{ MODKEY,			XK_r,		reapply,	NULL },
	{ MODKEY,			XK_h,		setmfact,	"-0.05" },
	{ MODKEY,			XK_l,		setmfact,	"+0.05" },

config.mk +2 −2

# flags
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
LDFLAGS = -s ${LIBS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = -g ${LIBS}
CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
LDFLAGS = -g ${LIBS}

# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

dwm.1 +6 −0

.B Mod1\-j
Focus next window.
.TP
.B Mod1\-Shift\-j
Focus next window with exactly the same tags as the current one.
.TP
.B Mod1\-k
Focus previous window.
.TP
.B Mod1\-Shift\-k
Focus previous window with exactly the same tags as the current one.
.TP
.B Mod1\-h
Decrease master area size.

dwm.c +17 −15

Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
Bool isurgent(unsigned int t);
Bool isvisible(Client *c);
Bool isvisible(Client *c, Bool *cmp);
void keypress(XEvent *e);
void killclient(const char *arg);
void manage(Window w, XWindowAttributes *wa);

	Client *c;

	for(c = clients; c; c = c->next)
		if(isvisible(c)) {
		if(isvisible(c, NULL)) {
			unban(c);
			if(lt->isfloating || c->isfloating)
				resize(c, c->fx, c->fy, c->fw, c->fh, True);

			if((ev->value_mask & (CWX|CWY))
			&& !(ev->value_mask & (CWWidth|CWHeight)))
				configure(c);
			if(isvisible(c))
			if(isvisible(c, NULL))
				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
		}
		else

		drawtext(geom->symbol, dc.norm, False);
		dc.x += bgw;
	}
	for(c = stack; c && !isvisible(c); c = c->snext);
	for(c = stack; c && !isvisible(c, NULL); c = c->snext);
	for(i = 0; i < LENGTH(tags); i++) {
		dc.w = textw(tags[i]);
		if(tagset[seltags][i]) {


void
focus(Client *c) {
	if(!c || (c && !isvisible(c)))
		for(c = stack; c && !isvisible(c); c = c->snext);
	if(!c || (c && !isvisible(c, NULL)))
		for(c = stack; c && !isvisible(c, NULL); c = c->snext);
	if(sel && sel != c) {
		grabbuttons(sel, False);
		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);


	if(!sel)
		return;
	for(c = sel->next; c && !isvisible(c); c = c->next);
	for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
	if(!c)
		for(c = clients; c && !isvisible(c); c = c->next);
		for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
	if(c) {
		focus(c);
		restack();


	if(!sel)
		return;
	for(c = sel->prev; c && !isvisible(c); c = c->prev);
	for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
	if(!c) {
		for(c = clients; c && c->next; c = c->next);
		for(; c && !isvisible(c); c = c->prev);
		for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
	}
	if(c) {
		focus(c);

}

Bool
isvisible(Client *c) {
isvisible(Client *c, Bool *cmp) {
	unsigned int i;

	if(!cmp)
		cmp = tagset[seltags];
	for(i = 0; i < LENGTH(tags); i++)
		if(c->tags[i] && tagset[seltags][i])
		if(c->tags[i] && cmp[i])
			return True;
	return False;
}

	Client *c;

	for(c = clients; c; c = c->next)
		if((lt->isfloating || !c->isfloating) &&  isvisible(c))
		if((lt->isfloating || !c->isfloating) &&  isvisible(c, NULL))
			resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
}



Client *
nexttiled(Client *c) {
	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
	for(; c && (c->isfloating || !isvisible(c, NULL)); c = c->next);
	return c;
}


		wc.stack_mode = Below;
		wc.sibling = barwin;
		for(c = stack; c; c = c->snext)
			if(!c->isfloating && isvisible(c)) {
			if(!c->isfloating && isvisible(c, NULL)) {
				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
				wc.sibling = c->win;
			}

53	53		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
54	54		{ MODKEY\|ShiftMask, XK_Return, spawn, "exec uxterm" },
55	55		{ MODKEY, XK_j, focusnext, NULL },
	56	+	{ MODKEY\|ShiftMask, XK_j, focusnext, "exact" },
56	57		{ MODKEY, XK_k, focusprev, NULL },
	58	+	{ MODKEY\|ShiftMask, XK_k, focusprev, "exact" },
57	59		{ MODKEY, XK_r, reapply, NULL },
58	60		{ MODKEY, XK_h, setmfact, "-0.05" },
59	61		{ MODKEY, XK_l, setmfact, "+0.05" },

66	66		.B Mod1\-j
67	67		Focus next window.
68	68		.TP
	69	+	.B Mod1\-Shift\-j
	70	+	Focus next window with exactly the same tags as the current one.
	71	+	.TP
69	72		.B Mod1\-k
70	73		Focus previous window.
	74	+	.TP
	75	+	.B Mod1\-Shift\-k
	76	+	Focus previous window with exactly the same tags as the current one.
71	77		.TP
72	78		.B Mod1\-h
73	79		Decrease master area size.

160	160		Bool isoccupied(unsigned int t);
161	161		Bool isprotodel(Client *c);
162	162		Bool isurgent(unsigned int t);
163		-	Bool isvisible(Client *c);
	163	+	Bool isvisible(Client c, Bool cmp);
164	164		void keypress(XEvent *e);
165	165		void killclient(const char *arg);
166	166		void manage(Window w, XWindowAttributes *wa);

287	287		Client *c;
288	288
289	289		for(c = clients; c; c = c->next)
290		-	if(isvisible(c)) {
	290	+	if(isvisible(c, NULL)) {
291	291		unban(c);
292	292		if(lt->isfloating \|\| c->isfloating)
293	293		resize(c, c->fx, c->fy, c->fw, c->fh, True);

469	469		if((ev->value_mask & (CWX\|CWY))
470	470		&& !(ev->value_mask & (CWWidth\|CWHeight)))
471	471		configure(c);
472		-	if(isvisible(c))
	472	+	if(isvisible(c, NULL))
473	473		XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
474	474		}
475	475		else

536	536		drawtext(geom->symbol, dc.norm, False);
537	537		dc.x += bgw;
538	538		}
539		-	for(c = stack; c && !isvisible(c); c = c->snext);
	539	+	for(c = stack; c && !isvisible(c, NULL); c = c->snext);
540	540		for(i = 0; i < LENGTH(tags); i++) {
541	541		dc.w = textw(tags[i]);
542	542		if(tagset[seltags][i]) {

676	676
677	677		void
678	678		focus(Client *c) {
679		-	if(!c \|\| (c && !isvisible(c)))
680		-	for(c = stack; c && !isvisible(c); c = c->snext);
	679	+	if(!c \|\| (c && !isvisible(c, NULL)))
	680	+	for(c = stack; c && !isvisible(c, NULL); c = c->snext);
681	681		if(sel && sel != c) {
682	682		grabbuttons(sel, False);
683	683		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);

711	711
712	712		if(!sel)
713	713		return;
714		-	for(c = sel->next; c && !isvisible(c); c = c->next);
	714	+	for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
715	715		if(!c)
716		-	for(c = clients; c && !isvisible(c); c = c->next);
	716	+	for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
717	717		if(c) {
718	718		focus(c);
719	719		restack();

726	726
727	727		if(!sel)
728	728		return;
729		-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
	729	+	for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
730	730		if(!c) {
731	731		for(c = clients; c && c->next; c = c->next);
732		-	for(; c && !isvisible(c); c = c->prev);
	732	+	for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
733	733		}
734	734		if(c) {
735	735		focus(c);

930	930		}
931	931
932	932		Bool
933		-	isvisible(Client *c) {
	933	+	isvisible(Client c, Bool cmp) {
934	934		unsigned int i;
935	935
	936	+	if(!cmp)
	937	+	cmp = tagset[seltags];
936	938		for(i = 0; i < LENGTH(tags); i++)
937		-	if(c->tags[i] && tagset[seltags][i])
	939	+	if(c->tags[i] && cmp[i])
938	940		return True;
939	941		return False;
940	942		}

1061	1063		Client *c;
1062	1064
1063	1065		for(c = clients; c; c = c->next)
1064		-	if((lt->isfloating \|\| !c->isfloating) && isvisible(c))
	1066	+	if((lt->isfloating \|\| !c->isfloating) && isvisible(c, NULL))
1065	1067		resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
1066	1068		}
1067	1069

1115	1117
1116	1118		Client *
1117	1119		nexttiled(Client *c) {
1118		-	for(; c && (c->isfloating \|\| !isvisible(c)); c = c->next);
	1120	+	for(; c && (c->isfloating \|\| !isvisible(c, NULL)); c = c->next);
1119	1121		return c;
1120	1122		}
1121	1123

1292	1294		wc.stack_mode = Below;
1293	1295		wc.sibling = barwin;
1294	1296		for(c = stack; c; c = c->snext)
1295		-	if(!c->isfloating && isvisible(c)) {
	1297	+	if(!c->isfloating && isvisible(c, NULL)) {
1296	1298		XConfigureWindow(dpy, c->win, CWSibling\|CWStackMode, &wc);
1297	1299		wc.sibling = c->win;
1298	1300		}

17	17		# flags
18	18		CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
19	19		LDFLAGS = -s ${LIBS}
20		-	#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
21		-	#LDFLAGS = -g ${LIBS}
	20	+	CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
	21	+	LDFLAGS = -g ${LIBS}
22	22
23	23		# Solaris
24	24		#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"