mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-11-03 09:01:40 -05:00 
			
		
		
		
	output: don't send make/model
- These are legacy wl_output properties [1]
- wl_output exposes name and description, which are better defined
- It's not clear what make/model/serial are for a virtual output
- Clients shouldn't rely on these fields
[1]: 8f1795f911/protocol/wayland.xml (L2508)
Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/1623
			
			
This commit is contained in:
		
							parent
							
								
									c9f0dbc159
								
							
						
					
					
						commit
						c2327248f8
					
				
					 1 changed files with 1 additions and 12 deletions
				
			
		| 
						 | 
					@ -16,20 +16,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void send_geometry(struct wl_resource *resource) {
 | 
					static void send_geometry(struct wl_resource *resource) {
 | 
				
			||||||
	struct wlr_output *output = wlr_output_from_resource(resource);
 | 
						struct wlr_output *output = wlr_output_from_resource(resource);
 | 
				
			||||||
 | 
					 | 
				
			||||||
	const char *make = output->make;
 | 
					 | 
				
			||||||
	if (make == NULL) {
 | 
					 | 
				
			||||||
		make = "Unknown";
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	const char *model = output->model;
 | 
					 | 
				
			||||||
	if (model == NULL) {
 | 
					 | 
				
			||||||
		model = "Unknown";
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	wl_output_send_geometry(resource, 0, 0,
 | 
						wl_output_send_geometry(resource, 0, 0,
 | 
				
			||||||
		output->phys_width, output->phys_height, output->subpixel,
 | 
							output->phys_width, output->phys_height, output->subpixel,
 | 
				
			||||||
		make, model, output->transform);
 | 
							"Unknown", "Unknown", output->transform);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void send_current_mode(struct wl_resource *resource) {
 | 
					static void send_current_mode(struct wl_resource *resource) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue