Changeset 97 for trunk/src/kernel/qapplication_pm.cpp

Timestamp:

Jul 6, 2006, 11:25:56 PM (19 years ago)

Author:

dmik

Message:

kernel: Created the initial implementation of the Drag'n'Drop support for OS/2 (not fully functiona yet: updating widget contents under the drag pointer will cause screen corruption, setting the drag object's pixmap is not possible). See ticket:22 for more info.

File:

• trunk/src/kernel/qapplication_pm.cpp (modified) (11 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -657 +657 @@
     // there is no need to unregister private window classes -- it is done
     // automatically upon process termination.
-//    QAsciiDictIterator<int> it(*winclassNames);
-//    const char *k;
-//    while ( (k = it.currentKey()) ) {
-//    }
     delete winclassNames;
     winclassNames = 0;
@@ -913 +909 @@
 extern uint qGlobalPostedEventsCount();
 
+#ifndef QT_NO_DRAGANDDROP
+extern MRESULT qt_dispatchDragAndDrop( QWidget *, const QMSG & ); // qdnd_pm.cpp
+#endif
+
 /*!
     The message procedure calls this function for every message
@@ -945 +945 @@
     }
 }
-
 
 //
@@ -1169 +1168 @@
         result = widget->translateWheelEvent( qmsg );
         rc = (MRESULT) result;
+#endif
+#ifndef QT_NO_DRAGANDDROP
+    } else if ( msg >= WM_DRAGFIRST && msg <= WM_DRAGLAST ) {
+        RETURN( qt_dispatchDragAndDrop( widget, qmsg ) );
 #endif
     } else {
@@ -1589 +1592 @@
             break;
 
-/// @todo (dmik) later
+/// @todo (dmik) remove?
 //      case WM_IME_STARTCOMPOSITION:
 //          result = QInputContext::startComposition();
@@ -2182 +2185 @@
 static int qt_extraKeyState = 0;
 
-// State holder for mouse buttons
-static int qt_buttonState = 0;
+static int mouseButtonState()
+{
+    int state = 0;
+
+    if ( WinGetKeyState( HWND_DESKTOP, VK_BUTTON1 ) & 0x8000 )
+        state |= Qt::LeftButton;
+    if ( WinGetKeyState( HWND_DESKTOP, VK_BUTTON2 ) & 0x8000 )
+        state |= Qt::RightButton;
+    if ( WinGetKeyState( HWND_DESKTOP, VK_BUTTON3 ) & 0x8000 )
+        state |= Qt::MidButton;
+
+    return state;
+}
 
 //
@@ -2195 +2209 @@
     autoCaptureWnd = h;
 
-    if ( !qt_buttonState ) {
+    if ( !mouseButtonState() ) {
         // all buttons released, we don't actually capture the mouse
         // (see QWidget::translateMouseEvent())
@@ -2242 +2256 @@
 static int translateButtonState( USHORT s, int type, int button )
 {
-    if ( type == QEvent::MouseButtonPress )
-        qt_buttonState |= ( button & Qt::MouseButtonMask );
-    if ( type == QEvent::MouseButtonRelease )
-        qt_buttonState &= ~( button & Qt::MouseButtonMask );
-
-    int bst = qt_buttonState;
+    int bst = mouseButtonState();
+
     if ( type == QEvent::ContextMenu ) {
         if ( WinGetKeyState( HWND_DESKTOP, VK_SHIFT ) & 0x8000 )
@@ -2279 +2289 @@
 }
 
-//@@TODO (dmik): later
-//// In DnD, the mouse release event never appears, so the
-//// mouse button state machine must be manually reset
-///*! \internal */
-//void QApplication::winMouseButtonUp()
-//{
-//    qt_button_down = 0;
-//    releaseAutoCapture();
-//}
+/*! \internal
+  In DnD, the mouse release event never appears, so the
+  mouse button state machine must be manually reset
+*/
+void qt_pmMouseButtonUp()
+{
+    // release any stored mouse capture
+    qt_button_down = 0;
+    autoCaptureReleased = TRUE;
+    releaseAutoCapture();
+}
 
 bool QETWidget::translateMouseEvent( const QMSG &qmsg )
@@ -2358 +2370 @@
     type   = (QEvent::Type)mouseTbl[++i];       // event type
     button = mouseTbl[++i];                     // which button
-//@@TODO (dmik): later (extra buttons)
+/// @todo (dmik) later (extra buttons)
 //    if ( button > Qt::MidButton ) {
 //      switch( GET_XBUTTON_WPARAM( msg.wParam ) ) {
@@ -2424 +2436 @@
 #endif
         if ( curWin != winId() ) {              // new current window
-//@@TODO (dmik): add CS_HITTEST to our window classes and handle WM_HITTEST,
+/// @todo (dmik)            
+//  add CS_HITTEST to our window classes and handle WM_HITTEST,
 //  otherwise disabled windows will not get mouse events?
             qt_dispatchEnterLeave( this, QWidget::find(curWin) );