Merge 662454b552 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

docs/input.md

@@ -940,9 +940,10 @@ with @ref glfwGetTimerValue.
 uint64_t value = glfwGetTimerValue();
 ```
 
-This value is in 1 / frequency seconds.  The frequency of the raw
-timer varies depending on the operating system and hardware.  You can query the
-frequency, in Hz, with @ref glfwGetTimerFrequency.
+This function returns the current value of the raw timer. To get the current time in 
+1 / frequency seconds, use `glfwGetTimerValue() / glfwGetTimerFrequency()`.
+The frequency of the rawtimer varies depending on the operating system and hardware.
+You can query the frequency, in Hz, with @ref glfwGetTimerFrequency.
 
 ```c
 uint64_t frequency = glfwGetTimerFrequency();

include/GLFW/glfw3.h

@@ -6042,9 +6042,12 @@ GLFWAPI void glfwSetTime(double time);
 
 /*! @brief Returns the current value of the raw timer.
  *
- *  This function returns the current value of the raw timer, measured in
- *  1 / frequency seconds.  To get the frequency, call @ref
- *  glfwGetTimerFrequency.
+ *  This function returns the current value of the raw timer. To get the 
+ *  current time measured in 1 / frequency seconds, use 
+ *  @ref glfwGetTimerValue / @ref glfwGetTimerFrequency.
+ *  To get the frequency, call @ref glfwGetTimerFrequency.
+ *  
+ *  
  *
  *  @return The value of the timer, or zero if an
  *  [error](@ref error_handling) occurred.

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)