From baebbb61eb5adf2faa741fd846fb6e5d7766d1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 20 Jun 2023 17:27:43 +0800 Subject: [PATCH] DisplayServer (Wayland): detect name using `wl_output_listener::name` Which matches X11 and module Brightness --- src/detection/displayserver/linux/wayland.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/detection/displayserver/linux/wayland.c b/src/detection/displayserver/linux/wayland.c index bb06661f1..a6864c397 100644 --- a/src/detection/displayserver/linux/wayland.c +++ b/src/detection/displayserver/linux/wayland.c @@ -85,21 +85,12 @@ static void waylandOutputGeometryListener(void *data, FF_MAYBE_UNUSED int32_t physical_width, FF_MAYBE_UNUSED int32_t physical_height, FF_MAYBE_UNUSED int32_t subpixel, - const char *make, - const char *model, + FF_MAYBE_UNUSED const char *make, + FF_MAYBE_UNUSED const char *model, int32_t transform) { WaylandDisplay* display = data; display->transform = (enum wl_output_transform) transform; - - if(make && !ffStrEquals(make, "unknown")) - ffStrbufAppendS(&display->name, make); - if(model && !ffStrEquals(model, "unknown")) - { - if(display->name.length > 0) - ffStrbufAppendC(&display->name, '-'); - ffStrbufAppendS(&display->name, model); - } } #ifdef WL_OUTPUT_NAME_SINCE_VERSION @@ -110,6 +101,7 @@ static void waylandOutputNameListener(void *data, FF_MAYBE_UNUSED struct wl_outp display->type = FF_DISPLAY_TYPE_BUILTIN; else if(ffStrStartsWith(name, "HDMI-") || ffStrStartsWith(name, "DP-")) display->type = FF_DISPLAY_TYPE_EXTERNAL; + ffStrbufAppendS(&display->name, name); } #endif