git.stevedylan.dev

committed a patch which fixes the hints of Jukka 937cabfa

arg@10ksloc.org · 2006-08-01 11:49 4 file(s) · +14 −40

client.c +8 −34

	if(sel->ismax)
		togglemax(NULL);

	if(!(c = getnext(sel->next, tsel)))
		c = getnext(clients, tsel);
	if(!(c = getnext(sel->next)))
		c = getnext(clients);
	if(c) {
		higher(c);
		focus(c);

	arrange(NULL);

	/* mapping the window now prevents flicker */
	if(c->tags[tsel]) {
		XMapRaised(dpy, c->win);
		XMapRaised(dpy, c->title);
	XMapRaised(dpy, c->win);
	XMapRaised(dpy, c->title);
	if(c->tags[tsel])
		focus(c);
	}
	else {
		XMapRaised(dpy, c->win);
		XMapRaised(dpy, c->title);

	}
}

void
pop(Client *c)
{
	Client **l;

	for(l = &clients; *l && *l != c; l = &(*l)->next);
	if(c->prev)
		c->prev->next = c->next;
	if(c->next)
		c->next->prev = c->prev;
	*l = c->next;

	c->prev = NULL;
	if(clients)
		clients->prev = c;
	c->next = clients;
	clients = c;
	arrange(NULL);
}

void

		c->next->prev = c->prev;
	*l = c->next;
	if(sel == c) {
		sel = getnext(c->next, tsel);
		sel = getnext(c->next);
		if(!sel)
			sel = getprev(c->prev);
		if(!sel)

	if(!sel)
		return;

	if(sel == getnext(clients, tsel) && sel->next)  {
		if((c = getnext(sel->next, tsel)))
	if(sel == getnext(clients) && sel->next)  {
		if((c = getnext(sel->next)))
			sel = c;
	}


draw.c +1 −1

{
	Client *c;

	for(c = clients; c; c = getnext(c->next, tsel))
	for(c = clients; c; c = getnext(c->next))
		drawtitle(c);
	drawstatus();
}

dwm.h +1 −1

extern void appendtag(Arg *arg);
extern void dofloat(Arg *arg);
extern void dotile(Arg *arg);
extern Client *getnext(Client *c, unsigned int t);
extern Client *getnext(Client *c);
extern Client *getprev(Client *c);
extern void replacetag(Arg *arg);
extern void settags(Client *c);

tag.c +4 −4

			ban(c);
	}
	if(sel && !sel->tags[tsel]) {
		if((sel = getnext(clients, tsel))) {
		if((sel = getnext(clients))) {
			higher(sel);
			focus(sel);
		}

			ban(c);
	}
	if(!sel || (sel && !sel->tags[tsel])) {
		if((sel = getnext(clients, tsel))) {
		if((sel = getnext(clients))) {
			higher(sel);
			focus(sel);
		}

}

Client *
getnext(Client *c, unsigned int t)
getnext(Client *c)
{
	for(; c && !c->tags[t]; c = c->next);
	for(; c && !c->tags[tsel]; c = c->next);
	return c;
}


73	73		if(sel->ismax)
74	74		togglemax(NULL);
75	75
76		-	if(!(c = getnext(sel->next, tsel)))
77		-	c = getnext(clients, tsel);
	76	+	if(!(c = getnext(sel->next)))
	77	+	c = getnext(clients);
78	78		if(c) {
79	79		higher(c);
80	80		focus(c);

260	260		arrange(NULL);
261	261
262	262		/* mapping the window now prevents flicker */
263		-	if(c->tags[tsel]) {
264		-	XMapRaised(dpy, c->win);
265		-	XMapRaised(dpy, c->title);
	263	+	XMapRaised(dpy, c->win);
	264	+	XMapRaised(dpy, c->title);
	265	+	if(c->tags[tsel])
266	266		focus(c);
267		-	}
268		-	else {
269		-	XMapRaised(dpy, c->win);
270		-	XMapRaised(dpy, c->title);
271		-
272		-	}
273		-	}
274		-
275		-	void
276		-	pop(Client *c)
277		-	{
278		-	Client **l;
279		-
280		-	for(l = &clients; l && l != c; l = &(*l)->next);
281		-	if(c->prev)
282		-	c->prev->next = c->next;
283		-	if(c->next)
284		-	c->next->prev = c->prev;
285		-	*l = c->next;
286		-
287		-	c->prev = NULL;
288		-	if(clients)
289		-	clients->prev = c;
290		-	c->next = clients;
291		-	clients = c;
292		-	arrange(NULL);
293	267		}
294	268
295	269		void

457	431		c->next->prev = c->prev;
458	432		*l = c->next;
459	433		if(sel == c) {
460		-	sel = getnext(c->next, tsel);
	434	+	sel = getnext(c->next);
461	435		if(!sel)
462	436		sel = getprev(c->prev);
463	437		if(!sel)

481	455		if(!sel)
482	456		return;
483	457
484		-	if(sel == getnext(clients, tsel) && sel->next) {
485		-	if((c = getnext(sel->next, tsel)))
	458	+	if(sel == getnext(clients) && sel->next) {
	459	+	if((c = getnext(sel->next)))
486	460		sel = c;
487	461		}
488	462

99	99		{
100	100		Client *c;
101	101
102		-	for(c = clients; c; c = getnext(c->next, tsel))
	102	+	for(c = clients; c; c = getnext(c->next))
103	103		drawtitle(c);
104	104		drawstatus();
105	105		}

133	133		extern void appendtag(Arg *arg);
134	134		extern void dofloat(Arg *arg);
135	135		extern void dotile(Arg *arg);
136		-	extern Client getnext(Client c, unsigned int t);
	136	+	extern Client getnext(Client c);
137	137		extern Client getprev(Client c);
138	138		extern void replacetag(Arg *arg);
139	139		extern void settags(Client *c);

63	63		ban(c);
64	64		}
65	65		if(sel && !sel->tags[tsel]) {
66		-	if((sel = getnext(clients, tsel))) {
	66	+	if((sel = getnext(clients))) {
67	67		higher(sel);
68	68		focus(sel);
69	69		}

126	126		ban(c);
127	127		}
128	128		if(!sel \|\| (sel && !sel->tags[tsel])) {
129		-	if((sel = getnext(clients, tsel))) {
	129	+	if((sel = getnext(clients))) {
130	130		higher(sel);
131	131		focus(sel);
132	132		}

135	135		}
136	136
137	137		Client *
138		-	getnext(Client *c, unsigned int t)
	138	+	getnext(Client *c)
139	139		{
140		-	for(; c && !c->tags[t]; c = c->next);
	140	+	for(; c && !c->tags[tsel]; c = c->next);
141	141		return c;
142	142		}
143	143