Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the unshifted charCode when the Shift key and other modifiers are down (for accesskey handling). p=zeniko b=351310 r=me

Browse Source
This commit is contained in:
mats.palmgren%bredband.net 2006-11-24 02:10:50 +00:00
parent 705ac0cfe6
commit f3f7cd3036
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
widget/src/windows/nsWindow.cpp
View File

@ -176,6 +176,11 @@ static const char kMozHeapDumpMessageString[] = "MOZ_HeapDump";
#define SPI_GETWHEELSCROLLCHARS 0x006C
#endif
#ifndef MAPVK_VSC_TO_VK
#define MAPVK_VSC_TO_VK 1
#define MAPVK_VK_TO_CHAR 2
#endif
#ifdef MOZ_XUL
#ifndef AC_SRC_ALPHA
@ -3526,7 +3531,7 @@ BOOL nsWindow::OnKeyDown(UINT aVirtualKeyCode, UINT aScanCode, LPARAM aKeyData)
(msg.message == WM_SYSCHAR) ? "WM_SYSCHAR" : "WM_CHAR",
msg.wParam, msg.wParam, msg.lParam);
#endif
return OnChar(msg.wParam, extraFlags);
return OnChar(msg.wParam, msg.lParam, extraFlags);
} else if (!mIsControlDown && !mIsAltDown &&
(KeyboardLayout::IsPrintableCharKey(aVirtualKeyCode) ||
KeyboardLayout::IsNumpadKey(aVirtualKeyCode)))
@ -3646,7 +3651,7 @@ BOOL nsWindow::OnKeyUp( UINT aVirtualKeyCode, UINT aScanCode, LPARAM aKeyData)
//
//
//-------------------------------------------------------------------------
BOOL nsWindow::OnChar(UINT charCode, PRUint32 aFlags)
BOOL nsWindow::OnChar(UINT charCode, LPARAM keyData, PRUint32 aFlags)
{
// These must be checked here too as a lone WM_CHAR could be received
// if a child window didn't handle it (for example Alt+Space in a content window)
@ -3695,6 +3700,18 @@ BOOL nsWindow::OnChar(UINT charCode, PRUint32 aFlags)
}
}
// Keep the characters unshifted for shortcuts and accesskeys and make sure
// that numbers are always passed as such (among others: bugs 50255 and 351310)
if (uniChar && (mIsControlDown || mIsAltDown)) {
UINT virtualKeyCode = ::MapVirtualKey(HIWORD(keyData) & 0xFF, MAPVK_VSC_TO_VK);
UINT unshiftedCharCode =
virtualKeyCode >= '0' && virtualKeyCode <= '9' ? virtualKeyCode :
mIsShiftDown ? ::MapVirtualKey(virtualKeyCode, MAPVK_VK_TO_CHAR) : 0;
// ignore diacritics (top bit set) and key mapping errors (char code 0)
if ((INT)unshiftedCharCode > 0)
uniChar = unshiftedCharCode;
}
// Fix for bug 285161 (and 295095) which was caused by the initial fix for bug 178110.
// When pressing (alt|ctrl)+char, the char must be lowercase unless shift is
// pressed too.
@ -4461,7 +4478,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
#ifdef KE_DEBUG
printf("%s\tchar=%c\twp=%4x\tlp=%8x\n", (msg == WM_SYSCHAR) ? "WM_SYSCHAR" : "WM_CHAR", wParam, wParam, lParam);
#endif
result = OnChar(wParam);
result = OnChar(wParam, lParam);
}
break;

2
widget/src/windows/nsWindow.h
View File

@ -306,7 +306,7 @@ protected:
virtual PRBool OnPaint(HDC aDC = nsnull);
virtual PRBool OnResize(nsRect &aWindowRect);
BOOL OnChar(UINT charCode, PRUint32 aFlags = 0);
BOOL OnChar(UINT charCode, LPARAM keyData, PRUint32 aFlags = 0);
BOOL OnKeyDown( UINT aVirtualKeyCode, UINT aScanCode, LPARAM aKeyCode);
BOOL OnKeyUp( UINT aVirtualKeyCode, UINT aScanCode, LPARAM aKeyCode);