Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed most focus issues when working with putty

Browse Source 
still need to resolve refocusing putty in some cases
This commit is contained in:
David Sparer
2019-08-25 15:59:51 -05:00
parent 26d9e3c2ff
commit f7dc0918eb
5 changed files with 1154 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1018
mRemoteV1/App/NativeMethods.cs
View File

File diff suppressed because it is too large Load Diff

2
mRemoteV1/App/Runtime.cs
View File

@@ -1,4 +1,4 @@
using mRemoteNG.App.Info;
using mRemoteNG.App.Info;
using mRemoteNG.Config.Putty;
using mRemoteNG.Connection;
using mRemoteNG.Credential;

112
mRemoteV1/UI/Forms/frmMain.cs
View File

@@ -53,6 +53,14 @@ namespace mRemoteNG.UI.Forms
private readonly ThemeManager _themeManager;
private readonly FileBackupPruner _backupPruner = new FileBackupPruner();
private readonly IConnectionInitiator _connectionInitiator = new ConnectionInitiator();
private readonly SystemKeyboardHook _keyboardHook;
private bool _childProcessHeldLastFocus;
private bool _currentlyFixingAltTab;
/// <summary>
/// TRUE if any part of mrng has focus - the main window or child processes
/// </summary>
private bool _mrngFocused;
internal FullscreenHandler Fullscreen { get; set; }
@@ -71,6 +79,7 @@ namespace mRemoteNG.UI.Forms
ApplyTheme();
_screenSystemMenu = new ScreenSelectionSystemMenu(this);
_keyboardHook = new SystemKeyboardHook(KeyboardHookCallback);
}
#region Properties
@@ -380,6 +389,8 @@ namespace mRemoteNG.UI.Forms
private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
{
_keyboardHook?.Dispose();
if (!(Runtime.WindowList == null || Runtime.WindowList.Count == 0))
{
var openConnections = 0;
@@ -484,9 +495,8 @@ namespace mRemoteNG.UI.Forms
// Maybe after starting putty, remove its ability to show up in alt-tab?
// SetWindowLong(this.Handle, GWL_EXSTYLE, (GetWindowLong(this.Handle,GWL_EXSTYLE) | WS_EX_TOOLWINDOW) & ~WS_EX_APPWINDOW);
protected override void WndProc(ref System.Windows.Forms.Message m)
protected override void WndProc(ref Message m)
{
const int tabKey = 0x09;
// Listen for and handle operating system messages
try
{
@@ -504,42 +514,30 @@ namespace mRemoteNG.UI.Forms
break;
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Clicked control: {controlThatWasClicked2}");
break;
case NativeMethods.WM_KEYDOWN:
case NativeMethods.WM_SYSKEYDOWN:
if (m.WParam.ToInt32() != tabKey)
break;
if ((m.LParam.ToInt32() & 0b00100000000000000000000000000000) == 0) // 29th bit ON means ALT key down
break;
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "ALT-TAB PRESSED");
break;
case NativeMethods.WM_SYSKEYUP:
if (m.WParam.ToInt32() != tabKey)
break;
if ((m.LParam.ToInt32() & 0b00100000000000000000000000000000) == 0) // 29th bit ON means ALT key down
break;
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "ALT-TAB RELEASED");
break;
case NativeMethods.WM_ACTIVATEAPP:
if (m.WParam.ToInt32() == 0) // mRemoteNG is being deactivated
{
//var threadWhichIsActivating = m.LParam.ToInt32();
//var activatingChildProcessWindow = _connectionInitiator.ActiveConnections
// .OfType<ExternalProcessProtocolBase>()
// .Any(prot => prot.ThreadId == threadWhichIsActivating);
var threadWhichIsActivating = m.LParam.ToInt32();
_childProcessHeldLastFocus = _connectionInitiator
.ActiveConnections
.OfType<ExternalProcessProtocolBase>()
.Any(proc => proc.ThreadId == threadWhichIsActivating);
_inMouseActivate = false;
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "mRemoteNG main window lost focus");
_mrngFocused = _childProcessHeldLastFocus;
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"mRemoteNG main window lost focus (_childProcessHeldLastFocus={_childProcessHeldLastFocus})");
break;
}
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "mRemoteNG main window received focus");
if (_childProcessHeldLastFocus && !_mrngFocused)
{
ActivateConnection();
}
_childProcessHeldLastFocus = false;
_mrngFocused = true;
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"mRemoteNG main window received focus (_childProcessHeldLastFocus={_childProcessHeldLastFocus})");
//var candidateTabToFocus = FromChildHandle(NativeMethods.WindowFromPoint(MousePosition))
// ?? GetChildAtPoint(MousePosition);
@@ -640,16 +638,53 @@ namespace mRemoteNG.UI.Forms
base.WndProc(ref m);
}
protected override bool ProcessKeyMessage(ref Message m)
public int KeyboardHookCallback(int msg, NativeMethods.KBDLLHOOKSTRUCT kbd)
{
if (m.WParam.ToInt32() != 0x09)
return false;
var key = (Keys) kbd.vkCode;
if (key.HasFlag(Keys.Tab) && kbd.flags.HasFlag(NativeMethods.KBDLLHOOKSTRUCTFlags.LLKHF_ALTDOWN))
{
if (msg == NativeMethods.WM_SYSKEYDOWN || msg == NativeMethods.WM_KEYDOWN)
{
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"ALT-TAB PRESSED (CPF={_childProcessHeldLastFocus}, MRNGF={_mrngFocused}, IMA={_inMouseActivate}, CFAT={_currentlyFixingAltTab})");
if (_childProcessHeldLastFocus && _mrngFocused && !_inMouseActivate && !_currentlyFixingAltTab)
{
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "FIXING ALT-TAB FOR EXTAPP");
_currentlyFixingAltTab = true;
if ((m.LParam.ToInt32() & 0b00100000000000000000000000000000) == 0) // 29th bit ON means ALT key down
return false;
// simulate an extra TAB key press. This skips focus of the mrng main window.
NativeMethods.keybd_event((byte)Keys.Tab, 0, (uint)NativeMethods.KEYEVENTF.KEYUP, 0);
NativeMethods.keybd_event((byte)Keys.Tab, 0, 0, 0);
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "ALT-TAB PRESSED");
return base.ProcessKeyMessage(ref m);
// WndProc will never get an event when we switch from a child proc to a completely different program since the main mrng window never had focus to begin with.
// Assume mrng as a whole will lose focus, even though the user could choose to retain focus on us. When Alt-tab completes, the mrng main window will
// receive the focus event and we will handle the child process focusing as necessary.
_mrngFocused = false;
_currentlyFixingAltTab = false;
}
}
}
// alt + right-shift
if (key.HasFlag(Keys.RShiftKey) && kbd.flags.HasFlag(NativeMethods.KBDLLHOOKSTRUCTFlags.LLKHF_ALTDOWN))
{
if (msg != NativeMethods.WM_SYSKEYUP && msg != NativeMethods.WM_KEYUP)
return 0;
if (!_mrngFocused)
return 0;
if (_childProcessHeldLastFocus)
{
Focus(); // focus main window
return 1;
}
// focus connection
ActivateConnection();
return 1;
}
return 0;
}
private void SimulateClick(Control control)
@@ -677,6 +712,9 @@ namespace mRemoteNG.UI.Forms
//var ifc = InterfaceControl.FindInterfaceControl(tab);
var tab = TabHelper.Instance.CurrentTab;
if (tab == null)
return;
var ifc = tab.InterfaceControl;
if (ifc == null)
{

60
mRemoteV1/UI/SystemKeyboardHook.cs Normal file
View File

@@ -0,0 +1,60 @@
using mRemoteNG.App;
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
namespace mRemoteNG.UI
{
public class SystemKeyboardHook : IDisposable
{
private readonly IntPtr _hookId;
private readonly Func<int, NativeMethods.KBDLLHOOKSTRUCT, int> _userCallback;
private readonly NativeMethods.LowLevelKeyboardProc _sysCallback;
private bool _disposed;
public SystemKeyboardHook(Func<int, NativeMethods.KBDLLHOOKSTRUCT, int> proc)
{
_userCallback = proc;
_sysCallback = SystemCallback;
using (var curProcess = Process.GetCurrentProcess())
using (var curModule = curProcess.MainModule)
{
_hookId = NativeMethods.SetWindowsHookEx(
NativeMethods.WH_KEYBOARD_LL,
_sysCallback,
NativeMethods.GetModuleHandle(curModule.ModuleName),
0);
}
}
private IntPtr SystemCallback(int nCode, IntPtr wParam, IntPtr lParam)
{
if (nCode >= 0)
{
var kdb = Marshal.PtrToStructure<NativeMethods.KBDLLHOOKSTRUCT>(lParam);
return new IntPtr(_userCallback(wParam.ToInt32(), kdb));
}
return NativeMethods.CallNextHookEx(IntPtr.Zero, nCode, wParam, lParam);
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
if (_disposed)
return;
if (disposing)
{
NativeMethods.UnhookWindowsHookEx(_hookId);
}
_disposed = true;
}
}
}

1
mRemoteV1/mRemoteV1.csproj
View File

@@ -736,6 +736,7 @@
<SubType>Component</SubType>
</Compile>
<Compile Include="UI\Panels\PanelAdder.cs" />
<Compile Include="UI\SystemKeyboardHook.cs" />
<Compile Include="UI\Tabs\Enums.cs" />
<Compile Include="UI\Tabs\ConnectionTab.cs">
<SubType>Form</SubType>