Merge baf3290308 into 936307558e

-  prevents BadValue error and program exit

CONTRIBUTORS.md

@@ -282,10 +282,12 @@ video tutorials.
  - Corentin Wallez
  - Torsten Walluhn
  - Patrick Walton
+ - Ivor Wanders
  - Jim Wang
  - Xo Wang
  - Andre Weissflog
  - Jay Weisskopf
+ - Drew Weymouth
  - Frank Wille
  - Andy Williams
  - Joel Winarske

README.md

@@ -145,6 +145,10 @@ information on what to include when reporting a bug.
  - [Wayland] Bugfix: The cursor position was not updated when clicking through
    from a modal to the content area
  - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
+ - [X11] Bugfix: Occasional crash when an idle display awakes (#2766) 
+ - [X11] Bugfix: Prevent BadWindow when creating small windows with a content scale
+   less than 1 (#2754)
+ - [X11] Bugfix: Clamp width and height to >= 1 to prevent BadValue error and app exit
  - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
  - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
  - [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to

src/wl_init.c

@@ -518,7 +518,12 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
         .createWindowSurface = _glfwCreateWindowSurfaceWayland
     };
 
-    void* module = _glfwPlatformLoadModule("libwayland-client.so.0");
+    void* module;
+#if defined(__OpenBSD__)
+    module = _glfwPlatformLoadModule("libwayland-client.so");
+#else
+    module = _glfwPlatformLoadModule("libwayland-client.so.0");
+#endif
     if (!module)
     {
         if (platformID == GLFW_PLATFORM_WAYLAND)
@@ -631,7 +636,11 @@ int _glfwInitWayland(void)
         return GLFW_FALSE;
     }
 
+#if defined(__OpenBSD__)
+    _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so");
+#else
     _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so.0");
+#endif
     if (!_glfw.wl.cursor.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -648,7 +657,11 @@ int _glfwInitWayland(void)
     _glfw.wl.cursor.image_get_buffer = (PFN_wl_cursor_image_get_buffer)
         _glfwPlatformGetModuleSymbol(_glfw.wl.cursor.handle, "wl_cursor_image_get_buffer");
 
+#if defined(__OpenBSD__)
+    _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so");
+#else
     _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so.1");
+#endif
     if (!_glfw.wl.egl.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -663,7 +676,11 @@ int _glfwInitWayland(void)
     _glfw.wl.egl.window_resize = (PFN_wl_egl_window_resize)
         _glfwPlatformGetModuleSymbol(_glfw.wl.egl.handle, "wl_egl_window_resize");
 
+#if defined(__OpenBSD__)
+    _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so");
+#else
     _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so.0");
+#endif
     if (!_glfw.wl.xkb.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -743,7 +760,11 @@ int _glfwInitWayland(void)
     }
 
     if (_glfw.hints.init.wl.libdecorMode == GLFW_WAYLAND_PREFER_LIBDECOR)
+#if defined(__OpenBSD__)
+        _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so");
+#else
         _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so.0");
+#endif
 
     if (_glfw.wl.libdecor.handle)
     {

src/x11_monitor.c

@@ -151,6 +151,11 @@ void _glfwPollMonitorsX11(void)
             }
 
             XRRCrtcInfo* ci = XRRGetCrtcInfo(_glfw.x11.display, sr, oi->crtc);
+            if (!ci) {
+                XRRFreeOutputInfo(oi);
+                continue;
+            }
+
             if (ci->rotation == RR_Rotate_90 || ci->rotation == RR_Rotate_270)
             {
                 widthMM  = oi->mm_height;

src/x11_window.c

@@ -576,6 +576,10 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
         height *= _glfw.x11.contentScaleY;
     }
 
+    // The dimensions must be nonzero, or a BadValue error results.
+    width = _glfw_max(1, width);
+    height = _glfw_max(1, height);
+
     int xpos = 0, ypos = 0;
 
     if (wndconfig->xpos != GLFW_ANY_POSITION && wndconfig->ypos != GLFW_ANY_POSITION)
@@ -2203,6 +2207,10 @@ void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height)
 
 void _glfwSetWindowSizeX11(_GLFWwindow* window, int width, int height)
 {
+	// The dimensions must be nonzero, or a BadValue error results.
+    width = _glfw_max(1, width);
+    height = _glfw_max(1, height);
+	
     if (window->monitor)
     {
         if (window->monitor->window == window)