The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-30 04:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.4.0.8

Browse Source 
Rework x360 mapping similarly to v1.4.075, however this time testing has
been done and truely works :). With this update you can map sticks to
multiple things and swap the actions of two buttons/sticks/triggers
Remapping touchpad clicks improvements
This commit is contained in:
jays2kings 2014-10-30 19:56:51 -04:00
parent ab72a2956b
commit 30e1188d74
5 changed files with 366 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
DS4Control/Control.cs
View File

@ -130,7 +130,7 @@ namespace DS4Control
else else
{ {
DS4LightBar.defualtLight = true; DS4LightBar.defualtLight = true;
DS4LightBar.updateLightBar(DS4Controllers[i], i, CurrentState[i], ExposedState[i]); DS4LightBar.updateLightBar(DS4Controllers[i], i, CurrentState[i], ExposedState[i], touchPad[i]);
System.Threading.Thread.Sleep(50); System.Threading.Thread.Sleep(50);
} }
CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change. CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change.
@ -408,12 +408,12 @@ namespace DS4Control
if (Global.getHasCustomKeysorButtons(ind)) if (Global.getHasCustomKeysorButtons(ind))
{ {
Mapping.MapCustom(ind, cState, MappedState[ind], ExposedState[ind]); Mapping.MapCustom(ind, cState, MappedState[ind], ExposedState[ind], touchPad[ind]);
cState = MappedState[ind]; cState = MappedState[ind];
} }
// Update the GUI/whatever. // Update the GUI/whatever.
DS4LightBar.updateLightBar(device, ind, cState, ExposedState[ind]); DS4LightBar.updateLightBar(device, ind, cState, ExposedState[ind], touchPad[ind]);
x360Bus.Parse(cState, processingData[ind].Report, ind); x360Bus.Parse(cState, processingData[ind].Report, ind);
// We push the translated Xinput state, and simultaneously we // We push the translated Xinput state, and simultaneously we
@ -440,40 +440,37 @@ namespace DS4Control
{ {
DS4State cState = CurrentState[ind]; DS4State cState = CurrentState[ind];
DS4StateExposed eState = ExposedState[ind]; DS4StateExposed eState = ExposedState[ind];
Mouse tp = touchPad[ind];
if (DS4Controllers[ind] != null) if (DS4Controllers[ind] != null)
if (Mapping.getBoolMapping(DS4Controls.Cross, cState, eState)) return "Cross"; if (Mapping.getBoolMapping(DS4Controls.Cross, cState, eState, tp)) return "Cross";
else if (Mapping.getBoolMapping(DS4Controls.Circle, cState, eState)) return "Circle"; else if (Mapping.getBoolMapping(DS4Controls.Circle, cState, eState, tp)) return "Circle";
else if (Mapping.getBoolMapping(DS4Controls.Triangle, cState, eState)) return "Triangle"; else if (Mapping.getBoolMapping(DS4Controls.Triangle, cState, eState, tp)) return "Triangle";
else if (Mapping.getBoolMapping(DS4Controls.Square, cState, eState)) return "Square"; else if (Mapping.getBoolMapping(DS4Controls.Square, cState, eState, tp)) return "Square";
else if (Mapping.getBoolMapping(DS4Controls.L1, cState, eState)) return "L1"; else if (Mapping.getBoolMapping(DS4Controls.L1, cState, eState, tp)) return "L1";
else if (Mapping.getBoolMapping(DS4Controls.R1, cState, eState)) return "R1"; else if (Mapping.getBoolMapping(DS4Controls.R1, cState, eState, tp)) return "R1";
else if (Mapping.getBoolMapping(DS4Controls.L2, cState, eState)) return "L2"; else if (Mapping.getBoolMapping(DS4Controls.L2, cState, eState, tp)) return "L2";
else if (Mapping.getBoolMapping(DS4Controls.R2, cState, eState)) return "R2"; else if (Mapping.getBoolMapping(DS4Controls.R2, cState, eState, tp)) return "R2";
else if (Mapping.getBoolMapping(DS4Controls.L3, cState, eState)) return "L3"; else if (Mapping.getBoolMapping(DS4Controls.L3, cState, eState, tp)) return "L3";
else if (Mapping.getBoolMapping(DS4Controls.R3, cState, eState)) return "R3"; else if (Mapping.getBoolMapping(DS4Controls.R3, cState, eState, tp)) return "R3";
else if (Mapping.getBoolMapping(DS4Controls.DpadUp, cState, eState)) return "Up"; else if (Mapping.getBoolMapping(DS4Controls.DpadUp, cState, eState, tp)) return "Up";
else if (Mapping.getBoolMapping(DS4Controls.DpadDown, cState, eState)) return "Down"; else if (Mapping.getBoolMapping(DS4Controls.DpadDown, cState, eState, tp)) return "Down";
else if (Mapping.getBoolMapping(DS4Controls.DpadLeft, cState, eState)) return "Left"; else if (Mapping.getBoolMapping(DS4Controls.DpadLeft, cState, eState, tp)) return "Left";
else if (Mapping.getBoolMapping(DS4Controls.DpadRight, cState, eState)) return "Right"; else if (Mapping.getBoolMapping(DS4Controls.DpadRight, cState, eState, tp)) return "Right";
else if (Mapping.getBoolMapping(DS4Controls.Share, cState, eState)) return "Share"; else if (Mapping.getBoolMapping(DS4Controls.Share, cState, eState, tp)) return "Share";
else if (Mapping.getBoolMapping(DS4Controls.Options, cState, eState)) return "Options"; else if (Mapping.getBoolMapping(DS4Controls.Options, cState, eState, tp)) return "Options";
else if (Mapping.getBoolMapping(DS4Controls.PS, cState, eState)) return "PS"; else if (Mapping.getBoolMapping(DS4Controls.PS, cState, eState, tp)) return "PS";
else if (Mapping.getBoolMapping(DS4Controls.LXPos, cState, eState)) return "LS Right"; else if (Mapping.getBoolMapping(DS4Controls.LXPos, cState, eState, tp)) return "LS Right";
else if (Mapping.getBoolMapping(DS4Controls.LXNeg, cState, eState)) return "LS Left"; else if (Mapping.getBoolMapping(DS4Controls.LXNeg, cState, eState, tp)) return "LS Left";
else if (Mapping.getBoolMapping(DS4Controls.LYPos, cState, eState)) return "LS Down"; else if (Mapping.getBoolMapping(DS4Controls.LYPos, cState, eState, tp)) return "LS Down";
else if (Mapping.getBoolMapping(DS4Controls.LYNeg, cState, eState)) return "LS Up"; else if (Mapping.getBoolMapping(DS4Controls.LYNeg, cState, eState, tp)) return "LS Up";
else if (Mapping.getBoolMapping(DS4Controls.RXPos, cState, eState)) return "RS Right"; else if (Mapping.getBoolMapping(DS4Controls.RXPos, cState, eState, tp)) return "RS Right";
else if (Mapping.getBoolMapping(DS4Controls.RXNeg, cState, eState)) return "RS Left"; else if (Mapping.getBoolMapping(DS4Controls.RXNeg, cState, eState, tp)) return "RS Left";
else if (Mapping.getBoolMapping(DS4Controls.RYPos, cState, eState)) return "RS Down"; else if (Mapping.getBoolMapping(DS4Controls.RYPos, cState, eState, tp)) return "RS Down";
else if (Mapping.getBoolMapping(DS4Controls.RYNeg, cState, eState)) return "RS Up"; else if (Mapping.getBoolMapping(DS4Controls.RYNeg, cState, eState, tp)) return "RS Up";
else if (Mapping.getBoolMapping(DS4Controls.TouchLeft, cState, eState)) return "Touch Left"; else if (Mapping.getBoolMapping(DS4Controls.TouchLeft, cState, eState, tp)) return "Touch Left";
else if (Mapping.getBoolMapping(DS4Controls.TouchRight, cState, eState)) return "Touch Right"; else if (Mapping.getBoolMapping(DS4Controls.TouchRight, cState, eState, tp)) return "Touch Right";
else if (Mapping.getBoolMapping(DS4Controls.TouchMulti, cState, eState)) return "Touch Multi"; else if (Mapping.getBoolMapping(DS4Controls.TouchMulti, cState, eState, tp)) return "Touch Multi";
else if (Mapping.getBoolMapping(DS4Controls.TouchUpper, cState, eState)) return "Touch Upper"; else if (Mapping.getBoolMapping(DS4Controls.TouchUpper, cState, eState, tp)) return "Touch Upper";
/*else if (Mapping.getBoolMapping(DS4Controls.GyroXPos, cState, eState)) return "GyroXP";
else if (Mapping.getBoolMapping(DS4Controls.GyroXNeg, cState, eState)) return "GyroXN";
else if (Mapping.getBoolMapping(DS4Controls.GyroZPos, cState, eState)) return "GyroZP";
else if (Mapping.getBoolMapping(DS4Controls.GyroZNeg, cState, eState)) return "GyroZN";*/
return "nothing"; return "nothing";
} }

