Skip to content

Commit 7c95ca6

Browse files
calebttcalebtt
committed
Merge branch 'thumbbehavior'
2 parents b6bc2a7 + 7a3acea commit 7c95ca6

File tree

4 files changed

+65
-8
lines changed

4 files changed

+65
-8
lines changed

‎XMapLib/MouseMapper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ namespace sds
134134
}
135135
protected:
136136
/// <summary>
137-
/// Worker thread, private visibility, gets updated data from ProcessState() function to use.
137+
/// Worker thread, protected visibility, gets updated data from ProcessState() function to use.
138138
/// Accesses the std::atomic m_thread_x and m_thread_y members.
139139
/// </summary>
140140
void workThread(sds::LambdaArgs::LambdaArg1& stopCondition, sds::LambdaArgs::LambdaArg2&, int&)

‎XMapLibSharp/ControllerButtons.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum ControllerButtons : int
2222
VK_PAD_DPAD_DOWN = 0x5811,
2323
VK_PAD_DPAD_LEFT = 0x5812,
2424
VK_PAD_DPAD_RIGHT = 0x5813,
25-
VK__PAD_START = 0x5814,
25+
VK_PAD_START = 0x5814,
2626
VK_PAD_BACK = 0x5815,
2727
VK_PAD_LTHUMB_PRESS = 0x5816,
2828
VK_PAD_RTHUMB_PRESS = 0x5817,

‎XMapLibSharp/KeymapPresetOperations.cs‎

