Merge 54ecc8a9f5 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/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)
@@ -2339,6 +2347,9 @@ void _glfwRestoreWindowX11(_GLFWwindow* window)
 
     if (_glfwWindowIconifiedX11(window))
     {
+        // Some window managers do not unmap iconified windows, and XMapWindow is
+        // then no-op. Explicitly unmap the window to make sure it gets restored.
+        XUnmapWindow(_glfw.x11.display, window->x11.handle);
         XMapWindow(_glfw.x11.display, window->x11.handle);
         waitForVisibilityNotify(window);
     }

tests/iconify.c

@@ -56,6 +56,8 @@ static void error_callback(int error, const char* description)
 
 static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
 {
+    static GLFWwindow *iconified;
+
     printf("%0.2f Key %s\n",
            glfwGetTime(),
            action == GLFW_PRESS ? "pressed" : "released");
@@ -67,12 +69,15 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
     {
         case GLFW_KEY_I:
             glfwIconifyWindow(window);
+            iconified = window;
             break;
         case GLFW_KEY_M:
             glfwMaximizeWindow(window);
             break;
         case GLFW_KEY_R:
+            if (iconified) window = iconified;
             glfwRestoreWindow(window);
+            iconified = NULL;
             break;
         case GLFW_KEY_ESCAPE:
             glfwSetWindowShouldClose(window, GLFW_TRUE);
@@ -253,9 +258,10 @@ int main(int argc, char** argv)
         if (fullscreen)
             monitor = glfwGetPrimaryMonitor();
 
-        window_count = 1;
+        window_count = 2;
         windows = calloc(window_count, sizeof(GLFWwindow*));
         windows[0] = create_window(monitor);
+        windows[1] = create_window(monitor);
     }
 
     for (i = 0;  i < window_count;  i++)