56
DS4Control/DS4LightBar.cs
View File

@ -25,12 +25,12 @@ namespace DS4Control
public static double[] fadetimer = new double[4] { 0, 0, 0, 0 }; public static double[] fadetimer = new double[4] { 0, 0, 0, 0 };
static bool[] fadedirection = new bool[4] { false, false, false, false }; static bool[] fadedirection = new bool[4] { false, false, false, false };
static DateTime oldnow = DateTime.UtcNow; static DateTime oldnow = DateTime.UtcNow;
public static void updateLightBar(DS4Device device, int deviceNum, DS4State cState, DS4StateExposed eState) public static void updateLightBar(DS4Device device, int deviceNum, DS4State cState, DS4StateExposed eState, Mouse tp)
{ {
DS4Color color; DS4Color color;
if (!defualtLight) if (!defualtLight)
{ {
if (Global.getShiftColorOn(deviceNum) && Global.getShiftModifier(deviceNum) > 0 && shiftMod(device, deviceNum, cState, eState)) if (Global.getShiftColorOn(deviceNum) && Global.getShiftModifier(deviceNum) > 0 && shiftMod(device, deviceNum, cState, eState, tp))
{ {
color = Global.loadShiftColor(deviceNum); color = Global.loadShiftColor(deviceNum);
} }
@ -185,36 +185,36 @@ namespace DS4Control
} }
public static bool defualtLight = false, shuttingdown = false; public static bool defualtLight = false, shuttingdown = false;
public static bool shiftMod(DS4Device device, int deviceNum, DS4State cState, DS4StateExposed eState) public static bool shiftMod(DS4Device device, int deviceNum, DS4State cState, DS4StateExposed eState, Mouse tp)
{ {
bool shift; bool shift;
switch (Global.getShiftModifier(deviceNum)) switch (Global.getShiftModifier(deviceNum))
{ {
case 1: shift = Mapping.getBoolMapping(DS4Controls.Cross, cState, eState); break; case 1: shift = Mapping.getBoolMapping(DS4Controls.Cross, cState, eState, tp); break;
case 2: shift = Mapping.getBoolMapping(DS4Controls.Circle, cState, eState); break; case 2: shift = Mapping.getBoolMapping(DS4Controls.Circle, cState, eState, tp); break;
case 3: shift = Mapping.getBoolMapping(DS4Controls.Square, cState, eState); break; case 3: shift = Mapping.getBoolMapping(DS4Controls.Square, cState, eState, tp); break;
case 4: shift = Mapping.getBoolMapping(DS4Controls.Triangle, cState, eState); break; case 4: shift = Mapping.getBoolMapping(DS4Controls.Triangle, cState, eState, tp); break;
case 5: shift = Mapping.getBoolMapping(DS4Controls.Options, cState, eState); break; case 5: shift = Mapping.getBoolMapping(DS4Controls.Options, cState, eState, tp); break;
case 6: shift = Mapping.getBoolMapping(DS4Controls.Share, cState, eState); break; case 6: shift = Mapping.getBoolMapping(DS4Controls.Share, cState, eState, tp); break;
case 7: shift = Mapping.getBoolMapping(DS4Controls.DpadUp, cState, eState); break; case 7: shift = Mapping.getBoolMapping(DS4Controls.DpadUp, cState, eState, tp); break;
case 8: shift = Mapping.getBoolMapping(DS4Controls.DpadDown, cState, eState); break; case 8: shift = Mapping.getBoolMapping(DS4Controls.DpadDown, cState, eState, tp); break;
case 9: shift = Mapping.getBoolMapping(DS4Controls.DpadLeft, cState, eState); break; case 9: shift = Mapping.getBoolMapping(DS4Controls.DpadLeft, cState, eState, tp); break;
case 10: shift = Mapping.getBoolMapping(DS4Controls.DpadRight, cState, eState); break; case 10: shift = Mapping.getBoolMapping(DS4Controls.DpadRight, cState, eState, tp); break;
case 11: shift = Mapping.getBoolMapping(DS4Controls.PS, cState, eState); break; case 11: shift = Mapping.getBoolMapping(DS4Controls.PS, cState, eState, tp); break;
case 12: shift = Mapping.getBoolMapping(DS4Controls.L1, cState, eState); break; case 12: shift = Mapping.getBoolMapping(DS4Controls.L1, cState, eState, tp); break;
case 13: shift = Mapping.getBoolMapping(DS4Controls.R1, cState, eState); break; case 13: shift = Mapping.getBoolMapping(DS4Controls.R1, cState, eState, tp); break;
case 14: shift = Mapping.getBoolMapping(DS4Controls.L2, cState, eState); break; case 14: shift = Mapping.getBoolMapping(DS4Controls.L2, cState, eState, tp); break;
case 15: shift = Mapping.getBoolMapping(DS4Controls.R2, cState, eState); break; case 15: shift = Mapping.getBoolMapping(DS4Controls.R2, cState, eState, tp); break;
case 16: shift = Mapping.getBoolMapping(DS4Controls.L3, cState, eState); break; case 16: shift = Mapping.getBoolMapping(DS4Controls.L3, cState, eState, tp); break;
case 17: shift = Mapping.getBoolMapping(DS4Controls.R3, cState, eState); break; case 17: shift = Mapping.getBoolMapping(DS4Controls.R3, cState, eState, tp); break;
case 18: shift = Mapping.getBoolMapping(DS4Controls.TouchLeft, cState, eState); break; case 18: shift = Mapping.getBoolMapping(DS4Controls.TouchLeft, cState, eState, tp); break;
case 19: shift = Mapping.getBoolMapping(DS4Controls.TouchUpper, cState, eState); break; case 19: shift = Mapping.getBoolMapping(DS4Controls.TouchUpper, cState, eState, tp); break;
case 20: shift = Mapping.getBoolMapping(DS4Controls.TouchMulti, cState, eState); break; case 20: shift = Mapping.getBoolMapping(DS4Controls.TouchMulti, cState, eState, tp); break;
case 21: shift = Mapping.getBoolMapping(DS4Controls.TouchRight, cState, eState); break; case 21: shift = Mapping.getBoolMapping(DS4Controls.TouchRight, cState, eState, tp); break;
case 22: shift = Mapping.getBoolMapping(DS4Controls.GyroZNeg, cState, eState); break; case 22: shift = Mapping.getBoolMapping(DS4Controls.GyroZNeg, cState, eState, tp); break;
case 23: shift = Mapping.getBoolMapping(DS4Controls.GyroZPos, cState, eState); break; case 23: shift = Mapping.getBoolMapping(DS4Controls.GyroZPos, cState, eState, tp); break;
case 24: shift = Mapping.getBoolMapping(DS4Controls.GyroXPos, cState, eState); break; case 24: shift = Mapping.getBoolMapping(DS4Controls.GyroXPos, cState, eState, tp); break;
case 25: shift = Mapping.getBoolMapping(DS4Controls.GyroXNeg, cState, eState); break; case 25: shift = Mapping.getBoolMapping(DS4Controls.GyroXNeg, cState, eState, tp); break;
case 26: shift = device.getCurrentState().Touch1; break; case 26: shift = device.getCurrentState().Touch1; break;
default: shift = false; break; default: shift = false; break;
} }

540
DS4Control/Mapping.cs
View File

@ -326,43 +326,43 @@ namespace DS4Control
public static bool[] pressedonce = new bool[261], macrodone = new bool[34]; public static bool[] pressedonce = new bool[261], macrodone = new bool[34];
public static int test = 0; public static int test = 0;
/** Map DS4 Buttons/Axes to other DS4 Buttons/Axes (largely the same as Xinput ones) and to keyboard and mouse buttons. */ /** Map DS4 Buttons/Axes to other DS4 Buttons/Axes (largely the same as Xinput ones) and to keyboard and mouse buttons. */
public static async void MapCustom(int device, DS4State cState, DS4State MappedState, DS4StateExposed eState) public static async void MapCustom(int device, DS4State cState, DS4State MappedState, DS4StateExposed eState, Mouse tp)
{ {
bool shift; bool shift;
cState.CopyTo(MappedState); cState.CopyTo(MappedState);
SyntheticState deviceState = Mapping.deviceState[device]; SyntheticState deviceState = Mapping.deviceState[device];
switch (Global.getShiftModifier(device)) switch (Global.getShiftModifier(device))
{ {
case 1: shift = getBoolMapping(DS4Controls.Cross, cState, eState); break; case 1: shift = getBoolMapping(DS4Controls.Cross, cState, eState, tp); break;
case 2: shift = getBoolMapping(DS4Controls.Circle, cState, eState); break; case 2: shift = getBoolMapping(DS4Controls.Circle, cState, eState, tp); break;
case 3: shift = getBoolMapping(DS4Controls.Square, cState, eState); break; case 3: shift = getBoolMapping(DS4Controls.Square, cState, eState, tp); break;
case 4: shift = getBoolMapping(DS4Controls.Triangle, cState, eState); break; case 4: shift = getBoolMapping(DS4Controls.Triangle, cState, eState, tp); break;
case 5: shift = getBoolMapping(DS4Controls.Options, cState, eState); break; case 5: shift = getBoolMapping(DS4Controls.Options, cState, eState, tp); break;
case 6: shift = getBoolMapping(DS4Controls.Share, cState, eState); break; case 6: shift = getBoolMapping(DS4Controls.Share, cState, eState, tp); break;
case 7: shift = getBoolMapping(DS4Controls.DpadUp, cState, eState); break; case 7: shift = getBoolMapping(DS4Controls.DpadUp, cState, eState, tp); break;
case 8: shift = getBoolMapping(DS4Controls.DpadDown, cState, eState); break; case 8: shift = getBoolMapping(DS4Controls.DpadDown, cState, eState, tp); break;
case 9: shift = getBoolMapping(DS4Controls.DpadLeft, cState, eState); break; case 9: shift = getBoolMapping(DS4Controls.DpadLeft, cState, eState, tp); break;
case 10: shift = getBoolMapping(DS4Controls.DpadRight, cState, eState); break; case 10: shift = getBoolMapping(DS4Controls.DpadRight, cState, eState, tp); break;
case 11: shift = getBoolMapping(DS4Controls.PS, cState, eState); break; case 11: shift = getBoolMapping(DS4Controls.PS, cState, eState, tp); break;
case 12: shift = getBoolMapping(DS4Controls.L1, cState, eState); break; case 12: shift = getBoolMapping(DS4Controls.L1, cState, eState, tp); break;
case 13: shift = getBoolMapping(DS4Controls.R1, cState, eState); break; case 13: shift = getBoolMapping(DS4Controls.R1, cState, eState, tp); break;
case 14: shift = getBoolMapping(DS4Controls.L2, cState, eState); break; case 14: shift = getBoolMapping(DS4Controls.L2, cState, eState, tp); break;
case 15: shift = getBoolMapping(DS4Controls.R2, cState, eState); break; case 15: shift = getBoolMapping(DS4Controls.R2, cState, eState, tp); break;
case 16: shift = getBoolMapping(DS4Controls.L3, cState, eState); break; case 16: shift = getBoolMapping(DS4Controls.L3, cState, eState, tp); break;
case 17: shift = getBoolMapping(DS4Controls.R3, cState, eState); break; case 17: shift = getBoolMapping(DS4Controls.R3, cState, eState, tp); break;
case 18: shift = getBoolMapping(DS4Controls.TouchLeft, cState, eState); break; case 18: shift = getBoolMapping(DS4Controls.TouchLeft, cState, eState, tp); break;
case 19: shift = getBoolMapping(DS4Controls.TouchUpper, cState, eState); break; case 19: shift = getBoolMapping(DS4Controls.TouchUpper, cState, eState, tp); break;
case 20: shift = getBoolMapping(DS4Controls.TouchMulti, cState, eState); break; case 20: shift = getBoolMapping(DS4Controls.TouchMulti, cState, eState, tp); break;
case 21: shift = getBoolMapping(DS4Controls.TouchRight, cState, eState); break; case 21: shift = getBoolMapping(DS4Controls.TouchRight, cState, eState, tp); break;
case 22: shift = getBoolMapping(DS4Controls.GyroZNeg, cState, eState); break; case 22: shift = getBoolMapping(DS4Controls.GyroZNeg, cState, eState, tp); break;
case 23: shift = getBoolMapping(DS4Controls.GyroZPos, cState, eState); break; case 23: shift = getBoolMapping(DS4Controls.GyroZPos, cState, eState, tp); break;
case 24: shift = getBoolMapping(DS4Controls.GyroXPos, cState, eState); break; case 24: shift = getBoolMapping(DS4Controls.GyroXPos, cState, eState, tp); break;
case 25: shift = getBoolMapping(DS4Controls.GyroXNeg, cState, eState); break; case 25: shift = getBoolMapping(DS4Controls.GyroXNeg, cState, eState, tp); break;
case 26: shift = cState.Touch1; break; case 26: shift = cState.Touch1; break;
default: shift = false; break; default: shift = false; break;
} }
if (shift) if (shift)
MapShiftCustom(device, cState, MappedState, eState); MapShiftCustom(device, cState, MappedState, eState, tp);
foreach (KeyValuePair<DS4Controls, string> customKey in Global.getCustomMacros(device)) foreach (KeyValuePair<DS4Controls, string> customKey in Global.getCustomMacros(device))
{ {
if (shift == false || if (shift == false ||
@ -371,7 +371,7 @@ namespace DS4Control
Global.getShiftCustomButton(device, customKey.Key) == X360Controls.None)) Global.getShiftCustomButton(device, customKey.Key) == X360Controls.None))
{ {
DS4KeyType keyType = Global.getCustomKeyType(device, customKey.Key); DS4KeyType keyType = Global.getCustomKeyType(device, customKey.Key);
if (getBoolMapping(customKey.Key, cState, eState)) if (getBoolMapping(customKey.Key, cState, eState, tp))
{ {
resetToDefaultValue(customKey.Key, MappedState); resetToDefaultValue(customKey.Key, MappedState);
bool LXChanged = (Math.Abs(127 - MappedState.LX) < 5); bool LXChanged = (Math.Abs(127 - MappedState.LX) < 5);
@ -395,31 +395,31 @@ namespace DS4Control
bool[] keydown = new bool[261]; bool[] keydown = new bool[261];
if (keys.Length > 0 && keys[0] > 260 && keys[0] < 300) if (keys.Length > 0 && keys[0] > 260 && keys[0] < 300)
{ {
if (keys[0] == 261 && !MappedState.Cross) MappedState.Cross = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 261 && !MappedState.Cross) MappedState.Cross = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 262 && !MappedState.Circle) MappedState.Circle = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 262 && !MappedState.Circle) MappedState.Circle = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 263 && !MappedState.Square) MappedState.Square = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 263 && !MappedState.Square) MappedState.Square = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 264 && !MappedState.Triangle) MappedState.Triangle = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 264 && !MappedState.Triangle) MappedState.Triangle = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 265 && !MappedState.DpadUp) MappedState.DpadUp = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 265 && !MappedState.DpadUp) MappedState.DpadUp = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 266 && !MappedState.DpadDown) MappedState.DpadDown = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 266 && !MappedState.DpadDown) MappedState.DpadDown = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 267 && !MappedState.DpadLeft) MappedState.DpadLeft = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 267 && !MappedState.DpadLeft) MappedState.DpadLeft = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 268 && !MappedState.DpadRight) MappedState.DpadRight = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 268 && !MappedState.DpadRight) MappedState.DpadRight = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 269 && !MappedState.Options) MappedState.Options = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 269 && !MappedState.Options) MappedState.Options = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 270 && !MappedState.Share) MappedState.Share = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 270 && !MappedState.Share) MappedState.Share = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 271 && !MappedState.PS) MappedState.PS = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 271 && !MappedState.PS) MappedState.PS = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 272 && !MappedState.L1) MappedState.L1 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 272 && !MappedState.L1) MappedState.L1 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 273 && !MappedState.R1) MappedState.R1 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 273 && !MappedState.R1) MappedState.R1 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 274 && MappedState.L2 == 0) MappedState.L2 = getByteMapping(device, customKey.Key, cState, eState); if (keys[0] == 274 && MappedState.L2 == 0) MappedState.L2 = getByteMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 275 && MappedState.R2 == 0) MappedState.R2 = getByteMapping(device, customKey.Key, cState, eState); if (keys[0] == 275 && MappedState.R2 == 0) MappedState.R2 = getByteMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 276 && !MappedState.L3) MappedState.L3 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 276 && !MappedState.L3) MappedState.L3 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 277 && !MappedState.R3) MappedState.R3 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 277 && !MappedState.R3) MappedState.R3 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 278 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 278 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 279 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 279 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
if (keys[0] == 280 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 280 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 281 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 281 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
if (keys[0] == 282 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 282 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 283 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 283 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
if (keys[0] == 284 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 284 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 285 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 285 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
} }
if (!macrodone[DS4ControltoInt(customKey.Key)]) if (!macrodone[DS4ControltoInt(customKey.Key)])
{ {
@ -470,7 +470,7 @@ namespace DS4Control
} }
} }
} }
else if (!getBoolMapping(customKey.Key, cState, eState)) else if (!getBoolMapping(customKey.Key, cState, eState, tp))
macrodone[DS4ControltoInt(customKey.Key)] = false; macrodone[DS4ControltoInt(customKey.Key)] = false;
} }
} }
@ -482,7 +482,7 @@ namespace DS4Control
Global.getShiftCustomButton(device, customKey.Key) == X360Controls.None)) Global.getShiftCustomButton(device, customKey.Key) == X360Controls.None))
{ {
DS4KeyType keyType = Global.getCustomKeyType(device, customKey.Key); DS4KeyType keyType = Global.getCustomKeyType(device, customKey.Key);
if (getBoolMapping(customKey.Key, cState, eState)) if (getBoolMapping(customKey.Key, cState, eState, tp))
{ {
resetToDefaultValue(customKey.Key, MappedState); resetToDefaultValue(customKey.Key, MappedState);
SyntheticState.KeyPresses kp; SyntheticState.KeyPresses kp;
@ -562,7 +562,7 @@ namespace DS4Control
} }
if (keyType.HasFlag(DS4KeyType.Toggle)) if (keyType.HasFlag(DS4KeyType.Toggle))
{ {
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
{ {
resetToDefaultValue(customButton.Key, MappedState); resetToDefaultValue(customButton.Key, MappedState);
if (!pressedonce[keyvalue]) if (!pressedonce[keyvalue])
@ -607,31 +607,31 @@ namespace DS4Control
case X360Controls.LT: L2.Add(customButton.Key); break; case X360Controls.LT: L2.Add(customButton.Key); break;
case X360Controls.RT: R2.Add(customButton.Key); break; case X360Controls.RT: R2.Add(customButton.Key); break;
case X360Controls.LeftMouse: case X360Controls.LeftMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.leftCount++; deviceState.currentClicks.leftCount++;
break; break;
case X360Controls.RightMouse: case X360Controls.RightMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.rightCount++; deviceState.currentClicks.rightCount++;
break; break;
case X360Controls.MiddleMouse: case X360Controls.MiddleMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.middleCount++; deviceState.currentClicks.middleCount++;
break; break;
case X360Controls.FourthMouse: case X360Controls.FourthMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.fourthCount++; deviceState.currentClicks.fourthCount++;
break; break;
case X360Controls.FifthMouse: case X360Controls.FifthMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.fifthCount++; deviceState.currentClicks.fifthCount++;
break; break;
case X360Controls.WUP: case X360Controls.WUP:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.wUpCount++; deviceState.currentClicks.wUpCount++;
break; break;
case X360Controls.WDOWN: case X360Controls.WDOWN:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.wDownCount++; deviceState.currentClicks.wDownCount++;
break; break;
case X360Controls.MouseUp: case X360Controls.MouseUp:
@ -666,91 +666,128 @@ namespace DS4Control
} }
} }
foreach (DS4Controls dc in Cross) foreach (DS4Controls dc in Cross)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Cross = true; MappedState.Cross = true;
foreach (DS4Controls dc in Circle) foreach (DS4Controls dc in Circle)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Circle = true; MappedState.Circle = true;
foreach (DS4Controls dc in Square) foreach (DS4Controls dc in Square)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Square = true; MappedState.Square = true;
foreach (DS4Controls dc in Triangle) foreach (DS4Controls dc in Triangle)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Triangle = true; MappedState.Triangle = true;
foreach (DS4Controls dc in L1) foreach (DS4Controls dc in L1)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.L1 = true; MappedState.L1 = true;
foreach (DS4Controls dc in L2) foreach (DS4Controls dc in L2)
if (getByteMapping(device, dc, cState, eState) != 0) if (getByteMapping(device, dc, cState, eState, tp) != 0)
MappedState.L2 = getByteMapping(device, dc, cState, eState); MappedState.L2 = getByteMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in L3) foreach (DS4Controls dc in L3)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.L3 = true; MappedState.L3 = true;
foreach (DS4Controls dc in R1) foreach (DS4Controls dc in R1)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.R1 = true; MappedState.R1 = true;
foreach (DS4Controls dc in R2) foreach (DS4Controls dc in R2)
if (getByteMapping(device, dc, cState, eState) != 0) if (getByteMapping(device, dc, cState, eState, tp) != 0)
MappedState.R2 = getByteMapping(device, dc, cState, eState); MappedState.R2 = getByteMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in R3) foreach (DS4Controls dc in R3)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.R3 = true; MappedState.R3 = true;
foreach (DS4Controls dc in DpadUp) foreach (DS4Controls dc in DpadUp)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadUp = true; MappedState.DpadUp = true;
foreach (DS4Controls dc in DpadRight) foreach (DS4Controls dc in DpadRight)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadRight = true; MappedState.DpadRight = true;
foreach (DS4Controls dc in DpadLeft) foreach (DS4Controls dc in DpadLeft)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadLeft = true; MappedState.DpadLeft = true;
foreach (DS4Controls dc in DpadDown) foreach (DS4Controls dc in DpadDown)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadDown = true; MappedState.DpadDown = true;
foreach (DS4Controls dc in Options) foreach (DS4Controls dc in Options)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Options = true; MappedState.Options = true;
foreach (DS4Controls dc in Share) foreach (DS4Controls dc in Share)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Share = true; MappedState.Share = true;
foreach (DS4Controls dc in PS) foreach (DS4Controls dc in PS)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.PS = true; MappedState.PS = true;
foreach (DS4Controls dc in LXN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Global.getCustomButton(device, DS4Controls.LXNeg) == X360Controls.None)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState); LXN.Add(DS4Controls.LXNeg);
if (Global.getCustomButton(device, DS4Controls.LXPos) == X360Controls.None)
LXP.Add(DS4Controls.LXPos);
if (Global.getCustomButton(device, DS4Controls.LYNeg) == X360Controls.None)
LYN.Add(DS4Controls.LYNeg);
if (Global.getCustomButton(device, DS4Controls.LYPos) == X360Controls.None)
LYP.Add(DS4Controls.LYPos);
if (Global.getCustomButton(device, DS4Controls.RXNeg) == X360Controls.None)
RXN.Add(DS4Controls.RXNeg);
if (Global.getCustomButton(device, DS4Controls.RXPos) == X360Controls.None)
RXP.Add(DS4Controls.RXPos);
if (Global.getCustomButton(device, DS4Controls.RYNeg) == X360Controls.None)
RYN.Add(DS4Controls.RYNeg);
if (Global.getCustomButton(device, DS4Controls.RYPos) == X360Controls.None)
RYP.Add(DS4Controls.RYPos);
if (LXN.Count > 0 || LXP.Count > 0)
{
foreach (DS4Controls dc in LXP) foreach (DS4Controls dc in LXP)
if (getXYAxisMapping(device, dc, cState, eState, true) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState, true); MappedState.LX = getXYAxisMapping(device, dc, cState, eState, tp, true);
foreach (DS4Controls dc in LXN)
if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState, tp);
}
else
MappedState.LX = cState.LX;
if (LYN.Count > 0 || LYP.Count > 0)
{
foreach (DS4Controls dc in LYN) foreach (DS4Controls dc in LYN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.LY = getXYAxisMapping(device, dc, cState, eState); MappedState.LY = getXYAxisMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in LYP) foreach (DS4Controls dc in LYP)
if (getXYAxisMapping(device, dc, cState, eState, true) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.LY = getXYAxisMapping(device, dc, cState, eState, true); MappedState.LY = getXYAxisMapping(device, dc, cState, eState, tp, true);
}
else
MappedState.LY = cState.LY;
if (RXN.Count > 0 || RXP.Count > 0)
{
foreach (DS4Controls dc in RXN) foreach (DS4Controls dc in RXN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.RX = getXYAxisMapping(device, dc, cState, eState); MappedState.RX = getXYAxisMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in RXP) foreach (DS4Controls dc in RXP)
if (getXYAxisMapping(device, dc, cState, eState, true) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.RX = getXYAxisMapping(device, dc, cState, eState, true); MappedState.RX = getXYAxisMapping(device, dc, cState, eState, tp, true);
}
else
MappedState.RX = cState.RX;
if (RYN.Count > 0 || RYP.Count > 0)
{
foreach (DS4Controls dc in RYN) foreach (DS4Controls dc in RYN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.RY = getXYAxisMapping(device, dc, cState, eState); MappedState.RY = getXYAxisMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in RYP) foreach (DS4Controls dc in RYP)
if (getXYAxisMapping(device, dc, cState, eState, true) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.RY = getXYAxisMapping(device, dc, cState, eState, true); MappedState.RY = getXYAxisMapping(device, dc, cState, eState, tp, true);
}
else
MappedState.RY = cState.RY;
InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY); InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY);
} }
public static async void MapShiftCustom(int device, DS4State cState, DS4State MappedState, DS4StateExposed eState) public static async void MapShiftCustom(int device, DS4State cState, DS4State MappedState, DS4StateExposed eState, Mouse tp)
{ {
cState.CopyTo(MappedState); cState.CopyTo(MappedState);
SyntheticState deviceState = Mapping.deviceState[device]; SyntheticState deviceState = Mapping.deviceState[device];
foreach (KeyValuePair<DS4Controls, string> customKey in Global.getShiftCustomMacros(device)) //with delays foreach (KeyValuePair<DS4Controls, string> customKey in Global.getShiftCustomMacros(device)) //with delays
{ {
DS4KeyType keyType = Global.getShiftCustomKeyType(device, customKey.Key); DS4KeyType keyType = Global.getShiftCustomKeyType(device, customKey.Key);
if (getBoolMapping(customKey.Key, cState, eState)) if (getBoolMapping(customKey.Key, cState, eState, tp))
{ {
resetToDefaultValue(customKey.Key, MappedState); resetToDefaultValue(customKey.Key, MappedState);
bool LXChanged = (Math.Abs(127 - MappedState.LX) < 5); bool LXChanged = (Math.Abs(127 - MappedState.LX) < 5);
@ -774,31 +811,31 @@ namespace DS4Control
bool[] keydown = new bool[261]; bool[] keydown = new bool[261];
if (keys.Length > 0 && keys[0] > 260 && keys[0] < 300) if (keys.Length > 0 && keys[0] > 260 && keys[0] < 300)
{ {
if (keys[0] == 261 && !MappedState.Cross) MappedState.Cross = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 261 && !MappedState.Cross) MappedState.Cross = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 262 && !MappedState.Circle) MappedState.Circle = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 262 && !MappedState.Circle) MappedState.Circle = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 263 && !MappedState.Square) MappedState.Square = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 263 && !MappedState.Square) MappedState.Square = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 264 && !MappedState.Triangle) MappedState.Triangle = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 264 && !MappedState.Triangle) MappedState.Triangle = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 265 && !MappedState.DpadUp) MappedState.DpadUp = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 265 && !MappedState.DpadUp) MappedState.DpadUp = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 266 && !MappedState.DpadDown) MappedState.DpadDown = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 266 && !MappedState.DpadDown) MappedState.DpadDown = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 267 && !MappedState.DpadLeft) MappedState.DpadLeft = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 267 && !MappedState.DpadLeft) MappedState.DpadLeft = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 268 && !MappedState.DpadRight) MappedState.DpadRight = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 268 && !MappedState.DpadRight) MappedState.DpadRight = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 269 && !MappedState.Options) MappedState.Options = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 269 && !MappedState.Options) MappedState.Options = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 270 && !MappedState.Share) MappedState.Share = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 270 && !MappedState.Share) MappedState.Share = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 271 && !MappedState.PS) MappedState.PS = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 271 && !MappedState.PS) MappedState.PS = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 272 && !MappedState.L1) MappedState.L1 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 272 && !MappedState.L1) MappedState.L1 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 273 && !MappedState.R1) MappedState.R1 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 273 && !MappedState.R1) MappedState.R1 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 274 && MappedState.L2 == 0) MappedState.L2 = getByteMapping(device, customKey.Key, cState, eState); if (keys[0] == 274 && MappedState.L2 == 0) MappedState.L2 = getByteMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 275 && MappedState.R2 == 0) MappedState.R2 = getByteMapping(device, customKey.Key, cState, eState); if (keys[0] == 275 && MappedState.R2 == 0) MappedState.R2 = getByteMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 276 && !MappedState.L3) MappedState.L3 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 276 && !MappedState.L3) MappedState.L3 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 277 && !MappedState.R3) MappedState.R3 = getBoolMapping(customKey.Key, cState, eState); if (keys[0] == 277 && !MappedState.R3) MappedState.R3 = getBoolMapping(customKey.Key, cState, eState, tp);
if (keys[0] == 278 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 278 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 279 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 279 && LYChanged) MappedState.LY = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
if (keys[0] == 280 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 280 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 281 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 281 && LXChanged) MappedState.LX = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
if (keys[0] == 282 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 282 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 283 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 283 && RYChanged) MappedState.RY = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
if (keys[0] == 284 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState); if (keys[0] == 284 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState, tp);
if (keys[0] == 285 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState, true); if (keys[0] == 285 && RXChanged) MappedState.RX = getXYAxisMapping(device, customKey.Key, cState, eState, tp, true);
} }
if (!macrodone[DS4ControltoInt(customKey.Key)]) if (!macrodone[DS4ControltoInt(customKey.Key)])
{ {
@ -849,13 +886,13 @@ namespace DS4Control
} }
} }
} }
else if (!getBoolMapping(customKey.Key, cState, eState)) else if (!getBoolMapping(customKey.Key, cState, eState, tp))
macrodone[DS4ControltoInt(customKey.Key)] = false; macrodone[DS4ControltoInt(customKey.Key)] = false;
} }
foreach (KeyValuePair<DS4Controls, ushort> customKey in Global.getShiftCustomKeys(device)) foreach (KeyValuePair<DS4Controls, ushort> customKey in Global.getShiftCustomKeys(device))
{ {
DS4KeyType keyType = Global.getShiftCustomKeyType(device, customKey.Key); DS4KeyType keyType = Global.getShiftCustomKeyType(device, customKey.Key);
if (getBoolMapping(customKey.Key, cState, eState)) if (getBoolMapping(customKey.Key, cState, eState, tp))
{ {
resetToDefaultValue(customKey.Key, MappedState); resetToDefaultValue(customKey.Key, MappedState);
SyntheticState.KeyPresses kp; SyntheticState.KeyPresses kp;
@ -930,7 +967,7 @@ namespace DS4Control
} }
if (keyType.HasFlag(DS4KeyType.Toggle)) if (keyType.HasFlag(DS4KeyType.Toggle))
{ {
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
{ {
resetToDefaultValue(customButton.Key, MappedState); resetToDefaultValue(customButton.Key, MappedState);
if (!pressedonce[keyvalue]) if (!pressedonce[keyvalue])
@ -974,31 +1011,31 @@ namespace DS4Control
case X360Controls.LT: L2.Add(customButton.Key); break; case X360Controls.LT: L2.Add(customButton.Key); break;
case X360Controls.RT: R2.Add(customButton.Key); break; case X360Controls.RT: R2.Add(customButton.Key); break;
case X360Controls.LeftMouse: case X360Controls.LeftMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.leftCount++; deviceState.currentClicks.leftCount++;
break; break;
case X360Controls.RightMouse: case X360Controls.RightMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.rightCount++; deviceState.currentClicks.rightCount++;
break; break;
case X360Controls.MiddleMouse: case X360Controls.MiddleMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.middleCount++; deviceState.currentClicks.middleCount++;
break; break;
case X360Controls.FourthMouse: case X360Controls.FourthMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.fourthCount++; deviceState.currentClicks.fourthCount++;
break; break;
case X360Controls.FifthMouse: case X360Controls.FifthMouse:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.fifthCount++; deviceState.currentClicks.fifthCount++;
break; break;
case X360Controls.WUP: case X360Controls.WUP:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.wUpCount++; deviceState.currentClicks.wUpCount++;
break; break;
case X360Controls.WDOWN: case X360Controls.WDOWN:
if (getBoolMapping(customButton.Key, cState, eState)) if (getBoolMapping(customButton.Key, cState, eState, tp))
deviceState.currentClicks.wDownCount++; deviceState.currentClicks.wDownCount++;
break; break;
case X360Controls.MouseUp: case X360Controls.MouseUp:
@ -1032,80 +1069,117 @@ namespace DS4Control
} }
} }
foreach (DS4Controls dc in Cross) foreach (DS4Controls dc in Cross)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Cross = true; MappedState.Cross = true;
foreach (DS4Controls dc in Circle) foreach (DS4Controls dc in Circle)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Circle = true; MappedState.Circle = true;
foreach (DS4Controls dc in Square) foreach (DS4Controls dc in Square)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Square = true; MappedState.Square = true;
foreach (DS4Controls dc in Triangle) foreach (DS4Controls dc in Triangle)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Triangle = true; MappedState.Triangle = true;
foreach (DS4Controls dc in L1) foreach (DS4Controls dc in L1)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.L1 = true; MappedState.L1 = true;
foreach (DS4Controls dc in L2) foreach (DS4Controls dc in L2)
if (getByteMapping(device, dc, cState, eState) != 0) if (getByteMapping(device, dc, cState, eState, tp) != 0)
MappedState.L2 = getByteMapping(device, dc, cState, eState); MappedState.L2 = getByteMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in L3) foreach (DS4Controls dc in L3)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.L3 = true; MappedState.L3 = true;
foreach (DS4Controls dc in R1) foreach (DS4Controls dc in R1)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.R1 = true; MappedState.R1 = true;
foreach (DS4Controls dc in R2) foreach (DS4Controls dc in R2)
if (getByteMapping(device, dc, cState, eState) != 0) if (getByteMapping(device, dc, cState, eState, tp) != 0)
MappedState.R2 = getByteMapping(device, dc, cState, eState); MappedState.R2 = getByteMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in R3) foreach (DS4Controls dc in R3)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.R3 = true; MappedState.R3 = true;
foreach (DS4Controls dc in DpadUp) foreach (DS4Controls dc in DpadUp)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadUp = true; MappedState.DpadUp = true;
foreach (DS4Controls dc in DpadRight) foreach (DS4Controls dc in DpadRight)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadRight = true; MappedState.DpadRight = true;
foreach (DS4Controls dc in DpadLeft) foreach (DS4Controls dc in DpadLeft)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadLeft = true; MappedState.DpadLeft = true;
foreach (DS4Controls dc in DpadDown) foreach (DS4Controls dc in DpadDown)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.DpadDown = true; MappedState.DpadDown = true;
foreach (DS4Controls dc in Options) foreach (DS4Controls dc in Options)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Options = true; MappedState.Options = true;
foreach (DS4Controls dc in Share) foreach (DS4Controls dc in Share)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.Share = true; MappedState.Share = true;
foreach (DS4Controls dc in PS) foreach (DS4Controls dc in PS)
if (getBoolMapping(dc, cState, eState)) if (getBoolMapping(dc, cState, eState, tp))
MappedState.PS = true; MappedState.PS = true;
foreach (DS4Controls dc in LXN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Global.getCustomButton(device, DS4Controls.LXNeg) == X360Controls.None)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState); LXN.Add(DS4Controls.LXNeg);
if (Global.getCustomButton(device, DS4Controls.LXPos) == X360Controls.None)
LXP.Add(DS4Controls.LXPos);
if (Global.getCustomButton(device, DS4Controls.LYNeg) == X360Controls.None)
LYN.Add(DS4Controls.LYNeg);
if (Global.getCustomButton(device, DS4Controls.LYPos) == X360Controls.None)
LYP.Add(DS4Controls.LYPos);
if (Global.getCustomButton(device, DS4Controls.RXNeg) == X360Controls.None)
RXN.Add(DS4Controls.RXNeg);
if (Global.getCustomButton(device, DS4Controls.RXPos) == X360Controls.None)
RXP.Add(DS4Controls.RXPos);
if (Global.getCustomButton(device, DS4Controls.RYNeg) == X360Controls.None)
RYN.Add(DS4Controls.RYNeg);
if (Global.getCustomButton(device, DS4Controls.RYPos) == X360Controls.None)
RYP.Add(DS4Controls.RYPos);
if (LXN.Count > 0 || LXP.Count > 0)
{
foreach (DS4Controls dc in LXP) foreach (DS4Controls dc in LXP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState, true); MappedState.LX = getXYAxisMapping(device, dc, cState, eState, tp, true);
foreach (DS4Controls dc in LXN)
if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState, tp);
}
else
MappedState.LX = cState.LX;
if (LYN.Count > 0 || LYP.Count > 0)
{
foreach (DS4Controls dc in LYN) foreach (DS4Controls dc in LYN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.LY = getXYAxisMapping(device, dc, cState, eState); MappedState.LY = getXYAxisMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in LYP) foreach (DS4Controls dc in LYP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.LY = getXYAxisMapping(device, dc, cState, eState, true); MappedState.LY = getXYAxisMapping(device, dc, cState, eState, tp, true);
}
else
MappedState.LY = cState.LY;
if (RXN.Count > 0 || RXP.Count > 0)
{
foreach (DS4Controls dc in RXN) foreach (DS4Controls dc in RXN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.RX = getXYAxisMapping(device, dc, cState, eState); MappedState.RX = getXYAxisMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in RXP) foreach (DS4Controls dc in RXP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.RX = getXYAxisMapping(device, dc, cState, eState, true); MappedState.RX = getXYAxisMapping(device, dc, cState, eState, tp, true);
}
else
MappedState.RX = cState.RX;
if (RYN.Count > 0 || RYP.Count > 0)
{
foreach (DS4Controls dc in RYN) foreach (DS4Controls dc in RYN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp)) > 5)
MappedState.RY = getXYAxisMapping(device, dc, cState, eState); MappedState.RY = getXYAxisMapping(device, dc, cState, eState, tp);
foreach (DS4Controls dc in RYP) foreach (DS4Controls dc in RYP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (Math.Abs(127 - getXYAxisMapping(device, dc, cState, eState, tp, true)) > 5)
MappedState.RY = getXYAxisMapping(device, dc, cState, eState, true); MappedState.RY = getXYAxisMapping(device, dc, cState, eState, tp, true);
}
else
MappedState.RY = cState.RY;
InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY); InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY);
} }
@ -1261,26 +1335,10 @@ namespace DS4Control
return true; return true;
} }
static bool[] touchArea = { true, true, true, true }; public static byte getByteMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState, Mouse tp)
public static byte getByteMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState)
{ {
double SXD = Global.getSXDeadzone(device); double SXD = Global.getSXDeadzone(device);
double SZD = Global.getSZDeadzone(device); double SZD = Global.getSZDeadzone(device);
if (!cState.TouchButton)
for (int i = 0; i < 4; i++)
touchArea[i] = false;
if (!(touchArea[0] || touchArea[1] || touchArea[2] || touchArea[3]))
{
if (cState.Touch2)
touchArea[0] = true;
if (cState.TouchLeft && !cState.Touch2 && cState.Touch1)
touchArea[1] = true;
if (cState.TouchRight && !cState.Touch2 && cState.Touch1)
touchArea[2] = true;
if (!cState.Touch1)
touchArea[3] = true;
}
switch (control) switch (control)
{ {
case DS4Controls.Share: return (byte)(cState.Share ? 255 : 0); case DS4Controls.Share: return (byte)(cState.Share ? 255 : 0);
@ -1298,6 +1356,10 @@ namespace DS4Control
case DS4Controls.Square: return (byte)(cState.Square ? 255 : 0); case DS4Controls.Square: return (byte)(cState.Square ? 255 : 0);
case DS4Controls.Triangle: return (byte)(cState.Triangle ? 255 : 0); case DS4Controls.Triangle: return (byte)(cState.Triangle ? 255 : 0);
case DS4Controls.Circle: return (byte)(cState.Circle ? 255 : 0); case DS4Controls.Circle: return (byte)(cState.Circle ? 255 : 0);
case DS4Controls.TouchLeft: return (byte)(tp.leftDown ? 255 : 0);
case DS4Controls.TouchRight: return (byte)(tp.rightDown ? 255 : 0);
case DS4Controls.TouchMulti: return (byte)(tp.multiDown ? 255 : 0);
case DS4Controls.TouchUpper: return (byte)(tp.upperDown ? 255 : 0);
case DS4Controls.LXNeg: return (byte)cState.LX; case DS4Controls.LXNeg: return (byte)cState.LX;
case DS4Controls.LYNeg: return (byte)cState.LY; case DS4Controls.LYNeg: return (byte)cState.LY;
case DS4Controls.RXNeg: return (byte)cState.RX; case DS4Controls.RXNeg: return (byte)cState.RX;
@ -1308,48 +1370,16 @@ namespace DS4Control
case DS4Controls.RYPos: return (byte)(cState.RY - 125 < 0 ? 0 : (cState.RY - 127)); case DS4Controls.RYPos: return (byte)(cState.RY - 125 < 0 ? 0 : (cState.RY - 127));
case DS4Controls.L2: return (byte)cState.L2; case DS4Controls.L2: return (byte)cState.L2;
case DS4Controls.R2: return (byte)cState.R2; case DS4Controls.R2: return (byte)cState.R2;
}
if (eState != null)
switch (control)
{
case DS4Controls.GyroXPos: return (byte)(eState.GyroX > SXD * 7500 ? Math.Min(255, eState.GyroX / 31) : 0); case DS4Controls.GyroXPos: return (byte)(eState.GyroX > SXD * 7500 ? Math.Min(255, eState.GyroX / 31) : 0);
case DS4Controls.GyroXNeg: return (byte)(eState.GyroX < -SXD * 7500 ? Math.Min(255, -eState.GyroX / 31) : 0); case DS4Controls.GyroXNeg: return (byte)(eState.GyroX < -SXD * 7500 ? Math.Min(255, -eState.GyroX / 31) : 0);
case DS4Controls.GyroZPos: return (byte)(eState.GyroZ > SZD * 7500 ? Math.Min(255, eState.GyroZ / 31) : 0); case DS4Controls.GyroZPos: return (byte)(eState.GyroZ > SZD * 7500 ? Math.Min(255, eState.GyroZ / 31) : 0);
case DS4Controls.GyroZNeg: return (byte)(eState.GyroZ < -SZD * 7500 ? Math.Min(255, -eState.GyroZ / 31) : 0); case DS4Controls.GyroZNeg: return (byte)(eState.GyroZ < -SZD * 7500 ? Math.Min(255, -eState.GyroZ / 31) : 0);
} }
if (cState.TouchButton)
{
if (control == DS4Controls.TouchMulti)
if (!(touchArea[1] || touchArea[2] || touchArea[3]))
return (byte)(touchArea[0] ? 255 : 0);
if (control == DS4Controls.TouchLeft)
if (!(touchArea[0] || touchArea[2] || touchArea[3]))
return (byte)(touchArea[1] ? 255 : 0);
if (control == DS4Controls.TouchRight)
if (!(touchArea[0] || touchArea[1] || touchArea[3]))
return (byte)(touchArea[2] ? 255 : 0);
if (control == DS4Controls.TouchUpper)
if (!(touchArea[0] || touchArea[1] || touchArea[2]))
return (byte)(touchArea[3] ? 255 : 0);
}
return 0; return 0;
} }
public static bool getBoolMapping(DS4Controls control, DS4State cState, DS4StateExposed eState)
public static bool getBoolMapping(DS4Controls control, DS4State cState, DS4StateExposed eState, Mouse tp)
{ {
if (!cState.TouchButton)
for (int i = 0; i < 4; i++)
touchArea[i] = false;
if (!(touchArea[0] || touchArea[1] || touchArea[2] || touchArea[3]))
{
if (cState.Touch2)
touchArea[0] = true;
if (cState.TouchLeft && !cState.Touch2 && cState.Touch1)
touchArea[1] = true;
if (cState.TouchRight && !cState.Touch2 && cState.Touch1)
touchArea[2] = true;
if (!cState.Touch1)
touchArea[3] = true;
}
switch (control) switch (control)
{ {
case DS4Controls.Share: return cState.Share; case DS4Controls.Share: return cState.Share;
@ -1367,6 +1397,10 @@ namespace DS4Control
case DS4Controls.Square: return cState.Square; case DS4Controls.Square: return cState.Square;
case DS4Controls.Triangle: return cState.Triangle; case DS4Controls.Triangle: return cState.Triangle;
case DS4Controls.Circle: return cState.Circle; case DS4Controls.Circle: return cState.Circle;
case DS4Controls.TouchLeft: return tp.leftDown;
case DS4Controls.TouchRight: return tp.rightDown;
case DS4Controls.TouchMulti: return tp.multiDown;
case DS4Controls.TouchUpper: return tp.upperDown;
case DS4Controls.LXNeg: return cState.LX < 127 - 55; case DS4Controls.LXNeg: return cState.LX < 127 - 55;
case DS4Controls.LYNeg: return cState.LY < 127 - 55; case DS4Controls.LYNeg: return cState.LY < 127 - 55;
case DS4Controls.RXNeg: return cState.RX < 127 - 55; case DS4Controls.RXNeg: return cState.RX < 127 - 55;
@ -1377,34 +1411,15 @@ namespace DS4Control
case DS4Controls.RYPos: return cState.RY > 127 + 55; case DS4Controls.RYPos: return cState.RY > 127 + 55;
case DS4Controls.L2: return cState.L2 > 100; case DS4Controls.L2: return cState.L2 > 100;
case DS4Controls.R2: return cState.R2 > 100; case DS4Controls.R2: return cState.R2 > 100;
}
if (eState != null)
switch (control)
{
case DS4Controls.GyroXPos: return eState.GyroX > 5000; case DS4Controls.GyroXPos: return eState.GyroX > 5000;
case DS4Controls.GyroXNeg: return eState.GyroX < -5000; case DS4Controls.GyroXNeg: return eState.GyroX < -5000;
case DS4Controls.GyroZPos: return eState.GyroZ > 5000; case DS4Controls.GyroZPos: return eState.GyroZ > 5000;
case DS4Controls.GyroZNeg: return eState.GyroZ < -5000; case DS4Controls.GyroZNeg: return eState.GyroZ < -5000;
} }
if (cState.TouchButton)
{
if (control == DS4Controls.TouchMulti)
if (!(touchArea[1] || touchArea[2] || touchArea[3]))
return touchArea[0];
if (control == DS4Controls.TouchLeft)
if (!(touchArea[0] || touchArea[2] || touchArea[3]))
return touchArea[1];
if (control == DS4Controls.TouchRight)
if (!(touchArea[0] || touchArea[1] || touchArea[3]))
return touchArea[2];
if (control == DS4Controls.TouchUpper)
if (!(touchArea[0] || touchArea[1] || touchArea[2]))
return touchArea[3];
}
return false; return false;
} }
public static byte getXYAxisMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState, bool alt = false) public static byte getXYAxisMapping(int device, DS4Controls control, DS4State cState, DS4StateExposed eState, Mouse tp, bool alt = false)
{ {
byte trueVal = 0; byte trueVal = 0;
byte falseVal = 127; byte falseVal = 127;
@ -1412,20 +1427,6 @@ namespace DS4Control
double SZD = Global.getSZDeadzone(device); double SZD = Global.getSZDeadzone(device);
if (alt) if (alt)
trueVal = 255; trueVal = 255;
if (!cState.TouchButton)
for (int i = 0; i < 4; i++)
touchArea[i] = false;
if (!(touchArea[0] || touchArea[1] || touchArea[2] || touchArea[3]))
{
if (cState.Touch2)
touchArea[0] = true;
if (cState.TouchLeft && !cState.Touch2 && cState.Touch1)
touchArea[1] = true;
if (cState.TouchRight && !cState.Touch2 && cState.Touch1)
touchArea[2] = true;
if (!cState.Touch1)
touchArea[3] = true;
}
switch (control) switch (control)
{ {
case DS4Controls.Share: return (byte)(cState.Share ? trueVal : falseVal); case DS4Controls.Share: return (byte)(cState.Share ? trueVal : falseVal);
@ -1443,13 +1444,12 @@ namespace DS4Control
case DS4Controls.Square: return (byte)(cState.Square ? trueVal : falseVal); case DS4Controls.Square: return (byte)(cState.Square ? trueVal : falseVal);
case DS4Controls.Triangle: return (byte)(cState.Triangle ? trueVal : falseVal); case DS4Controls.Triangle: return (byte)(cState.Triangle ? trueVal : falseVal);
case DS4Controls.Circle: return (byte)(cState.Circle ? trueVal : falseVal); case DS4Controls.Circle: return (byte)(cState.Circle ? trueVal : falseVal);
case DS4Controls.TouchLeft: return (byte)(tp.leftDown ? trueVal : falseVal);
case DS4Controls.TouchRight: return (byte)(tp.rightDown ? trueVal : falseVal);
case DS4Controls.TouchMulti: return (byte)(tp.multiDown ? trueVal : falseVal);
case DS4Controls.TouchUpper: return (byte)(tp.upperDown ? trueVal : falseVal);
case DS4Controls.L2: if (alt) return (byte)(127 + cState.L2 / 2); else return (byte)(127 - cState.L2 / 2); case DS4Controls.L2: if (alt) return (byte)(127 + cState.L2 / 2); else return (byte)(127 - cState.L2 / 2);
case DS4Controls.R2: if (alt) return (byte)(127 + cState.R2 / 2); else return (byte)(127 - cState.R2 / 2); case DS4Controls.R2: if (alt) return (byte)(127 + cState.R2 / 2); else return (byte)(127 - cState.R2 / 2);
}
if (eState != null)
{
switch (control)
{
case DS4Controls.GyroXPos: if (eState.GyroX > SXD * 7500) case DS4Controls.GyroXPos: if (eState.GyroX > SXD * 7500)
if (alt) return (byte)Math.Min(255, 127 + eState.GyroX / 62); else return (byte)Math.Max(0, 127 - eState.GyroX / 62); if (alt) return (byte)Math.Min(255, 127 + eState.GyroX / 62); else return (byte)Math.Max(0, 127 - eState.GyroX / 62);
else return falseVal; else return falseVal;
@ -1463,7 +1463,6 @@ namespace DS4Control
if (alt) return (byte)Math.Min(255, 127 + -eState.GyroZ / 62); else return (byte)Math.Max(0, 127 - -eState.GyroZ / 62); if (alt) return (byte)Math.Min(255, 127 + -eState.GyroZ / 62); else return (byte)Math.Max(0, 127 - -eState.GyroZ / 62);
else return falseVal; else return falseVal;
} }
}
if (!alt) if (!alt)
{ {
switch (control) switch (control)
@ -1492,21 +1491,6 @@ namespace DS4Control
case DS4Controls.RYPos: return cState.RY; case DS4Controls.RYPos: return cState.RY;
} }
} }
if (cState.TouchButton)
{
if (control == DS4Controls.TouchMulti)
if (!(touchArea[1] || touchArea[2] || touchArea[3]))
return (byte)(touchArea[0] ? trueVal : falseVal);
if (control == DS4Controls.TouchLeft)
if (!(touchArea[0] || touchArea[2] || touchArea[3]))
return (byte)(touchArea[1] ? trueVal : falseVal);
if (control == DS4Controls.TouchRight)
if (!(touchArea[0] || touchArea[1] || touchArea[3]))
return (byte)(touchArea[2] ? trueVal : falseVal);
if (control == DS4Controls.TouchUpper)
if (!(touchArea[0] || touchArea[1] || touchArea[2]))
return (byte)(touchArea[3] ? trueVal : falseVal);
}
return 0; return 0;
} }

