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

Be less sensitive about the shift modifier for key events with character codes. b=401086, r=neil, sr=jst

Browse Source
This commit is contained in:
karlt+@karlt.net 2008-03-27 22:19:14 -07:00
parent 16e3fdc498
commit 0c2bc78774
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
content/xbl/src/nsXBLPrototypeHandler.cpp
View File

@ -70,7 +70,6 @@
#include "nsContentUtils.h"
#include "nsIScriptError.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsGkAtoms.h"
#include "nsGUIEvent.h"
#include "nsIXPConnect.h"
@ -606,7 +605,19 @@ nsXBLPrototypeHandler::KeyEventMatched(nsIDOMKeyEvent* aKeyEvent)
if (mMisc) {
aKeyEvent->GetCharCode(&code);
code = ToLowerCase(PRUnichar(code));
// non-BMP characters are currently not handled.
if (!IS_IN_BMP(code))
return PR_FALSE;
// Ignore CapsLock, and distinguish between Ctrl-a and Ctrl-Shift-A,
// unless any Shift-state is explicitly permitted (in which case,
// mDetail is lowercase).
PRBool isShift;
aKeyEvent->GetShiftKey(&isShift);
if ((mKeyMask & cShiftMask) && isShift)
code = ToUpperCase(PRUnichar(code));
else
code = ToLowerCase(PRUnichar(code));
}
else
aKeyEvent->GetKeyCode(&code);
@ -930,11 +941,19 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
if (!key.IsEmpty()) {
if (mKeyMask == 0)
mKeyMask = cAllModifiers;
ToLowerCase(key);
// If Shift is required then ensure the case of the character matches the
// Shift-state. Otherwise normalize to lowercase.
if ((mKeyMask & (cShift | cShiftMask)) == (cShift | cShiftMask))
ToUpperCase(key);
else
ToLowerCase(key);
// We have a charcode.
mMisc = 1;
// non-BMP characters are currently not handled.
// KeyEventMatched doesn't match against surrogate codes.
mDetail = key[0];
const PRUint8 GTK2Modifiers = cShift | cControl | cShiftMask | cControlMask;
if ((mKeyMask & GTK2Modifiers) == GTK2Modifiers &&
modifiers.First() != PRUnichar(',') &&
@ -1004,7 +1023,11 @@ nsXBLPrototypeHandler::ModifiersMatchMask(nsIDOMUIEvent* aEvent)
return PR_FALSE;
}
if (mKeyMask & cShiftMask) {
// Punctuation and characters from some scripts may be on any level,
// so ignore the Shift state for key events with unicase character codes.
// (The Shift state is considered in KeyEventMatched for letters from
// bicameral scripts.)
if (!(key && mMisc) && (mKeyMask & cShiftMask)) {
key ? key->GetShiftKey(&keyPresent) : mouse->GetShiftKey(&keyPresent);
if (keyPresent != ((mKeyMask & cShift) != 0))
return PR_FALSE;