Lines changed: 62 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public static class KeymapPresetOperations
1717
const int Height = 70;
1818
const float FontSizePresetButton = 8.5f;
1919
const string PRESET_BROWSING = "Browsing";
20+
const string PRESET_GAMING = "Gaming";
21+
const string PRESET_MOVIE = "Movie";
2022
const string MSG_PRESET_SELECTED = "\n*SELECTED*";
2123
public static void ChangeButtonTextForSelected(Button prButton, bool makeSelected)
2224
{
@@ -53,20 +55,17 @@ static Button BuildPresetButton(string presetName)
5355
tb1.Text = "[" + presetName + "]";
5456
tb1.Font = f;
5557
tb1.BackColor = Color.Aquamarine;
56-
//tb1.Margin = new(100);
57-
//tb1.Padding = new Padding(100);
5858
tb1.MaximumSize = new(Width, Height);
5959
tb1.MinimumSize = new(Width, Height);
6060
tb1.FlatStyle = FlatStyle.Flat;
6161
tb1.Visible = true;
6262
tb1.TextAlign = ContentAlignment.MiddleCenter;
63-
//tb1.Dock = DockStyle.Fill;
6463
return tb1;
6564
}
6665
List<KeymapPreset> presetButtons = new();
6766
presetButtons.Add(new() { ButtonForPresetSection = BuildPresetButton(PRESET_BROWSING), KeymapName = PRESET_BROWSING, Keymaps = BuildPresetBrowsing()});
68-
presetButtons.Add(new() { ButtonForPresetSection = BuildPresetButton(PRESET_BROWSING), KeymapName = PRESET_BROWSING, Keymaps = BuildPresetBrowsing() });
69-
presetButtons.Add(new() { ButtonForPresetSection = BuildPresetButton(PRESET_BROWSING), KeymapName = PRESET_BROWSING, Keymaps = BuildPresetBrowsing() });
67+
presetButtons.Add(new() { ButtonForPresetSection = BuildPresetButton(PRESET_GAMING), KeymapName = PRESET_BROWSING, Keymaps = BuildPresetGaming() });
68+
presetButtons.Add(new() { ButtonForPresetSection = BuildPresetButton(PRESET_MOVIE), KeymapName = PRESET_BROWSING, Keymaps = BuildPresetMovie() });
7069
return presetButtons;
7170
}
7271
public static List<XMapLibKeymap> BuildPresetBrowsing()
@@ -91,6 +90,64 @@ public static List<XMapLibKeymap> BuildPresetBrowsing()
9190
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNLEFT, VKMappedTo = (int)Keys.A },
9291
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNRIGHT, VKMappedTo = (int)Keys.S },
9392
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNRIGHT, VKMappedTo = (int)Keys.D },
93+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LSHOULDER, VKMappedTo = (int)Keys.BrowserBack },
94+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_RSHOULDER, VKMappedTo = (int)Keys.BrowserForward },
95+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_A, VKMappedTo = (int)Keys.Space },
96+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_B, VKMappedTo = (int)Keys.E },
97+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_X, VKMappedTo = (int)Keys.R }
98+
};
99+
return mp;
100+
}
101+
public static List<XMapLibKeymap> BuildPresetGaming()
102+
{
103+
List<XMapLibKeymap> mp = new()
104+
{
105+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_DOWN, VKMappedTo = (int)Keys.Down },
106+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_UP, VKMappedTo = (int)Keys.Up },
107+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_LEFT, VKMappedTo = (int)Keys.Left },
108+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_RIGHT, VKMappedTo = (int)Keys.Right },
109+
new() { UsesRepeatBehavior = false, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTRIGGER, VKMappedTo = (int)Keys.RButton },
110+
new() { UsesRepeatBehavior = false, VKMappedFrom = (int)ControllerButtons.VK_PAD_RTRIGGER, VKMappedTo = (int)Keys.LButton },
111+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_UP, VKMappedTo = (int)Keys.W },
112+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_LEFT, VKMappedTo = (int)Keys.A },
113+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWN, VKMappedTo = (int)Keys.S },
114+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_RIGHT, VKMappedTo = (int)Keys.D },
115+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_UPLEFT, VKMappedTo = (int)Keys.W },
116+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_UPLEFT, VKMappedTo = (int)Keys.A },
117+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_UPRIGHT, VKMappedTo = (int)Keys.W },
118+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_UPRIGHT, VKMappedTo = (int)Keys.D },
119+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNLEFT, VKMappedTo = (int)Keys.S },
120+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNLEFT, VKMappedTo = (int)Keys.A },
121+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNRIGHT, VKMappedTo = (int)Keys.S },
122+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWNRIGHT, VKMappedTo = (int)Keys.D },
123+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_A, VKMappedTo = (int)Keys.Space },
124+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_B, VKMappedTo = (int)Keys.F },
125+
new() { UsesRepeatBehavior = false, VKMappedFrom = (int)ControllerButtons.VK_PAD_Y, VKMappedTo = (int)Keys.G},
126+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_RTHUMB_PRESS, VKMappedTo = (int)Keys.C },
127+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_PRESS, VKMappedTo = (int)Keys.LShiftKey },
128+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_START, VKMappedTo = (int)Keys.Escape },
129+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LSHOULDER, VKMappedTo = (int)Keys.Q },
130+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_RSHOULDER, VKMappedTo = (int)Keys.E },
131+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_X, VKMappedTo = (int)Keys.R }
132+
};
133+
return mp;
134+
}
135+
public static List<XMapLibKeymap> BuildPresetMovie()
136+
{
137+
List<XMapLibKeymap> mp = new()
138+
{
139+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_DOWN, VKMappedTo = (int)Keys.VolumeDown },
140+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_UP, VKMappedTo = (int)Keys.VolumeUp },
141+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_LEFT, VKMappedTo = (int)Keys.Left },
142+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_DPAD_RIGHT, VKMappedTo = (int)Keys.Right },
143+
new() { UsesRepeatBehavior = false, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTRIGGER, VKMappedTo = (int)Keys.RButton },
144+
new() { UsesRepeatBehavior = false, VKMappedFrom = (int)ControllerButtons.VK_PAD_RTRIGGER, VKMappedTo = (int)Keys.LButton },
145+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_UP, VKMappedTo = (int)Keys.PageUp },
146+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_LEFT, VKMappedTo = (int)Keys.BrowserBack },
147+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_DOWN, VKMappedTo = (int)Keys.PageDown},
148+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LTHUMB_RIGHT, VKMappedTo = (int)Keys.BrowserForward },
149+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_LSHOULDER, VKMappedTo = (int)Keys.MediaPlayPause },
150+
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_RSHOULDER, VKMappedTo = (int)Keys.VolumeMute },
94151
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_A, VKMappedTo = (int)Keys.Space },
95152
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_B, VKMappedTo = (int)Keys.E },
96153
new() { UsesRepeatBehavior = true, VKMappedFrom = (int)ControllerButtons.VK_PAD_X, VKMappedTo = (int)Keys.R }

‎XMapLibTest/TemplatesForTest.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace XMapLibTest::TemplatesForTest
99
{
10-
bool IsWithin(const auto result, const auto testVal, const auto within)
10+
constexpr bool IsWithin(const auto result, const auto testVal, const auto within)
1111
{
1212
return ((result > (testVal - within)) && (result < (testVal + within)));
1313
}

0 commit comments

Comments
 (0)