UI redesign for 360 controls in mapping window

Added manual mouse click buttons for 4th and 5th mouse button
Can also hold an X360 action while a macro is running
Changelog link in help window, also fixes in tips
Macro list scrolls down as you record strokes
DS4Updater: If settings are in appdata, the update zip actually unzips

DS4Control/Mapping.cs

@@ -471,8 +471,11 @@ namespace DS4Control
                 DS4KeyType keyType = Global.getCustomKeyType(device, customKey.Key);
                 if (getBoolMapping(customKey.Key, cState))
                 {
-
                     resetToDefaultValue(customKey.Key, MappedState);
+                    bool LXChanged = (Math.Abs(127 - MappedState.LX) < 5);
+                    bool LYChanged = (Math.Abs(127 - MappedState.LY) < 5);
+                    bool RXChanged = (Math.Abs(127 - MappedState.RX) < 5);
+                    bool RYChanged = (Math.Abs(127 - MappedState.RY) < 5);
                     string[] skeys;
                     int[] keys;
                     if (!string.IsNullOrEmpty(customKey.Value))
@@ -488,6 +491,34 @@ namespace DS4Control
                     for (int i = 0; i < keys.Length; i++)
                         keys[i] = ushort.Parse(skeys[i]);
                     bool[] keydown = new bool[261];
+                    if (keys[0] > 260 && keys[0] < 300)
+                    {
+                        if (keys[0] == 261 && !MappedState.Cross) MappedState.Cross = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 262 && !MappedState.Circle) MappedState.Circle = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 263 && !MappedState.Square) MappedState.Square = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 264 && !MappedState.Triangle) MappedState.Triangle = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 265 && !MappedState.DpadUp) MappedState.DpadUp = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 266 && !MappedState.DpadDown) MappedState.DpadDown = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 267 && !MappedState.DpadLeft) MappedState.DpadLeft = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 268 && !MappedState.DpadRight) MappedState.DpadRight = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 269 && !MappedState.Options) MappedState.Options = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 270 && !MappedState.Share) MappedState.Share = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 271 && !MappedState.PS) MappedState.PS = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 272 && !MappedState.L1) MappedState.L1 = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 273 && !MappedState.R1) MappedState.R1 = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 274 && MappedState.L2 == 0) MappedState.L2 = getByteMapping(customKey.Key, cState);
+                        if (keys[0] == 275 && MappedState.R2 == 0) MappedState.R2 = getByteMapping(customKey.Key, cState);
+                        if (keys[0] == 276 && !MappedState.L3) MappedState.L3 = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 277 && !MappedState.R3) MappedState.R3 = getBoolMapping(customKey.Key, cState);
+                        if (keys[0] == 278 && LYChanged) MappedState.LY = getXYAxisMapping(customKey.Key, cState);
+                        if (keys[0] == 279 && LYChanged) MappedState.LY = getXYAxisMapping(customKey.Key, cState, true);
+                        if (keys[0] == 280 && LXChanged) MappedState.LX = getXYAxisMapping(customKey.Key, cState);
+                        if (keys[0] == 281 && LXChanged) MappedState.LX = getXYAxisMapping(customKey.Key, cState, true);
+                        if (keys[0] == 282 && RYChanged) MappedState.RY = getXYAxisMapping(customKey.Key, cState);
+                        if (keys[0] == 283 && RYChanged) MappedState.RY = getXYAxisMapping(customKey.Key, cState, true);
+                        if (keys[0] == 284 && RXChanged) MappedState.RX = getXYAxisMapping(customKey.Key, cState);
+                        if (keys[0] == 285 && RXChanged) MappedState.RX = getXYAxisMapping(customKey.Key, cState, true);
+                    }
                     if (!macrodone[DS4ControltoInt(customKey.Key)])
                     {
                         macrodone[DS4ControltoInt(customKey.Key)] = true;
@@ -495,7 +526,7 @@ namespace DS4Control
                         {
                             if (keys[i] >= 300) //ints over 300 used to delay
                                 await Task.Delay(keys[i] - 300);
-                            else if (!keydown[keys[i]])
+                            else if (keys[i] < 261 && !keydown[keys[i]])
                             {
                                 if (keys[i] == 256) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTDOWN); //anything above 255 is not a keyvalue
                                 else if (keys[i] == 257) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTDOWN);
@@ -508,7 +539,7 @@ namespace DS4Control
                                     InputMethods.performKeyPress((ushort)keys[i]);
                                 keydown[keys[i]] = true;
                             }
-                            else
+                            else if (keys[i] < 261)
                             {
                                 if (keys[i] == 256) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTUP); //anything above 255 is not a keyvalue
                                 else if (keys[i] == 257) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTUP);

DS4Tool/DS4Tool.csproj

@@ -225,6 +225,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\xbox_360_controller.png" />
+    <None Include="Resources\Y.png" />
+    <None Include="Resources\X.png" />
+    <None Include="Resources\UP.png" />
+    <None Include="Resources\START.png" />
+    <None Include="Resources\x360test.png" />
     <None Include="Resources\sticks.png" />
     <None Include="Resources\UpperTouch.png" />
     <None Include="Resources\shell32_export.png" />
