Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-29 17:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Includes ControlKeyState for all the buttons events.

Browse Source
This commit is contained in:
BDisp
2020-03-14 17:55:30 +00:00
parent 2babe56168
commit 3c3dcd5bd6
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Terminal.Gui/Drivers/WindowsDriver.cs
View File

@@ -594,6 +594,7 @@ namespace Terminal.Gui {
LastMouseButtonPressed = null;
IsButtonReleased = false;
}
//Debug.WriteLine ($"MouseEventRecord: {mouseEvent}");
if ((mouseEvent.EventFlags == 0 && LastMouseButtonPressed == null && !IsButtonDoubleClicked) ||
(mouseEvent.EventFlags == WindowsConsole.EventFlags.MouseMoved &&
@@ -648,18 +649,7 @@ namespace Terminal.Gui {
}
LastMouseButtonPressed = null;
IsButtonReleased = false;
switch (mouseEvent.ControlKeyState) {
case WindowsConsole.ControlKeyState.RightControlPressed:
case WindowsConsole.ControlKeyState.LeftControlPressed:
mouseFlag |= MouseFlags.ButtonCtrl;
break;
case WindowsConsole.ControlKeyState.ShiftPressed:
mouseFlag |= MouseFlags.ButtonShift;
break;
}
} else if (mouseEvent.EventFlags == WindowsConsole.EventFlags.DoubleClick) {
} else if (mouseEvent.EventFlags.HasFlag (WindowsConsole.EventFlags.DoubleClick)) {
switch (mouseEvent.ButtonState) {
case WindowsConsole.ButtonState.Button1Pressed:
mouseFlag = MouseFlags.Button1DoubleClicked;
@@ -700,21 +690,13 @@ namespace Terminal.Gui {
break;
}
switch (mouseEvent.ControlKeyState) {
case WindowsConsole.ControlKeyState.RightControlPressed:
case WindowsConsole.ControlKeyState.LeftControlPressed:
mouseFlag |= MouseFlags.ButtonCtrl;
break;
case WindowsConsole.ControlKeyState.ShiftPressed:
mouseFlag |= MouseFlags.ButtonShift;
break;
}
} else if (mouseEvent.EventFlags == WindowsConsole.EventFlags.MouseMoved) {
mouseFlag = MouseFlags.ReportMousePosition;
}
//Debug.WriteLine ($"MouseFlags: {mouseFlag}");
mouseFlag = SetControlKeyStates (mouseEvent, mouseFlag);
Debug.WriteLine ($"MouseFlags: {mouseFlag}");
return new MouseEvent () {
X = mouseEvent.MousePosition.X,
Y = mouseEvent.MousePosition.Y,
@@ -722,6 +704,21 @@ namespace Terminal.Gui {
};
}
private static MouseFlags SetControlKeyStates (WindowsConsole.MouseEventRecord mouseEvent, MouseFlags mouseFlag)
{
if (mouseEvent.ControlKeyState.HasFlag (WindowsConsole.ControlKeyState.RightControlPressed) ||
mouseEvent.ControlKeyState.HasFlag (WindowsConsole.ControlKeyState.LeftControlPressed))
mouseFlag |= MouseFlags.ButtonCtrl;
if (mouseEvent.ControlKeyState.HasFlag (WindowsConsole.ControlKeyState.ShiftPressed))
mouseFlag |= MouseFlags.ButtonShift;
if (mouseEvent.ControlKeyState.HasFlag (WindowsConsole.ControlKeyState.RightAltPressed) ||
mouseEvent.ControlKeyState.HasFlag (WindowsConsole.ControlKeyState.LeftAltPressed))
mouseFlag |= MouseFlags.ButtonAlt;
return mouseFlag;
}
bool timer (MainLoop caller)
{
IsButtonDoubleClicked = false;