Skip to content

Fixes 4088 mouse released flag cannot be combined safely with report position #4091

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

Merged
tig merged 5 commits into from
May 18, 2025
Merged

Fixes 4088 mouse released flag cannot be combined safely with report position #4091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7703286
raise 'released' flags in isolation in v2 win
May 16, 2025
56cf8c5
Fix tests and button 3 (aka rightmost)
May 16, 2025
7a5a521
Merge branch 'v2_develop' into 4088-releasedflag-only
tznind May 18, 2025
7c08480
Comment out mouse logging code
May 18, 2025
fc33b26
Merge branch '4088-releasedflag-only' of https://github.com/tznind/gu…
May 18, 2025
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
2 changes: 1 addition & 1 deletion Examples/UICatalog/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"UICatalog --driver v2win": {
"commandName": "Project",
"commandLineArgs": "--driver v2win"
"commandLineArgs": "--driver v2win -dl Trace"
},
"UICatalog --driver v2net": {
"commandName": "Project",
Expand Down
7 changes: 6 additions & 1 deletion Terminal.Gui/ConsoleDrivers/V2/ConsoleDriverFacade.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Runtime.InteropServices;
using Microsoft.Extensions.Logging;

namespace Terminal.Gui;

Expand Down Expand Up @@ -29,7 +30,11 @@ IWindowSizeMonitor windowSizeMonitor

InputProcessor.KeyDown += (s, e) => KeyDown?.Invoke (s, e);
InputProcessor.KeyUp += (s, e) => KeyUp?.Invoke (s, e);
InputProcessor.MouseEvent += (s, e) => MouseEvent?.Invoke (s, e);
InputProcessor.MouseEvent += (s, e) =>
{
//Logging.Logger.LogTrace ($"Mouse {e.Flags} at x={e.ScreenPosition.X} y={e.ScreenPosition.Y}");
MouseEvent?.Invoke (s, e);
};

windowSizeMonitor.SizeChanging += (_, e) => SizeChanged?.Invoke (this, e);

Expand Down
8 changes: 8 additions & 0 deletions Terminal.Gui/ConsoleDrivers/V2/WindowsInputProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public MouseEventArgs ToDriverMouse (MouseEventRecord e)
mouseFlags = UpdateMouseFlags (mouseFlags, e.ButtonState, ButtonState.Button2Pressed, MouseFlags.Button2Pressed, MouseFlags.Button2Released, 1);
mouseFlags = UpdateMouseFlags (mouseFlags, e.ButtonState, ButtonState.Button4Pressed, MouseFlags.Button4Pressed, MouseFlags.Button4Released, 3);


// Deal with button 3 separately because it is considered same as 'rightmost button'
if (e.ButtonState.HasFlag (ButtonState.Button3Pressed) || e.ButtonState.HasFlag (ButtonState.RightmostButtonPressed))
{
Expand All @@ -98,6 +99,10 @@ public MouseEventArgs ToDriverMouse (MouseEventRecord e)
if (_lastWasPressed [2])
{
mouseFlags |= MouseFlags.Button3Released;

// Removes the moved flag when raising released flags (see https://github.com/gui-cs/Terminal.Gui/issues/4088)
mouseFlags &= ~MouseFlags.ReportMousePosition;

_lastWasPressed [2] = false;
}
}
Expand Down Expand Up @@ -148,6 +153,9 @@ int buttonIndex
if (_lastWasPressed [buttonIndex])
{
current |= releasedFlag;

// Removes the moved flag when raising released flags (see https://github.com/gui-cs/Terminal.Gui/issues/4088)
current &= ~MouseFlags.ReportMousePosition;
_lastWasPressed [buttonIndex] = false;
}
}
Expand Down
22 changes: 11 additions & 11 deletions Tests/UnitTests/ConsoleDrivers/V2/WindowsInputProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
new []
{
Tuple.Create (ButtonState.Button1Pressed, MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button1Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button1Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition | MouseFlags.ReportMousePosition)
}
};
Expand All @@ -210,7 +210,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
new []
{
Tuple.Create (ButtonState.Button2Pressed, MouseFlags.Button2Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button2Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button2Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition | MouseFlags.ReportMousePosition)
}
};
Expand All @@ -220,7 +220,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
new []
{
Tuple.Create (ButtonState.Button3Pressed, MouseFlags.Button3Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition | MouseFlags.ReportMousePosition)
}
};
Expand All @@ -230,7 +230,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
new []
{
Tuple.Create (ButtonState.Button4Pressed, MouseFlags.Button4Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button4Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button4Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition | MouseFlags.ReportMousePosition)
}
};
Expand All @@ -240,7 +240,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
new []
{
Tuple.Create (ButtonState.RightmostButtonPressed, MouseFlags.Button3Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition | MouseFlags.ReportMousePosition)
}
};
Expand All @@ -253,8 +253,8 @@ public static IEnumerable<object []> MouseFlagTestData ()
Tuple.Create (
ButtonState.Button1Pressed | ButtonState.Button2Pressed,
MouseFlags.Button1Pressed | MouseFlags.Button2Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.Button1Pressed, MouseFlags.Button1Pressed | MouseFlags.Button2Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button1Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.Button1Pressed, MouseFlags.Button1Pressed | MouseFlags.Button2Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button1Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition)
}
};
Expand All @@ -266,8 +266,8 @@ public static IEnumerable<object []> MouseFlagTestData ()
Tuple.Create (
ButtonState.Button3Pressed | ButtonState.Button4Pressed,
MouseFlags.Button3Pressed | MouseFlags.Button4Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.Button3Pressed, MouseFlags.Button3Pressed | MouseFlags.Button4Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.Button3Pressed, MouseFlags.Button3Pressed | MouseFlags.Button4Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition)
}
};
Expand All @@ -280,7 +280,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
Tuple.Create (
ButtonState.Button1Pressed | ButtonState.Button2Pressed,
MouseFlags.Button1Pressed | MouseFlags.Button2Pressed | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button1Released | MouseFlags.Button2Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button1Released | MouseFlags.Button2Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition)
}
};
Expand All @@ -297,7 +297,7 @@ public static IEnumerable<object []> MouseFlagTestData ()
Tuple.Create (ButtonState.RightmostButtonPressed, MouseFlags.Button3Pressed | MouseFlags.ReportMousePosition),

// Now with neither we get released
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released | MouseFlags.ReportMousePosition),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.Button3Released),
Tuple.Create (ButtonState.NoButtonPressed, MouseFlags.ReportMousePosition)
}
};
Expand Down
Loading