@@ -235,12 +241,18 @@
     <None Include="Resources\Touch.png" />
     <None Include="Resources\Touch states2.png" />
     <None Include="Resources\sticks2.png" />
-    <None Include="Resources\360 fades.png" />
     <None Include="Resources\1401402547_menu-24.png" />
     <None Include="Resources\delete.png" />
     <None Include="Resources\BT.png" />
     <None Include="Resources\DS4 Controller.png" />
     <None Include="Resources\Clock.png" />
+    <None Include="Resources\360LS.png" />
+    <None Include="Resources\360RS.png" />
+    <None Include="Resources\A.PNG" />
+    <None Include="Resources\B.png" />
+    <None Include="Resources\BACK.png" />
+    <None Include="Resources\DOWN.png" />
+    <None Include="Resources\360 fades.png" />
     <Content Include="Resources\DS4.ico" />
     <None Include="Resources\mouse.png" />
     <None Include="Resources\rainbow.png" />
@@ -254,6 +266,22 @@
     <None Include="Resources\MultiTouch.png" />
     <None Include="Resources\RightTouch.png" />
     <None Include="Resources\Pairmode.png" />
+    <None Include="Resources\LB.png" />
+    <None Include="Resources\LEFT.png" />
+    <None Include="Resources\LS.png" />
+    <None Include="Resources\LSD.png" />
+    <None Include="Resources\LSL.png" />
+    <None Include="Resources\LSR.png" />
+    <None Include="Resources\LSU.png" />
+    <None Include="Resources\LT.png" />
+    <None Include="Resources\RB.png" />
+    <None Include="Resources\RIGHT.png" />
+    <None Include="Resources\RS.png" />
+    <None Include="Resources\RSD.png" />
+    <None Include="Resources\RSL.png" />
+    <None Include="Resources\RSR.png" />
+    <None Include="Resources\RSU.png" />
+    <None Include="Resources\RT.png" />
     <Content Include="Resources\Scp_All.ico" />
   </ItemGroup>
   <ItemGroup>

DS4Tool/Hotkeys.Designer.cs

@@ -66,6 +66,7 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.label30 = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
+            this.lLChangelog = new System.Windows.Forms.LinkLabel();
             this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -172,7 +173,7 @@
             // 
             this.label27.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label27.AutoSize = true;
-            this.label27.Location = new System.Drawing.Point(193, 282);
+            this.label27.Location = new System.Drawing.Point(193, 244);
             this.label27.Name = "label27";
             this.label27.Size = new System.Drawing.Size(296, 13);
             this.label27.TabIndex = 14;
@@ -192,7 +193,7 @@
             // 
             this.label29.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label29.AutoSize = true;
-            this.label29.Location = new System.Drawing.Point(193, 244);
+            this.label29.Location = new System.Drawing.Point(193, 282);
             this.label29.Name = "label29";
             this.label29.Size = new System.Drawing.Size(313, 13);
             this.label29.TabIndex = 14;
@@ -437,12 +438,12 @@
             this.tableLayoutPanel1.Controls.Add(this.label8, 1, 7);
             this.tableLayoutPanel1.Controls.Add(this.label14, 1, 5);
             this.tableLayoutPanel1.Controls.Add(this.label28, 1, 13);
-            this.tableLayoutPanel1.Controls.Add(this.label29, 1, 12);
             this.tableLayoutPanel1.Controls.Add(this.label25, 0, 13);
-            this.tableLayoutPanel1.Controls.Add(this.label27, 1, 14);
             this.tableLayoutPanel1.Controls.Add(this.label26, 0, 14);
             this.tableLayoutPanel1.Controls.Add(this.label30, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.label31, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label27, 1, 12);
+            this.tableLayoutPanel1.Controls.Add(this.label29, 1, 14);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 31);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 15;
@@ -484,6 +485,17 @@
             this.label31.TabIndex = 14;
             this.label31.Text = "Hides the DS4\'s regular input (Dinput) from other progrmas\r\ncheck if you are gett" +
     "ing double input in games or R2 pauses games";
+            // 
+            // lLChangelog
+            // 
+            this.lLChangelog.AutoSize = true;
+            this.lLChangelog.Location = new System.Drawing.Point(8, 9);
+            this.lLChangelog.Name = "lLChangelog";
+            this.lLChangelog.Size = new System.Drawing.Size(58, 13);
+            this.lLChangelog.TabIndex = 20;
+            this.lLChangelog.TabStop = true;
+            this.lLChangelog.Text = "Changelog";
+            this.lLChangelog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lLChangelog_LinkClicked);
             // 
             // Hotkeys
             // 
@@ -492,6 +504,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.button1;
             this.ClientSize = new System.Drawing.Size(520, 413);
+            this.Controls.Add(this.lLChangelog);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.linkJhebbel);
             this.Controls.Add(this.linkInhexSTER);
@@ -553,5 +566,6 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.Label label30;
         private System.Windows.Forms.Label label31;
+        private System.Windows.Forms.LinkLabel lLChangelog;
     }
 }

DS4Tool/Hotkeys.cs

@@ -47,5 +47,10 @@ namespace ScpServer
             System.Diagnostics.Process.Start("https://code.google.com/r/jhebbel-ds4tool/source/browse/");
         }
 
