update default keys and doc for palette adjustments

docs/index.html

@@ -1336,6 +1336,52 @@
 
   </table>
 
+  <p><b>Palettes (can be remapped, only active in TIA mode)</b></p>
+
+  <table BORDER=2 cellpadding=4>
+    <tr>
+      <th>Function</th>
+      <th>Key (Standard)</th>
+      <th>Key (macOS)</th>
+    </tr>
+
+    <tr>
+      <td>Select previous palette (Standard/Z26/User/Custom)</td>
+      <td>Shift-Control + p</td>
+      <td>Shift-Control + p</td>
+    </tr>
+
+    <tr>
+      <td>Select next palette (Standard/Z26/User/Custom)</td>
+      <td>Control + p</td>
+      <td>Control + p</td>
+    </tr>
+
+    <tr>
+      <td>Select previous palette attribute</td>
+      <td>Shift-Alt + 9</td>
+      <td>Shift-Cmd + 9</td>
+    </tr>
+
+    <tr>
+      <td>Select next palette attribute</td>
+      <td>Alt + 9</td>
+      <td>Cmd + 9</td>
+    </tr>
+
+    <tr>
+      <td>Decrease selected palette attribute</td>
+      <td>Shift-Alt + 0</td>
+      <td>Shift-Cmd + 0</td>
+    </tr>
+
+    <tr>
+      <td>Increase selected palette attribute</td>
+      <td>Alt + 0</td>
+      <td>Cmd + 0</td>
+    </tr>
+  </table>
+
   <p><b>TV effects (can be remapped, only active in TIA mode)</b></p>
 
   <table BORDER=2 cellpadding=4>
@@ -1345,54 +1391,34 @@
       <th>Key (macOS)</th>
     </tr>
     <tr>
-      <td>Disable TV effects</td>
+      <td>Select previous TV effects preset</td>
+      <td>Shift-Alt + 1</td>
+      <td>Shift-Cmd + 1</td>
+    </tr>
+    <tr>
+      <td>Select next TV effects preset</td>
       <td>Alt + 1</td>
       <td>Cmd + 1</td>
     </tr>
     <tr>
-      <td>Select 'RGB' preset</td>
+      <td>Select previous 'Custom' mode attribute (*)</td>
+      <td>Shift-Alt + 2</td>
+      <td>Shift-Cmd + 2</td>
+    </tr>
+    <tr>
+      <td>Select next 'Custom' mode attribute (*)</td>
       <td>Alt + 2</td>
       <td>Cmd + 2</td>
     </tr>
-    <tr>
-      <td>Select 'S-Video' preset</td>
-      <td>Alt + 3</td>
-      <td>Cmd + 3</td>
-    </tr>
-    <tr>
-      <td>Select 'Composite' preset</td>
-      <td>Alt + 4</td>
-      <td>Cmd + 4</td>
-    </tr>
-    <tr>
-      <td>Select 'Badly adjusted' preset</td>
-      <td>Alt + 5</td>
-      <td>Cmd + 5</td>
-    </tr>
-    <tr>
-      <td>Select 'Custom' preset</td>
-      <td>Alt + 6</td>
-      <td>Cmd + 6</td>
-    </tr>
-    <tr>
-      <td>Select previous 'Custom' mode attribute (*)</td>
-      <td>Shift-Alt + 7</td>
-      <td>Shift-Cmd + 7</td>
-    </tr>
-    <tr>
-      <td>Select next 'Custom' mode attribute (*)</td>
-      <td>Alt + 7</td>
-      <td>Cmd + 7</td>
-    </tr>
     <tr>
       <td>Decrease 'Custom' selected attribute value (*)</td>
-      <td>Shift-Alt + 8</td>
-      <td>Shift-Cmd + 8</td>
+      <td>Shift-Alt + 3</td>
+      <td>Shift-Cmd + 3</td>
     </tr>
     <tr>
       <td>Increase 'Custom' selected attribute value (*)</td>
-      <td>Alt + 8</td>
-      <td>Cmd + 8</td>
+      <td>Alt + 3</td>
+      <td>Cmd + 3</td>
     </tr>
 
     <tr>
