mirror of
				https://github.com/labwc/labwc.git
				synced 2025-11-03 09:01:51 -05:00 
			
		
		
		
	Chase wlroots: Use wlr_cursor_set_xcursor()
Chases: 18bafbfc57039e16d1dabd78b882b3d6477f76b5 xcursor-manager: drop wlr_xcursor_manager_set_cursor_image()
This commit is contained in:
		
							parent
							
								
									4d49c8250c
								
							
						
					
					
						commit
						9c5266ac76
					
				
					 2 changed files with 12 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -252,8 +252,8 @@ cursor_set(struct seat *seat, enum lab_cursors cursor)
 | 
			
		|||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	wlr_xcursor_manager_set_cursor_image(
 | 
			
		||||
		seat->xcursor_manager, cursor_names[cursor], seat->cursor);
 | 
			
		||||
	wlr_cursor_set_xcursor(seat->cursor, seat->xcursor_manager,
 | 
			
		||||
		cursor_names[cursor]);
 | 
			
		||||
	seat->server_cursor = cursor;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -274,8 +274,15 @@ cursor_update_image(struct seat *seat)
 | 
			
		|||
		}
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
	wlr_xcursor_manager_set_cursor_image(
 | 
			
		||||
		seat->xcursor_manager, cursor_names[cursor], seat->cursor);
 | 
			
		||||
	/*
 | 
			
		||||
	 * Call wlr_cursor_unset_image() first to force wlroots to
 | 
			
		||||
	 * update the cursor (e.g. for a new output). Otherwise,
 | 
			
		||||
	 * wlr_cursor_set_xcursor() may detect that we are setting the
 | 
			
		||||
	 * same cursor as before, and do nothing.
 | 
			
		||||
	 */
 | 
			
		||||
	wlr_cursor_unset_image(seat->cursor);
 | 
			
		||||
	wlr_cursor_set_xcursor(seat->cursor, seat->xcursor_manager,
 | 
			
		||||
		cursor_names[cursor]);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue