Minimize and horizontal peak

Can now minimize window, and horizontal peak suppressor while blinking is implemented
LIMUNIMI · Jun 12, 2023 · b5cb1a8 · b5cb1a8
1 parent b2fe41c
commit b5cb1a8
Show file tree

Hide file tree

Showing 28 changed files with 196 additions and 76 deletions.
diff --git a/.vs/DJeyeMouseWrapper/FileContentIndex/860244a7-dd5e-41ef-b578-901bbf24b9cd.vsidx b/.vs/DJeyeMouseWrapper/FileContentIndex/860244a7-dd5e-41ef-b578-901bbf24b9cd.vsidx
diff --git a/.vs/DJeyeMouseWrapper/FileContentIndex/87adb016-228b-47b5-85e3-0127a55b4936.vsidx b/.vs/DJeyeMouseWrapper/FileContentIndex/87adb016-228b-47b5-85e3-0127a55b4936.vsidx
diff --git a/.vs/DJeyeMouseWrapper/FileContentIndex/92280633-9f6d-49f9-be3a-185f68a00bac.vsidx b/.vs/DJeyeMouseWrapper/FileContentIndex/92280633-9f6d-49f9-be3a-185f68a00bac.vsidx
diff --git a/.vs/DJeyeMouseWrapper/FileContentIndex/95649582-689b-4708-9ffc-3ab4b141cdb3.vsidx b/.vs/DJeyeMouseWrapper/FileContentIndex/95649582-689b-4708-9ffc-3ab4b141cdb3.vsidx
diff --git a/.vs/DJeyeMouseWrapper/FileContentIndex/read.lock b/.vs/DJeyeMouseWrapper/FileContentIndex/read.lock
diff --git a/.vs/DJeyeMouseWrapper/v17/.suo b/.vs/DJeyeMouseWrapper/v17/.suo
diff --git a/.vs/Supercharger/DJeyeMouseWrapper/codemap.dat b/.vs/Supercharger/DJeyeMouseWrapper/codemap.dat
diff --git a/.vs/Supercharger/DJeyeMouseWrapper/global_history.dat b/.vs/Supercharger/DJeyeMouseWrapper/global_history.dat
diff --git a/.vs/Supercharger/NeeqDMIs/codemap.dat b/.vs/Supercharger/NeeqDMIs/codemap.dat
diff --git a/.vs/Supercharger/_/DTabsHistory.dat b/.vs/Supercharger/_/DTabsHistory.dat
@@ -1 +1 @@
-<ArrayOfstring xmlns="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\setups\defaultsetup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\kbshortcuts.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\modules\rack.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\modules\mappingmodule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\modules\renderingmodule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\settings\defaultsettings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\bbmouseclicks.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeye_Wrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\settings\djeyewrappersettings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string></ArrayOfstring>
+<ArrayOfstring xmlns="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\setups\defaultsetup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\kbshorcutsalt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:1:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\kbshortcuts.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\behaviors\bbsuppresshorizontalpeak.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:1:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\modules\mappingmodule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\modules\mappingmodule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\bbsuppresshorizontalpeak.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\kbshortcuts.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\bbmouseclicks.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string><string>D:0:0:{32B8450B-A336-467D-B4A0-C22AF3BF79A1}|DJeyeMouseWrapper.csproj|c:\users\neequ\onedrive\documenti\github\djeye_eyelayer_windows\behaviors\ebsuppresshorizontalpeak.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}</string></ArrayOfstring>
diff --git a/Behaviors/BBsuppressHorizontalPeak.cs b/Behaviors/BBsuppressHorizontalPeak.cs
@@ -0,0 +1,49 @@
+using DJeyeMouseWrapper.Modules;
+using NeeqDMIs.Eyetracking.Tobii;
+using System;
+
+namespace DJeyeMouseWrapper.Behaviors
+{
+    internal class BBsuppressHorizontalPeak : ATobiiBlinkBehavior
+    {
+        public BBsuppressHorizontalPeak()
+        {
+            DCThresh = 1;
+            LCThresh = 1;
+            RCThresh = 1;
+            DOThresh = 2;
+            LOThresh = 2;
+            ROThresh = 2;
+        }
+
+        public override void Event_doubleClose()
+        {
+            Rack.MappingModule.SuppressGaze = true;
+        }
+
+        public override void Event_doubleOpen()
+        {
+            Rack.MappingModule.SuppressGaze = false;
+        }
+
+        public override void Event_leftClose()
+        {
+            Rack.MappingModule.SuppressGaze = true;
+        }
+
+        public override void Event_leftOpen()
+        {
+            Rack.MappingModule.SuppressGaze = false;
+        }
+
+        public override void Event_rightClose()
+        {
+            Rack.MappingModule.SuppressGaze = true;
+        }
+
+        public override void Event_rightOpen()
+        {
+            Rack.MappingModule.SuppressGaze = false;
+        }
+    }
+}
diff --git a/Behaviors/KBshorcutsAlt.cs b/Behaviors/KBshorcutsAlt.cs
@@ -0,0 +1,41 @@
+using DJeyeMouseWrapper.Modules;
+using NeeqDMIs.Keyboard;
+using RawInputProcessor;
+
+namespace BlankADMI.Behaviors
+{
+    internal class KBshortcutsAlt : IKeyboardBehavior
+    {
+        const VKeyCodes keyEnable = VKeyCodes.E;
+        const VKeyCodes keyDisable = VKeyCodes.D;
+        const VKeyCodes keyAlt = VKeyCodes.LeftMenu;
+
+        private bool isModPressed = false;
+        public int ReceiveEvent(RawInputEventArgs e)
+        {
+            // ALT MOD
+            if (e.VirtualKey == (int)keyAlt)
+            {
+                if(e.KeyPressState == KeyPressState.Down)
+                {
+                    isModPressed = true;
+                }
+                else if(e.KeyPressState == KeyPressState.Up)
+                {
+                    isModPressed = false;
+                }
+            }
+
+            // ENABLE, DISABLE
+            if(e.VirtualKey == (int)keyEnable && e.KeyPressState == KeyPressState.Down && isModPressed)
+            {
+                Rack.MappingModule.Enabled = true;
+            }
+            if (e.VirtualKey == (int)keyDisable && e.KeyPressState == KeyPressState.Down && isModPressed)
+            {
+                Rack.MappingModule.Enabled = false;
+            }
+            return 0;
+        }
+    }
+}
diff --git a/Behaviors/KBshortcuts.cs b/Behaviors/KBshortcuts.cs
@@ -8,8 +8,8 @@ internal class KBshortcuts : IKeyboardBehavior
     {
         const VKeyCodes keyEnable = VKeyCodes.E;
         const VKeyCodes keyDisable = VKeyCodes.D;
-        const VKeyCodes keyShow = VKeyCodes.S;
-        const VKeyCodes keyHide = VKeyCodes.H;
+        //const VKeyCodes keyShow = VKeyCodes.S;
+        //const VKeyCodes keyHide = VKeyCodes.H;
         public int ReceiveEvent(RawInputEventArgs e)
         {
             if(e.VirtualKey == (int)keyEnable && e.KeyPressState == KeyPressState.Down)

diff --git a/DJeyeMouseWrapper.csproj b/DJeyeMouseWrapper.csproj
@@ -187,6 +187,8 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Behaviors\BBmouseClicks.cs" />
+    <Compile Include="Behaviors\BBsuppressHorizontalPeak.cs" />
+    <Compile Include="Behaviors\KBshorcutsAlt.cs" />
     <Compile Include="Behaviors\KBshortcuts.cs" />
     <Compile Include="Modules\MappingModule.cs" />
     <Compile Include="Settings\DefaultSettings.cs" />

diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -4,10 +4,14 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="DJeye mouse wrapper" WindowStyle="SingleBorderWindow" ResizeMode="NoResize"
+        Title="DJeye mouse wrapper" WindowStyle="SingleBorderWindow" ResizeMode="CanMinimize"
         WindowStartupLocation="CenterScreen" WindowState="Normal"  Width="384" Height="433" Loaded="Window_Loaded" Closing="Window_Closing">
     <Grid Background="Black">
-        <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="299*"/>
+            <ColumnDefinition Width="85*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.ColumnSpan="2">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="1*" />

diff --git a/Modules/MappingModule.cs b/Modules/MappingModule.cs
@@ -9,6 +9,7 @@ namespace DJeyeMouseWrapper
     /// </summary>
     public class MappingModule
     {
+        public bool suppressGaze = false;
         private readonly int SCROLLING_SPEED = 120;
         private bool enabled = false;
 
@@ -24,6 +25,27 @@ public bool Enabled
         }
 
         public bool IsHoldScroll { get; private set; } = false;
+
+        public bool SuppressGaze
+        {
+            get { return suppressGaze; }
+            set
+            {
+                if (value != suppressGaze && !IsHoldScroll && Enabled) // Switch false -> true
+                {
+                    suppressGaze = value;
+                    if (suppressGaze)
+                    {
+                        Rack.TobiiModule.MouseEmulator.Enabled = false;
+                    }
+                    else
+                    {
+                        Rack.TobiiModule.MouseEmulator.Enabled = true;
+                    }
+                }
+            }
+        }
+
         private double HoldScrollY { get; set; }
 
         private MicroTimer TimerScroll { get; set; }
@@ -78,15 +100,14 @@ internal void ReceiveHoldScroll_Start()
         private void TimerScroll_MicroTimerElapsed(object sender, MicroTimerEventArgs e)
         {
             double verticalOffset = Rack.TobiiModule.LastEyePositionData.LeftEye.Y - HoldScrollY;
-            if(verticalOffset > Rack.UserSettings.DeadzoneSize)
+            if (verticalOffset > Rack.UserSettings.DeadzoneSize)
             {
                 Rack.MouseModule.SendMouseWheelMove(SCROLLING_SPEED);
             }
-            else if(verticalOffset < -Rack.UserSettings.DeadzoneSize)
+            else if (verticalOffset < -Rack.UserSettings.DeadzoneSize)
             {
                 Rack.MouseModule.SendMouseWheelMove(-SCROLLING_SPEED);
             }
-
         }
     }
 }
