From f284b91f28ef2bf530930e4e34cb465cb8209df5 Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Mon, 25 May 2020 09:19:51 +0200
Subject: [PATCH] disable scanlines by default add default pause key for macOS

---
 docs/index.html                 | 2 +-
 src/common/PKeyboardHandler.cxx | 4 ++++
 src/emucore/Settings.cxx        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 98bf31b72..cb5855c2b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -775,7 +775,7 @@
     <tr>
       <td>Pause/resume emulation</td>
       <td>Pause</td>
-      <td>&nbsp;</td>
+      <td>Shift-Cmd + p</td>
     </tr>
 
   </table>
diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 81b25cd6e..5f97b90a1 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -443,7 +443,11 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
   {Event::LoadState,                KBDK_F11},
   {Event::LoadAllStates,            KBDK_F11, MOD3},
   {Event::TakeSnapshot,             KBDK_F12},
+#ifdef BSPF_MACOS
+  {Event::TogglePauseMode,          KBDK_P, KBDM_SHIFT | MOD3},
+#else
   {Event::TogglePauseMode,          KBDK_PAUSE},
+#endif
   {Event::OptionsMenuMode,          KBDK_TAB},
   {Event::CmdMenuMode,              KBDK_BACKSLASH},
   {Event::TimeMachineMode,          KBDK_T, KBDM_SHIFT},
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 790c784bb..e6d81abdd 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -69,7 +69,7 @@ Settings::Settings()
   setPermanent("tv.filter", "0");
   setPermanent("tv.phosphor", "byrom");
   setPermanent("tv.phosblend", "50");
-  setPermanent("tv.scanlines", "25");
+  setPermanent("tv.scanlines", "0");
   // TV options when using 'custom' mode
   setPermanent("tv.sharpness", "0.0");
   setPermanent("tv.resolution", "0.0");