wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

take key modifiers from the current event not the current hardware state. b=320746 r=smichaud sr=roc

Browse Source
This commit is contained in:
joshmoz@gmail.com 2008-03-04 09:58:52 -08:00
parent 41721e9840
commit df3cd329a5
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsObjectFrame.cpp
View File

@ -2885,7 +2885,7 @@ static void InitializeEventRecord(EventRecord* event)
memset(event, 0, sizeof(EventRecord));
::GetGlobalMouse(&event->where);
event->when = ::TickCount();
event->modifiers = ::GetCurrentKeyModifiers();
event->modifiers = ::GetCurrentEventKeyModifiers();
}
NPDrawingModel nsPluginInstanceOwner::GetDrawingModel()

2
toolkit/xre/nsAppRunner.cpp
View File

@ -2687,7 +2687,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
}
#ifdef XP_MACOSX
if (GetCurrentKeyModifiers() & optionKey)
if (GetCurrentEventKeyModifiers() & optionKey)
gSafeMode = PR_TRUE;
#endif

14
widget/src/cocoa/nsChildView.mm
View File

@ -1886,7 +1886,7 @@ NS_IMETHODIMP nsChildView::GetToggledKeyState(PRUint32 aKeyCode,
default:
return NS_ERROR_NOT_IMPLEMENTED;
}
PRUint32 modifierFlags = ::GetCurrentKeyModifiers();
PRUint32 modifierFlags = ::GetCurrentEventKeyModifiers();
*aLEDState = (modifierFlags & key) != 0;
return NS_OK;
@ -2834,7 +2834,7 @@ NSEvent* gLastDragEvent = nil;
macEvent.message = 0;
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = GetCurrentKeyModifiers();
macEvent.modifiers = ::GetCurrentEventKeyModifiers();
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchMouseEvent(geckoEvent);
@ -2870,7 +2870,7 @@ NSEvent* gLastDragEvent = nil;
macEvent.message = 0;
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = GetCurrentKeyModifiers();
macEvent.modifiers = ::GetCurrentEventKeyModifiers();
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchMouseEvent(geckoEvent);
@ -2900,7 +2900,7 @@ static nsEventStatus SendGeckoMouseEnterOrExitEvent(PRBool isTrusted,
macEvent.message = 0;
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = ::GetCurrentKeyModifiers();
macEvent.modifiers = ::GetCurrentEventKeyModifiers();
event.nativeMsg = &macEvent;
nsEventStatus status;
@ -3021,7 +3021,7 @@ static nsEventStatus SendGeckoMouseEnterOrExitEvent(PRBool isTrusted,
macEvent.message = 0;
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = GetCurrentKeyModifiers();
macEvent.modifiers = ::GetCurrentEventKeyModifiers();
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchMouseEvent(geckoEvent);
@ -3058,7 +3058,7 @@ static nsEventStatus SendGeckoMouseEnterOrExitEvent(PRBool isTrusted,
macEvent.message = 0;
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = btnState | ::GetCurrentKeyModifiers();
macEvent.modifiers = btnState | ::GetCurrentEventKeyModifiers();
geckoEvent.nativeMsg = &macEvent;
mGeckoChild->DispatchMouseEvent(geckoEvent);
@ -3467,7 +3467,7 @@ static void ConvertCocoaKeyEventToMacEvent(NSEvent* cocoaEvent, EventRecord& mac
macEvent.message = (charCode & 0x00FF) | ([cocoaEvent keyCode] << 8);
macEvent.when = ::TickCount();
::GetGlobalMouse(&macEvent.where);
macEvent.modifiers = ::GetCurrentKeyModifiers();
macEvent.modifiers = ::GetCurrentEventKeyModifiers();
NS_OBJC_END_TRY_ABORT_BLOCK;
}

2
xpfe/components/startup/src/Makefile.in
View File

@ -74,7 +74,7 @@ else
ifeq (WINNT,$(OS_ARCH))
CPPSRCS += nsUserInfoWin.cpp
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += \
nsUserInfoMac.cpp \
nsCommandLineServiceMac.cpp \

7
xpfe/components/startup/src/nsCommandLineServiceMac.cpp
View File

@ -139,15 +139,10 @@ nsresult nsMacCommandLine::Initialize(int& argc, char**& argv)
mArgsAllocated = kArgsGrowSize;
mArgsUsed = 0;
#if defined(XP_MACOSX)
// Here, we may actually get useful args.
// Copy them first to mArgv.
for (int arg = 0; arg < argc; arg++)
AddToCommandLine(argv[arg]);
#else
// init the args buffer with the program name
AddToCommandLine("mozilla");
#endif
// Set up AppleEvent handling.
OSErr err = CreateAEHandlerClasses(false);
@ -176,7 +171,7 @@ nsresult nsMacCommandLine::Initialize(int& argc, char**& argv)
}
}
if (GetCurrentKeyModifiers() & optionKey)
if (::GetCurrentEventKeyModifiers() & optionKey)
AddToCommandLine("-p");
// we've started up now