diff io.c @ 1398:08116cb5ffaa

Fix absolute mouse mode when non-default overscan settings are used
author Michael Pavone <pavone@retrodev.com>
date Wed, 14 Jun 2017 20:46:11 -0700
parents aca496957999
children 6a0e3bb6981f
line wrap: on
line diff
--- a/io.c	Wed Jun 14 09:48:46 2017 -0700
+++ b/io.c	Wed Jun 14 20:46:11 2017 -0700
@@ -614,11 +614,14 @@
 	case MOUSE_NONE:
 		break;
 	case MOUSE_ABSOLUTE: {
-		float scale_x = 640.0 / ((float)render_width());
-		float scale_y = 480.0 / ((float)render_height());
-		float scale = scale_x > scale_y ? scale_y : scale_x;
-		mice[mouse].motion_port->device.mouse.cur_x = x * scale_x;
-		mice[mouse].motion_port->device.mouse.cur_y = y * scale_y;
+		float scale_x = (render_emulated_width() * 2.0f) / ((float)render_width());
+		float scale_y = (render_emulated_height() * 2.0f) / ((float)render_height());
+		int32_t adj_x = x * scale_x + 2 * render_overscan_left() - 2 * BORDER_LEFT;
+		int32_t adj_y = y * scale_y + 2 * render_overscan_top() - 4;
+		if (adj_x >= 0 && adj_y >= 0) {
+			mice[mouse].motion_port->device.mouse.cur_x = adj_x;
+			mice[mouse].motion_port->device.mouse.cur_y = adj_y;
+		}
 		break;
 	}
 	case MOUSE_RELATIVE: {