From 5596351d8b42572b8c880bd1b89be77c9b4ff914 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Sun, 21 Apr 2013 01:42:26 +0000
Subject: [PATCH] Cocoa Port: - Fix bug where the default input profile was not
 being applied when user defaults contained no input mappings. - Rename
 keyboard key name "-" to "- (Dash)".

---
 desmume/src/cocoa/DefaultKeyMappings.plist    |   4 ++--
 desmume/src/cocoa/DefaultUserPrefs.plist      | Bin 5399 -> 5406 bytes
 desmume/src/cocoa/KeyNames.plist              |   2 +-
 .../src/cocoa/userinterface/InputManager.mm   |   2 --
 .../src/cocoa/userinterface/appDelegate.mm    |  12 ++++++++++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/desmume/src/cocoa/DefaultKeyMappings.plist b/desmume/src/cocoa/DefaultKeyMappings.plist
index a9f3dbe11..34a6b6a13 100644
--- a/desmume/src/cocoa/DefaultKeyMappings.plist
+++ b/desmume/src/cocoa/DefaultKeyMappings.plist
@@ -371,7 +371,7 @@
 				<array>
 					<dict>
 						<key>deviceInfoSummary</key>
-						<string>Keyboard: -</string>
+						<string>Keyboard: - (Dash)</string>
 						<key>deviceCode</key>
 						<string>NSEventKeyboard</string>
 						<key>deviceName</key>
@@ -379,7 +379,7 @@
 						<key>elementCode</key>
 						<string>27</string>
 						<key>elementName</key>
-						<string>-</string>
+						<string>- (Dash)</string>
 						<key>inputSettingsSummary</key>
 						<string>0.50x Speed</string>
 						<key>floatValue0</key>
diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist
index f6cdacf6ac75a592957a594a044499a03ae3f13a..dab675cb193b040a50d9b4547d61b0a085fd081a 100644
GIT binary patch
delta 284
zcmXBFO(=tL90%}iW^C;D{eAznC(6Offn_HLmXn&B!%Au5f&&gXP-<j3xSH(Xu-ZxD
zHpzvRl>_Hlxr&mPl!LZ;+oR@l`Rs+Vp<LPTjfXqCqf^UsJttMa<w@GoAOUHUuta27
zVlpYSGB0bgA)B%*SvitZDM(RDaw|{rAvRiIA&5ToV*rB~K^!w!LIUg9#tzchM-Jz>
zLJ=iA;u$Y^Lrr}e(4h9}kdEq@j_aZ(bW2l7&FFz1>Y3*CLJNASCB4&Et<Xg`Ew;0R
zVMZ8bj1!#Z3Rjt6iWwd=&uiZBo)3IynH5&~$uEBMhrg`RHV)%7ZqsNyrpYuLucOZ8
P`ro-wKiwMeIlKM<V6aXC

delta 256
zcmV~$O(=r_90qV3xxN4AdERhX$;l3jVmT>p4lAXJ69>7FQtBn;z|q9bYA3{vgVe07
z95~NguA<~4<skF5y*{@2{kCJ7*ip#|Cp)t>r=@WvaQ@6p7PYwbTf#<d!X|Cr7H!Ga
zEn|CjXn8A`Z<lswFBYHyKm;A=LN|IafF#B-4G#-g#TquSg?$|33<dbO#XTPIgfi=C
zjIf=(9OMv(IYp1lOwBOO9quyA98Z|%DSck?kwyNpBFI&<qKd0e35{q>vzn8ql+rp-
qPUpJNwQlsRR~7Z9cYWwnUn;4rK;QaNMOD?@IydBoH>*u;q1JzB3Q<P@

diff --git a/desmume/src/cocoa/KeyNames.plist b/desmume/src/cocoa/KeyNames.plist
index 771b91749..2eff728ed 100644
--- a/desmume/src/cocoa/KeyNames.plist
+++ b/desmume/src/cocoa/KeyNames.plist
@@ -115,7 +115,7 @@
 	<key>50</key>
 	<string>` (Accent)</string>
 	<key>27</key>
-	<string>-</string>
+	<string>- (Dash)</string>
 	<key>24</key>
 	<string>=</string>
 	<key>51</key>
diff --git a/desmume/src/cocoa/userinterface/InputManager.mm b/desmume/src/cocoa/userinterface/InputManager.mm
index b2d3515bb..e771e829b 100644
--- a/desmume/src/cocoa/userinterface/InputManager.mm
+++ b/desmume/src/cocoa/userinterface/InputManager.mm
@@ -973,8 +973,6 @@ static std::tr1::unordered_map<unsigned short, std::string> keyboardNameTable; /
 	[self addMappingForIBAction:@selector(reset:) commandAttributes:&cmdReset];
 	[self addMappingForIBAction:@selector(toggleGPUState:) commandAttributes:&cmdToggleGPUState];
 	
-	[self setMappingsWithMappings:[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"Input_ControllerMappings"]];
-	
 	return self;
 }
 
diff --git a/desmume/src/cocoa/userinterface/appDelegate.mm b/desmume/src/cocoa/userinterface/appDelegate.mm
index 46d06ca55..ae065aa9c 100644
--- a/desmume/src/cocoa/userinterface/appDelegate.mm
+++ b/desmume/src/cocoa/userinterface/appDelegate.mm
@@ -545,6 +545,18 @@
 	// Set the default sound volume per user preferences.
 	[prefWindowDelegate updateVolumeIcon:nil];
 	
+	// Set up the user's default input settings.
+	NSDictionary *userMappings = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"Input_ControllerMappings"];
+	if (userMappings == nil)
+	{
+		NSDictionary *defaultKeyMappingsDict = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DefaultKeyMappings" ofType:@"plist"]];
+		NSArray *internalDefaultProfilesList = (NSArray *)[defaultKeyMappingsDict valueForKey:@"DefaultInputProfiles"];
+		userMappings = [(NSDictionary *)[internalDefaultProfilesList objectAtIndex:0] valueForKey:@"Mappings"];
+	}
+	
+	[inputManager setMappingsWithMappings:userMappings];
+	
+	// Set up the rest of the emulation-related user defaults.
 	[emuControl setupUserDefaults];
 }