@@ -1403,25 +1429,25 @@
 
     <tr>
       <td>Decrease 'phosphor' blend</td>
-      <td>Shift-Alt + 9</td>
-      <td>Shift-Cmd + 9</td>
+      <td>Shift-Alt + 4</td>
+      <td>Shift-Cmd + 4</td>
     </tr>
 
     <tr>
       <td>Increase 'phosphor' blend</td>
-      <td>Alt + 9</td>
-      <td>Cmd + 9</td>
+      <td>Alt + 4</td>
+      <td>Cmd + 4</td>
     </tr>
 
     <tr>
       <td>Decrease scanline intensity</td>
-      <td>Shift-Alt + 0</td>
-      <td>Shift-Cmd + 0</td>
+      <td>Shift-Alt + 5</td>
+      <td>Shift-Cmd + 5</td>
     </tr>
     <tr>
       <td>Increase scanline intensity</td>
-      <td>Alt + 0</td>
-      <td>Cmd + 0</td>
+      <td>Alt + 5</td>
+      <td>Cmd + 5</td>
     </tr>
 
     <tr>
@@ -1614,24 +1640,6 @@
       <td>Control + f</td>
     </tr>
 
-    <tr>
-      <td>Switch palette (Standard/Z26/User/Custom)</td>
-      <td>Control + p</td>
-      <td>Control + p</td>
-    </tr>
-
-    <tr>
-      <td>Decrease 'Custom' palette's phase shift</td>
-      <td>Shift-Control + 9</td>
-      <td>Shift-Control + 9</td>
-    </tr>
-
-    <tr>
-      <td>Increase 'Custom' palette's phase shift</td>
-      <td>Control + 9</td>
-      <td>Control + 9</td>
-    </tr>
-
     <tr>
       <td>Toggle display interpolation</td>
       <td>Control + i</td>

src/common/PKeyboardHandler.cxx

@@ -481,15 +481,15 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
   {Event::NextAttribute,            KBDK_2, MOD3},
   {Event::DecreaseAttribute,        KBDK_3, KBDM_SHIFT | MOD3},
   {Event::IncreaseAttribute,        KBDK_3, MOD3},
-  {Event::PreviousPaletteAttribute, KBDK_4, KBDM_SHIFT | MOD3},
-  {Event::NextPaletteAttribute,     KBDK_4, MOD3},
-  {Event::PaletteAttributeDecrease, KBDK_5, KBDM_SHIFT | MOD3},
-  {Event::PaletteAttributeIncrease, KBDK_5, MOD3},
-  {Event::PhosphorDecrease,         KBDK_9, KBDM_SHIFT | MOD3},
-  {Event::PhosphorIncrease,         KBDK_9, MOD3},
+  {Event::PhosphorDecrease,         KBDK_4, KBDM_SHIFT | MOD3},
+  {Event::PhosphorIncrease,         KBDK_4, MOD3},
   {Event::TogglePhosphor,           KBDK_P, MOD3},
-  {Event::ScanlinesDecrease,        KBDK_0, KBDM_SHIFT | MOD3},
-  {Event::ScanlinesIncrease,        KBDK_0, MOD3},
+  {Event::ScanlinesDecrease,        KBDK_5, KBDM_SHIFT | MOD3},
+  {Event::ScanlinesIncrease,        KBDK_5, MOD3},
+  {Event::PreviousPaletteAttribute, KBDK_9, KBDM_SHIFT | MOD3},
+  {Event::NextPaletteAttribute,     KBDK_9, MOD3},
+  {Event::PaletteAttributeDecrease, KBDK_0, KBDM_SHIFT | MOD3},
+  {Event::PaletteAttributeIncrease, KBDK_0, MOD3},
   {Event::ToggleColorLoss,          KBDK_L, KBDM_CTRL},
   {Event::PaletteDecrease,          KBDK_P, KBDM_SHIFT | KBDM_CTRL},
   {Event::PaletteIncrease,          KBDK_P, KBDM_CTRL},