macOS: Do not simulate right/middle mouse buttons in full keyboard em…

…ulation
FrodeSolheim · Nov 26, 2021 · 74bea84 · 74bea84
1 parent 309a3df
commit 74bea84
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,7 @@
 Version 3.1.x:
 
+* macOS: Do not simulate right/middle mouse buttons in full keyboard emulation.
+* Potential fix for crash if warning is issued from device helper.
 * Fix mouse grab on startup on macOS.
 * Support controller_[event] input mapping for matching all controllers.
 * Prefer $HOME/FS-UAE if it exists, otherwise use $DOCUMENTS/FS-UAE.

diff --git a/libfsemu/src/ml/sdl.c b/libfsemu/src/ml/sdl.c
@@ -1104,13 +1104,15 @@ int fs_ml_event_loop(void)
             new_event->button.device = g_fs_ml_first_mouse_index;
             new_event->button.button = event.button.button;
 #ifdef MACOSX
-            if (new_event->button.button == 1) {
-                int mod = SDL_GetModState();
-                if (mod & KMOD_ALT) {
-                    new_event->button.button = 2;
-                }
-                else if (mod & KMOD_CTRL) {
-                    new_event->button.button = 3;
+            if (fs_emu_full_keyboard_emulation() == false) {
+                if (new_event->button.button == 1) {
+                    int mod = SDL_GetModState();
+                    if (mod & KMOD_ALT) {
+                        new_event->button.button = 2;
+                    }
+                    else if (mod & KMOD_CTRL) {
+                        new_event->button.button = 3;
+                    }
                 }
             }
 #endif