Skip to content

Commit 1b82a45

Browse files
committed
Add more emulated and host key suggestions
1 parent da6994c commit 1b82a45

2 files changed

Lines changed: 103 additions & 7 deletions

File tree

Data/EmulatedDevice.cs

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,72 @@ public string Name
2626
if (_name.StartsWith("Wiimote"))
2727
{
2828
List<string> suggestions = new List<string>();
29+
30+
// Wiimote button presses
31+
suggestions.Add("Buttons/A");
32+
suggestions.Add("Buttons/B");
33+
suggestions.Add("Buttons/1");
34+
suggestions.Add("Buttons/2");
35+
suggestions.Add("Buttons/-");
36+
suggestions.Add("Buttons/+");
37+
suggestions.Add("D-Pad/Up");
38+
suggestions.Add("D-Pad/Down");
39+
suggestions.Add("D-Pad/Left");
40+
suggestions.Add("D-Pad/Right");
41+
42+
// Wiimote simulated motions
43+
suggestions.Add("Swing/Up");
44+
suggestions.Add("Swing/Down");
45+
suggestions.Add("Swing/Left");
46+
suggestions.Add("Swing/Right");
47+
suggestions.Add("Swing/Forward");
48+
suggestions.Add("Shake/X");
49+
suggestions.Add("Shake/Y");
50+
suggestions.Add("Shake/Z");
51+
52+
// Nunchuk
53+
suggestions.Add("Nunchuk/Buttons/Z");
54+
suggestions.Add("Nunchuk/Buttons/C");
55+
suggestions.Add("Nunchuk/Shake/X");
56+
suggestions.Add("Nunchuk/Shake/Y");
57+
suggestions.Add("Nunchuk/Shake/Z");
58+
59+
// Classic
60+
suggestions.Add("Classic/Buttons/A");
61+
suggestions.Add("Classic/Buttons/B");
62+
suggestions.Add("Classic/Buttons/X");
63+
suggestions.Add("Classic/Buttons/Y");
64+
suggestions.Add("Classic/Buttons/ZL");
65+
suggestions.Add("Classic/Buttons/ZR");
66+
suggestions.Add("Classic/Triggers/L");
67+
suggestions.Add("Classic/Triggers/R");
68+
suggestions.Add("Classic/D-Pad/Up");
69+
suggestions.Add("Classic/D-Pad/Down");
70+
suggestions.Add("Classic/D-Pad/Left");
71+
suggestions.Add("Classic/D-Pad/Right");
72+
73+
suggestions.Sort();
74+
75+
SearchSuggestions = new ObservableCollection<string>(suggestions);
76+
}
77+
else if (_name.StartsWith("GCPad"))
78+
{
79+
List<string> suggestions = new List<string>();
80+
2981
suggestions.Add("Buttons/A");
3082
suggestions.Add("Buttons/B");
83+
suggestions.Add("Buttons/X");
84+
suggestions.Add("Buttons/Y");
85+
suggestions.Add("Buttons/Z");
86+
suggestions.Add("Buttons/Start");
3187
suggestions.Add("D-Pad/Up");
3288
suggestions.Add("D-Pad/Down");
3389
suggestions.Add("D-Pad/Left");
3490
suggestions.Add("D-Pad/Right");
91+
92+
suggestions.Add("Triggers/L");
93+
suggestions.Add("Triggers/R");
94+
3595
suggestions.Sort();
3696

3797
SearchSuggestions = new ObservableCollection<string>(suggestions);

Data/HostDevice.cs

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,51 @@ public string Name
2222
_name = value;
2323
OnPropertyChanged(nameof(Name));
2424

25-
if (_name.EndsWith("Keyboard Mouse"))
25+
if (_name.Contains("Keyboard Mouse"))
2626
{
2727
List<string> suggestions = new List<string>();
28-
suggestions.Add("A");
29-
suggestions.Add("B");
30-
suggestions.Add("C");
31-
suggestions.Add("D");
32-
suggestions.Add("E");
33-
suggestions.Add("F");
28+
29+
// Mouse
30+
suggestions.Add("Click 0");
31+
suggestions.Add("Click 1");
32+
suggestions.Add("Click 2");
33+
34+
// Keyboard
35+
char[] alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray();
36+
37+
foreach (char c in alpha)
38+
{
39+
suggestions.Add(c.ToString());
40+
}
41+
suggestions.Add("LSHIFT");
42+
suggestions.Add("RSHIFT");
43+
suggestions.Add("LCONTROL");
44+
suggestions.Add("RCONTROL");
45+
suggestions.Add("SPACE");
46+
47+
suggestions.Sort();
48+
49+
SearchSuggestions = new ObservableCollection<string>(suggestions);
50+
}
51+
else if (_name.Contains("XInput"))
52+
{
53+
List<string> suggestions = new List<string>();
54+
suggestions.Add("`Pad N`");
55+
suggestions.Add("`Pad S`");
56+
suggestions.Add("`Pad E`");
57+
suggestions.Add("`Pad W`");
58+
suggestions.Add("`Button A`");
59+
suggestions.Add("`Button B`");
60+
suggestions.Add("`Button X`");
61+
suggestions.Add("`Button Y`");
62+
suggestions.Add("`Shoulder L`");
63+
suggestions.Add("`Shoulder R`");
64+
suggestions.Add("`Trigger L`");
65+
suggestions.Add("`Trigger R`");
66+
suggestions.Add("`Thumb L`");
67+
suggestions.Add("`Thumb R`");
68+
suggestions.Add("Start");
69+
suggestions.Add("Back");
3470
suggestions.Sort();
3571

3672
SearchSuggestions = new ObservableCollection<string>(suggestions);

0 commit comments

Comments
 (0)