v0.2a

-- Added target app to vjoy buttons so focus returns to app when sending buttons as well as keyboard data.
muchimi · Jul 23, 2022 · a2a7144 · a2a7144
1 parent 7af0442
commit a2a7144
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 105 deletions.
diff --git a/muchimi.vjoy/AddApplication.Designer.cs b/muchimi.vjoy/AddApplication.Designer.cs
diff --git a/muchimi.vjoy/AddApplication.cs b/muchimi.vjoy/AddApplication.cs
@@ -8,7 +8,7 @@
 using muchimi_vjoy;
 using SuchByte.MacroDeck.GUI.CustomControls;
 
-namespace muchimi.vjoy
+namespace muchimi_vjoy
 {
     public partial class AddApplication : DialogForm
     {

diff --git a/muchimi.vjoy/ConfigData.cs b/muchimi.vjoy/ConfigData.cs
@@ -573,6 +573,25 @@ public bool LoadVjoyConfig(VjoyAction action)
             {
                 return VjoyConfigFromJson(action.Configuration);
             }
+            else
+            {
+
+                // default values
+                ButtonNumber = 1;
+                DeviceNumber = 1;
+                ButtonMode = EButtonMode.pulse;
+                ButtonPulseInterval = 600;
+                AxisEnabled = false;
+                ButtonEnabled = false;
+                ActionId = Guid.NewGuid().ToString();
+                TrackState = false;
+
+                AxisMode = EAxisMode.absolute;
+                AxisValue = 0.0; // center
+                Axis = VJoyAxis.AXIS_X;
+                AxisHatValue = -1; // center
+                TargetProcess = Main.Instance.Config.LastApplication;
+            }
 
             return false;
         }
@@ -680,6 +699,19 @@ public bool VjoyConfigFromJson(string json)
                 }
 
 
+                var targetProcessText = "";
+                value = jObject[ConfigData.TARGET_PROCESS];
+                if (value != null)
+                {
+                    targetProcessText = value.ToString();
+                    if (string.IsNullOrWhiteSpace(targetProcessText))
+                    {
+                        // default to the focused app entry
+                        targetProcessText = VjoyPluginConfiguration.FOCUSED_APP;
+                    }
+                }
+
+
 
                 ButtonNumber = uint.Parse(buttonNumberText);
                 DeviceNumber = uint.Parse(deviceNumberText);
@@ -701,25 +733,9 @@ public bool VjoyConfigFromJson(string json)
                 AxisMode = Enum.TryParse(axisModeText, out EAxisMode axisMode) ? axisMode : EAxisMode.absolute;
 
 
+                TargetProcess = targetProcessText;
             }
-            else
-            {
-
-                // default values
-                ButtonNumber = 1;
-                DeviceNumber = 1;
-                ButtonMode = EButtonMode.pulse;
-                ButtonPulseInterval = 600;
-                AxisEnabled = false;
-                ButtonEnabled = false;
-                ActionId = Guid.NewGuid().ToString();
-                TrackState = false;
 
-                AxisMode = EAxisMode.absolute;
-                AxisValue = 0.0; // center
-                Axis = VJoyAxis.AXIS_X;
-                AxisHatValue = -1; // center
-            }
 
             return true;
         }
@@ -959,6 +975,8 @@ public string VJoyConfigToJson()
                 [ConfigData.AXIS_VALUE] = AxisValue.ToString(),
                 [ConfigData.AXIS_HATVALUE] = AxisHatValue.ToString(),
                 [ConfigData.AXIS_PULSE_INTERVAL] = AxisPulseInterval.ToString(),
+
+                [ConfigData.TARGET_PROCESS] = TargetProcess,
             };
             return jObject.ToString();
         }
@@ -1091,7 +1109,6 @@ void Clone(ConfigData source, ref ConfigData dest)
             dest.Axis = source.Axis;
             dest.AxisValue = source.AxisValue;
             dest.AxisHatValue = source.AxisHatValue;
-
             dest.AxisPulseInterval = source.AxisPulseInterval;
 
 

diff --git a/muchimi.vjoy/InputActionConfigurator.Designer.cs b/muchimi.vjoy/InputActionConfigurator.Designer.cs
diff --git a/muchimi.vjoy/InputActionConfigurator.cs b/muchimi.vjoy/InputActionConfigurator.cs
@@ -223,43 +223,40 @@ private void rb_keyup_CheckedChanged(object sender, EventArgs e)
 
 
 
-        private void cmd_select_application_Click(object sender, EventArgs e)
-        {
-            var ofd = new OpenFileDialog();
-            ofd.Filter = "Applications (*.exe)|*.exe;All Files (*.*)|*.*";
-            ofd.CheckFileExists = true;
-            ofd.Multiselect=false;
-            var result = ofd.ShowDialog();
-            if (result == DialogResult.OK)
-            {
-                var config = Main.Instance.Config;
-                var name = config.FixedName(Path.GetFileNameWithoutExtension(ofd.FileName));
-                config.AddApplication(name);
-                cb_applications.SelectedItem = name;
+        //private void cmd_select_application_Click(object sender, EventArgs e)
+        //{
+        //    var ofd = new OpenFileDialog();
+        //    ofd.Filter = "Applications (*.exe)|*.exe;All Files (*.*)|*.*";
+        //    ofd.CheckFileExists = true;
+        //    ofd.Multiselect=false;
+        //    var result = ofd.ShowDialog();
+        //    if (result == DialogResult.OK)
+        //    {
+        //        var config = Main.Instance.Config;
+        //        var name = config.FixedName(Path.GetFileNameWithoutExtension(ofd.FileName));
+        //        config.AddApplication(name);
+        //        cb_applications.SelectedItem = name;
 
 
-            }
+        //    }
 
-        }
+        //}
 
-        private void cb_applications_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            data.TargetProcess = cb_applications.SelectedItem.ToString();
-        }
+
 
         private void cmd_remove_Click(object sender, EventArgs e)
         {
             var config = Main.Instance.Config;
             config.RemoveApplication(cb_applications.SelectedItem.ToString());
         }
 
-        private void cb_applications_SelectedIndexChanged_1(object sender, EventArgs e)
+        private void cb_applications_SelectedIndexChanged(object sender, EventArgs e)
         {
             string name = cb_applications.SelectedItem.ToString();
             cmd_remove.Enabled = ! string.IsNullOrEmpty(name);
             var config = Main.Instance.Config;
             config.LastApplication = name;
-
+            data.TargetProcess = name;
         }
 
         private void cmd_add_Click(object sender, EventArgs e)