Actually check the mouse position when clicking, instead of just assuming people clicked wherever the mouse moves to later.

In theory, this should make the UI usable, even on machines that don't consistently get 10000 FPS.

Because WZ widgets are weird, just make the widgets pretend that the mouse stopped moving after clicking or releasing in a given frame.

If you click twice in the same frame, the second widget will still greedily steal the mouse click from the first widget.

Changelog: Try to improve UI responsiveness under low framerates.

Author: Cyp

lib/framework/input.c

@@ -50,6 +50,8 @@ typedef enum _key_state
 typedef struct _input_state {
 	KEY_STATE state; /// Last key/mouse state
 	UDWORD lastdown; /// last key/mouse button down timestamp
+	Vector2i pressPos;    ///< Location of last mouse press event.
+	Vector2i releasePos;  ///< Location of last mouse release event.
 } INPUT_STATE;
 
 /// constant for the interval between 2 singleclicks for doubleclick event in ms
@@ -317,9 +319,14 @@ void inputHandleKeyEvent(SDL_KeyboardEvent * keyEvent)
  */
 void inputHandleMouseButtonEvent(SDL_MouseButtonEvent * buttonEvent)
 {
+	mouseXPos = buttonEvent->x;
+	mouseYPos = buttonEvent->y;
+
 	switch (buttonEvent->type)
 	{
 		case SDL_MOUSEBUTTONDOWN:
+			aMouseState[buttonEvent->button].pressPos.x = mouseXPos;
+			aMouseState[buttonEvent->button].pressPos.y = mouseYPos;
 			if ( aMouseState[buttonEvent->button].state == KEY_UP
 				|| aMouseState[buttonEvent->button].state == KEY_RELEASED
 				|| aMouseState[buttonEvent->button].state == KEY_PRESSRELEASE )
@@ -355,6 +362,8 @@ void inputHandleMouseButtonEvent(SDL_MouseButtonEvent * buttonEvent)
 			}
 			break;
 		case SDL_MOUSEBUTTONUP:
+			aMouseState[buttonEvent->button].releasePos.x = mouseXPos;
+			aMouseState[buttonEvent->button].releasePos.y = mouseYPos;
 			if (aMouseState[buttonEvent->button].state == KEY_PRESSED)
 			{
 				aMouseState[buttonEvent->button].state = KEY_PRESSRELEASE;
@@ -489,6 +498,16 @@ Uint16 mouseY(void)
 	return mouseYPos;
 }
 
+Vector2i mousePressPos(MOUSE_KEY_CODE code)
+{
+	return aMouseState[code].pressPos;
+}
+
+Vector2i mouseReleasePos(MOUSE_KEY_CODE code)
+{
+	return aMouseState[code].releasePos;
+}
+
 /* This returns true if the mouse key is currently depressed */
 bool mouseDown(MOUSE_KEY_CODE code)
 {

lib/framework/input.h

@@ -33,6 +33,7 @@
 #include <SDL.h>
 #include "types.h"
 #include "lib/framework/utf.h"
+#include "vector.h"
 
 /** Defines for all the key codes used. */
 typedef enum _key_code
@@ -184,6 +185,11 @@ extern Uint16 mouseX(void) WZ_DECL_PURE;
 /** Return the current Y position of the mouse. */
 extern Uint16 mouseY(void) WZ_DECL_PURE;
 
+/// Return the position of the mouse where it was clicked last.
+Vector2i mousePressPos(MOUSE_KEY_CODE code) WZ_DECL_PURE;
+/// Return the position of the mouse where it was released last.
+Vector2i mouseReleasePos(MOUSE_KEY_CODE code) WZ_DECL_PURE;
+
 /** This returns true if the mouse key is currently depressed. */
 extern bool mouseDown(MOUSE_KEY_CODE code);
 

lib/widget/widget.c

@@ -1451,34 +1451,41 @@ UDWORD widgRunScreen(W_SCREEN *psScreen)
 
 	// Note which keys have been pressed
 	pressed = WKEY_NONE;
+	sContext.mx = mouseX();
+	sContext.my = mouseY();
 	if(getWidgetsStatus())
 	{
-
 		if (mousePressed(MOUSE_LMB))
 		{
 			pressed = WKEY_PRIMARY;
+			sContext.mx = mousePressPos(MOUSE_LMB).x;
+			sContext.my = mousePressPos(MOUSE_LMB).y;
 		}
 		else if (mousePressed(MOUSE_RMB))
 		{
 			pressed = WKEY_SECONDARY;
+			sContext.mx = mousePressPos(MOUSE_RMB).x;
+			sContext.my = mousePressPos(MOUSE_RMB).y;
 		}
 		released = WKEY_NONE;
 		if (mouseReleased(MOUSE_LMB))
 		{
 			released = WKEY_PRIMARY;
+			sContext.mx = mouseReleasePos(MOUSE_LMB).x;
+			sContext.my = mouseReleasePos(MOUSE_LMB).y;
 		}
 		else if (mouseReleased(MOUSE_RMB))
 		{
 			released = WKEY_SECONDARY;
+			sContext.mx = mouseReleasePos(MOUSE_RMB).x;
+			sContext.my = mouseReleasePos(MOUSE_RMB).y;
 		}
 	}
 	/* Initialise the context */
 	sContext.psScreen = psScreen;
 	sContext.psForm = (W_FORM *)psScreen->psForm;
 	sContext.xOffset = 0;
 	sContext.yOffset = 0;
-	sContext.mx = mouseX();
-	sContext.my = mouseY();
 	psMouseOverWidget = NULL;
 
 	/* Process the screen's widgets */

src/display.c

@@ -392,6 +392,16 @@ void ProcessRadarInput(void)
 
 			if (mousePressed(MOUSE_ORDER) || (mousePressed(MOUSE_MMB) && keyDown(KEY_LALT)))
 			{
+				if (mousePressed(MOUSE_ORDER))
+				{
+					x = mousePressPos(MOUSE_ORDER).x;
+					y = mousePressPos(MOUSE_ORDER).y;
+				}
+				else
+				{
+					x = mousePressPos(MOUSE_MMB).x;
+					y = mousePressPos(MOUSE_MMB).y;
+				}
 				if(driveModeActive()) {
 					driveProcessRadarInput(x,y);
 				} else {
@@ -431,6 +441,9 @@ void ProcessRadarInput(void)
 			}
 			else if (mousePressed(MOUSE_SELECT))
 			{
+				x = mousePressPos(MOUSE_SELECT).x;
+				y = mousePressPos(MOUSE_SELECT).y;
+
 				CalcRadarPosition(x, y, &PosX, &PosY);
 
 				if(bInstantRadarJump)