+        private void lLChangelog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://docs.google.com/document/d/1l4xcgVQkGUskc5CQ0p069yW22Cd5WAH_yE3Fz2hXo0E/edit?usp=sharing");
+        }
+
     }
 }

DS4Tool/KBM360.cs

@@ -64,12 +64,14 @@ namespace ScpServer
                     else
                         keyname = "How did you get here?";
                 }
+                else if (((Button)sender).Tag.ToString().Contains("X360"))
+                    keyname = ((Button)sender).Tag.ToString().Substring(4);
                 else
                     keyname = ((Button)sender).Text;
 
                 object keytag;
-                if (((Button)sender).Tag.ToString() == "X360")
+                if (((Button)sender).Tag.ToString().Contains("X360"))
-                    keytag = ((Button)sender).Text;
+                    keytag = ((Button)sender).Tag.ToString().Substring(4);
                 else
                     keytag = ((Button)sender).Tag;
                 lBMacroOn.Visible = false;

DS4Tool/Options.cs

@@ -131,6 +131,7 @@ namespace ScpServer
             tp.SetToolTip(lBControlTip, "You can also use your controller to change controls");
             tp.SetToolTip(touchpadJitterCompensation, "Use Sixaxis to help calulate touchpad movement");
             tp.SetToolTip(pBRainbow, "Always on Rainbow Mode");
+            tp.SetToolTip(flushHIDQueue, "Flush HID Queue after each reading");
             advColorDialog.OnUpdateColor += advColorDialog_OnUpdateColor;
             btnLeftStick.Enter += btnSticks_Enter;
             btnRightStick.Enter += btnSticks_Enter;

DS4Tool/Properties/Resources.resx

@@ -121,9 +121,6 @@
   <data name="DS4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DS4.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_360_fades" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\360 fades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="mouse" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mouse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -184,4 +181,79 @@
   <data name="saveprofile" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\saveprofile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="A" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\A.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="B" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\B.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BACK" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BACK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DOWN.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LEFT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LEFT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LSD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LSD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LSL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LSL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LSR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LSR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LSU" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LSU.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RIGHT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RIGHT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RS" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RSD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RSD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RSL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RSL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RSR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RSR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RSU" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RSU.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="START" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\START.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\UP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="X" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\X.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Y" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Y.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_360_fades" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\360 fades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

DS4Tool/Properties/Resources1.Designer.cs

