diff --git a/DS4Control/Mouse.cs b/DS4Control/Mouse.cs index b5075b3..274d95a 100644 --- a/DS4Control/Mouse.cs +++ b/DS4Control/Mouse.cs @@ -115,13 +115,25 @@ namespace DS4Control private DS4State remapped = new DS4State(); private void synthesizeMouseButtons() { - if (Global.getCustomButton(deviceNum, DS4Controls.TouchLeft) == X360Controls.None && leftDown) + if (Global.getCustomButton(deviceNum, DS4Controls.TouchLeft) == X360Controls.None && + Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchLeft) == "0" && + Global.getShiftCustomKey(deviceNum, DS4Controls.TouchLeft) == 0 && + leftDown) Mapping.MapClick(deviceNum, Mapping.Click.Left); - if (Global.getCustomButton(deviceNum, DS4Controls.TouchUpper) == X360Controls.None && upperDown) + if (Global.getCustomButton(deviceNum, DS4Controls.TouchUpper) == X360Controls.None && + Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchUpper) == "0" && + Global.getShiftCustomKey(deviceNum, DS4Controls.TouchUpper) == 0 && + upperDown) Mapping.MapClick(deviceNum, Mapping.Click.Middle); - if (Global.getCustomButton(deviceNum, DS4Controls.TouchRight) == X360Controls.None && rightDown) + if (Global.getCustomButton(deviceNum, DS4Controls.TouchRight) == X360Controls.None && + Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchRight) == "0" && + Global.getShiftCustomKey(deviceNum, DS4Controls.TouchRight) == 0 && + rightDown) Mapping.MapClick(deviceNum, Mapping.Click.Left); - if (Global.getCustomButton(deviceNum, DS4Controls.TouchMulti) == X360Controls.None && multiDown) + if (Global.getCustomButton(deviceNum, DS4Controls.TouchMulti) == X360Controls.None && + Global.getShiftCustomMacro(deviceNum, DS4Controls.TouchMulti) == "0" && + Global.getShiftCustomKey(deviceNum, DS4Controls.TouchMulti) == 0 && + multiDown) Mapping.MapClick(deviceNum, Mapping.Click.Right); if (tappedOnce) { diff --git a/DS4Tool/DS4Tool.csproj b/DS4Tool/DS4Tool.csproj index ff70ef6..d096499 100644 --- a/DS4Tool/DS4Tool.csproj +++ b/DS4Tool/DS4Tool.csproj @@ -73,6 +73,9 @@ true + + OnBuildSuccess + @@ -172,6 +175,7 @@ KBM360.cs + Designer MessageTextBox.cs @@ -350,6 +354,13 @@ + + + + + + ilmerge /targetplatform:"v4,C:\Windows\Microsoft.NET\Framework\v4.0.30319" /out:Build\DS4Windows.exe DS4Windows.exe HidLibrary.dll DS4Control.dll DS4Library.dll +