Skip to content

Fix Windows Alt codes #18624

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
merged 1 commit into from
Apr 11, 2025
Merged

Fix Windows Alt codes #18624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 20 additions & 11 deletions src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,12 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
return LoadIcon(requestIcon, requestDpi)?.Handle ?? default;

case WindowsMessage.WM_KEYDOWN:
e = TryCreateRawKeyEventArgs(RawKeyEventType.KeyDown, timestamp, wParam, lParam, true);
break;

case WindowsMessage.WM_SYSKEYDOWN:
{
e = TryCreateRawKeyEventArgs(RawKeyEventType.KeyDown, timestamp, wParam, lParam);
break;
}
e = TryCreateRawKeyEventArgs(RawKeyEventType.KeyDown, timestamp, wParam, lParam, false);
break;

case WindowsMessage.WM_SYSCOMMAND:
// Disable system handling of Alt/F10 menu keys.
Expand All @@ -199,11 +200,15 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
}

case WindowsMessage.WM_KEYUP:
e = TryCreateRawKeyEventArgs(RawKeyEventType.KeyUp, timestamp, wParam, lParam, true);
_ignoreWmChar = false;
break;

case WindowsMessage.WM_SYSKEYUP:
{
e = TryCreateRawKeyEventArgs(RawKeyEventType.KeyUp, timestamp, wParam, lParam);
break;
}
e = TryCreateRawKeyEventArgs(RawKeyEventType.KeyUp, timestamp, wParam, lParam, false);
_ignoreWmChar = false;
break;

case WindowsMessage.WM_CHAR:
{
if (Imm32InputMethod.Current.IsComposing)
Expand All @@ -219,6 +224,7 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
e = new RawTextInputEventArgs(WindowsKeyboardDevice.Instance, timestamp, Owner, text);
}

_ignoreWmChar = false;
break;
}

Expand Down Expand Up @@ -881,7 +887,7 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
// is handled.
_ignoreWmChar = e.Handled;
}
}
}

if (s_intermediatePointsPooledList.Count > 0)
{
Expand Down Expand Up @@ -1314,13 +1320,16 @@ private static RawInputModifiers GetInputModifiers(PointerFlags flags)
return modifiers;
}

private RawKeyEventArgs? TryCreateRawKeyEventArgs(RawKeyEventType eventType, ulong timestamp, IntPtr wParam, IntPtr lParam)
private RawKeyEventArgs? TryCreateRawKeyEventArgs(RawKeyEventType eventType, ulong timestamp, IntPtr wParam, IntPtr lParam, bool useKeySymbol)
{
var virtualKey = ToInt32(wParam);
var keyData = ToInt32(lParam);
var key = KeyInterop.KeyFromVirtualKey(virtualKey, keyData);
var physicalKey = KeyInterop.PhysicalKeyFromVirtualKey(virtualKey, keyData);
var keySymbol = KeyInterop.GetKeySymbol(virtualKey, keyData);

// Avoid calling GetKeySymbol() for WM_SYSKEYDOWN/UP:
// it ultimately calls User32!ToUnicodeEx, which messes up the keyboard state in this case.
var keySymbol = useKeySymbol ? KeyInterop.GetKeySymbol(virtualKey, keyData) : null;

if (key == Key.None && physicalKey == PhysicalKey.None && string.IsNullOrWhiteSpace(keySymbol))
return null;
Expand Down
Loading