diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java index 780f80357c..df45aadd56 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java @@ -467,7 +467,9 @@ public class DisplayWindow implements ImmediateWindowProvider { this.winWidth = x[0]; this.winHeight = y[0]; + // Setting the window position isn't supported on wayland, so check the error here glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY); + handleLastGLFWError(); // Attempt setting the icon // int[] channels = new int[1]; @@ -490,7 +492,10 @@ public class DisplayWindow implements ImmediateWindowProvider { // Show the window glfwShowWindow(window); + // Getting the window position isn't supported on wayland, so check the error here glfwGetWindowPos(window, x, y); + handleLastGLFWError(); + this.winX = x[0]; this.winY = y[0]; glfwGetFramebufferSize(window, x, y); @@ -499,6 +504,18 @@ public class DisplayWindow implements ImmediateWindowProvider { glfwPollEvents(); } + private static void handleLastGLFWError() { + handleLastGLFWError((error, description) -> { + if (error == GLFW_FEATURE_UNAVAILABLE) { + // suppress window pos errors for unsupported platforms (wayland) + LOGGER.debug(String.format("Suppressing GLFW error: [0x%X]%s", error, description)); + return; + } + + throw new IllegalStateException(String.format("GLFW error: [0x%X]%s", error, description)); + }); + } + private void winResize(long window, int width, int height) { if (window == this.window && width != 0 && height != 0) { this.winWidth = width; @@ -656,4 +673,4 @@ public class DisplayWindow implements ImmediateWindowProvider { this.context.elementShader().close(); SimpleBufferBuilder.destroy(); } -} \ No newline at end of file +}