Another monster pass on the v2 refactor. WIP

Author: nhmkdev

Format/BaseIOConfig.cs

@@ -36,6 +36,17 @@ public abstract class BaseIOConfig
 
         public BaseIOConfig() { }
 
+        /// <summary>
+        /// Clone constructor
+        /// </summary>
+        /// <param name="config"></param>
+        public BaseIOConfig(BaseIOConfig config)
+        {
+            Flags = config.Flags;
+            VirtualKey = config.VirtualKey;
+            Parameter = config.Parameter;
+        }
+
         /// <summary>
         /// Constructor for an InputConfig
         /// </summary>

Format/InputConfig.cs

@@ -33,7 +33,13 @@ namespace KeyCap.Format
     public class InputConfig : BaseIOConfig
     {
         /// <summary>
-        /// Flags applied to a given input/output key
+        /// Copy constructor
+        /// </summary>
+        /// <param name="config"></param>
+        public InputConfig(InputConfig config) : base(config) { }
+
+        /// <summary>
+        /// Flags applied to a given input key (this is the same size as the OutputFlag (32bit)
         /// </summary>
         public enum InputFlag
         {
@@ -49,18 +55,18 @@ public enum InputFlag
         /// <param name="byFlags">The flags defining the input</param>
         /// <param name="byVirtualKey">The value of the input</param>
         /// <param name="eKeyArgs">The input key arguments from user input</param>
-        public InputConfig(byte byFlags, byte byVirtualKey, KeyEventArgs eKeyArgs)
+        public InputConfig(int nFlags, byte byVirtualKey, KeyEventArgs eKeyArgs)
         {
-            Flags = byFlags;
+            Flags = nFlags;
             VirtualKey = byVirtualKey;
 
             if (null != eKeyArgs)
             {
 #warning this is weird to have the flags further defined/or'd with the pkey args (likely only applied to outputs)
-                Flags |= (byte)(
-                    (eKeyArgs.Shift ? (byte)InputFlag.Shift : (byte)0) |
-                    (eKeyArgs.Alt ? (byte)InputFlag.Alt : (byte)0) |
-                    (eKeyArgs.Control ? (byte)InputFlag.Control : (byte)0));
+                Flags |= (int)(
+                    (eKeyArgs.Shift ? (int)InputFlag.Shift : (byte)0) |
+                    (eKeyArgs.Alt ? (int)InputFlag.Alt : (byte)0) |
+                    (eKeyArgs.Control ? (int)InputFlag.Control : (byte)0));
             }
         }
 

Format/OutputConfig.cs

@@ -24,6 +24,7 @@
 
 using System.IO;
 using System.Windows.Forms;
+using Support.UI;
 
 namespace KeyCap.Format
 {
@@ -32,6 +33,12 @@ namespace KeyCap.Format
     /// </summary>
     public class OutputConfig : BaseIOConfig
     {
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="config"></param>
+        public OutputConfig(OutputConfig config) : base(config) { }
+
         /// <summary>
         /// Flags applied to a given input/output key
         /// </summary>
@@ -44,8 +51,8 @@ public enum OutputFlag
             MouseOut = 1 << 4, // mouse output -- see MouseButton
             Delay = 1 << 5,
             Toggle = 1 << 6,
-            TestFlagOne = 1 << 30,
-            TestFlagTwo = 1 << 31
+            Down = 1 << 7,
+            Up = 1 << 8
             //MAX         = 1 << 32, // it's an int! (aka if you need 32 you'll need more space)
         }
 
@@ -107,6 +114,7 @@ public override string GetDescription()
             {
                 return "[" + 
                     (MouseButton)VirtualKey +
+                    getOutputDescriptionText("Mouse") +
                     (IsFlaggedAs(OutputFlag.Toggle) ? "+Toggle" : string.Empty) +
                     "]";
             }
@@ -119,11 +127,21 @@ public override string GetDescription()
             // keyboard 
             return "[" +
                 (Keys)VirtualKey +
+                getOutputDescriptionText("Key") +
                 (IsFlaggedAs(OutputFlag.Shift) ? "+Shift" : string.Empty) +
                 (IsFlaggedAs(OutputFlag.Alt) ? "+Alt" : string.Empty) +
                 (IsFlaggedAs(OutputFlag.Control) ? "+Control" : string.Empty)+
                 (IsFlaggedAs(OutputFlag.Toggle) ? "+Toggle" : string.Empty) +
                     "]";
         }
+
+        private string getOutputDescriptionText(string sPrefix)
+        {
+            return (IsFlaggedAs(OutputFlag.Down) && IsFlaggedAs(OutputFlag.Up)
+                    ? ":Press"
+                    : ((IsFlaggedAs(OutputFlag.Down) ? ":{0}Down".FormatString(sPrefix) : string.Empty) +
+                       (IsFlaggedAs(OutputFlag.Up) ? ":{0}Up".FormatString(sPrefix) : string.Empty))
+                );
+        }
     }
 }

