Merge pull request #9871 from OatmealDome/leftrightclick

Core: Use proper names for left, right, and middle click on Quartz ciface
dolphin-emu · Jul 7, 2021 · 4b5dabf · 4b5dabf
2 parents 925379c + f6fabec
commit 4b5dabf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/Source/Core/Core/FreeLookManager.cpp b/Source/Core/Core/FreeLookManager.cpp
@@ -142,28 +142,48 @@ void FreeLookController::LoadDefaults(const ControllerInterface& ciface)
   m_fov_buttons->SetControlExpression(FieldOfViewButtons::DecreaseY,
                                       hotkey_string({"Shift", "`Axis Z-`"}));
 
+  // Left Click
 #if defined HAVE_X11 && HAVE_X11
   m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp,
                                         "if(`Click 3`,`RelativeMouse Y-` * 0.10, 0)");
   m_rotation_gyro->SetControlExpression(GyroButtons::PitchDown,
                                         "if(`Click 3`,`RelativeMouse Y+` * 0.10, 0)");
+#elif __APPLE__
+  m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp,
+                                        "if(`Left Click`,`RelativeMouse Y-` * 0.10, 0)");
+  m_rotation_gyro->SetControlExpression(GyroButtons::PitchDown,
+                                        "if(`Left Click`,`RelativeMouse Y+` * 0.10, 0)");
 #else
   m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp,
                                         "if(`Click 1`,`RelativeMouse Y-` * 0.10, 0)");
   m_rotation_gyro->SetControlExpression(GyroButtons::PitchDown,
                                         "if(`Click 1`,`RelativeMouse Y+` * 0.10, 0)");
 #endif
 
+  // Middle Click
+#ifdef __APPLE__
+  m_rotation_gyro->SetControlExpression(GyroButtons::RollLeft,
+                                        "if(`Middle Click`,`RelativeMouse X-` * 0.10, 0)");
+  m_rotation_gyro->SetControlExpression(GyroButtons::RollRight,
+                                        "if(`Middle Click`,`RelativeMouse X+` * 0.10, 0)");
+#else
   m_rotation_gyro->SetControlExpression(GyroButtons::RollLeft,
                                         "if(`Click 2`,`RelativeMouse X-` * 0.10, 0)");
   m_rotation_gyro->SetControlExpression(GyroButtons::RollRight,
                                         "if(`Click 2`,`RelativeMouse X+` * 0.10, 0)");
+#endif
 
+  // Right Click
 #if defined HAVE_X11 && HAVE_X11
   m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft,
                                         "if(`Click 3`,`RelativeMouse X-` * 0.10, 0)");
   m_rotation_gyro->SetControlExpression(GyroButtons::YawRight,
                                         "if(`Click 3`,`RelativeMouse X+` * 0.10, 0)");
+#elif __APPLE__
+  m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft,
+                                        "if(`Right Click`,`RelativeMouse X-` * 0.10, 0)");
+  m_rotation_gyro->SetControlExpression(GyroButtons::YawRight,
+                                        "if(`Right Click`,`RelativeMouse X+` * 0.10, 0)");
 #else
   m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft,
                                         "if(`Click 1`,`RelativeMouse X-` * 0.10, 0)");

diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -613,6 +613,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
   m_buttons->SetControlExpression(0, "`Click 1`");
   // B
   m_buttons->SetControlExpression(1, "`Click 3`");
+#elif __APPLE__
+  // A
+  m_buttons->SetControlExpression(0, "`Left Click`");
+  // B
+  m_buttons->SetControlExpression(1, "`Right Click`");
 #else
   // A
   m_buttons->SetControlExpression(0, "`Click 0`");
@@ -633,7 +638,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 
   // Shake
   for (int i = 0; i < 3; ++i)
+#ifdef __APPLE__
+    m_shake->SetControlExpression(i, "`Middle Click`");
+#else
     m_shake->SetControlExpression(i, "`Click 2`");
+#endif
 
   // Pointing (IR)
   m_ir->SetControlExpression(0, "`Cursor Y-`");