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

Fixing Bug #8328, keybinding fix

Browse Source
This commit is contained in:
saari%netscape.com 1999-06-17 01:48:22 +00:00
parent 96a3f9fe33
commit e35eca0fca
4 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/events/src/nsDOMEvent.cpp
View File

@ -345,6 +345,11 @@ NS_METHOD nsDOMEvent::GetShiftKey(PRBool* aIsDown)
NS_METHOD nsDOMEvent::GetMetaKey(PRBool* aIsDown)
{
#ifdef XP_MAC
*aIsDown = ((nsInputEvent*)mEvent)->isCommand;
#else
*aIsDown = ((nsInputEvent*)mEvent)->isControl;
#endif
return NS_OK;
}

5
layout/events/src/nsDOMEvent.cpp
View File

@ -345,6 +345,11 @@ NS_METHOD nsDOMEvent::GetShiftKey(PRBool* aIsDown)
NS_METHOD nsDOMEvent::GetMetaKey(PRBool* aIsDown)
{
#ifdef XP_MAC
*aIsDown = ((nsInputEvent*)mEvent)->isCommand;
#else
*aIsDown = ((nsInputEvent*)mEvent)->isControl;
#endif
return NS_OK;
}

45
rdf/content/src/nsXULKeyListener.cpp
View File

@ -237,6 +237,7 @@ nsresult nsXULKeyListenerImpl::KeyPress(nsIDOMEvent* aKeyEvent)
nsString keyName;
nsString disabled;
nsString modCommand;
nsString modControl;
nsString modShift;
nsString modAlt;
nsString cmdToExecute;
@ -244,57 +245,65 @@ nsresult nsXULKeyListenerImpl::KeyPress(nsIDOMEvent* aKeyEvent)
//printf("keyNodeType [%s] \n", keyNodeType.ToNewCString()); // this leaks
if (keyNodeType.Equals("key")) {
keyElement->GetAttribute(nsAutoString("key"), keyName);
printf("Found key [%s] \n", keyName.ToNewCString()); // this leaks
//printf("Found key [%s] \n", keyName.ToNewCString()); // this leaks
keyElement->GetAttribute(nsAutoString("disabled"), disabled);
if (disabled == "false") {
PRUint32 theChar;
//theEvent->GetCharCode(&theChar);
#ifdef XP_PC
theEvent->GetCharCode(&theChar);
#else
theEvent->GetKeyCode(&theChar);
printf("event key [%c] \n", theChar); // this leaks
#endif
//printf("event key [%c] \n", theChar); // this leaks
char tempChar[2];
tempChar[0] = theChar;
tempChar[1] = 0;
nsString tempChar2 = tempChar;
printf("compare key [%s] \n", tempChar2.ToNewCString()); // this leaks
//printf("compare key [%s] \n", tempChar2.ToNewCString()); // this leaks
// NOTE - convert theChar and keyName to upper
keyName.ToUpperCase();
tempChar2.ToUpperCase();
if (tempChar2 == keyName) {
keyElement->GetAttribute(nsAutoString("modifiercommand"), modCommand);
keyElement->GetAttribute(nsAutoString("modifiercontrol"), modControl);
keyElement->GetAttribute(nsAutoString("modifiershift"), modShift);
keyElement->GetAttribute(nsAutoString("modifieralt"), modAlt);
keyElement->GetAttribute(nsAutoString("onkeypress"), cmdToExecute);
printf("onkeypress [%s] \n", cmdToExecute.ToNewCString()); // this leaks
//printf("onkeypress [%s] \n", cmdToExecute.ToNewCString()); // this leaks
do {
// Test Command attribute
/*
#ifdef XP_MAC
if (theEvent.isCommand && (modCommand != "true"))
break;
#else
if (theEvent.isControl && (modCommand != "true"))
break;
#endif // XP_MAC
*/
PRBool isCommand = PR_FALSE;
theEvent->GetMetaKey(&isCommand);
if ((isCommand && (modCommand != "true")) ||
(!isCommand && (modCommand == "true")))
break;
//printf("Passed command test \n"); // this leaks
PRBool isControl = PR_FALSE;
theEvent->GetCtrlKey(&isControl);
if (isControl && (modCommand != "true"))
if ((isControl && (modControl != "true")) ||
(!isControl && (modControl == "true")))
break;
//printf("Passed control test \n"); // this leaks
// Test Shift attribute
PRBool isShift = PR_FALSE;
theEvent->GetShiftKey(&isShift);
if (isShift && (modShift != "true"))
if ((isShift && (modShift != "true")) ||
(!isShift && (modShift == "true")))
break;
// Test Alt attribute
PRBool isAlt = PR_FALSE;
theEvent->GetAltKey(&isAlt);
if (isAlt && (modAlt != "true"))
if ((isAlt && (modAlt != "true")) ||
(!isAlt && (modAlt == "true")))
break;
// Modifier tests passed so execute onclick command
nsresult rv = NS_ERROR_FAILURE;
nsresult rv = NS_ERROR_FAILURE;
// This code executes in every presentation context in which this
// document is appearing.

20
widget/src/mac/nsMacMessagePump.cpp
View File

@ -674,17 +674,17 @@ void nsMacMessagePump::DoMouseMove(EventRecord &anEvent)
void nsMacMessagePump::DoKey(EventRecord &anEvent)
{
char theChar = (char)(anEvent.message & charCodeMask);
if ((anEvent.what == keyDown) && ((anEvent.modifiers & cmdKey) != 0))
{
//if ((anEvent.what == keyDown) && ((anEvent.modifiers & cmdKey) != 0))
//{
// do a menu key command
long menuResult = ::MenuKey(theChar);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
}
else
// long menuResult = ::MenuKey(theChar);
// if (HiWord(menuResult) != 0)
// {
// menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
// DoMenu(anEvent, menuResult);
// }
//}
//else
{
DispatchOSEventToRaptor(anEvent, ::FrontWindow());
}