Fixed an issue with skipping joystick input.

Fixed the selected text color in the restart/shutdown menu.
Updated README.md.

README.md

@@ -21,7 +21,7 @@ sudo apt-get install libsdl1.2-dev libboost-filesystem-dev libfreeimage-dev libf
 There are also a few libraries already on the RPi (located in /opt/vc/, like the Broadcom libraries, EGL, and GLES). You can build EmulationStation by simply running `make`.
 
 
-**On something else:**
+**On something else (desktop):**
 
 EmulationStation can also be built on a "normal" Linux system. You'll need the same libraries listed above:
 ```
@@ -36,15 +36,40 @@ Configuring
 **~/.emulationstation/es_systems.cfg:**
 When first run, an example systems configuration file will be created at $HOME/.emulationstation/es_systems.cfg. This example has some comments explaining how to write the configuration file, and an example RetroArch launch command. Keep in mind you can define more than one system! Just use all the variables again. Also, you can use multiple extensions - just separate them with a space, e.g.: ".nes .NES .bin".
 
-If an SDL Joystick is detected at startup, and $HOME/.emulationstation/es_input.cfg is nonexistant, an Input Configuration screen will appear instead of the game list. This should be pretty self-explanatory. If you want to reconfigure, just delete $HOME/.emulationstation/es_input.cfg.
+If an SDL Joystick is detected at startup, and $HOME/.emulationstation/es_input.cfg doesn't exist, an Input Configuration screen will appear instead of the game list.
+This should be pretty self-explanatory. If you want to reconfigure, just delete $HOME/.emulationstation/es_input.cfg.
 
-Mappings will always be applied to the SDL joystick at index 0. An Xbox 360 controller with the xboxdrv driver was tested. POV hats are automatically mapped to directions (so if you're not using an analog stick, you'll need to skip mapping Up/Down/Left/Right by pressing a keyboard key).
+Mappings will be applied to the first joystick with the same name as the joystick you configured.
+An Xbox 360 controller with the xboxdrv driver was used for testing. POV hats are automatically mapped to directions (so if you're not using an analog stick, you'll need to skip mapping Up/Down/Left/Right by pressing a keyboard key).
 
-Keep in mind you'll have to set up your emulator separately from EmulationStation. If you're using RetroArch, a handy input config generation tool can be found in the tools/ subdirectory - you can use it with `retroarch-joyconfig -o ~/.retroarch.cfg` or something similar. You may need to tell RetroArch to load this config file with `-c ~/.retroarch.cfg` in your RetroArch launch commands.
+**Keep in mind you'll have to set up your emulator separately from EmulationStation.**
+If you're using RetroArch, a handy input config generation tool can be found in the tools/ subdirectory - you can use it with `retroarch-joyconfig -o ~/.retroarch.cfg` or something similar. You may need to tell RetroArch to load this config file with `-c ~/.retroarch.cfg` in your RetroArch launch commands.
 
-EmulationStation will return once your system's command terminates (i.e. your emulator closes). To close EmulationStation itself, you can press the F4 key on the keyboard. You can also press F1 to open a menu allowing you to shutdown or restart the system.
+EmulationStation will return once your system's command terminates (i.e. your emulator closes).
 
 
+**Keyboard mappings:**
+
+Up - Scroll up
+
+Down - Scroll down
+
+Left - Last system (if it exists)
+
+Right - Next system (if it exists)
+
+Enter - Select
+
+Escape - Back out of a folder
+
+F1 - Open the restart/shutdown system menu
+
+F2 - Open the fast select dialog
+
+F4 - Close EmulationStation (should work as long as ES hasn't frozen)
+
+Unfortunately, there is no built-in way to change keyboard mappings - if you need to, check out `src/InputManager.cpp`. There's a switch statement with a list of keys; it should be pretty simple to change them.
+
 gamelist.xml
 ============
 
@@ -65,14 +90,16 @@ An example gamelist.xml:
 The path element should be the absolute path of the ROM. Special characters SHOULD NOT be escaped. The image element is the absolute path to an image to display above the description (like a screenshot or boxart). Most formats can be used (including png, jpg, gif, etc.). Not all elements need to be used.
 
 The switch `--gamelist-only` can be used to skip automatic searching, and only display games defined in the system's gamelist.xml.
+The switch `--ignore-gamelist` can be used to ignore the gamelist and use the non-detailed view.
 
-**Making a gamelist.xml by hand sucks, so a cool guy named Pendor made a python script which automatically generates a gamelist.xml for you, with boxart automatically downloaded. I highly recommend it. It can be found here:** https://github.com/elpendor/ES-scraper
+**Making a gamelist.xml by hand sucks, so a cool guy named Pendor made a python script which automatically generates a gamelist.xml for you, with boxart automatically downloaded. It can be found here:** https://github.com/elpendor/ES-scraper
 
 Themes
 ======
 
 By default, EmulationStation looks pretty ugly. You can fix that. If you want to know more, read THEMES.md!
 
+There is no special place to download themes right now, but you might be able to find some old ones in the GitHub "Theme Support" issue. The RetroPie setup script also automatically installs a few.
 
 -Aloshi
 http://www.aloshi.com

changelog.txt

@@ -1,5 +1,6 @@
 October 25
 -Added gameImageNotFound tag for an image to display if a game image is not found/defined.
+-Fixed keyboard not skipping joystick input configuration.
 
 October 17
 -Added GuiAnimation class which animates its children.

src/components/GuiInputConfig.cpp

@@ -46,7 +46,7 @@ void GuiInputConfig::onRender()
 	Renderer::drawCenteredText("It looks like you have a joystick plugged in!", 0, 2, 0x000000FF, font);
 	Renderer::drawCenteredText("POV hats (some D-Pads) are automatically mapped to directions.", 0, height, 0x000000FF, font);
 	Renderer::drawCenteredText("You can press a keyboard key to skip any input.", 0, height * 2, 0x000000FF, font);
-	Renderer::drawCenteredText("If you want to remap later, just delete ~/.es_input.cfg.", 0, height * 3, 0x000000FF, font);
+	Renderer::drawCenteredText("If you want to remap later, delete ~/.emulationstation/es_input.cfg.", 0, height * 3, 0x000000FF, font);
 	Renderer::drawCenteredText("This interface only configures the first joystick plugged in.", 0, height * 4, 0x000000FF, font);
 	Renderer::drawCenteredText("Remember - you'll need to set up your emulator separately!", 0, Renderer::getScreenHeight() - height, 0x000000FF, font);
 
@@ -75,6 +75,12 @@ void GuiInputConfig::onInput(InputManager::InputButton button, bool keyDown)
 	}
 
 	SDL_Event* event = InputManager::lastEvent;
+	if(event->type == SDL_KEYUP)
+	{
+		//keyboard key pressed; skip and continue
+		mInputNum++;
+	}
+
 	if(event->type == SDL_JOYBUTTONDOWN)
 	{
 		mButtonMap[event->jbutton.button] = (InputManager::InputButton)mInputNum;

src/components/GuiMenu.cpp

@@ -7,6 +7,7 @@ GuiMenu::GuiMenu(GuiComponent* parent)
 	parent->pause();
 
 	mList = new GuiList<std::string>(0, Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::LARGE);
+	mList->setSelectedTextColor(0x0000FFFF);
 	populateList();
 	addChild(mList);
 
@@ -14,7 +15,6 @@ GuiMenu::GuiMenu(GuiComponent* parent)
 
 	Renderer::registerComponent(this);
 	InputManager::registerComponent(this);
-
 }
 
 GuiMenu::~GuiMenu()