Changeset 115

Timestamp:

Aug 10, 2006, 8:19:08 PM (19 years ago)

Author:

dmik

Message:

Kernel: WinUpdateWindow() is called on every WM_ERASEBACKGROUND also when no QT_PM_NO_WIDGETMASK macro is defined (i.e. when we support widget masks), for better visual effect (no unpainted areas flashes at program startup, on resize, etc.)

File:

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

trunk/src/kernel/qapplication_pm.cpp ¶

@@ -74 +74 @@
 
 extern void qt_ensure_pm();
-
-/// @todo (dmik) how we can use buttons 4 and 5 on OS/2?
-//// support for xbuttons
-//#ifndef WM_XBUTTONDOWN
-//#define WM_XBUTTONDOWN                  0x020B
-//#define WM_XBUTTONUP                    0x020C
-//#define WM_XBUTTONDBLCLK                0x020D
-//#define GET_KEYSTATE_WPARAM(wParam)     (LOWORD(wParam))
-//#define GET_XBUTTON_WPARAM(wParam)      (HIWORD(wParam))
-//#define XBUTTON1      0x0001
-//#define XBUTTON2      0x0002
-//#define MK_XBUTTON1         0x0020
-//#define MK_XBUTTON2         0x0040
-//#endif
 
 /// @todo (dmik) hmm, extended keys under OS/2?
@@ -497 +483 @@
 #endif // QT_DEBUG
 
-    // No message boxes but important ones
-//@@TODO (dmik): configuring error popups per process is not usual practice
-//      in OS/2 (since global AUTOFAIL/SUPPRESSPOPUPS control this). remove it?
-    DosError( FERR_DISABLEHARDERR | FERR_ENABLEEXCEPTION );
-
     // Ensure we are in PM mode
     qt_ensure_pm();
-    // Force creation of the main event loop to make it possible to
-    // create windows before the application invikes exec()
+    // Force creation of the main event queue to make it possible to
+    // create windows before the application invokes exec()
     QApplication::eventLoop();
-
-
-//@@TODO (dmik): do we need appInst anywhere? if yes, make it obtaining its
-//  value using the return value of qt_ensure_pm() since it also uses PIB.
-//    if ( appInst == 0 ) {
-//        PPIB ppib;
-//        DosGetInfoBlocks( NULL, &ppib );
-//        appInst = ppib->pib_hmte;
-//    }
 
     // Misc. initialization
@@ -540 +512 @@
         qt_set_pm_resources();
 
-//@@TODO (dmik): remove?
+/// @todo (dmik) remove?
 //    QInputContext::init();
 }
@@ -1021 +993 @@
     // flip y coordinate
     qmsg.ptl.y = QApplication::desktop()->height() - (qmsg.ptl.y + 1);
-
-/// @todo (dmik) do we need this?
-//    /*
-//    // sometimes the autograb is not released, so the clickevent is sent
-//    // to the wrong window. We ignore this for now, because it doesn't
-//    // cause any problems.
-//    if ( msg.message == WM_LBUTTONDOWN || msg.message == WM_RBUTTONDOWN || msg.message == WM_MBUTTONDOWN ) {
-//      HWND handle = WindowFromPoint( msg.pt );
-//      if ( msg.hwnd != handle ) {
-//          msg.hwnd = handle;
-//          hwnd = handle;
-//      }
-//    }
-//    */
 
     if ( qt_pmEventFilter( &qmsg, rc ) )        // send through app filter
@@ -1132 +1090 @@
         case WM_BUTTON2DOWN:
         case WM_BUTTON3DOWN:
-/// @todo (dmik) later (extra buttons)
-//        case WM_XBUTTONDOWN:
             if ( ignoreNextMouseReleaseEvent )
                 ignoreNextMouseReleaseEvent = FALSE;
@@ -1140 +1096 @@
         case WM_BUTTON2UP:
         case WM_BUTTON3UP:
-/// @todo (dmik) later (extra buttons)
-//        case WM_XBUTTONUP:
             if ( ignoreNextMouseReleaseEvent ) {
                 ignoreNextMouseReleaseEvent = FALSE;
@@ -1381 +1335 @@
 //#endif
 
-/// @todo (dmik) later
+/// @todo (dmik) later (WM_KBDLAYERCHANGED (0xBD4)?)
 //      case WM_SETTINGCHANGE:
 //          if ( !msg.wParam ) {
@@ -1391 +1345 @@
 //          break;
 //
-//#ifndef Q_OS_TEMP
-//      case WM_NCLBUTTONDBLCLK:
-//          if ( wParam == HTCAPTION ) {
-//              bool window_state_changed = FALSE;
-//              if ( widget->isMaximized() ) {
-//                  window_state_changed = TRUE;
-//                  widget->clearWState(Qt::WState_Maximized);
-//              } else if (widget->testWFlags(Qt::WStyle_Maximize)){
-//                  window_state_changed = TRUE;
-//                  widget->setWState(Qt::WState_Maximized);
-//              }
-//
-//              if (window_state_changed) {
-//                  QEvent e(QEvent::WindowStateChange);
-//                  qt_sendSpontaneousEvent(widget, &e);
-//              }
-//          }
-//          result = FALSE;
-//          break;
-//#endif
         case WM_PAINT:                          // paint event
             result = widget->translatePaintEvent( qmsg );
             break;
         case WM_ERASEBACKGROUND:                // erase window background
-#if defined (QT_PM_NO_WIDGETMASK)
             // flush WM_PAINT messages here to update window contents
             // instantly while tracking the resize frame (normally these
@@ -1426 +1359 @@
             // clients only, so we would have to do all calculations ourselves).
             WinUpdateWindow( widget->winId() );
-#else
-            // We flush WM_PAINT messages in QETWidget::translateConfigEvent().
-#endif
             RETURN( FALSE );
             break;
@@ -2420 +2350 @@
     type   = (QEvent::Type)mouseTbl[++i];       // event type
     button = mouseTbl[++i];                     // which button
-/// @todo (dmik) later (extra buttons)
-//    if ( button > Qt::MidButton ) {
-//      switch( GET_XBUTTON_WPARAM( msg.wParam ) ) {
-//      case XBUTTON1:
-//          button = Qt::MidButton*2; //### XButton1;
-//          break;
-//      case XBUTTON2:
-//          button = Qt::MidButton*4; //### XButton2;
-//          break;
-//      }
-//    }
     state  = translateButtonState( SHORT2FROMMP(qmsg.mp2), type, button ); // button state
 
@@ -3361 +3280 @@
                 if ( !testWFlags( WStaticContents ) )
                     repaint( !testWFlags(WResizeNoErase) );
-#if !defined (QT_PM_NO_WIDGETMASK)
-                // Flush WM_PAINT messages here to update window contents
-                // instantly while tracking the resize frame (normally these
-                // messages are delivered after resizing is stopped for some
-                // time). It makes resizing a bit slower but gives a better look
-                // (no invalid window contents can be seen during resize).
-                // The alternative could be to erase the background only
-                // (similarly to Win32), but we need to do it for every
-                // non-toplevel window, which can be also time-consuming
-                WinUpdateWindow( winId() );
-#endif
             } else {
                 QResizeEvent *e = new QResizeEvent( newSize, oldSize );