cpp/openttd-patchpack/source Changeset - r27487:4d1c2a7bde00

Changeset - r27487:4d1c2a7bde00

Parent rev.

Child rev.

[Not reviewed]

master

0 7 0

Patric Stout - 12 months ago 2023-06-03 21:10:16
truebrain@openttd.org

Codechange: remove queue_wrap / last_position from mouse movement

No backend uses it anymore, so also no longer any need to support
it.

7 files changed with 12 insertions and 44 deletions:

src/gfx.cpp

src/gfx_type.h

src/video/allegro_v.cpp

src/video/cocoa/cocoa_wnd.mm

src/video/sdl2_v.cpp

src/video/sdl_v.cpp

src/video/win32_v.cpp

0 comments (0 inline, 0 general)

src/gfx.cpp

➞

Show inline comments

@@ @@ -1897,50 +1897,22 @@ void CursorVars::UpdateCursorPositionRel @@
  * Update cursor position on mouse movement.
  * @param x New X position.
  * @param y New Y position.
  * @param queued_warp True, if the OS queues mouse warps after pending mouse movement events.
  *                    False, if the warp applies instantaneous.
  * @return true, if the OS cursor position should be warped back to this->pos.
  */
-bool CursorVars::UpdateCursorPosition(int x, int y, bool queued_warp)
 bool CursorVars::UpdateCursorPosition(int x, int y)
+{
 	/* Detecting relative mouse movement is somewhat tricky.
 	 *  - There may be multiple mouse move events in the video driver queue (esp. when OpenTTD lags a bit).
 	 *  - When we request warping the mouse position (return true), a mouse move event is appended at the end of the queue.
+	 *
 	 * So, when this->fix_at is active, we use the following strategy:
 	 *  - The first movement triggers the warp to reset the mouse position.
 	 *  - Subsequent events have to compute movement relative to the previous event.
 	 *  - The relative movement is finished, when we receive the event matching the warp.
 	 */
 	if (x == this->pos.x && y == this->pos.y) {
 		/* Warp finished. */
 		this->queued_warp = false;
+	}
 	this->delta.x = x - this->pos.x;
 	this->delta.y = y - this->pos.y;
 	this->delta.x = x - (this->queued_warp ? this->last_position.x : this->pos.x);
 	this->delta.y = y - (this->queued_warp ? this->last_position.y : this->pos.y);
 	this->last_position.x = x;
 	this->last_position.y = y;
 	bool need_warp = false;
 	if (this->fix_at) {
 		if (this->delta.x != 0 || this->delta.y != 0) {
 			/* Trigger warp.
 			 * Note: We also trigger warping again, if there is already a pending warp.
 			 *       This makes it more tolerant about the OS or other software in between
 			 *       botchering the warp. */
 			this->queued_warp = queued_warp;
 			need_warp = true;
+		}
 		return this->delta.x != 0 || this->delta.y != 0;
 	} else if (this->pos.x != x || this->pos.y != y) {
 		this->queued_warp = false; // Cancel warping, we are no longer confining the position.
 		this->dirty = true;
 		this->pos.x = x;
 		this->pos.y = y;
+	}
 	return need_warp;
 	return false;
+}
 bool ChangeResInGame(int width, int height)

src/gfx_type.h

➞

Show inline comments

@@ @@ -144,11 +144,7 @@ struct CursorVars { @@
 	bool vehchain;                ///< vehicle chain is dragged
 	void UpdateCursorPositionRelative(int delta_x, int delta_y);
 	bool UpdateCursorPosition(int x, int y, bool queued_warp);
 private:
 	bool queued_warp;
 	Point last_position;
 	bool UpdateCursorPosition(int x, int y);
 };
 /** Data about how and where to blit pixels. */

src/video/allegro_v.cpp

➞

Show inline comments

@@ @@ -391,7 +391,7 @@ bool VideoDriver_Allegro::PollEvent() @@
+	}
 	/* Mouse movement */
-	if (_cursor.UpdateCursorPosition(mouse_x, mouse_y, false)) {
 	if (_cursor.UpdateCursorPosition(mouse_x, mouse_y)) {
 		position_mouse(_cursor.pos.x, _cursor.pos.y);
+	}
 	if (_cursor.delta.x != 0 || _cursor.delta.y) mouse_action = true;

src/video/cocoa/cocoa_wnd.mm

➞

Show inline comments

@@ @@ -658,7 +658,7 @@ void CocoaDialog(const char *title, cons @@
 		_cursor.UpdateCursorPositionRelative(event.deltaX * self.getContentsScale, event.deltaY * self.getContentsScale);
 	} else {
 		NSPoint pt = [ self mousePositionFromEvent:event ];
-		_cursor.UpdateCursorPosition(pt.x, pt.y, false);
 		_cursor.UpdateCursorPosition(pt.x, pt.y);
+	}
 	HandleMouseEvents();

src/video/sdl2_v.cpp

➞

Show inline comments

@@ @@ -384,7 +384,7 @@ bool VideoDriver_SDL_Base::PollEvent() @@
+				}
+			}
-			if (_cursor.UpdateCursorPosition(x, y, false)) {
 			if (_cursor.UpdateCursorPosition(x, y)) {
 				SDL_WarpMouseInWindow(this->sdl_window, _cursor.pos.x, _cursor.pos.y);
+			}
 			HandleMouseEvents();

src/video/sdl_v.cpp

➞

Show inline comments

@@ @@ -491,7 +491,7 @@ bool VideoDriver_SDL::PollEvent() @@
+				}
+			}
-			if (_cursor.UpdateCursorPosition(x, y, false)) {
 			if (_cursor.UpdateCursorPosition(x, y)) {
 				SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y);
+			}
 			HandleMouseEvents();

src/video/win32_v.cpp

➞

Show inline comments

@@ @@ -490,7 +490,7 @@ LRESULT CALLBACK WndProcGdi(HWND hwnd, U @@
+				}
+			}
-			if (_cursor.UpdateCursorPosition(x, y, false)) {
 			if (_cursor.UpdateCursorPosition(x, y)) {
 				POINT pt;
 				pt.x = _cursor.pos.x;
 				pt.y = _cursor.pos.y;

0 comments (0 inline, 0 general)