From c2327248f8a22b3e66e00a6e8bccb3771834cad9 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sun, 20 Apr 2025 21:46:11 +0200 Subject: [PATCH] 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]: https://gitlab.freedesktop.org/wayland/wayland/-/blob/8f1795f9115bfb71cf143cea43bcb102b6c5c3ea/protocol/wayland.xml?page=3#L2508 Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/1623 --- types/output/output.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/types/output/output.c b/types/output/output.c index 346a3aa40..55f8a7645 100644 --- a/types/output/output.c +++ b/types/output/output.c @@ -16,20 +16,9 @@ static void send_geometry(struct wl_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, 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) {