197d196
< 		killclient(NULL);
198a198,199
> 		killclient(NULL);
> 		/*focus(c);*/		/* moved above by Sergey Markelov (bug in cleanup with not first child selected fixed) */
315c316,333
< 	for(c = fc; c && dc.x < width; c = c->next) {
---
> 
> 	/*for(c = fc; c && dc.x < width; c = c->next) {*/	/* commented out by Sergey Markelov */
> 	
> 	/* added by Sergey Markelov */
> 	int sh_i = -1;			/* start tabs counting from 0, not from 1 */
> 	Bool sh_start_draw = False;
> 	for(c = clients; c; c = c->next) {
> 		 sh_i++;
> 		 if(!sh_start_draw) {
> 		 if(c == fc)
> 		  sh_start_draw = True;
> 		 else
> 		  continue;
> 		}
> 		if(dc.x >= width)
> 		 break;
> 	/* /end Sergey Markelov */
> 
327c345,355
< 		drawtext(c->name, col);
---
> 
> 		/* added by Sergey Markelov */
> 		char	tabbed_name[256];
> 		int	tabbed_name_len;
> 		tabbed_name_len = sprintf(tabbed_name, "[%d] ", sh_i);
> 		strncpy(tabbed_name + tabbed_name_len, c->name, 256 - tabbed_name_len);
> 		tabbed_name[255] = 0;
> 		drawtext(tabbed_name, col);
> 		/* / end Sergey Markelov */
> 
> 		/*drawtext(c->name, col);*/		/* moved by Sergey Markelov to the section above */
551c579
< 		return;
---
> 	 	return;
804a833,837
> 
> 	/* added by Sergey Markelov (close tabbed if no more instances left) */
> 	if(!sel)
> 	 	running = False;
> 	/* / end Sergey Markelov */
875a909,915
> 
> 	/* added by Sergey Markelov (run an insance on start) */
> 	Arg arg;
> 	arg.v = run_cmd;
> 	spawn(&arg);
> 	/* / end Sergey Markelov */
>