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

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include "qwidget.h"
 #include "qcolormap.h"
 #include "qdir.h"
 #include "qdebug.h"
 #include "qtimer.h"
+#include "qurl.h"
 #include "private/qmacinputcontext_p.h"
 #include "private/qpaintengine_mac_p.h"
 #include "private/qcursor_p.h"
 #include "private/qapplication_p.h"
 #include "private/qcolor_p.h"
 struct QMacAppleEventTypeSpec {
 AEEventClass mac_class;
 AEEventID mac_id;
 } app_apple_events[] = {
 { kCoreEventClass, kAEQuitApplication },
-{ kCoreEventClass, kAEOpenDocuments }
+{ kCoreEventClass, kAEOpenDocuments },
+{ kInternetEventClass, kAEGetURL },
 };
 #ifndef QT_MAC_USE_COCOA
 #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
 #endif
 if (!app_proc_ae_handlerUPP) {
 app_proc_ae_handlerUPP = AEEventHandlerUPP(QApplicationPrivate::globalAppleEventProcessor);
 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,
-app_proc_ae_handlerUPP, SRefCon(qApp), true);
+app_proc_ae_handlerUPP, SRefCon(qApp), false);
 }
 if (QApplicationPrivate::app_style) {
 QEvent ev(QEvent::Style);
 qt_sendSpontaneousEvent(QApplicationPrivate::app_style, &ev);
 }
 [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) {
 Qt::MouseButtons buttons;
 {
 UInt32 mac_buttons = 0;
 GetEventParameter(event, kEventParamMouseChord, typeUInt32, 0,
 sizeof(mac_buttons), 0, &mac_buttons);
-buttons = qt_mac_get_buttons(mac_buttons);
+if (ekind != kEventMouseWheelMoved)
+buttons = qt_mac_get_buttons(mac_buttons);
+else
+buttons = QApplication::mouseButtons();
 }
 int wheel_deltaX = 0;
 int wheel_deltaY = 0;
 static EventRef compatibilityEvent = 0;
 // 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'.
-const int scrollFactor = 4 * 8;
 SInt32 mdelt = 0;
 GetEventParameter(event, kEventParamMouseWheelSmoothHorizontalDelta, typeSInt32, 0,
 sizeof(mdelt), 0, &mdelt);
-wheel_deltaX = mdelt * scrollFactor;
+wheel_deltaX = mdelt;
 mdelt = 0;
 GetEventParameter(event, kEventParamMouseWheelSmoothVerticalDelta, typeSInt32, 0,
 sizeof(mdelt), 0, &mdelt);
-wheel_deltaY = mdelt * scrollFactor;
+wheel_deltaY = mdelt;
 GetEventParameter(event, kEventParamEventRef, typeEventRef, 0,
 sizeof(compatibilityEvent), 0, &compatibilityEvent);
 } else if (ekind == kEventMouseWheelMoved) {
 if (event != compatibilityEvent) {
 compatibilityEvent = 0;
 sizeof(mdelt), 0, &mdelt);
 EventMouseWheelAxis axis;
 GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis, 0,
 sizeof(axis), 0, &axis);
-// The 'new' event has acceleration applied by the OS, while the old (on
+// Remove acceleration, and use either -120 or 120 as delta:
-// Carbon only), has not. So we introduce acceleration here to be consistent.
-// The acceleration is trying to respect both pixel based and line scrolling,
-// which turns out to be rather difficult.
-int linesToScroll = mdelt > 0 ? 1 : -1;
-static QTime t;
-int elapsed = t.elapsed();
-t.restart();
-if (elapsed < 20)
-linesToScroll *= 120;
-else if (elapsed < 30)
-linesToScroll *= 60;
-else if (elapsed < 50)
-linesToScroll *= 30;
-else if (elapsed < 100)
-linesToScroll *= 6;
-else if (elapsed < 200)
-linesToScroll *= 3;
-else if (elapsed < 300)
-linesToScroll *= 2;
 if (axis == kEventMouseWheelAxisX)
-wheel_deltaX = linesToScroll * 120;
+wheel_deltaX = qBound(-120, int(mdelt * 10000), 120);
 else
-wheel_deltaY = linesToScroll * 120;
+wheel_deltaY = qBound(-120, int(mdelt * 10000), 120);
 }
 }
 Qt::MouseButton button = Qt::NoButton;
 if(ekind == kEventMouseDown || ekind == kEventMouseUp) {
 AEGetAttributePtr(ae, keyEventIDAttr, typeType, 0, &aeID, sizeof(aeID), 0);
 if(aeClass == kCoreEventClass) {
 switch(aeID) {
 case kAEQuitApplication: {
 extern bool qt_mac_quit_menu_item_enabled; // qmenu_mac.cpp
-if(!QApplicationPrivate::modalState() && qt_mac_quit_menu_item_enabled) {
+if (qt_mac_quit_menu_item_enabled) {
 QCloseEvent ev;
 QApplication::sendSpontaneousEvent(app, &ev);
 if(ev.isAccepted()) {
 handled_event = true;
 app->quit();
 }
 if(str_buffer)
 free(str_buffer);
 }
 break; }
+default:
+break;
+}
+} else if (aeClass == kInternetEventClass) {
+switch (aeID) {
+case kAEGetURL: {
+char urlData[1024];
+Size actualSize;
+if (AEGetParamPtr(ae, keyDirectObject, typeChar, 0, urlData,
+sizeof(urlData) - 1, &actualSize) == noErr) {
+urlData[actualSize] = 0;
+QFileOpenEvent ev(QUrl(QString::fromUtf8(urlData)));
+QApplication::sendSpontaneousEvent(app, &ev);
+}
+break;
+}
 default:
 break;
 }
 }
 #ifdef DEBUG_EVENTS
 return QApplicationPrivate::keyboard_input_time;
 }
 void QApplication::setWheelScrollLines(int n)
 {
-Q_UNUSED(n);
+QApplicationPrivate::wheel_scroll_lines = n;
-// On Mac, acceleration is handled by the OS. Multiplying wheel scroll
-// deltas with n will not be as cross platform as one might think! So
-// we choose to go native in this case (and let wheel_scroll_lines == 1).
-//    QApplicationPrivate::wheel_scroll_lines = n;
 }
 int QApplication::wheelScrollLines()
 {
 return QApplicationPrivate::wheel_scroll_lines;

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c