mirror of
				https://github.com/labwc/labwc.git
				synced 2025-11-03 09:01:51 -05:00 
			
		
		
		
	seat: get output name from touch config for current device
The output name attached to the touch device has still priority.
This commit is contained in:
		
							parent
							
								
									3f77514459
								
							
						
					
					
						commit
						19cab55092
					
				
					 1 changed files with 9 additions and 1 deletions
				
			
		
							
								
								
									
										10
									
								
								src/seat.c
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/seat.c
									
										
									
									
									
								
							| 
						 | 
					@ -273,7 +273,15 @@ static void
 | 
				
			||||||
map_touch_to_output(struct seat *seat, struct wlr_input_device *dev)
 | 
					map_touch_to_output(struct seat *seat, struct wlr_input_device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct wlr_touch *touch = wlr_touch_from_input_device(dev);
 | 
						struct wlr_touch *touch = wlr_touch_from_input_device(dev);
 | 
				
			||||||
	char *output_name = touch->output_name ? touch->output_name : NULL;
 | 
					
 | 
				
			||||||
 | 
						char *touch_config_output_name = NULL;
 | 
				
			||||||
 | 
						struct touch_config_entry *config_entry =
 | 
				
			||||||
 | 
							touch_find_config_for_device(touch->base.name);
 | 
				
			||||||
 | 
						if (config_entry) {
 | 
				
			||||||
 | 
							touch_config_output_name = config_entry->output_name;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						char *output_name = touch->output_name ? touch->output_name : touch_config_output_name;
 | 
				
			||||||
	wlr_log(WLR_INFO, "map touch to output %s\n", output_name);
 | 
						wlr_log(WLR_INFO, "map touch to output %s\n", output_name);
 | 
				
			||||||
	map_input_to_output(seat, dev, output_name);
 | 
						map_input_to_output(seat, dev, output_name);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue