FCL/sf/mw/qt: comparison src/gui/kernel/qapplication

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 extern bool qt_tab_all_widgets;         // from qapplication.cpp
 bool qt_mac_app_fullscreen = false;
 bool qt_scrollbar_jump_to_pos = false;
 static bool qt_mac_collapse_on_dblclick = true;
 extern int qt_antialiasing_threshold; // from qapplication.cpp
-QPointer<QWidget> qt_button_down;                // widget got last button-down
+QWidget * qt_button_down;                // widget got last button-down
+QPointer<QWidget> qt_last_mouse_receiver;
 #ifndef QT_MAC_USE_COCOA
 static bool qt_button_down_in_content; // whether the button_down was in the content area.
 static bool qt_mac_previous_press_in_popup_mode = false;
 static bool qt_mac_no_click_through_mode = false;
 static int tablet_button_state = 0;
 app_proc_handlerUPP = NewEventHandlerUPP(QApplicationPrivate::globalEventProcessor);
 qt_init_app_proc_handler();
 }
 #endif
-if (!app_proc_ae_handlerUPP) {
+if (!app_proc_ae_handlerUPP && !QApplication::testAttribute(Qt::AA_MacPluginApplication)) {
 app_proc_ae_handlerUPP = AEEventHandlerUPP(QApplicationPrivate::globalAppleEventProcessor);
-for(uint i = 0; i < sizeof(app_apple_events) / sizeof(QMacAppleEventTypeSpec); ++i)
+for(uint i = 0; i < sizeof(app_apple_events) / sizeof(QMacAppleEventTypeSpec); ++i) {
-AEInstallEventHandler(app_apple_events[i].mac_class, app_apple_events[i].mac_id,
+// Install apple event handler, but avoid overwriting an already
-app_proc_ae_handlerUPP, SRefCon(qApp), false);
+// existing handler (it means a 3rd party application has installed one):
+SRefCon refCon = 0;
+AEEventHandlerUPP current_handler = NULL;
+AEGetEventHandler(app_apple_events[i].mac_class, app_apple_events[i].mac_id, &current_handler, &refCon, false);
+if (!current_handler)
+AEInstallEventHandler(app_apple_events[i].mac_class, app_apple_events[i].mac_id,
+app_proc_ae_handlerUPP, SRefCon(qApp), false);
+}
 }
 if (QApplicationPrivate::app_style) {
 QEvent ev(QEvent::Style);
 qt_sendSpontaneousEvent(QApplicationPrivate::app_style, &ev);
 if (QApplication::desktopSettingsAware())
 QApplicationPrivate::qt_mac_apply_settings();
 // Cocoa application delegate
 #ifdef QT_MAC_USE_COCOA
-NSApplication *cocoaApp = [NSApplication sharedApplication];
+NSApplication *cocoaApp = [QNSApplication sharedApplication];
 QMacCocoaAutoReleasePool pool;
 NSObject *oldDelegate = [cocoaApp delegate];
 QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
 Q_ASSERT(newDelegate);
 [newDelegate setQtPrivate:priv];
 }
 [cocoaApp setMenu:[qtMenuLoader menu]];
 [newDelegate setMenuLoader:qtMenuLoader];
 [qtMenuLoader release];
-NSAppleEventManager *eventManager = [NSAppleEventManager sharedAppleEventManager];
-[eventManager setEventHandler:newDelegate andSelector:@selector(getUrl:withReplyEvent:)
-forEventClass:kInternetEventClass andEventID:kAEGetURL];
 }
 #endif
 // Register for Carbon tablet proximity events on the event monitor target.
 // This means that we should receive proximity events even when we aren't the active application.
 if (!tablet_proximity_handler) {
 #ifndef QT_NO_CURSOR
 /*****************************************************************************
 QApplication cursor stack
 *****************************************************************************/
+#ifdef QT_MAC_USE_COCOA
+void QApplicationPrivate::disableUsageOfCursorRects(bool disable)
+{
+// In Cocoa there are two competing ways of setting the cursor; either
+// by using cursor rects (see qcocoaview_mac.mm), or by pushing/popping
+// the cursor manually. When we use override cursors, it makes most sense
+// to use the latter. But then we need to tell cocoa to stop using the
+// first approach so it doesn't change the cursor back when hovering over
+// a cursor rect:
+QWidgetList topLevels = qApp->topLevelWidgets();
+for (int i=0; i<topLevels.size(); ++i) {
+if (NSWindow *window = qt_mac_window_for(topLevels.at(i)))
+disable ? [window disableCursorRects] : [window enableCursorRects];
+}
+}
+void QApplicationPrivate::updateOverrideCursor()
+{
+// Sometimes Cocoa forgets that we have set a Cursor
+// manually. In those cases, remind it again:
+if (QCursor *override = qApp->overrideCursor())
+[static_cast<NSCursor *>(qt_mac_nsCursorForQCursor(*override)) set];
+}
+#endif
 void QApplication::setOverrideCursor(const QCursor &cursor)
 {
 qApp->d_func()->cursor_list.prepend(cursor);
 #ifdef QT_MAC_USE_COCOA
 QMacCocoaAutoReleasePool pool;
+if (qApp->d_func()->cursor_list.size() == 1)
+qApp->d_func()->disableUsageOfCursorRects(true);
 [static_cast<NSCursor *>(qt_mac_nsCursorForQCursor(cursor)) push];
 #else
 if (qApp && qApp->activeWindow())
 qt_mac_set_cursor(&qApp->d_func()->cursor_list.first(), QCursor::pos());
 #endif
 qApp->d_func()->cursor_list.removeFirst();
 #ifdef QT_MAC_USE_COCOA
 QMacCocoaAutoReleasePool pool;
 [NSCursor pop];
+if (qApp->d_func()->cursor_list.isEmpty())
+qApp->d_func()->disableUsageOfCursorRects(false);
 #else
 if (qApp && qApp->activeWindow()) {
 const QCursor def(Qt::ArrowCursor);
 qt_mac_set_cursor(qApp->d_func()->cursor_list.isEmpty() ? &def : &qApp->d_func()->cursor_list.first(), QCursor::pos());
 }
 // compatibility with older applications, carbon will also send us
 // kEventMouseWheelMoved events if we dont eat this event
 // (actually two events; one for horizontal and one for vertical).
 // As a results of this, and to make sure we dont't receive duplicate events,
 // we try to detect when this happend by checking the 'compatibilityEvent'.
+// Since delta is delivered as pixels rather than degrees, we need to
+// convert from pixels to degrees in a sensible manner.
+// It looks like 1/4 degrees per pixel behaves most native.
+// (NB: Qt expects the unit for delta to be 8 per degree):
+const int pixelsToDegrees = 2;
 SInt32 mdelt = 0;
 GetEventParameter(event, kEventParamMouseWheelSmoothHorizontalDelta, typeSInt32, 0,
 sizeof(mdelt), 0, &mdelt);
-wheel_deltaX = mdelt;
+wheel_deltaX = mdelt * pixelsToDegrees;
 mdelt = 0;
 GetEventParameter(event, kEventParamMouseWheelSmoothVerticalDelta, typeSInt32, 0,
 sizeof(mdelt), 0, &mdelt);
-wheel_deltaY = mdelt;
+wheel_deltaY = mdelt * pixelsToDegrees;
 GetEventParameter(event, kEventParamEventRef, typeEventRef, 0,
 sizeof(compatibilityEvent), 0, &compatibilityEvent);
 } else if (ekind == kEventMouseWheelMoved) {
 if (event != compatibilityEvent) {
 compatibilityEvent = 0;
 if(SendEventToMenu(copy, copy_cmd.menu.menuRef) == noErr)
 handled_event = true;
 }
 if(!handled_event) {
 if(cmd.commandID == kHICommandQuit) {
-handled_event = true;
+// Quitting the application is not Qt's responsibility if
-HiliteMenu(0);
+// used in a plugin or just embedded into a native application.
-bool handle_quit = true;
+// In that case, let the event pass down to the native apps event handler.
-if(QApplicationPrivate::modalState()) {
+if (!QApplication::testAttribute(Qt::AA_MacPluginApplication)) {
-int visible = 0;
+handled_event = true;
-const QWidgetList tlws = QApplication::topLevelWidgets();
+HiliteMenu(0);
-for(int i = 0; i < tlws.size(); ++i) {
+bool handle_quit = true;
-if(tlws.at(i)->isVisible())
+if(QApplicationPrivate::modalState()) {
-++visible;
+int visible = 0;
+const QWidgetList tlws = QApplication::topLevelWidgets();
+for(int i = 0; i < tlws.size(); ++i) {
+if(tlws.at(i)->isVisible())
+++visible;
+}
+handle_quit = (visible <= 1);
 }
-handle_quit = (visible <= 1);
+if(handle_quit) {
-}
+QCloseEvent ev;
-if(handle_quit) {
+QApplication::sendSpontaneousEvent(app, &ev);
-QCloseEvent ev;
+if(ev.isAccepted())
-QApplication::sendSpontaneousEvent(app, &ev);
+app->quit();
-if(ev.isAccepted())
+} else {
-app->quit();
+QApplication::beep();
-} else {
+}
-QApplication::beep();
 }
 } else if(cmd.commandID == kHICommandSelectWindow) {
 if((GetCurrentKeyModifiers() & cmdKey))
 handled_event = true;
 } else if(cmd.commandID == kHICommandAbout) {
 Q_UNUSED(event);
 Q_UNUSED(data);
 return eventNotHandledErr;
 #endif
 }
+#ifdef QT_MAC_USE_COCOA
+void QApplicationPrivate::qt_initAfterNSAppStarted()
+{
+setupAppleEvents();
+updateOverrideCursor();
+}
+void QApplicationPrivate::setupAppleEvents()
+{
+// This function is called from the event dispatcher when NSApplication has
+// finished initialization, which appears to be just after [NSApplication run] has
+// started to execute. By setting up our apple events handlers this late, we override
+// the ones set up by NSApplication.
+// If Qt is used as a plugin, we let the 3rd party application handle events
+// like quit and open file events. Otherwise, if we install our own handlers, we
+// easily end up breaking functionallity the 3rd party application depend on:
+if (QApplication::testAttribute(Qt::AA_MacPluginApplication))
+return;
+QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
+NSAppleEventManager *eventManager = [NSAppleEventManager sharedAppleEventManager];
+[eventManager setEventHandler:newDelegate andSelector:@selector(appleEventQuit:withReplyEvent:)
+forEventClass:kCoreEventClass andEventID:kAEQuitApplication];
+[eventManager setEventHandler:newDelegate andSelector:@selector(getUrl:withReplyEvent:)
+forEventClass:kInternetEventClass andEventID:kAEGetURL];
+}
+#endif
 // In Carbon this is your one stop for apple events.
 // In Cocoa, it ISN'T. This is the catch-all Apple Event handler that exists
 // for the time between instantiating the NSApplication, but before the
 // NSApplication has installed it's OWN Apple Event handler. When Cocoa has
 if (QApplicationPrivate::active_window == widget)
 qApp->setActiveWindow(0);
 }
 QMenuBar::macUpdateMenuBar();
+QApplicationPrivate::updateOverrideCursor();
 #else
 Q_UNUSED(widget);
 Q_UNUSED(activated);
 #endif
 }

changeset 30	5dc02b23752f
parent 18	2f34d5167611
child 37	758a864f9613