mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-7336 Any keyboard shortcut with Alt produces a Windows system sound.

Browse Source 
fixup! JBR-7157: Alt+Shift+Enter sends KEY_TYPED Event.

Consume all WM_SYSCHAR messages (except for the Alt+Space keystroke), not allowing them to reach the system default handling routine, so the last won't make system beeps anymore after any [Shift+]Alt+<digit/letter> keystroke.

(cherry picked from commit 5d0e304db7)
This commit is contained in:
Nikita Provotorov
2024-06-25 00:57:27 +02:00
parent 5a78e0df16
commit d433cc6f73
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
View File

@@ -1874,14 +1874,8 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
LOWORD(lParam), HIWORD(lParam), FALSE);
break;
case WM_SYSCHAR:
// JBR-7157: Alt+Shift+Enter sends KEY_TYPED Event
// Alt[+Shift]+letter generate input only as WM_SYSCHAR messages.
// We shouldn't treat them as real user input, according to MSDN: https://learn.microsoft.com/en-us/windows/win32/learnwin32/keyboard-input#character-messages.
// > The WM_SYSCHAR message indicates a system character. As with WM_SYSKEYDOWN, you should generally pass
// > this message directly to DefWindowProc. Otherwise, you may interfere with standard system commands.
// > In particular, do not treat WM_SYSCHAR as text that the user has typed.
mr = mrDoDefault;
mr = WmChar(static_cast<UINT>(wParam),
LOWORD(lParam), HIWORD(lParam), TRUE);
break;
case WM_IME_CHAR:
mr = WmIMEChar(static_cast<UINT>(wParam),
@@ -3969,13 +3963,27 @@ MsgRouting AwtComponent::WmChar(UINT character, UINT repCnt, UINT flags,
// i.e., it is the 13th bit of `flags' (which is HIWORD(lParam)).
bool alt_is_down = (flags & (1<<13)) != 0;
// Fix for bug 4141621, corrected by fix for bug 6223726: Alt+space doesn't invoke system menu
// We should not pass this particular combination to Java.
if (system && alt_is_down) {
if (character == VK_SPACE) {
if (system) {
// Fix for bug 4141621, corrected by fix for bug 6223726: Alt+space doesn't invoke system menu
// We should not pass this particular combination to Java.
if ( alt_is_down && (character == VK_SPACE) ) {
return mrDoDefault;
}
// JBR-7157: Alt+Shift+Enter sends KEY_TYPED Event.
// Alt[+Shift]+letter generate input only as WM_SYSCHAR messages.
// We shouldn't treat them as real user input, according to MSDN: https://learn.microsoft.com/en-us/windows/win32/learnwin32/keyboard-input#character-messages.
// > The WM_SYSCHAR message indicates a system character. As with WM_SYSKEYDOWN, you should generally pass
// > this message directly to DefWindowProc. Otherwise, you may interfere with standard system commands.
// > In particular, do not treat WM_SYSCHAR as text that the user has typed.
// In other words, we shouldn't generate KEY_TYPED events for WM_SYSCHAR messages.
// You can find below how the field is used, let's reset the state just-in-case.
m_PendingLeadByte = 0;
// JBR-7336 Any keyboard shortcut with Alt produces a Windows system sound.
// mrDoDefault here would lead to system beeps after any [Shift+]Alt+<letter/digit> keystrokes.
return mrConsume;
}
// If this is a WM_CHAR (non-system) message, then the Alt flag