diff --git a/Setups/DefaultSetup.cs b/Setups/DefaultSetup.cs
@@ -54,6 +54,7 @@ public void Setup()
 
             // Behaviors spawn
             Rack.TobiiModule.BlinkBehaviors.Add(Rack.BBmouseClicks);
+            Rack.TobiiModule.BlinkBehaviors.Add(new BBsuppressHorizontalPeak());
             Rack.KeyboardModule.KeyboardBehaviors.Add(new KBshortcuts());
 
             // Add disposables to list

diff --git a/bin/Release/DJeyeMouseWrapper.exe b/bin/Release/DJeyeMouseWrapper.exe
diff --git a/bin/Release/DJeyeMouseWrapper.pdb b/bin/Release/DJeyeMouseWrapper.pdb
diff --git a/obj/Release/DJeyeMouseWrapper.csproj.CoreCompileInputs.cache b/obj/Release/DJeyeMouseWrapper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-55232715d42ae51013b61fc16526309ced493473
+7fed4626f3b01e1f0c9f0c88a9a48e0a3c82c419
diff --git a/obj/Release/DJeyeMouseWrapper.exe b/obj/Release/DJeyeMouseWrapper.exe
diff --git a/obj/Release/DJeyeMouseWrapper.g.resources b/obj/Release/DJeyeMouseWrapper.g.resources
diff --git a/obj/Release/DJeyeMouseWrapper.pdb b/obj/Release/DJeyeMouseWrapper.pdb
diff --git a/obj/Release/DJeyeMouseWrapper_MarkupCompile.cache b/obj/Release/DJeyeMouseWrapper_MarkupCompile.cache
@@ -12,7 +12,7 @@ TRACE
 C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\App.xaml
 1219584333
 11-1163821235
-14945034738
+16218701903
 1391525045984
 MainWindow.xaml;
 

diff --git a/obj/Release/DJeyeMouseWrapper_MarkupCompile.i.cache b/obj/Release/DJeyeMouseWrapper_MarkupCompile.i.cache
@@ -12,7 +12,7 @@ TRACE
 C:\Users\neequ\OneDrive\Documenti\GitHub\DJEye_EyeLayer_Windows\App.xaml
 1219584333
 11-1163821235
-15382892155
+17-343440680
 1391525045984
 MainWindow.xaml;
 

diff --git a/obj/Release/MainWindow.baml b/obj/Release/MainWindow.baml