rename paddle events

update input mapping doc
remove abbreviation from InputDialog tab

Changes.txt

@@ -30,7 +30,7 @@
 
   * Added configurable paddle dejittering.
 
-  * Huge improvements to event remapping. (TODO: doc)
+  * Huge improvements to event remapping. 
     - Allow mapping of modifier-key and button-direction combinations.
     - One controller can use the same mappings as other controllers  
     - Much more events can be remapped

docs/index.html

@@ -1021,13 +1021,13 @@
           </tr>
 
           <tr>
-            <td>Paddle 0 decrease</td>
+            <td>Paddle 0 Turn Left</td>
-            <td>Right arrow</td>
+            <td>Left arrow</td>
           </tr>
 
           <tr>
-            <td>Paddle 0 increase</td>
+            <td>Paddle 0 Turn Right</td>
-            <td>Left arrow</td>
+            <td>Right arrow</td>
           </tr>
 
           <tr>
@@ -1036,13 +1036,13 @@
           </tr>
 
           <tr>
-            <td>Paddle 1 decrease</td>
+            <td>Paddle 1 Turn Left</td>
-            <td>Down arrow</td>
+            <td>Up arrow</td>
           </tr>
 
           <tr>
-            <td>Paddle 1 increase</td>
+            <td>Paddle 1 Turn Right</td>
-            <td>Up arrow</td>
+            <td>Down arrow</td>
           </tr>
 
           <tr>
@@ -1060,13 +1060,13 @@
           </tr>
 
           <tr>
-            <td>Paddle 2 decrease</td>
+            <td>Paddle 2 Turn Left</td>
-            <td>J</td>
+            <td>G</td>
           </tr>
 
           <tr>
-            <td>Paddle 2 increase</td>
+            <td>Paddle 2 Turn Right</td>
-            <td>G</td>
+            <td>J</td>
           </tr>
 
           <tr>
@@ -1075,13 +1075,13 @@
           </tr>
 
           <tr>
-            <td>Paddle 3 decrease</td>
+            <td>Paddle 3 Turn Left</td>
-            <td>H</td>
+            <td>Y</td>
           </tr>
 
           <tr>
-            <td>Paddle 3 increase</td>
+            <td>Paddle 3 Turn Right</td>
-            <td>Y</td>
+            <td>H</td>
           </tr>
 
           <tr>
@@ -2934,18 +2934,21 @@
   <p>To remap an event:
   <ol>
     <li>Enter <b>Options Menu</b> and click the <b>Input Settings</b> button.</li>
-    <li>If you wish to remap emulation events, click the 'Emul. Events' tab.
+    <li>If you wish to remap emulation events, click the 'Emulation Events' tab.
       Otherwise, click the 'UI Events' tab for user interface events.</li>
-    <li>Select event you want to remap and click the 'Map' button.</li>
+    <li>Select event you want to remap and double-click or click the 'Map' button.</li>
-    <li>Press a key, a modifier key (Control, Shift...), a modifier+key combination or
+    <li>Now define the input:
-    use a controller direction or button. Then that key (combination) or controller
+    <ul>
-    action will be bound to the selected event. </br>
+      <li>Either press a key, a modifier key (Control, Shift...) or a modifier+key combination.</li>
+      <li>Or use a controller direction, a button or a button+controller direction combination.</li>
+    </ul>Then that key (combination) or controller action will be bound to the selected event.</br>
     Notes:<ul>
       <li>If nothing seems to happen, either Stella can't see the input device, or the
       selected event doesn't support being remapped to the input device.</li>
+      <li>The same input can be used for multiple controller types (e.g. 'Right' for 'P0 Joystick Right' and 'Paddle 0 Turn Right').</li>
+      <li>If the same input is used again for the same controller type, the old mapping will be removed.</li>
       <li>Events which are available in both event modes can be remapped individually.</li>
-      <li>Left and right modifiers are mapped separately. To map them as one, press both
+      <li>Left and right modifiers are mapped separately when used alone.</li>
-      modifier keys during mapping.</li>
     </ul></li>
     <li>Cancel a remap in progress by clicking 'Cancel', erase the event's mappings by
       clicking 'Erase', or reset to default mapping by clicking 'Reset'</li>
@@ -2956,7 +2959,7 @@
   <img src="graphics/eventmapping.png">
   <img src="graphics/eventmapping_remap.png">
 