@@ -70,6 +70,36 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap A {
+            get {
+                object obj = ResourceManager.GetObject("A", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap B {
+            get {
+                object obj = ResourceManager.GetObject("B", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap BACK {
+            get {
+                object obj = ResourceManager.GetObject("BACK", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -100,6 +130,16 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap DOWN {
+            get {
+                object obj = ResourceManager.GetObject("DOWN", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
@@ -150,6 +190,26 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LB {
+            get {
+                object obj = ResourceManager.GetObject("LB", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LEFT {
+            get {
+                object obj = ResourceManager.GetObject("LEFT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -160,6 +220,66 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LS {
+            get {
+                object obj = ResourceManager.GetObject("LS", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LSD {
+            get {
+                object obj = ResourceManager.GetObject("LSD", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LSL {
+            get {
+                object obj = ResourceManager.GetObject("LSL", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LSR {
+            get {
+                object obj = ResourceManager.GetObject("LSR", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LSU {
+            get {
+                object obj = ResourceManager.GetObject("LSU", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap LT {
+            get {
+                object obj = ResourceManager.GetObject("LT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -230,6 +350,26 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RB {
+            get {
+                object obj = ResourceManager.GetObject("RB", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RIGHT {
+            get {
+                object obj = ResourceManager.GetObject("RIGHT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -240,6 +380,66 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RS {
+            get {
+                object obj = ResourceManager.GetObject("RS", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RSD {
+            get {
+                object obj = ResourceManager.GetObject("RSD", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RSL {
+            get {
+                object obj = ResourceManager.GetObject("RSL", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RSR {
+            get {
+                object obj = ResourceManager.GetObject("RSR", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RSU {
+            get {
+                object obj = ResourceManager.GetObject("RSU", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap RT {
+            get {
+                object obj = ResourceManager.GetObject("RT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -250,6 +450,16 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap START {
+            get {
+                object obj = ResourceManager.GetObject("START", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -260,6 +470,16 @@ namespace ScpServer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap UP {
+            get {
+                object obj = ResourceManager.GetObject("UP", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -279,5 +499,25 @@ namespace ScpServer.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap X {
+            get {
+                object obj = ResourceManager.GetObject("X", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap Y {
+            get {
+                object obj = ResourceManager.GetObject("Y", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

DS4Tool/RecordBox.Designer.cs

@@ -38,15 +38,24 @@
             this.cBStyle = new System.Windows.Forms.ComboBox();
             this.btnSave = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
+            this.cB360Controls = new System.Windows.Forms.ComboBox();
+            this.lBHoldX360 = new System.Windows.Forms.Label();
+            this.pnlSettings = new System.Windows.Forms.Panel();
+            this.pnlMouseButtons = new System.Windows.Forms.Panel();
+            this.btn5th = new System.Windows.Forms.Button();
+            this.btn4th = new System.Windows.Forms.Button();
+            this.pnlSettings.SuspendLayout();
+            this.pnlMouseButtons.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnRecord
             // 
             this.btnRecord.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRecord.Location = new System.Drawing.Point(13, 2);
+            this.btnRecord.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnRecord.Location = new System.Drawing.Point(3, 2);
             this.btnRecord.Name = "btnRecord";
-            this.btnRecord.Size = new System.Drawing.Size(258, 23);
+            this.btnRecord.Size = new System.Drawing.Size(268, 23);
             this.btnRecord.TabIndex = 322;
             this.btnRecord.TabStop = false;
             this.btnRecord.Text = "Record";
@@ -57,9 +66,8 @@
             // 
             // cBRecordDelays
             // 
-            this.cBRecordDelays.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cBRecordDelays.AutoSize = true;
-            this.cBRecordDelays.Location = new System.Drawing.Point(12, 219);
+            this.cBRecordDelays.Location = new System.Drawing.Point(0, 5);
             this.cBRecordDelays.Name = "cBRecordDelays";
             this.cBRecordDelays.Size = new System.Drawing.Size(96, 17);
             this.cBRecordDelays.TabIndex = 324;
@@ -78,10 +86,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lVMacros.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1});
+            this.lVMacros.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
             this.lVMacros.LargeImageList = this.iLKeys;
-            this.lVMacros.Location = new System.Drawing.Point(13, 29);
+            this.lVMacros.Location = new System.Drawing.Point(3, 29);
             this.lVMacros.Name = "lVMacros";
-            this.lVMacros.Size = new System.Drawing.Size(258, 182);
+            this.lVMacros.Size = new System.Drawing.Size(268, 200);
             this.lVMacros.SmallImageList = this.iLKeys;
             this.lVMacros.TabIndex = 326;
             this.lVMacros.UseCompatibleStateImageBehavior = false;
@@ -89,6 +98,7 @@
             this.lVMacros.KeyDown += new System.Windows.Forms.KeyEventHandler(this.anyKeyDown);
             this.lVMacros.KeyUp += new System.Windows.Forms.KeyEventHandler(this.anyKeyUp);
             this.lVMacros.MouseDown += new System.Windows.Forms.MouseEventHandler(this.anyMouseDown);
+            this.lVMacros.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lVMacros_MouseMove);
             this.lVMacros.MouseUp += new System.Windows.Forms.MouseEventHandler(this.anyMouseUp);
             // 
             // columnHeader1
@@ -106,21 +116,20 @@
             // 
             // cBStyle
             // 
-            this.cBStyle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cBStyle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.cBStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cBStyle.FormattingEnabled = true;
             this.cBStyle.Items.AddRange(new object[] {
             "Play once",
             "Repeat while held"});
-            this.cBStyle.Location = new System.Drawing.Point(150, 217);
+            this.cBStyle.Location = new System.Drawing.Point(147, 3);
             this.cBStyle.Name = "cBStyle";
             this.cBStyle.Size = new System.Drawing.Size(121, 21);
             this.cBStyle.TabIndex = 327;
             // 
             // btnSave
             // 
-            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnSave.Location = new System.Drawing.Point(0, 51);
-            this.btnSave.Location = new System.Drawing.Point(12, 242);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 328;
@@ -130,8 +139,8 @@
             // 
             // btnCancel
             // 
-            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.Location = new System.Drawing.Point(196, 243);
+            this.btnCancel.Location = new System.Drawing.Point(193, 51);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(75, 23);
             this.btnCancel.TabIndex = 328;
@@ -139,19 +148,121 @@
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
+            // cB360Controls
+            // 
+            this.cB360Controls.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.cB360Controls.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cB360Controls.FormattingEnabled = true;
+            this.cB360Controls.Items.AddRange(new object[] {
+            "(none)",
+            "A Button",
+            "B Button",
+            "X Button",
+            "Y Button",
+            "Up Button",
+            "Down Button",
+            "Left Button",
+            "Right Button",
+            "Start",
+            "Back",
+            "Guide",
+            "Left Bumper",
+            "Right Bumper",
+            "Left Trigger",
+            "Right Trigger",
+            "Left Stick",
+            "Right Click",
+            "Left Y-Axis+",
+            "Left Y-Axis-",
+            "Left X-Axis+",
+            "Left X-Axis-",
+            "Right Y-Axis+",
+            "Right Y-Axis-",
+            "Right X-Axis+",
+            "Right X-Axis-"});
+            this.cB360Controls.Location = new System.Drawing.Point(147, 27);
+            this.cB360Controls.Name = "cB360Controls";
+            this.cB360Controls.Size = new System.Drawing.Size(121, 21);
+            this.cB360Controls.TabIndex = 329;
+            // 
+            // lBHoldX360
+            // 
+            this.lBHoldX360.AutoSize = true;
+            this.lBHoldX360.Location = new System.Drawing.Point(-3, 30);
+            this.lBHoldX360.Name = "lBHoldX360";
+            this.lBHoldX360.Size = new System.Drawing.Size(125, 13);
+            this.lBHoldX360.TabIndex = 330;
+            this.lBHoldX360.Text = "Also hold a X360 control:";
+            // 
+            // pnlSettings
+            // 
+            this.pnlSettings.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlSettings.Controls.Add(this.lBHoldX360);
+            this.pnlSettings.Controls.Add(this.cBStyle);
+            this.pnlSettings.Controls.Add(this.cB360Controls);
+            this.pnlSettings.Controls.Add(this.cBRecordDelays);
+            this.pnlSettings.Controls.Add(this.btnCancel);
+            this.pnlSettings.Controls.Add(this.btnSave);
+            this.pnlSettings.Location = new System.Drawing.Point(3, 229);
+            this.pnlSettings.Name = "pnlSettings";
+            this.pnlSettings.Size = new System.Drawing.Size(272, 77);
+            this.pnlSettings.TabIndex = 331;
+            this.pnlSettings.MouseDown += new System.Windows.Forms.MouseEventHandler(this.anyMouseDown);
+            this.pnlSettings.MouseUp += new System.Windows.Forms.MouseEventHandler(this.anyMouseUp);
+            // 
+            // pnlMouseButtons
+            // 
+            this.pnlMouseButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlMouseButtons.Controls.Add(this.btn5th);
+            this.pnlMouseButtons.Controls.Add(this.btn4th);
+            this.pnlMouseButtons.Location = new System.Drawing.Point(3, 232);
+            this.pnlMouseButtons.Name = "pnlMouseButtons";
+            this.pnlMouseButtons.Size = new System.Drawing.Size(272, 78);
+            this.pnlMouseButtons.TabIndex = 331;
+            this.pnlMouseButtons.Visible = false;
+            this.pnlMouseButtons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.anyMouseDown);
+            this.pnlMouseButtons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.anyMouseUp);
+            // 
+            // btn5th
+            // 
+            this.btn5th.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.btn5th.Location = new System.Drawing.Point(76, 42);
+            this.btn5th.Name = "btn5th";
+            this.btn5th.Size = new System.Drawing.Size(131, 23);
+            this.btn5th.TabIndex = 0;
+            this.btn5th.Text = "5th Mouse Button Down";
+            this.btn5th.UseVisualStyleBackColor = true;
+            this.btn5th.Click += new System.EventHandler(this.btn5th_Click);
+            this.btn5th.KeyDown += new System.Windows.Forms.KeyEventHandler(this.anyKeyDown);
+            this.btn5th.KeyUp += new System.Windows.Forms.KeyEventHandler(this.anyKeyUp);
+            // 
+            // btn4th
+            // 
+            this.btn4th.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.btn4th.Location = new System.Drawing.Point(76, 13);
+            this.btn4th.Name = "btn4th";
+            this.btn4th.Size = new System.Drawing.Size(131, 23);
+            this.btn4th.TabIndex = 0;
+            this.btn4th.Text = "4th Mouse Button Down";
+            this.btn4th.UseVisualStyleBackColor = true;
+            this.btn4th.Click += new System.EventHandler(this.btn4th_Click);
+            this.btn4th.KeyDown += new System.Windows.Forms.KeyEventHandler(this.anyKeyDown);
+            this.btn4th.KeyUp += new System.Windows.Forms.KeyEventHandler(this.anyKeyUp);
+            // 
             // RecordBox
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.ClientSize = new System.Drawing.Size(276, 268);
+            this.ClientSize = new System.Drawing.Size(276, 306);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnSave);
-            this.Controls.Add(this.cBStyle);
-            this.Controls.Add(this.lVMacros);
-            this.Controls.Add(this.cBRecordDelays);
             this.Controls.Add(this.btnRecord);
+            this.Controls.Add(this.lVMacros);
+            this.Controls.Add(this.pnlSettings);
+            this.Controls.Add(this.pnlMouseButtons);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+            this.MinimumSize = new System.Drawing.Size(260, 205);
             this.Name = "RecordBox";
             this.ShowInTaskbar = false;
             this.Text = "Record a Macro";
@@ -160,8 +271,10 @@
             this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.anyKeyUp);
             this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.anyMouseDown);
             this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.anyMouseUp);
+            this.pnlSettings.ResumeLayout(false);
+            this.pnlSettings.PerformLayout();
+            this.pnlMouseButtons.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -175,5 +288,11 @@
         private System.Windows.Forms.ComboBox cBStyle;
         private System.Windows.Forms.Button btnSave;
         private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.ComboBox cB360Controls;
+        private System.Windows.Forms.Label lBHoldX360;
+        private System.Windows.Forms.Panel pnlSettings;
+        private System.Windows.Forms.Panel pnlMouseButtons;
+        private System.Windows.Forms.Button btn5th;
+        private System.Windows.Forms.Button btn4th;
     }
 }

DS4Tool/RecordBox.cs

@@ -25,6 +25,7 @@ namespace ScpServer
                 cBStyle.SelectedIndex = 1;
             else
                 cBStyle.SelectedIndex = 0;
+            cB360Controls.SelectedIndex = 0;
         }
 
         private void btnRecord_Click(object sender, EventArgs e)
@@ -42,6 +43,10 @@ namespace ScpServer
             }
             else
             {
+                if (btn4th.Text.Contains("Up"))
+                    btn4th_Click(sender, e);
+                if (btn5th.Text.Contains("Up"))
+                    btn5th_Click(sender, e);
                 if (cBRecordDelays.Checked)
                     sw.Reset();
                 btnRecord.Text = "Record";
@@ -51,11 +56,9 @@ namespace ScpServer
 
         private void EnableControls(bool on)
         {
-            cBRecordDelays.Enabled = on;
             lVMacros.Enabled = on;
-            cBStyle.Enabled = on;
+            pnlSettings.Visible = on;
-            btnCancel.Enabled = on;
+            pnlMouseButtons.Visible = !on;
-            btnSave.Enabled = on;
         }
 
         private void anyKeyDown(object sender, KeyEventArgs e)
@@ -90,6 +93,7 @@ namespace ScpServer
                     macros.Add(e.KeyValue);
                     lVMacros.Items.Add(e.KeyCode.ToString(), 0);
                 }
+                lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
             }
             else
             {
@@ -115,9 +119,9 @@ namespace ScpServer
                     macros.Add(e.KeyValue);
                 }
                 lVMacros.Items.Add(e.KeyCode.ToString(), 1);
+                lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
             }
         }
-
         private void anyMouseDown(object sender, MouseEventArgs e)
         {
             if (btnRecord.Text == "Stop")
@@ -132,7 +136,6 @@ namespace ScpServer
                     case System.Windows.Forms.MouseButtons.XButton2: value = 260; break;
                     default: value = 0; break;
                 }
-
                 if (macros.Count == 0)
                 {
                     macros.Add(value);
@@ -159,6 +162,7 @@ namespace ScpServer
                     lVMacros.Items[lVMacros.Items.Count - 1].Text = "4th Mouse Button";
                 if (e.Button == System.Windows.Forms.MouseButtons.XButton2)
                     lVMacros.Items[lVMacros.Items.Count - 1].Text = "5th Mouse Button";
+                lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
             }
         }
 
@@ -190,13 +194,17 @@ namespace ScpServer
                     lVMacros.Items[lVMacros.Items.Count - 1].Text = "4th Mouse Button";
                 if (e.Button == System.Windows.Forms.MouseButtons.XButton2)
                     lVMacros.Items[lVMacros.Items.Count - 1].Text = "5th Mouse Button";
+                lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
             }
         }
+
         bool saved = false;
         private void btnSave_Click(object sender, EventArgs e)
         {
             if (macros.Count > 0)
             {
+                if (cB360Controls.SelectedIndex > 0)
+                    macros.Insert(0, cB360Controls.SelectedIndex + 260);
                 kbm.macrostag = macros;
                 foreach (ListViewItem lvi in lVMacros.Items)
                 {
@@ -213,6 +221,10 @@ namespace ScpServer
             else MessageBox.Show("No macro was recorded", "DS4Windows", MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
         
+        private void lVMacros_MouseMove(object sender, MouseEventArgs e)
+        {
+        }
+
         private void btnCancel_Click(object sender, EventArgs e)
         {
             saved = true;
@@ -264,5 +276,95 @@ namespace ScpServer
                     break;
             }
         }
+
+        private void btn4th_Click(object sender, EventArgs e)
+        {
+            int value = 259;
+            if (btn4th.Text.Contains("Down"))
+            {
+                if (macros.Count == 0)
+                {
+                    macros.Add(value);
+                    lVMacros.Items.Add("4th Mouse Button", 0);
+                    if (cBRecordDelays.Checked)
+                    {
+                        sw.Reset();
+                        sw.Start();
+                    }
+                }
+                else
+                {
+                    if (cBRecordDelays.Checked)
+                    {
+                        macros.Add((int)sw.ElapsedMilliseconds + 300);
+                        lVMacros.Items.Add("Wait " + sw.ElapsedMilliseconds + "ms", 2);
+                        sw.Reset();
+                        sw.Start();
+                    }
+                    macros.Add(value);
+                    lVMacros.Items.Add("4th Mouse Button", 0);
+                }
+                btn4th.Text = "4th Mouse Button Up";
+            }
+            else
+            {
+                if (cBRecordDelays.Checked)
+                {
+                    macros.Add((int)sw.ElapsedMilliseconds + 300);
+                    lVMacros.Items.Add("Wait " + sw.ElapsedMilliseconds + "ms", 2);
+                    sw.Reset();
+                    sw.Start();
+                }
+                macros.Add(value);
+                lVMacros.Items.Add("4th Mouse Button", 1);
+                btn4th.Text = "4th Mouse Button Down";
+            }
+            lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
+        }
+
+        private void btn5th_Click(object sender, EventArgs e)
+        {
+            int value = 260;
+            if (btn5th.Text.Contains("Down"))
+            {
+                if (macros.Count == 0)
+                {
+                    macros.Add(value);
+                    lVMacros.Items.Add("5th Mouse Button", 0);
+                    if (cBRecordDelays.Checked)
+                    {
+                        sw.Reset();
+                        sw.Start();
+                    }
+                }
+                else
+                {
+                    if (cBRecordDelays.Checked)
+                    {
+                        macros.Add((int)sw.ElapsedMilliseconds + 300);
+                        lVMacros.Items.Add("Wait " + sw.ElapsedMilliseconds + "ms", 2);
+                        sw.Reset();
+                        sw.Start();
+                    }
+                    macros.Add(value);
+                    lVMacros.Items.Add("5th Mouse Button", 0);
+                }
+                btn5th.Text = "5th Mouse Button Up";
+            }
+            else
+            {
+                if (cBRecordDelays.Checked)
+                {
+                    macros.Add((int)sw.ElapsedMilliseconds + 300);
+                    lVMacros.Items.Add("Wait " + sw.ElapsedMilliseconds + "ms", 2);
+                    sw.Reset();
+                    sw.Start();
+                }
+                macros.Add(value);
+                lVMacros.Items.Add("5th Mouse Button", 1);
+                btn5th.Text = "5th Mouse Button Down";
+            }
+            lVMacros.Items[lVMacros.Items.Count - 1].EnsureVisible();
+        }
     }
 }

DS4Tool/RecordBox.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
-        CgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

DS4Tool/ScpForm.Designer.cs

@@ -409,7 +409,7 @@
             this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 23.34039F));
             this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.31077F));
             this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 117F));
-            this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F));
+            this.tLPControllers.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F));
             this.tLPControllers.Controls.Add(this.pBStatus1, 1, 1);
             this.tLPControllers.Controls.Add(this.lbPad1, 0, 1);
             this.tLPControllers.Controls.Add(this.lbPad2, 0, 2);
@@ -451,7 +451,7 @@
             this.pBStatus1.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pBStatus1.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus1.Image")));
             this.pBStatus1.InitialImage = global::ScpServer.Properties.Resources.BT;
-            this.pBStatus1.Location = new System.Drawing.Point(369, 19);
+            this.pBStatus1.Location = new System.Drawing.Point(373, 19);
             this.pBStatus1.Name = "pBStatus1";
             this.pBStatus1.Size = new System.Drawing.Size(39, 20);
             this.pBStatus1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -483,7 +483,7 @@
             // bnEditC3
             // 
             this.bnEditC3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.bnEditC3.Location = new System.Drawing.Point(737, 76);
+            this.bnEditC3.Location = new System.Drawing.Point(742, 76);
             this.bnEditC3.Name = "bnEditC3";
             this.bnEditC3.Size = new System.Drawing.Size(40, 23);
             this.bnEditC3.TabIndex = 43;
@@ -495,7 +495,7 @@
             // bnEditC4
             // 
             this.bnEditC4.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.bnEditC4.Location = new System.Drawing.Point(737, 105);
+            this.bnEditC4.Location = new System.Drawing.Point(742, 105);
             this.bnEditC4.Name = "bnEditC4";
             this.bnEditC4.Size = new System.Drawing.Size(40, 23);
             this.bnEditC4.TabIndex = 43;
@@ -531,7 +531,7 @@
             this.cBController1.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.cBController1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cBController1.FormattingEnabled = true;
-            this.cBController1.Location = new System.Drawing.Point(620, 19);
+            this.cBController1.Location = new System.Drawing.Point(625, 19);
             this.cBController1.Name = "cBController1";
             this.cBController1.Size = new System.Drawing.Size(111, 21);
             this.cBController1.TabIndex = 42;
@@ -541,7 +541,7 @@
             // bnEditC2
             // 
             this.bnEditC2.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.bnEditC2.Location = new System.Drawing.Point(737, 47);
+            this.bnEditC2.Location = new System.Drawing.Point(742, 47);
             this.bnEditC2.Name = "bnEditC2";
             this.bnEditC2.Size = new System.Drawing.Size(40, 23);
             this.bnEditC2.TabIndex = 43;
@@ -555,7 +555,7 @@
             this.cBController2.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.cBController2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cBController2.FormattingEnabled = true;
-            this.cBController2.Location = new System.Drawing.Point(620, 48);
+            this.cBController2.Location = new System.Drawing.Point(625, 48);
             this.cBController2.Name = "cBController2";
             this.cBController2.Size = new System.Drawing.Size(111, 21);
             this.cBController2.TabIndex = 42;
@@ -567,7 +567,7 @@
             this.cBController3.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.cBController3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cBController3.FormattingEnabled = true;
-            this.cBController3.Location = new System.Drawing.Point(620, 77);
+            this.cBController3.Location = new System.Drawing.Point(625, 77);
             this.cBController3.Name = "cBController3";
             this.cBController3.Size = new System.Drawing.Size(111, 21);
             this.cBController3.TabIndex = 42;
@@ -577,7 +577,7 @@
             // bnEditC1
             // 
             this.bnEditC1.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.bnEditC1.Location = new System.Drawing.Point(737, 18);
+            this.bnEditC1.Location = new System.Drawing.Point(742, 18);
             this.bnEditC1.Name = "bnEditC1";
             this.bnEditC1.Size = new System.Drawing.Size(40, 23);
             this.bnEditC1.TabIndex = 43;
@@ -591,7 +591,7 @@
             this.cBController4.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.cBController4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cBController4.FormattingEnabled = true;
-            this.cBController4.Location = new System.Drawing.Point(620, 106);
+            this.cBController4.Location = new System.Drawing.Point(625, 106);
             this.cBController4.Name = "cBController4";
             this.cBController4.Size = new System.Drawing.Size(111, 21);
             this.cBController4.TabIndex = 42;
@@ -603,7 +603,7 @@
             this.lBSelectedProfile.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBSelectedProfile.AutoSize = true;
             this.lBSelectedProfile.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBSelectedProfile.Location = new System.Drawing.Point(621, 0);
+            this.lBSelectedProfile.Location = new System.Drawing.Point(626, 0);
             this.lBSelectedProfile.Name = "lBSelectedProfile";
             this.lBSelectedProfile.Size = new System.Drawing.Size(109, 15);
             this.lBSelectedProfile.TabIndex = 45;
@@ -625,7 +625,7 @@
             this.lBStatus.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBStatus.AutoSize = true;
             this.lBStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBStatus.Location = new System.Drawing.Point(365, 0);
+            this.lBStatus.Location = new System.Drawing.Point(369, 0);
             this.lBStatus.Name = "lBStatus";
             this.lBStatus.Size = new System.Drawing.Size(47, 15);
             this.lBStatus.TabIndex = 45;
@@ -636,7 +636,7 @@
             this.lBBattery.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBBattery.AutoSize = true;
             this.lBBattery.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBBattery.Location = new System.Drawing.Point(513, 0);
+            this.lBBattery.Location = new System.Drawing.Point(518, 0);
             this.lBBattery.Name = "lBBattery";
             this.lBBattery.Size = new System.Drawing.Size(51, 15);
             this.lBBattery.TabIndex = 45;
@@ -647,7 +647,7 @@
             this.lBBatt1.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBBatt1.AutoSize = true;
             this.lBBatt1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBBatt1.Location = new System.Drawing.Point(519, 22);
+            this.lBBatt1.Location = new System.Drawing.Point(524, 22);
             this.lBBatt1.Name = "lBBatt1";
             this.lBBatt1.Size = new System.Drawing.Size(39, 15);
             this.lBBatt1.TabIndex = 44;
@@ -658,7 +658,7 @@
             this.lBBatt2.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBBatt2.AutoSize = true;
             this.lBBatt2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBBatt2.Location = new System.Drawing.Point(519, 51);
+            this.lBBatt2.Location = new System.Drawing.Point(524, 51);
             this.lBBatt2.Name = "lBBatt2";
             this.lBBatt2.Size = new System.Drawing.Size(39, 15);
             this.lBBatt2.TabIndex = 44;
@@ -669,7 +669,7 @@
             this.lBBatt3.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBBatt3.AutoSize = true;
             this.lBBatt3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBBatt3.Location = new System.Drawing.Point(519, 80);
+            this.lBBatt3.Location = new System.Drawing.Point(524, 80);
             this.lBBatt3.Name = "lBBatt3";
             this.lBBatt3.Size = new System.Drawing.Size(39, 15);
             this.lBBatt3.TabIndex = 44;
@@ -680,7 +680,7 @@
             this.lBBatt4.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.lBBatt4.AutoSize = true;
             this.lBBatt4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lBBatt4.Location = new System.Drawing.Point(519, 109);
+            this.lBBatt4.Location = new System.Drawing.Point(524, 109);
             this.lBBatt4.Name = "lBBatt4";
             this.lBBatt4.Size = new System.Drawing.Size(39, 15);
             this.lBBatt4.TabIndex = 44;
@@ -691,7 +691,7 @@
             this.pBStatus2.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pBStatus2.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus2.Image")));
             this.pBStatus2.InitialImage = global::ScpServer.Properties.Resources.BT;
-            this.pBStatus2.Location = new System.Drawing.Point(369, 48);
+            this.pBStatus2.Location = new System.Drawing.Point(373, 48);
             this.pBStatus2.Name = "pBStatus2";
             this.pBStatus2.Size = new System.Drawing.Size(39, 20);
             this.pBStatus2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -703,7 +703,7 @@
             this.pBStatus3.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pBStatus3.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus3.Image")));
             this.pBStatus3.InitialImage = global::ScpServer.Properties.Resources.BT;
-            this.pBStatus3.Location = new System.Drawing.Point(369, 77);
+            this.pBStatus3.Location = new System.Drawing.Point(373, 77);
             this.pBStatus3.Name = "pBStatus3";
             this.pBStatus3.Size = new System.Drawing.Size(39, 20);
             this.pBStatus3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -715,7 +715,7 @@
             this.pBStatus4.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pBStatus4.Image = ((System.Drawing.Image)(resources.GetObject("pBStatus4.Image")));
             this.pBStatus4.InitialImage = global::ScpServer.Properties.Resources.BT;
-            this.pBStatus4.Location = new System.Drawing.Point(369, 106);
+            this.pBStatus4.Location = new System.Drawing.Point(373, 106);
             this.pBStatus4.Name = "pBStatus4";
             this.pBStatus4.Size = new System.Drawing.Size(39, 20);
             this.pBStatus4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;

DS4Tool/ScpForm.cs

@@ -17,7 +17,7 @@ namespace ScpServer
 {
     public partial class ScpForm : Form
     {
-        double version = 10.4;
+        double version = 10.45;
         private DS4Control.Control rootHub;
         delegate void LogDebugDelegate(DateTime Time, String Data);