From 7178392eb166eeeaf856fedfaa2d306cefa261d4 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Tue, 11 Feb 2025 17:05:27 +0100
Subject: [PATCH] [client,x11] reconfigure mouse mapping on MappingPointer

---
 client/X11/xf_client.c   | 2 +-
 client/X11/xf_event.c    | 1 +
 client/X11/xf_keyboard.h | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c
index d7b07ec77..7bbbe558b 100644
--- a/client/X11/xf_client.c
+++ b/client/X11/xf_client.c
@@ -1076,7 +1076,7 @@ static UINT16 get_flags_for_button(size_t button)
 	return 0;
 }
 
-static void xf_button_map_init(xfContext* xfc)
+void xf_button_map_init(xfContext* xfc)
 {
 	size_t pos = 0;
 	/* loop counter for array initialization */
diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index 58acdab8c..fdd927ff9 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -734,6 +734,7 @@ static BOOL xf_event_MappingNotify(xfContext* xfc, const XMappingEvent* event, B
 			return xf_keyboard_init(xfc);
 		case MappingPointer:
 			WLog_VRB(TAG, "[%d] MappingPointer", event->request);
+			xf_button_map_init(xfc);
 			return TRUE;
 		default:
 			WLog_WARN(TAG,
diff --git a/client/X11/xf_keyboard.h b/client/X11/xf_keyboard.h
index 687bfa229..a1954b554 100644
--- a/client/X11/xf_keyboard.h
+++ b/client/X11/xf_keyboard.h
@@ -42,4 +42,6 @@ BOOL xf_keyboard_set_ime_status(rdpContext* context, UINT16 imeId, UINT32 imeSta
 
 BOOL xf_ungrab(xfContext* xfc);
 
+void xf_button_map_init(xfContext* xfc);
+
 #endif /* FREERDP_CLIENT_X11_XF_KEYBOARD_H */