x11: Ignore BadValue for extremely small XRRSetScreenSize resolutions.

icculus · icculus · commit 1c7bf478ae9c · 2022-03-31T10:09:47.000-04:00
Reference Issue #4840.
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
@@ -1011,7 +1011,13 @@ static int (*PreXRRSetScreenSizeErrorHandler)(Display *, XErrorEvent *) = NULL;
 static int
 SDL_XRRSetScreenSizeErrHandler(Display *d, XErrorEvent *e)
 {
-    return (e->error_code == BadMatch) ? 0 : PreXRRSetScreenSizeErrorHandler(d, e);
+    /* BadMatch: https://github.com/libsdl-org/SDL/issues/4561 */
+    /* BadValue: https://github.com/libsdl-org/SDL/issues/4840 */
+    if ((e->error_code == BadMatch) || (e->error_code == BadValue)) {
+        return 0;
+    }
+
+    return PreXRRSetScreenSizeErrorHandler(d, e);
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,13 @@ static int (PreXRRSetScreenSizeErrorHandler)(Display , XErrorEvent *) = NULL;`
`1011`	`1011`	`static int`
`1012`	`1012`	`SDL_XRRSetScreenSizeErrHandler(Display d, XErrorEvent e)`
`1013`	`1013`	`{`
`1014`		`- return (e->error_code == BadMatch) ? 0 : PreXRRSetScreenSizeErrorHandler(d, e);`
	`1014`	`+ /* BadMatch: https://github.com/libsdl-org/SDL/issues/4561 */`
	`1015`	`+ /* BadValue: https://github.com/libsdl-org/SDL/issues/4840 */`
	`1016`	`+ if ((e->error_code == BadMatch) \|\| (e->error_code == BadValue)) {`
	`1017`	`+ return 0;`
	`1018`	`+ }`
	`1019`	`+`
	`1020`	`+ return PreXRRSetScreenSizeErrorHandler(d, e);`
`1015`	`1021`	`}`
`1016`	`1022`
`1017`	`1023`	`int`