applied Eckehard Berns barwin leak fix and his suggestion to deal with restack() -- the latter aspect needs further investigation.
This commit is contained in:
		
							parent
							
								
									907db0a851
								
							
						
					
					
						commit
						873bcb97a9
					
				
							
								
								
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							@ -1,6 +1,6 @@
 | 
				
			|||||||
MIT/X Consortium License
 | 
					MIT/X Consortium License
 | 
				
			||||||
 | 
					
 | 
				
			||||||
© 2006-2011 Anselm R Garbe <anselm@garbe.us>
 | 
					© 2006-2012 Anselm R Garbe <anselm@garbe.us>
 | 
				
			||||||
© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
 | 
					© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
 | 
				
			||||||
© 2010-2011 Connor Lane Smith <cls@lubutu.com>
 | 
					© 2010-2011 Connor Lane Smith <cls@lubutu.com>
 | 
				
			||||||
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
 | 
					© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										6
									
								
								dwm.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								dwm.c
									
									
									
									
									
								
							@ -1420,8 +1420,6 @@ restack(Monitor *m) {
 | 
				
			|||||||
	drawbar(m);
 | 
						drawbar(m);
 | 
				
			||||||
	if(!m->sel)
 | 
						if(!m->sel)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	if(m->sel->isfloating || !m->lt[m->sellt]->arrange)
 | 
					 | 
				
			||||||
		XRaiseWindow(dpy, m->sel->win);
 | 
					 | 
				
			||||||
	if(m->lt[m->sellt]->arrange) {
 | 
						if(m->lt[m->sellt]->arrange) {
 | 
				
			||||||
		wc.stack_mode = Below;
 | 
							wc.stack_mode = Below;
 | 
				
			||||||
		wc.sibling = m->barwin;
 | 
							wc.sibling = m->barwin;
 | 
				
			||||||
@ -1827,6 +1825,8 @@ updatebars(void) {
 | 
				
			|||||||
		.event_mask = ButtonPressMask|ExposureMask
 | 
							.event_mask = ButtonPressMask|ExposureMask
 | 
				
			||||||
	};
 | 
						};
 | 
				
			||||||
	for(m = mons; m; m = m->next) {
 | 
						for(m = mons; m; m = m->next) {
 | 
				
			||||||
 | 
							if (m->barwin)
 | 
				
			||||||
 | 
								continue;
 | 
				
			||||||
		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
 | 
							m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
 | 
				
			||||||
		                          CopyFromParent, DefaultVisual(dpy, screen),
 | 
							                          CopyFromParent, DefaultVisual(dpy, screen),
 | 
				
			||||||
		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 | 
							                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 | 
				
			||||||
@ -2129,7 +2129,7 @@ zoom(const Arg *arg) {
 | 
				
			|||||||
int
 | 
					int
 | 
				
			||||||
main(int argc, char *argv[]) {
 | 
					main(int argc, char *argv[]) {
 | 
				
			||||||
	if(argc == 2 && !strcmp("-v", argv[1]))
 | 
						if(argc == 2 && !strcmp("-v", argv[1]))
 | 
				
			||||||
		die("dwm-"VERSION", © 2006-2011 dwm engineers, see LICENSE for details\n");
 | 
							die("dwm-"VERSION", © 2006-2012 dwm engineers, see LICENSE for details\n");
 | 
				
			||||||
	else if(argc != 1)
 | 
						else if(argc != 1)
 | 
				
			||||||
		die("usage: dwm [-v]\n");
 | 
							die("usage: dwm [-v]\n");
 | 
				
			||||||
	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 | 
						if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user