Changeset 108

Timestamp:

Aug 12, 2009, 10:18:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added mouse event translation, various message handling.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (9 diffs)
• qcursor.h (modified) (1 diff)
• qcursor_p.h (modified) (1 diff)
• qcursor_pm.cpp (modified) (2 diffs)
• qwidget_pm.cpp (modified) (2 diffs)
• qwindowdefs_pm.h (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -51 +51 @@
 #include "qcolormap.h"
 #include "qpixmapcache.h"
+
 
 #include "qset.h"
@@ -68 +69 @@
 static HWND      curWin         = 0;            // current window
 static HPS       displayPS      = 0;            // display presentation space
+
+
+
+
+
+
+
+
+
 
 static bool replayPopupMouseEvent = false; // replay handling when popups close
@@ -82 +92 @@
 extern QDesktopWidget *qt_desktopWidget;
 static QPointer<QWidget> popupButtonFocus;
-static bool     qt_try_modal(QWidget *, QMSG *, int& ret);
+static bool     qt_try_modal(QWidget);
 
 QWidget *qt_button_down = 0; // widget got last button-down
@@ -88 +98 @@
 
 static HWND autoCaptureWnd = NULLHANDLE;
+
 static void setAutoCapture(HWND); // automatic capture
 static void releaseAutoCapture();
@@ -107 +118 @@
 //  QWidgetPrivate *dptr() { return d_func(); }
 //  QRect frameStrut() const { return d_func()->frameStrut(); }
-//  bool        winEvent(QMSG *m, long *r) { return QWidget::winEvent(m, r); }
+Event(m, r); }
 //  void        markFrameStrutDirty() { data->fstrut_dirty = 1; }
-//  bool        translateMouseEvent(const MSG &msg);
-//  bool        translateWheelEvent(const MSG &msg);
-//  bool        translatePaintEvent(const MSG &msg);
+    bool        translateMouseEvent(const QMSG &qmsg);
+#ifndef QT_NO_WHEELEVENT
+    bool        translateWheelEvent(const QMSG &qmsg);
+#endif
+    bool        translatePaintEvent(const QMSG &qmsg);
 //  bool        translateConfigEvent(const MSG &msg);
 //  bool        translateCloseEvent(const MSG &msg);
@@ -254 +267 @@
 class QGuiEventDispatcherPM : public QEventDispatcherPM
 {
-    Q_DECLARE_PRIVATE(QEventDispatcherPM)
 public:
     QGuiEventDispatcherPM(QObject *parent = 0);
@@ -424 +436 @@
 MRESULT EXPENTRY QtWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    // message handling indicators: if handled is true at the end of message
-    // processing, no default window proc is called but rc is returned.
-    bool handled = false;
-    MRESULT rc = (MRESULT) FALSE;
-    QETWidget *widget = 0;
-    HWND hwndC = NULLHANDLE;
-
     do {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         switch(msg) {
         default:
             break;
         }
-        if (handled)
-            return rc;
-    } while(0);
-
-    return WinDefWindowProc(hwnd, msg, mp1, mp2);
-}
-
-PFNWP QtOldFrameProc = 0;
-
-MRESULT EXPENTRY QtFrameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
-{
-    // message handling indicators: if handled is true at the end of message
-    // processing, no default window proc is called but rc is returned.
-    bool handled = false;
-    MRESULT rc = (MRESULT) FALSE;
-    QETWidget *widget = 0;
-    HWND hwndC = NULLHANDLE;
-
-    do {
-        switch(msg) {
-        default:
-            break;
-        }
-        if (handled)
-            return rc;
     } while(0);
 
@@ -499 +634 @@
 }
 
+
+
+
+
+
+
 /*****************************************************************************
   Popup widget mechanism
@@ -527 +668 @@
  *****************************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE

trunk/src/gui/kernel/qcursor.h

@@ -115 +115 @@
     HCURSOR handle() const;
     QCursor(HCURSOR cursor);
+
+
+
 #elif defined(Q_WS_X11)
     Qt::HANDLE handle() const;

trunk/src/gui/kernel/qcursor_p.h

@@ -93 +93 @@
 #if defined (Q_WS_WIN)
     HCURSOR hcurs;
+
+
 #elif defined (Q_WS_X11)
     XColor fg, bg;

trunk/src/gui/kernel/qcursor_pm.cpp

@@ -60 +60 @@
 
 QCursorData::QCursorData(Qt::CursorShape s)
-  : cshape(s), bm(0), bmm(0), hx(0), hy(0) // @todo, hcurs(0)
+  : cshape(s), bm(0), bmm(0), hx(0), hy(0))
 {
     ref = 1;
@@ -79 +79 @@
     // @todo implement
     return 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -857 +857 @@
 
     if (flags & Qt::WindowTitleHint) {
-        title = topLevel ? qAppName().toLocal8Bit() : q->objectName().toLocal8Bit();
+        QString t = topLevel ? qAppName() : q->objectName();
+        t = t.left(1).toUpper() + t.mid(1).toLower();
+        title = t.toLocal8Bit();
     }
 
@@ -1186 +1188 @@
 }
 
+
+
+
+
+
 void QWidget::grabMouse()
 {

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -59 +59 @@
 typedef LHANDLE HWND;
 typedef LHANDLE HPS;
+
 typedef struct _QMSG QMSG;
 typedef void *MRESULT;