Ticket #791: new_ui_mouse_support.diff

mythmainwindow.cpp

@@ -29 +29 @@
 
 //#include "screensaver.h"
 
+#include "mythstroke.h"
+
 #ifdef USE_LIRC
 static void *SpawnLirc(void *param)
 {
@@ -127 +129 @@
 
     bool AllowInput;
 
+    MythStroke stroker;
+
     QRegion repaintRegion;
 };
 
@@ -197 +201 @@
     d->escapekey = Key_Escape;
     d->mainStack = NULL;
 
+    installEventFilter(this);
+
 #ifdef USE_LIRC
     pthread_t lirc_tid;
     pthread_attr_t attr;
@@ -724 +730 @@
     d->AllowInput = allow;
 }
 
-void MythMainWindow::keyPressEvent(QKeyEvent *e)
+bool MythMainWindow::eventFilter(QObject *o, QEvent *e)
 {
+
+    MythGestureEvent *ge;
+
+    /* dont let anything through if input is disallowed. */
     if (!d->AllowInput)
-        return;
+        return true;
 
-    QValueVector<MythScreenStack *>::Iterator it;
-    for (it = d->stackList.begin(); it != d->stackList.end(); ++it)
+    /* filter mouse events */
+    switch (e->type())
     {
-         MythScreenType *top = (*it)->GetTopScreen();
-         if (top)
-         {
-             if (top->keyPressEvent(e))
-                 break;
-         }
+    case QEvent::KeyPress:
+
+        QValueVector<MythScreenStack *>::Iterator it;
+        for (it = d->stackList.begin(); it != d->stackList.end(); ++it)
+        {
+            MythScreenType *top = (*it)->GetTopScreen();
+            if (top)
+            {
+                if (top->keyPressEvent(dynamic_cast<QKeyEvent*>(e)))
+                    return true;
+            }
+        }
+        break;
+
+    case QEvent::MouseButtonPress:
+
+        d->stroker.start();
+        d->stroker.record(dynamic_cast<QMouseEvent*>(e)->pos());
+        return true;
+
+    case QEvent::MouseButtonRelease:
+
+        ge = d->stroker.complete();
+
+        /* handle clicks separately */
+        if (ge->gesture() == MythGestureEvent::Click)
+        {            
+            MythUIType *clicked;
+            QValueVector<MythScreenStack *>::iterator it;
+            QPoint p = dynamic_cast<QMouseEvent*>(e)->pos();
+
+            delete ge;
+
+            for (it = d->stackList.begin(); it != d->stackList.end(); it++)
+            {
+                MythScreenType *screen = (*it)->GetTopScreen();
+                if ((clicked = screen->GetChildAt(p)) != NULL)
+                {
+                    cout << "UI Type: " << clicked->name() << endl;
+                    break;
+                }
+            }
+        }
+        else QApplication::postEvent(this, ge);
+
+        return true;
+
+    case QEvent::MouseMove:
+
+        d->stroker.record(dynamic_cast<QMouseEvent*>(e)->pos());
+        return true;
+
+    default:
+        break;        
     }
+
+    return false;
 }
 
-void MythMainWindow::customEvent(QCustomEvent* /* ce */)
+void MythMainWindow::customEvent(QCustomEvent* ce)
 {
+
+    if (ce->type() == MythGestureEventType)
+    {
+        MythGestureEvent *ge = dynamic_cast<MythGestureEvent*>(ce);
+        if (ge != NULL)
+        {
+            cout << "Gesture: " << QString(*ge) << endl;
+        }
+    }
+
+
 #if 0
     if (ce->type() == kExitToMainMenuEventType && d->exitingtomain)
     {

mythuitype.cpp

@@ -82 +82 @@
     return &m_ChildrenList;
 }
 
+MythUIType *MythUIType::GetChildAt(const QPoint &p)
+{
+    if (GetArea().contains(p)) {
+
+        /* assumes no selectible ui type will contain another
+         * selectible ui type. */
+        if (CanTakeFocus() && IsVisible()) return this;
+
+        /* check all children */
+        QValueVector<MythUIType*>::iterator it;
+        for (it = m_ChildrenList.begin(); it != m_ChildrenList.end(); ++it)
+        {
+            MythUIType *child = (*it)->GetChildAt(p - GetArea().topLeft());
+            if (child != NULL)
+            {
+                return child;
+            }
+        }
+    }
+    return NULL;
+}
+
 bool MythUIType::NeedsRedraw(void)
 {
     return m_NeedsRedraw;

mythmainwindow.h

@@ -89 +89 @@
   protected:
     MythMainWindow();
 
-    void keyPressEvent(QKeyEvent *e);
+    bool eventFilter(QObject *o, QEvent *e);
     void customEvent(QCustomEvent *ce);
     void closeEvent(QCloseEvent *e);
     void paintEvent(QPaintEvent *e);

libmythui.pro

@@ -28 +28 @@
 SOURCES += mythscreenstack.cpp mythscreentype.cpp 
 SOURCES += mythuitype.cpp mythuiimage.cpp mythuitext.cpp
 SOURCES += mythuistatetype.cpp mythlistbutton.cpp mythfontproperties.cpp
-SOURCES += mythuibutton.cpp themedmenu.cpp dialogbox.cpp
+SOURCES += mythuibutton.cpp themedmenu.cpp dialogbox.cpp mythstroke.cpp
 
 inc.path = $${PREFIX}/include/mythui/
 
@@ -36 +36 @@
 inc.files += mythpainter_ogl.h mythpainter_qt.h mythuistatetype.h
 inc.files += mythscreenstack.h mythscreentype.h mythuitype.h mythuiimage.h 
 inc.files += mythuitext.h mythuibutton.h mythlistbutton.h
-inc.files += themedmenu.h dialogbox.h mythfontproperties.h
+inc.files += themedmenu.h dialogbox.h mythfontproperties.h mythstroke.h
 
 INSTALLS += inc
 

mythuitype.h

@@ -25 +25 @@
     void AddChild(MythUIType *child);
     MythUIType *GetChild(const char *name, const char *inherits = 0);
     QValueVector<MythUIType *> *GetAllChildren(void);
+    MythUIType *GetChildAt(const QPoint &p);
 
     // Check set dirty status
     bool NeedsRedraw(void);