Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified JavaApp/libs/lwjgl/lwjgl-freetype.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-glfw.jar
Binary file not shown.
Binary file added JavaApp/libs/lwjgl/lwjgl-jemalloc.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-lwjglx.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-nanovg.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-openal.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-opengl.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-shaderc.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-stb.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-tinyfd.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-vma.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl-vulkan.jar
Binary file not shown.
Binary file modified JavaApp/libs/lwjgl/lwjgl.jar
Binary file not shown.
43 changes: 41 additions & 2 deletions JavaApp/src/lwjgl/org/lwjgl/glfw/GLFW.java
Original file line number Diff line number Diff line change
Expand Up @@ -320,13 +320,16 @@ public class GLFW
GLFW_STICKY_KEYS = 0x33002,
GLFW_STICKY_MOUSE_BUTTONS = 0x33003,
GLFW_LOCK_KEY_MODS = 0x33004,
GLFW_RAW_MOUSE_MOTION = 0x33005;
GLFW_RAW_MOUSE_MOTION = 0x33005,
GLFW_UNLIMITED_MOUSE_BUTTONS = 0x33006,
GLFW_IME = 0x33007;

/** Cursor state. */
public static final int
GLFW_CURSOR_NORMAL = 0x34001,
GLFW_CURSOR_HIDDEN = 0x34002,
GLFW_CURSOR_DISABLED = 0x34003;
GLFW_CURSOR_DISABLED = 0x34003,
GLFW_CURSOR_CAPTURED = 0x34004;

/** The regular arrow cursor shape. */
public static final int GLFW_ARROW_CURSOR = 0x36001;
Expand Down Expand Up @@ -499,6 +502,10 @@ public class GLFW
/* volatile */ public static GLFWWindowRefreshCallback mGLFWWindowRefreshCallback;
/* volatile */ public static GLFWWindowSizeCallback mGLFWWindowSizeCallback;

public static GLFWPreeditCallback mGLFWPreeditCallback;
public static GLFWIMEStatusCallback mGLFWIMEStatusCallback;
public static GLFWPreeditCandidateCallback mGLFWPreeditCandidateCallback;

volatile public static int mGLFWWindowWidth, mGLFWWindowHeight;

private static GLFWGammaRamp mGLFWGammaRamp;
Expand Down Expand Up @@ -778,7 +785,27 @@ public static GLFWWindowRefreshCallback glfwSetWindowRefreshCallback(@NativeType

return lastCallback;
}
public static GLFWPreeditCallback glfwSetPreeditCallback(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("GLFWpreeditfun") GLFWPreeditCallbackI cbfun) {
GLFWPreeditCallback lastCallback = mGLFWPreeditCallback;
if (cbfun == null) mGLFWPreeditCallback = null;
else mGLFWPreeditCallback = GLFWPreeditCallback.create(cbfun);

return lastCallback;
}
public static GLFWIMEStatusCallback glfwSetIMEStatusCallback(@NativeType("GLFWwindow *") long window, @NativeType("GLFWimestatusfun") @Nullable GLFWIMEStatusCallbackI cbfun) {
GLFWIMEStatusCallback lastCallback = mGLFWIMEStatusCallback;
if (cbfun == null) mGLFWIMEStatusCallback = null;
else mGLFWIMEStatusCallback = GLFWIMEStatusCallback.create(cbfun);

return lastCallback;
}
public static GLFWPreeditCandidateCallback glfwSetPreeditCandidateCallback(@NativeType("GLFWwindow *") long window, @NativeType("GLFWpreeditcandidatefun") @Nullable GLFWPreeditCandidateCallbackI cbfun) {
GLFWPreeditCandidateCallback lastCallback = mGLFWPreeditCandidateCallback;
if (cbfun == null) mGLFWPreeditCandidateCallback = null;
else mGLFWPreeditCandidateCallback = GLFWPreeditCandidateCallback.create(cbfun);

return lastCallback;
}
public static GLFWWindowSizeCallback glfwSetWindowSizeCallback(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("GLFWwindowsizefun") GLFWWindowSizeCallbackI cbfun) {
GLFWWindowSizeCallback lastCallback = mGLFWWindowSizeCallback;
if (cbfun == null) mGLFWWindowSizeCallback = null;
Expand Down Expand Up @@ -809,6 +836,10 @@ public static int glfwGetPlatform() {
return GLFW_PLATFORM_X11;
}

public static boolean glfwPlatformSupported(int platform) {
return platform == GLFW_PLATFORM_X11;
}

@NativeType("GLFWwindow *")
public static long glfwGetCurrentContext() {
long __functionAddress = Functions.GetCurrentContext;
Expand Down Expand Up @@ -982,6 +1013,14 @@ public static long glfwCreateWindow(int width, int height, CharSequence title, l
win.height = mGLFWWindowHeight;
win.title = title;

win.windowAttribs.put(GLFW_RESIZABLE, GLFW_FALSE);
// I don't understand why Minecraft doesn't set this itself or why it crashes trying to read
// it before set when it controls the cursor status...
win.inputModes.put(GLFW_CURSOR, GLFW_CURSOR_NORMAL);
win.inputModes.put(GLFW_STICKY_KEYS, GLFW_FALSE); // TODO: Fix glfwGetKeyName() to support this
win.inputModes.put(GLFW_STICKY_MOUSE_BUTTONS, GLFW_FALSE); // TODO: Fix glfwGetMouseButton() to support this
win.inputModes.put(GLFW_IME, GLFW_FALSE);

win.windowAttribs.put(GLFW_HOVERED, 1);
win.windowAttribs.put(GLFW_VISIBLE, 1);

Expand Down
Binary file modified Natives/resources/Frameworks/libfreetype.dylib
Binary file not shown.
Binary file modified Natives/resources/Frameworks/liblwjgl.dylib
100644 → 100755
Binary file not shown.
Binary file modified Natives/resources/Frameworks/liblwjgl_nanovg.dylib
100644 → 100755
Binary file not shown.
Binary file modified Natives/resources/Frameworks/liblwjgl_opengl.dylib
100644 → 100755
Binary file not shown.
Binary file modified Natives/resources/Frameworks/liblwjgl_stb.dylib
100644 → 100755
Binary file not shown.
Binary file modified Natives/resources/Frameworks/liblwjgl_tinyfd.dylib
100644 → 100755
Binary file not shown.
Binary file modified Natives/resources/Frameworks/liblwjgl_vma.dylib
Binary file not shown.
Binary file modified Natives/resources/Frameworks/libshaderc.dylib
100644 → 100755
Binary file not shown.