Merge branch 'attachbelow' into allpatch
This commit is contained in:
		
						commit
						c5858fb340
					
				| @ -42,6 +42,7 @@ static const Rule rules[] = { | ||||
| static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */ | ||||
| static const int nmaster     = 1;    /* number of clients in master area */ | ||||
| static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */ | ||||
| static const int attachbelow = 1;    /* 1 means attach after the currently active window */ | ||||
| 
 | ||||
| static const Layout layouts[] = { | ||||
| 	/* symbol     arrange function */ | ||||
|  | ||||
							
								
								
									
										3
									
								
								dwm.1
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								dwm.1
									
									
									
									
									
								
							| @ -29,6 +29,9 @@ color. The tags of the focused window are indicated with a filled square in the | ||||
| top left corner.  The tags which are applied to one or more windows are | ||||
| indicated with an empty square in the top left corner. | ||||
| .P | ||||
| The attach below patch makes newly spawned windows attach after the currently | ||||
| selected window | ||||
| .P | ||||
| dwm draws a small border around windows to indicate the focus state. | ||||
| .SH OPTIONS | ||||
| .TP | ||||
|  | ||||
							
								
								
									
										31
									
								
								dwm.c
									
									
									
									
									
								
							
							
						
						
									
										31
									
								
								dwm.c
									
									
									
									
									
								
							| @ -149,6 +149,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac | ||||
| static void arrange(Monitor *m); | ||||
| static void arrangemon(Monitor *m); | ||||
| static void attach(Client *c); | ||||
| static void attachBelow(Client *c); | ||||
| static void attachstack(Client *c); | ||||
| static void buttonpress(XEvent *e); | ||||
| static void checkotherwm(void); | ||||
| @ -414,6 +415,21 @@ attach(Client *c) | ||||
| 	c->next = c->mon->clients; | ||||
| 	c->mon->clients = c; | ||||
| } | ||||
| void | ||||
| attachBelow(Client *c) | ||||
| { | ||||
| 	//If there is nothing on the monitor or the selected client is floating, attach as normal
 | ||||
| 	if(c->mon->sel == NULL || c->mon->sel == c || c->mon->sel->isfloating) { | ||||
| 		attach(c); | ||||
| 		return; | ||||
| 	} | ||||
| 
 | ||||
| 	//Set the new client's next property to the same as the currently selected clients next
 | ||||
| 	c->next = c->mon->sel->next; | ||||
| 	//Set the currently selected clients next property to the new client
 | ||||
| 	c->mon->sel->next = c; | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| void | ||||
| attachstack(Client *c) | ||||
| @ -1071,7 +1087,10 @@ manage(Window w, XWindowAttributes *wa) | ||||
| 		c->isfloating = c->oldstate = trans != None || c->isfixed; | ||||
| 	if (c->isfloating) | ||||
| 		XRaiseWindow(dpy, c->win); | ||||
| 	attach(c); | ||||
| 	if( attachbelow ) | ||||
| 		attachBelow(c); | ||||
| 	else | ||||
| 		attach(c); | ||||
| 	attachstack(c); | ||||
| 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, | ||||
| 		(unsigned char *) &(c->win), 1); | ||||
| @ -1426,7 +1445,10 @@ sendmon(Client *c, Monitor *m) | ||||
| 	detachstack(c); | ||||
| 	c->mon = m; | ||||
| 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ | ||||
| 	attach(c); | ||||
| 	if( attachbelow ) | ||||
| 		attachBelow(c); | ||||
| 	else | ||||
| 		attach(c); | ||||
| 	attachstack(c); | ||||
| 	focus(NULL); | ||||
| 	arrange(NULL); | ||||
| @ -1911,7 +1933,10 @@ updategeom(void) | ||||
| 					m->clients = c->next; | ||||
| 					detachstack(c); | ||||
| 					c->mon = mons; | ||||
| 					attach(c); | ||||
| 					if( attachbelow ) | ||||
| 						attachBelow(c); | ||||
| 					else | ||||
| 						attach(c); | ||||
| 					attachstack(c); | ||||
| 				} | ||||
| 				if (m == selmon) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user