From d9add3eb3d7f6df7b5b3c56a9e113b7aad11430e Mon Sep 17 00:00:00 2001 From: Payn Date: Fri, 10 Oct 2025 20:54:03 -0300 Subject: [PATCH 1/2] Wayland: Use more accurate monitor names --- src/wl_monitor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/wl_monitor.c b/src/wl_monitor.c index 1ec5f5afa..c7adb9a4e 100644 --- a/src/wl_monitor.c +++ b/src/wl_monitor.c @@ -55,9 +55,6 @@ static void outputHandleGeometry(void* userData, monitor->wl.y = y; monitor->widthMM = physicalWidth; monitor->heightMM = physicalHeight; - - if (strlen(monitor->name) == 0) - snprintf(monitor->name, sizeof(monitor->name), "%s %s", make, model); } static void outputHandleMode(void* userData, @@ -133,13 +130,17 @@ void outputHandleName(void* userData, struct wl_output* wl_output, const char* n { struct _GLFWmonitor* monitor = userData; - strncpy(monitor->name, name, sizeof(monitor->name) - 1); + if (strlen(monitor->name) == 0) + strncpy(monitor->name, name, sizeof(monitor->name) - 1); } void outputHandleDescription(void* userData, struct wl_output* wl_output, const char* description) { + struct _GLFWmonitor* monitor = userData; + + strncpy(monitor->name, description, sizeof(monitor->name) - 1); } static const struct wl_output_listener outputListener = From dfb325bba951e1b15f0dd78f60f7545c6ff84b09 Mon Sep 17 00:00:00 2001 From: Payn Date: Fri, 10 Oct 2025 21:30:35 -0300 Subject: [PATCH 2/2] Update README.md and CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index cfb4f42ca..679bb3f67 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -299,6 +299,7 @@ video tutorials. - Jonas Ådahl - Lasse Öörni - Leonard König + - Ivan Souza - All the unmentioned and anonymous contributors in the GLFW community, for bug reports, patches, feedback, testing and encouragement diff --git a/README.md b/README.md index 1c7ced36e..5a06b3a8e 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,7 @@ information on what to include when reporting a bug. a modal to a fallback decoration - [Wayland] Bugfix: The cursor position was not updated when clicking through from a modal to the content area + - [Wayland] Bugfix: Use more accurate monitor names - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631) - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface` - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`