warp: do not warp if force_warp = 1 and mouse cursor is on a bar
This commit is contained in:
		
							
								
								
									
										13
									
								
								patch/warp.c
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								patch/warp.c
									
									
									
									
									
								
							| @@ -13,15 +13,18 @@ warp(const Client *c) | |||||||
| 		return; | 		return; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	if (!force_warp) { | 	if (!getrootptr(&x, &y)) | ||||||
| 		if (!getrootptr(&x, &y) || | 		return; | ||||||
|  |  | ||||||
|  | 	if (!force_warp && | ||||||
| 		(x > c->x - c->bw && | 		(x > c->x - c->bw && | ||||||
| 		 y > c->y - c->bw && | 		 y > c->y - c->bw && | ||||||
| 		 x < c->x + c->w + c->bw*2 && | 		 x < c->x + c->w + c->bw*2 && | ||||||
| 			 y < c->y + c->h + c->bw*2) | 		 y < c->y + c->h + c->bw*2)) | ||||||
| 		) |  | ||||||
| 		return; | 		return; | ||||||
|  |  | ||||||
|  | 	force_warp = 0; | ||||||
|  |  | ||||||
| 	for (m = mons; m; m = m->next) | 	for (m = mons; m; m = m->next) | ||||||
| 		for (bar = m->bar; bar; bar = bar->next) | 		for (bar = m->bar; bar; bar = bar->next) | ||||||
| 			if (x > bar->bx && | 			if (x > bar->bx && | ||||||
| @@ -29,8 +32,6 @@ warp(const Client *c) | |||||||
| 				y > bar->by && | 				y > bar->by && | ||||||
| 				y < bar->by + bar->bh) | 				y < bar->by + bar->bh) | ||||||
| 				return; | 				return; | ||||||
| 	} else |  | ||||||
| 		force_warp = 0; |  | ||||||
|  |  | ||||||
| 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2); | 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2); | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user