-  <p>There is also a 'Combo' button in the 'Emul. Events' tab, accessible
+  <p>There is also a 'Combo' button in the 'Emulation Events' tab, accessible
   when a Combo event has been selected from the list of events on the left.
   Clicking 'Combo' will show a dialog similar to the following:</p>
   <img src="graphics/eventmapping_combo.png">

src/emucore/EventHandler.cxx

@@ -1625,23 +1625,23 @@ EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] =
   { Event::JoystickOneFire9,        "P1 Booster Handle Grip Trigger",        "" },
 
   { Event::PaddleZeroAnalog,        "Paddle 0 Analog",                       "" },
-  { Event::PaddleZeroDecrease,      "Paddle 0 Decrease",                     "" },
+  { Event::PaddleZeroIncrease,      "Paddle 0 Turn Left",                    "" },
-  { Event::PaddleZeroIncrease,      "Paddle 0 Increase",                     "" },
+  { Event::PaddleZeroDecrease,      "Paddle 0 Turn Right",                   "" },
   { Event::PaddleZeroFire,          "Paddle 0 Fire",                         "" },
 
   { Event::PaddleOneAnalog,         "Paddle 1 Analog",                       "" },
-  { Event::PaddleOneDecrease,       "Paddle 1 Decrease",                     "" },
+  { Event::PaddleOneIncrease,       "Paddle 1 Turn Left",                    "" },
-  { Event::PaddleOneIncrease,       "Paddle 1 Increase",                     "" },
+  { Event::PaddleOneDecrease,       "Paddle 1 Turn Right",                   "" },
   { Event::PaddleOneFire,           "Paddle 1 Fire",                         "" },
 
   { Event::PaddleTwoAnalog,         "Paddle 2 Analog",                       "" },
-  { Event::PaddleTwoDecrease,       "Paddle 2 Decrease",                     "" },
+  { Event::PaddleTwoIncrease,       "Paddle 2 Turn Left",                    "" },
-  { Event::PaddleTwoIncrease,       "Paddle 2 Increase",                     "" },
+  { Event::PaddleTwoDecrease,       "Paddle 2 Turn Right",                   "" },
   { Event::PaddleTwoFire,           "Paddle 2 Fire",                         "" },
 
   { Event::PaddleThreeAnalog,       "Paddle 3 Analog",                       "" },
-  { Event::PaddleThreeDecrease,     "Paddle 3 Decrease",                     "" },
+  { Event::PaddleThreeIncrease,     "Paddle 3 Turn Left",                    "" },
-  { Event::PaddleThreeIncrease,     "Paddle 3 Increase",                     "" },
+  { Event::PaddleThreeDecrease,     "Paddle 3 Turn Right",                   "" },
   { Event::PaddleThreeFire,         "Paddle 3 Fire",                         "" },
 
   { Event::KeyboardZero1,           "P0 Keyboard 1",                         "" },

src/gui/InputDialog.cxx

@@ -59,7 +59,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
   addTabWidget(myTab);
 
   // 1) Event mapper for emulation actions
-  tabID = myTab->addTab("Emul. Events");
+  tabID = myTab->addTab(" Emulation Events ", TabWidget::AUTO_WIDTH);
   actions = instance().eventHandler().getActionList(kEmulationMode);
   myEmulEventMapper = new EventMappingWidget(myTab, font, 2, 2,
                                              myTab->getWidth(),
@@ -69,7 +69,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
   addToFocusList(myEmulEventMapper->getFocusList(), myTab, tabID);
 
   // 2) Event mapper for UI actions
-  tabID = myTab->addTab("UI Events");
+  tabID = myTab->addTab("  UI Events  ", TabWidget::AUTO_WIDTH);
   actions = instance().eventHandler().getActionList(kMenuMode);
   myMenuEventMapper = new EventMappingWidget(myTab, font, 2, 2,
                                              myTab->getWidth(),
@@ -110,7 +110,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
   const int HBORDER = 8;
 
   // Devices/ports
-  tabID = myTab->addTab("Devices & Ports");
+  tabID = myTab->addTab(" Devices & Ports ", TabWidget::AUTO_WIDTH);
 
   ypos = VBORDER;
   lwidth = font.getStringWidth("Digital paddle sensitivity "); // was: "Use mouse as a controller "