Forms/KeyCaptureConfig.cs

@@ -82,12 +82,17 @@ private void KeyCaptureConfig_Load(object sender, EventArgs e)
             IniManager.RestoreState(this, m_zIniManager.GetValue(Name));
 
             // setup the various mouse output options
-            comboBoxMouseOut.Items.Add("No Action");
+            comboBoxOutMouse.Items.Add("No Action");
             foreach (OutputConfig.MouseButton sName in Enum.GetValues(typeof(OutputConfig.MouseButton)))
             {
-                comboBoxMouseOut.Items.Add(sName);
+                comboBoxOutMouse.Items.Add(sName);
             }
-            comboBoxMouseOut.SelectedIndex = 0;
+            comboBoxOutMouse.SelectedIndex = 0;
+
+            // toggle: mouse buttons, Key
+            // action: mouse buttons down/up, Key down/up
+            
+
 
             // set the notification icon accordingly
             notifyIcon.Icon = Resources.KeyCapIdle;
@@ -106,8 +111,10 @@ private void KeyCaptureConfig_Load(object sender, EventArgs e)
             // initialize capture from command line specified file
             if (0 != m_sLoadedFile.Length)
             {
+#if false
                 btnStart_Click(sender, new EventArgs());
                 new Thread(MinimizeThread) { Name = "MinimizeThread" }.Start();
+#endif
             }
         }
 
@@ -183,9 +190,9 @@ private void KeyCaptureConfig_Resize(object sender, EventArgs e)
             }
         }
 
-        #endregion
+#endregion
 
-        #region Text Capture Handling
+#region Text Capture Handling
 
 #warning Need to make an input and output version of this
         private void txtKeyIn_KeyDown(object sender, KeyEventArgs e)
@@ -217,9 +224,9 @@ private void txtKey_Leave(object sender, EventArgs e)
             ((TextBox)sender).BackColor = SystemColors.Control;
         }
 
-        #endregion
+#endregion
 
-        #region AbstractDirtyForm overrides
+#region AbstractDirtyForm overrides
 
         protected override bool SaveFormData(string sFileName)
         {
@@ -260,9 +267,9 @@ protected override bool OpenFormData(string sFileName)
             return true;
         }
 
-        #endregion
+#endregion
 
-        #region Menu Events
+#region Menu Events
 
         private void loadToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -301,9 +308,9 @@ private void recentConfiguration_Click(object sender, EventArgs e)
             InitOpen(zItem.Text);
         }
 
-        #endregion
+#endregion
 
-        #region Control Events
+#region Control Events
 
         private void listViewKeys_SelectedIndexChanged(object sender, EventArgs e)
         {
@@ -317,13 +324,13 @@ private void listViewKeys_Resize(object sender, EventArgs e)
             ListViewAssist.ResizeColumnHeaders(listViewKeys);
         }
 
-        private void comboBoxSpecialOut_SelectedIndexChanged(object sender, EventArgs e)
+        private void comboBoxMouseOut_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (0 != comboBoxMouseOut.SelectedIndex) // the first entry does nothing
+            if (0 != comboBoxOutMouse.SelectedIndex) // the first entry does nothing
             {
                 var zOutputConfig = new OutputConfig(
                     (byte)OutputConfig.OutputFlag.MouseOut,
-                    (byte)(OutputConfig.MouseButton)comboBoxMouseOut.SelectedItem);
+                    (byte)(OutputConfig.MouseButton)comboBoxOutMouse.SelectedItem);
                 var zDisplay = txtKeyOut;
                 zDisplay.Text = zOutputConfig.GetDescription();
                 zDisplay.Tag = zOutputConfig;
