Skip to content

SubscribeKey Extended for v1 #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bluechipps wants to merge 6 commits into
base: master
Choose a base branch
from
Open

SubscribeKey Extended for v1 #100

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37dd5b9
Update KeyboardHandler.cs
bluechipps Mar 30, 2023
a077e64
Update IDeviceHandler.cs
bluechipps Mar 30, 2023
22dc040
Update DeviceHandler.cs
bluechipps Mar 30, 2023
2c7d9ba
Update Manager.cs
bluechipps Mar 30, 2023
503da54
Update KeyboardKeyTester.cs
bluechipps Mar 30, 2023
63d1225
Update AutoHotInterception.ahk
bluechipps Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update KeyboardHandler.cs
  • Loading branch information
@bluechipps
bluechipps authored Mar 30, 2023
commit 37dd5b9855287fde89d52d74621aecdad6239f2c
28 changes: 26 additions & 2 deletions C#/AutoHotInterception/DeviceHandlers/KeyboardHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public override void DisableFilterIfNeeded()
{
if (AllButtonsMapping == null
&& SingleButtonMappings.Count == 0
&& SingleButtonMappingsEx.Count == 0
&& ContextCallback == null)
{
_isFiltered = false;
Expand Down Expand Up @@ -56,6 +57,7 @@ public override void ProcessStroke(List<ManagedWrapper.Stroke> strokes)
if (_isFiltered)
{
var isKeyMapping = false; // True if this is a mapping to a single key, else it would be a mapping to a whole device
var useExtendedCallback = false;
var processedState = ScanCodeHelper.TranslateScanCodes(strokes);
var code = processedState.Code;
var state = processedState.State;
Expand All @@ -65,8 +67,16 @@ public override void ProcessStroke(List<ManagedWrapper.Stroke> strokes)
if (SingleButtonMappings.ContainsKey(code))
{
isKeyMapping = true;
useExtendedCallback = false;
mapping = SingleButtonMappings[code];
}
// If there is an mapping (via SubscribeKeyEx) to this specific key, then use that ...
if (SingleButtonMappingsEx.ContainsKey(code))
{
isKeyMapping = true;
useExtendedCallback = true;
mapping = SingleButtonMappingsEx[code];
}
// ... otherwise, if there is a mapping to the whole keyboard, use that
else if (AllButtonsMapping != null)
{
Expand All @@ -82,7 +92,14 @@ public override void ProcessStroke(List<ManagedWrapper.Stroke> strokes)
{
if (isKeyMapping)
{
ThreadPool.QueueUserWorkItem(threadProc => mapping.Callback(state));
if (useExtendedCallback)
{
ThreadPool.QueueUserWorkItem(threadProc => mapping.Callback(state, code));
}
else
{
ThreadPool.QueueUserWorkItem(threadProc => mapping.Callback(state));
}
}
else
{
Expand All @@ -94,7 +111,14 @@ public override void ProcessStroke(List<ManagedWrapper.Stroke> strokes)
//mapping.Callback(code, state);
if (isKeyMapping)
{
WorkerThreads[code]?.Actions.Add(() => mapping.Callback(state));
if (useExtendedCallback)
{
WorkerThreads[code]?.Actions.Add(() => mapping.Callback(state, code));
}
else
{
WorkerThreads[code]?.Actions.Add(() => mapping.Callback(state));
}
}
else
{
Expand Down