Merge branch 'input_enhancements'

This PR adds extended input configuration support (analog, triggers, X, Y).
It can be enabled by the `EXTENDED_INPUT_CFG` CMake configuration flag.

Based partially on the patch by Florian.

Author: mmatyas

CMakeLists.txt

@@ -65,6 +65,11 @@ if(XDG_ON_OSX)
     add_definitions(-DUSE_XDG_OSX)
 endif()
 
+option(EXTENDED_INPUT_CFG "Extended input config (analog, triggers, XY)" OFF)
+if(EXTENDED_INPUT_CFG)
+    add_definitions(-DEXTENDED_INPUT_CFG)
+endif()
+
 #-------------------------------------------------------------------------------
 
 # Require C++11

README.md

@@ -98,7 +98,7 @@ When you first start EmulationStation, you will be prompted to configure an inpu
 
 1. Hold a button on the device you want to configure.  This includes the keyboard.
 
-2. Press the buttons as they appear in the list.  Some inputs can be skipped by holding any button down for a few seconds (e.g. page up/page down).
+2. Press the buttons as they appear in the list.  Some inputs can be skipped by holding any button down for a few seconds (e.g. left/right shoulders).
 
 3. You can review your mappings by pressing up and down, making any changes by pressing A.
 

data/resources/help/analog_down.svg

@@ -242,20 +242,20 @@ bool TextListComponent<T>::input(InputConfig* config, Input input)
 				listInput(-1);
 				return true;
 			}
-			if(config->isMappedTo("pagedown", input))
+			if(config->isMappedTo("rightshoulder", input))
 			{
 				listInput(10);
 				return true;
 			}
 
-			if(config->isMappedTo("pageup", input))
+			if(config->isMappedTo("leftshoulder", input))
 			{
 				listInput(-10);
 				return true;
 			}
 		}else{
 			if(config->isMappedTo("down", input) || config->isMappedTo("up", input) ||
-				config->isMappedTo("pagedown", input) || config->isMappedTo("pageup", input))
+				config->isMappedTo("rightshoulder", input) || config->isMappedTo("leftshoulder", input))
 			{
 				stopScrolling();
 			}

data/resources/help/analog_left.svg

@@ -121,6 +121,11 @@ set(EMBEDDED_ASSET_SOURCES
     ${emulationstation-all_SOURCE_DIR}/data/converted/frame_png.cpp
     ${emulationstation-all_SOURCE_DIR}/data/converted/scroll_gradient_png.cpp
 
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_left_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_right_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_up_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_down_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_thumb_svg.cpp
     ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_a_svg.cpp
     ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_b_svg.cpp
     ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_x_svg.cpp

data/resources/help/analog_right.svg

@@ -287,8 +287,8 @@ void InputManager::loadDefaultKBConfig()
 	cfg->mapInput("start", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F1, 1, true));
 	cfg->mapInput("select", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true));
 
-	cfg->mapInput("pageup", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_RIGHTBRACKET, 1, true));
-	cfg->mapInput("pagedown", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_LEFTBRACKET, 1, true));
+	cfg->mapInput("leftshoulder", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_RIGHTBRACKET, 1, true));
+	cfg->mapInput("rightshoulder", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_LEFTBRACKET, 1, true));
 }
 
 void InputManager::writeDeviceConfig(InputConfig* config)