From 317da14fc9788b87e5d417fe4af2e66ffd5c1e0f Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Fri, 1 Jan 2021 17:56:37 +0300
Subject: [PATCH] LWJGL2-specific event handling

---
 .../src/main/java/org/lwjgl/input/Mouse.java  | 39 ++++++++++++++-----
 .../main/java/org/lwjgl/opengl/Display.java   | 10 ++---
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Mouse.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Mouse.java
index facc3af74..0546530aa 100644
--- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Mouse.java
+++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Mouse.java
@@ -31,6 +31,15 @@ public class Mouse {
 	private static int[] lastxEvents = new int[queue.getMaxEvents()];
 	private static int[] lastyEvents = new int[queue.getMaxEvents()];
 	private static long[] nanoTimeEvents = new long[queue.getMaxEvents()];
+	/* varbuffer to avoid IOOBE on some Forge mods */
+    static int XEvent;
+	static int YEvent;
+	static int lastXEvent;
+	static int lastYEvent;
+	static int ButtonEvent;
+	static int WheelEvent;
+	static long NanoTimeEvent;
+	static boolean ButtonStateEvent;
 
 	private static boolean clipPostionToDisplay = true;
 
@@ -139,39 +148,51 @@ public class Mouse {
 	}
 
 	public static boolean next() {
-		return queue.next();
+		if(queue.next()) {
+			XEvent = xEvents[queue.getCurrentPos()];
+			YEvent = yEvents[queue.getCurrentPos()];
+			lastXEvent = lastxEvents[queue.getCurrentPos()];
+			lastYEvent = lastyEvents[queue.getCurrentPos()];
+ 			NanoTimeEvent = nanoTimeEvents[queue.getCurrentPos()];
+			ButtonEvent = buttonEvents[queue.getCurrentPos()];
+			ButtonStateEvent = buttonEventStates[queue.getCurrentPos()];
+			WheelEvent = wheelEvents[queue.getCurrentPos()];
+			return true;
+		}else{
+			return false;
+		}
 	}
 
 	public static int getEventX() {
-		return xEvents[queue.getCurrentPos()];
+		return XEvent;
 	}
 
 	public static int getEventY() {
-		return yEvents[queue.getCurrentPos()];
+		return YEvent;
 	}
 
 	public static int getEventDX() {
-		return xEvents[queue.getCurrentPos()] - lastxEvents[queue.getCurrentPos()];
+		return XEvent - lastXEvent;
 	}
 
 	public static int getEventDY() {
-		return yEvents[queue.getCurrentPos()] - lastyEvents[queue.getCurrentPos()];
+		return YEvent - lastYEvent;
 	}
 
 	public static long getEventNanoseconds() {
-		return nanoTimeEvents[queue.getCurrentPos()];
+		return NanoTimeEvent;
 	}
 
 	public static int getEventButton() {
-		return buttonEvents[queue.getCurrentPos()];
+		return ButtonEvent;
 	}
 
 	public static boolean getEventButtonState() {
-		return buttonEventStates[queue.getCurrentPos()];
+		return ButtonStateEvent;
 	}
 
 	public static int getEventDWheel() {
-		return wheelEvents[queue.getCurrentPos()];
+		return WheelEvent;
 	}
 
 	public static int getX() {
diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
index 123caabdb..2d8956ba3 100644
--- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
+++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
@@ -316,22 +316,22 @@ public class Display {
         Window.cursorEnterCallback = new GLFWCursorEnterCallback() {
             @Override
             public void invoke(long window, boolean entered) {
-                //Mouse.setMouseInsideWindow(entered == true);
-                Mouse.setInside(entered);
+                Mouse.setMouseInsideWindow(entered == true);
+
             }
         };
 
         Window.cursorPosCallback = new GLFWCursorPosCallback() {
             @Override
             public void invoke(long window, double xpos, double ypos) {
-                Mouse.pushMouseEvent((int)xpos,(int)ypos, (byte) -1,false,0);
+                Mouse.addMoveEvent(xpos,ypos);
             }
         };
 
         Window.mouseButtonCallback = new GLFWMouseButtonCallback() {
             @Override
             public void invoke(long window, int button, int action, int mods) {
-                Mouse.pushMouseEvent(-1,-1, (byte) button, action == GLFW.GLFW_PRESS ? true : false,0);
+                Mouse.addButtonEvent(button, action == GLFW.GLFW_PRESS ? true : false);
             }
         };
 
@@ -385,7 +385,7 @@ public class Display {
             @Override
             public void invoke(long window, double xoffset, double yoffset) {
               //  Mouse.addWheelEvent((int) (yoffset * 120));
-                Mouse.pushMouseEvent(-1,-1, (byte) -1, false,(int)(yoffset*120));
+                Mouse.addWheelEvent((int)(yoffset*120));
             }
         };