@@ -343,7 +350,7 @@ private void numericUpDownDelay_ValueChanged(object sender, EventArgs e)
 
         private void btnAdd_Click(object sender, EventArgs e)
         {
-            var zInput = (InputConfig)txtKeyIn.Tag;
+            var zInput = new InputConfig((InputConfig)txtKeyIn.Tag);
             var zOutput = getCurrentOutputDefinition();
 
             if (null == zInput || null == zOutput)
@@ -357,6 +364,7 @@ private void btnAdd_Click(object sender, EventArgs e)
             var zPairDef = new RemapEntry(zInput, zOutput);
 
             // TODO: is it worth keeping a hashset of these to cut the time from o(n) to o(1)?
+            // TODO: validation method for this (also need to check that an output actually does something (unless do nothing is selected)
             // verify this is not already defined
             foreach (ListViewItem zListItem in listViewKeys.Items)
             {
@@ -420,12 +428,13 @@ private void btnAppend_Click(object sender, EventArgs e)
 
         private OutputConfig getCurrentOutputDefinition()
         {
-            var zOutput = (OutputConfig)txtKeyOut.Tag;
+            var zOutput = new OutputConfig((OutputConfig)txtKeyOut.Tag);
             if (zOutput == null)
             {
                 return null;
             }
 
+#warning Is this necessary? Why not just let the do nothing flag override?
             if (checkOutputNone.Checked) // if output is set to none change zOutput keyarg
             {
                 zOutput = new OutputConfig((byte)OutputConfig.OutputFlag.DoNothing, 0x00);
@@ -472,9 +481,9 @@ private void btnStart_Click(object sender, EventArgs e)
             }
         }
 
-        #endregion
+#endregion
 
-        #region Support Methods
+#region Support Methods
 
         /// <summary>
         /// Updates the recent loaded file list
@@ -519,8 +528,10 @@ private void UpdateOutputFlags(OutputConfig zOutputConfig)
             var bShift = checkOutputShift.Checked;
             var bNone = checkOutputNone.Checked;
             var bToggle = checkOutputToggle.Checked;
+            var bDown = checkOutputDown.Checked;
+            var bUp = checkOutputUp.Checked;
 
-            int nFlags = 0;
+            var nFlags = 0;
 #warning Make a new method on the config object to update the flag on a field and eliminate this copy+paste garbage
             nFlags = BitUtil.UpdateFlag(nFlags, bShift, OutputConfig.OutputFlag.Shift);
             nFlags = BitUtil.UpdateFlag(nFlags, bControl, OutputConfig.OutputFlag.Control);
@@ -531,6 +542,8 @@ private void UpdateOutputFlags(OutputConfig zOutputConfig)
 
             nFlags = BitUtil.UpdateFlag(nFlags, bNone, OutputConfig.OutputFlag.DoNothing);
             nFlags = BitUtil.UpdateFlag(nFlags, bToggle, OutputConfig.OutputFlag.Toggle);
+            nFlags = BitUtil.UpdateFlag(nFlags, bDown, OutputConfig.OutputFlag.Down);
+            nFlags = BitUtil.UpdateFlag(nFlags, bUp, OutputConfig.OutputFlag.Up);
             zOutputConfig.Flags = nFlags;
         }
 
@@ -559,5 +572,24 @@ private void MinimizeThread()
         }
 
         #endregion
+
+        private void checkOutputToggle_CheckedChanged(object sender, EventArgs e)
+        {
+            checkOutputUp.Checked = checkOutputToggle.Checked;
+            checkOutputDown.Checked = checkOutputToggle.Checked;
+            checkOutputUp.Enabled = !checkOutputToggle.Checked;
+            checkOutputDown.Enabled = !checkOutputToggle.Checked;
+        }
+
+        private void checkOutputNone_CheckedChanged(object sender, EventArgs e)
+        {
+            comboBoxOutMouse.Enabled = !checkOutputNone.Checked;
+            checkOutputAlt.Enabled = !checkOutputNone.Checked;
+            checkOutputShift.Enabled = !checkOutputNone.Checked;
+            checkOutputControl.Enabled = !checkOutputNone.Checked;
+            checkOutputUp.Enabled = !checkOutputNone.Checked;
+            checkOutputDown.Enabled = !checkOutputNone.Checked;
+            checkOutputToggle.Enabled = !checkOutputNone.Checked;
+        }
     }
 }