12
DS4Control/Mouse.cs
View File

@ -16,6 +16,11 @@ namespace DS4Control
private readonly MouseCursor cursor; private readonly MouseCursor cursor;
private readonly MouseWheel wheel; private readonly MouseWheel wheel;
private bool tappedOnce = false, secondtouchbegin = false; private bool tappedOnce = false, secondtouchbegin = false;
public bool slideleft, slideright;
// touch area stuff
public bool leftDown, rightDown, upperDown, multiDown;
protected DS4Controls pushed = DS4Controls.None;
protected Mapping.Click clicked = Mapping.Click.None;
public Mouse(int deviceID, DS4Device d) public Mouse(int deviceID, DS4Device d)
{ {
@ -29,7 +34,7 @@ namespace DS4Control
{ {
return "Standard Mode"; return "Standard Mode";
} }
public bool slideleft, slideright;
public virtual void touchesMoved(object sender, TouchpadEventArgs arg) public virtual void touchesMoved(object sender, TouchpadEventArgs arg)
{ {
cursor.touchesMoved(arg); cursor.touchesMoved(arg);
@ -90,11 +95,6 @@ namespace DS4Control
synthesizeMouseButtons(); synthesizeMouseButtons();
} }
protected DS4Controls pushed = DS4Controls.None;
protected Mapping.Click clicked = Mapping.Click.None;
// touch area stuff
public bool leftDown, rightDown, upperDown, multiDown;
private bool isLeft(Touch t) private bool isLeft(Touch t)
{ {
return t.hwX < 1920 * 2 / 5; return t.hwX < 1920 * 2 / 5;

4
DS4Tool/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.76")] [assembly: AssemblyVersion("1.4.0.8")]
[assembly: AssemblyFileVersion("1.4.0.76")] [assembly: AssemblyFileVersion("1.4.0.8")]