From 213663a09c260d72cd6bdbd71e3970b812c39461 Mon Sep 17 00:00:00 2001
From: Martin Fouilleul <martinfouilleul@gmail.com>
Date: Tue, 25 Jul 2023 17:02:38 +0200
Subject: [PATCH] [milepost update] use autoresizeMask to resize surfaces to
 the parent window's client area

---
 milepost   | 2 +-
 src/main.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/milepost b/milepost
index 3816e85..e7cce5e 160000
--- a/milepost
+++ b/milepost
@@ -1 +1 @@
-Subproject commit 3816e85592b5c68eeea4ed00001692f910a50c82
+Subproject commit e7cce5e36fd522a20666e73e945a6aeca1f4ed8b
diff --git a/src/main.c b/src/main.c
index 32de24e..f73dbaa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -558,13 +558,8 @@ void* orca_runloop(void* user)
 				{
 					if(exports[G_EXPORT_MOUSE_MOVE])
 					{
-<<<<<<< Updated upstream
-						const void* args[4] = {&event->move.x, &event->move.y, &event->move.deltaX, &event->move.deltaY};
-						m3_Call(exports[G_EXPORT_MOUSE_MOVE], 4, args);
-=======
 						const void* args[4] = {&event->mouse.x, &event->mouse.y, &event->mouse.deltaX, &event->mouse.deltaY};
-						m3_Call(eventHandlers[G_EVENT_MOUSE_MOVE], 4, args);
->>>>>>> Stashed changes
+						m3_Call(exports[G_EXPORT_MOUSE_MOVE], 4, args);
 					}
 				} break;