From 70fed68de45a3a7bea3de3e1b8768b5d0d04338b Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Wed, 3 Mar 2010 09:28:23 +0000
Subject: [PATCH] SDL: changed default keybindings to match w32 defaults

---
 TODO-SDL                   |  7 ++++---
 changelog.txt              |  1 +
 src/drivers/sdl/config.cpp | 10 +++++-----
 src/drivers/sdl/input.cpp  |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/TODO-SDL b/TODO-SDL
index dce6fd8f..0da589fa 100644
--- a/TODO-SDL
+++ b/TODO-SDL
@@ -3,15 +3,15 @@ TODO-SVN:
 * DONE! Get to compile with SDL 1.3
 	* segfaults when opening a second game
 	* segfaults on fullscreen entry
-* Fix sound stuttering/lag (fixed in SDL 1.1.14?) 
+* DONE! Fix sound stuttering/lag (fixed in SDL 1.1.14)
 * Flesh out GTK GUI
 	* Sound config
 		* DONE! Individual volume mixers
 	* Save config
 		* Should be in menus
 	* Hotkeys
-		* Redesign internal data structures of hotkeys 
-		* (a bunch of global ints is ugly)
+		* DONE! Redesign internal data structures of hotkeys 
+		* design UI
 	* Video config
 		* DONE! Windowed scale amount
 		* DONE! Color / Hue / Tint
@@ -30,3 +30,4 @@ TODO-SVN:
 * DONE! Fix Famicom Disk System
 * DONE!(PAUSE) Add a key to resume normal playback when finished frameskipping
 * DONE! Make GetUserInput not depend on zenity
+* DONE! Fixed dpad/hat support
diff --git a/changelog.txt b/changelog.txt
index 320f408f..617244bc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+03-march-2010 - prcokguy - SDL - changed default hotkeys and keys to match w32
 03-march-2010 - prockguy - SDL - fixed dpad/joyhat support
 01-march-2010 - adelikat - Movie file format header now has a FDS flag
 01-march-2010 - adelikat - win32 - cheats dialog - toggling a cheat in the cheats list now updates the active cheats count
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index b9aeeb93..b791f967 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -302,7 +302,7 @@ InitConfig()
 		SDLK_F6, // fds select
 		SDLK_F7, // load state
 		SDLK_F8, // fds eject
-		SDLK_F9, // toggle frame display
+		SDLK_PERIOD, // toggle frame display
 		SDLK_F10, // toggle subtitle
 		SDLK_F11, // reset
 		SDLK_F12, // screenshot
@@ -311,12 +311,12 @@ InitConfig()
 		SDLK_EQUALS, // speed--
 		SDLK_BACKSLASH, //frame advnace
 		SDLK_TAB, // turbo
-		SDLK_i, // toggle input display
-		SDLK_o, // toggle movie RW
-		SDLK_p, // toggle mute capture
+		SDLK_COMMA, // toggle input display
+		SDLK_q, // toggle movie RW
+		SDLK_QUOTE, // toggle mute capture
 		0, // quit
 		SDLK_DELETE, // frame advance lag skip
-		SDLK_ESCAPE, // lag counter display
+		SDLK_SLASH, // lag counter display
 		SDLK_0, SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5,
 		SDLK_6, SDLK_7, SDLK_8, SDLK_9}; 
 	
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index c5bcbe68..aafcf924 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -1754,8 +1754,8 @@ const char *GamePadNames[GAMEPAD_NUM_BUTTONS] =
 const char *DefaultGamePadDevice[GAMEPAD_NUM_DEVICES] =
     {"Keyboard", "None", "None", "None"};
 const int DefaultGamePad[GAMEPAD_NUM_DEVICES][GAMEPAD_NUM_BUTTONS] =
-    { { SDLK_j, SDLK_k, SDLK_TAB, SDLK_RETURN,
-        SDLK_w, SDLK_s, SDLK_a, SDLK_d, 0, 0 },
+    { { SDLK_F, SDLK_D, SDLK_S, SDLK_RETURN,
+        SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };