Archives/AutoHotInterception
2
0
Fork 0
mirror of https://github.com/evilC/AutoHotInterception.git synced 2024-11-05 06:00:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66 from evilC/hotfix/issue-65

Browse Source 
Fix #65
This commit is contained in:
Clive Galway 2020-05-14 17:21:35 +01:00 committed by GitHub
commit bb5cdb472a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 162 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
C#/AutoHotInterception/Manager.cs
View File

@ -263,6 +263,7 @@ namespace AutoHotInterception
public void SubscribeMouseMoveAbsolute(int id, bool block, dynamic callback, bool concurrent = false)
{
HelperFunctions.IsValidDeviceId(true, id);
SetFilterState(false);
_mouseMoveAbsoluteMappings[id] = new MappingOptions
{Block = block, Concurrent = concurrent, Callback = callback};
@ -284,9 +285,13 @@ namespace AutoHotInterception
public void UnsubscribeMouseMoveAbsolute(int id)
{
HelperFunctions.IsValidDeviceId(true, id);
SetFilterState(false);
if (_mouseMoveAbsoluteMappings.TryRemove(id, out _))
if (!DeviceHasBindings(id))
SetDeviceFilterState(id, false);
SetFilterState(true);
SetThreadState(true);
}
//Shorthand for SubscribeMouseMoveRelative
@ -332,6 +337,7 @@ namespace AutoHotInterception
public void UnsubscribeMouseMoveRelative(int id)
{
HelperFunctions.IsValidDeviceId(true, id);
SetFilterState(false);
if (_mouseMoveRelativeMappings.TryRemove(id, out _))
if (!DeviceHasBindings(id))
@ -680,10 +686,10 @@ namespace AutoHotInterception
while (ManagedWrapper.Receive(_deviceContext, i, ref stroke, 1) > 0)
{
if (!isMonitoredMouse) continue;
var moveRemoved = false;
var hasMove = false;
if (isMonitoredMouse)
{
var x = stroke.mouse.x;
var y = stroke.mouse.y;
//Debug.WriteLine($"AHK| Stroke Seen. State = {stroke.mouse.state}, Flags = {stroke.mouse.flags}, x={x}, y={y}");
@ -748,6 +754,7 @@ namespace AutoHotInterception
{
//debugStr += "Not Blocking";
}
//Debug.WriteLine(debugStr);
}
}
@ -777,6 +784,7 @@ namespace AutoHotInterception
{
//debugStr += "Not Blocking";
}
//Debug.WriteLine(debugStr);
}
}
@ -792,7 +800,8 @@ namespace AutoHotInterception
var btnStates = HelperFunctions.MouseStrokeToButtonStates(stroke);
foreach (var btnState in btnStates)
{
if (!isMouseButtonsMapping && !_mouseButtonMappings[i].ContainsKey(btnState.Button)) continue;
if (!isMouseButtonsMapping && !_mouseButtonMappings[i].ContainsKey(btnState.Button))
continue;
hasSubscription = true;
MappingOptions mapping = null;
@ -811,7 +820,8 @@ namespace AutoHotInterception
{
if (isMouseButtonsMapping)
{
ThreadPool.QueueUserWorkItem(threadProc => mapping.Callback(btnState.Button, state.State));
ThreadPool.QueueUserWorkItem(threadProc =>
mapping.Callback(btnState.Button, state.State));
}
else
{
@ -840,12 +850,14 @@ namespace AutoHotInterception
// If we are removing a mouse wheel event, then set rolling to 0 if no mouse wheel event left
if (btnState.Flag == 0x400 || btnState.Flag == 0x800)
{
if ((stroke.mouse.state & 0x400) != 0x400 && (stroke.mouse.state & 0x800) != 0x800)
if ((stroke.mouse.state & 0x400) != 0x400 &&
(stroke.mouse.state & 0x800) != 0x800)
{
//Debug.WriteLine("AHK| Removing rolling flag from stroke");
stroke.mouse.rolling = 0;
}
}
//Debug.WriteLine($"AHK| Removing flag {btnState.Flag} from stoke, leaving state {stroke.mouse.state}");
}
else
@ -854,7 +866,7 @@ namespace AutoHotInterception
}
}
}
}
// Forward on the stroke if required
if (hasSubscription)

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Deprecated
### Removed
### Fixed
- Fix Issue 65: UnsubscribeMouseMoveRelative when subscribed with blocking enabled did not restore mouse movement
## [0.5.2] - 2020-04-29
- Compiled scripts now pack the required DLLs inside the EXE and unpack them on run