mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Set Xwayland seat on focus
Necessary to make primary selection syncronize
This commit is contained in:
		
							parent
							
								
									ae0552606b
								
							
						
					
					
						commit
						5c08e13e50
					
				
					 2 changed files with 7 additions and 2 deletions
				
			
		| 
						 | 
					@ -291,7 +291,8 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
 | 
				
			||||||
		seat->cursor->cursor->y);
 | 
							seat->cursor->cursor->y);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container) {
 | 
					void sway_seat_set_focus(struct sway_seat *seat,
 | 
				
			||||||
 | 
							struct sway_container *container) {
 | 
				
			||||||
	struct sway_container *last_focus = sway_seat_get_focus(seat);
 | 
						struct sway_container *last_focus = sway_seat_get_focus(seat);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (container && last_focus == container) {
 | 
						if (container && last_focus == container) {
 | 
				
			||||||
| 
						 | 
					@ -311,6 +312,11 @@ void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *containe
 | 
				
			||||||
		if (container->type == C_VIEW) {
 | 
							if (container->type == C_VIEW) {
 | 
				
			||||||
			struct sway_view *view = container->sway_view;
 | 
								struct sway_view *view = container->sway_view;
 | 
				
			||||||
			view_set_activated(view, true);
 | 
								view_set_activated(view, true);
 | 
				
			||||||
 | 
								if (view->type == SWAY_XWAYLAND_VIEW) {
 | 
				
			||||||
 | 
									struct wlr_xwayland *xwayland =
 | 
				
			||||||
 | 
										seat->input->server->xwayland;
 | 
				
			||||||
 | 
									wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
			struct wlr_keyboard *keyboard =
 | 
								struct wlr_keyboard *keyboard =
 | 
				
			||||||
				wlr_seat_get_keyboard(seat->wlr_seat);
 | 
									wlr_seat_get_keyboard(seat->wlr_seat);
 | 
				
			||||||
			if (keyboard) {
 | 
								if (keyboard) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -110,7 +110,6 @@ bool server_init(struct sway_server *server) {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	input_manager = sway_input_manager_create(server);
 | 
						input_manager = sway_input_manager_create(server);
 | 
				
			||||||
 | 
					 | 
				
			||||||
	return true;
 | 
						return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue