Use qevents to send between direct glib loop events and qt.

5 files changed, 202 insertions, 28 deletions

diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index e0ee902..db8095a 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -12,6 +12,7 @@ set(QMENUMODEL_SRC
     qstateaction.cpp
     unitymenuaction.cpp
     unitymenumodel.cpp
+    unitymenumodelevents.cpp
     unitythemediconprovider.cpp
     gtk/gtkactionmuxer.c
     gtk/gtkactionmuxer.h
diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp
index 631a3c2..8045d57 100644
--- a/libqmenumodel/src/unitymenumodel.cpp
+++ b/libqmenumodel/src/unitymenumodel.cpp
@@ -20,9 +20,11 @@
 #include "converter.h"
 #include "actionstateparser.h"
 #include "unitymenuaction.h"
+#include "unitymenumodelevents.h"
 
 #include <QIcon>
 #include <QQmlComponent>
+#include <QCoreApplication>
 
 extern "C" {
   #include "gtk/gtkactionmuxer.h"
@@ -171,18 +173,8 @@ UnityMenuModelPrivate::~UnityMenuModelPrivate()
 
 void UnityMenuModelPrivate::clearItems(bool resetModel)
 {
-    GSequenceIter *begin;
-    GSequenceIter *end;
-
-    if (resetModel)
-        model->beginResetModel();
-
-    begin = g_sequence_get_begin_iter (this->items);
-    end = g_sequence_get_end_iter (this->items);
-    g_sequence_remove_range (begin, end);
-
-    if (resetModel)
-        model->endResetModel();
+    UnityMenuModelClearEvent ummce(resetModel);
+    QCoreApplication::sendEvent(model, &ummce);
 }
 
 void UnityMenuModelPrivate::clearName()
@@ -266,28 +258,17 @@ void UnityMenuModelPrivate::nameVanished(GDBusConnection *connection, const gcha
 void UnityMenuModelPrivate::menuItemInserted(GtkMenuTrackerItem *item, gint position, gpointer user_data)
 {
     UnityMenuModelPrivate *priv = (UnityMenuModelPrivate *)user_data;
-    GSequenceIter *it;
-
-    priv->model->beginInsertRows(QModelIndex(), position, position);
-
-    it = g_sequence_get_iter_at_pos (priv->items, position);
-    it = g_sequence_insert_before (it, g_object_ref (item));
-    g_object_set_qdata (G_OBJECT (item), unity_menu_model_quark (), priv->model);
-    g_signal_connect (item, "notify", G_CALLBACK (menuItemChanged), it);
 
-    priv->model->endInsertRows();
+    UnityMenuModelAddRowEvent ummare(item, position);
+    QCoreApplication::sendEvent(priv->model, &ummare);
 }
 
 void UnityMenuModelPrivate::menuItemRemoved(gint position, gpointer user_data)
 {
     UnityMenuModelPrivate *priv = (UnityMenuModelPrivate *)user_data;
-    GSequenceIter *it;
-
-    priv->model->beginRemoveRows(QModelIndex(), position, position);
 
-    g_sequence_remove (g_sequence_get_iter_at_pos (priv->items, position));
-
-    priv->model->endRemoveRows();
+    UnityMenuModelRemoveRowEvent ummrre(position);
+    QCoreApplication::sendEvent(priv->model, &ummrre);
 }
 
 void UnityMenuModelPrivate::menuItemChanged(GObject *object, GParamSpec *pspec, gpointer user_data)
@@ -303,7 +284,8 @@ void UnityMenuModelPrivate::menuItemChanged(GObject *object, GParamSpec *pspec,
     model = (UnityMenuModel *) g_object_get_qdata (G_OBJECT (item), unity_menu_model_quark ());
     position = g_sequence_iter_get_position (it);
 
-    Q_EMIT model->dataChanged(model->index(position, 0), model->index(position, 0));
+    UnityMenuModelDataChangeEvent ummdce(position);
+    QCoreApplication::sendEvent(model, &ummdce);
 }
 
 UnityMenuModel::UnityMenuModel(QObject *parent):
@@ -661,3 +643,59 @@ void UnityMenuModel::activate(int index)
     item = (GtkMenuTrackerItem *) g_sequence_get (g_sequence_get_iter_at_pos (priv->items, index));
     gtk_menu_tracker_item_activated (item);
 }
+
+bool UnityMenuModel::event(QEvent* e)
+{
+    if (e->type() == UnityMenuModelClearEvent::eventType) {
+        UnityMenuModelClearEvent *emmce = static_cast<UnityMenuModelClearEvent*>(e);
+
+        GSequenceIter *begin;
+        GSequenceIter *end;
+
+        if (emmce->reset)
+            beginResetModel();
+
+        begin = g_sequence_get_begin_iter (priv->items);
+        end = g_sequence_get_end_iter (priv->items);
+        g_sequence_remove_range (begin, end);
+
+        if (emmce->reset)
+            endResetModel();
+
+        return true;
+    } else if (e->type() == UnityMenuModelAddRowEvent::eventType) {
+        UnityMenuModelAddRowEvent *ummrce = static_cast<UnityMenuModelAddRowEvent*>(e);
+
+        GSequenceIter *it;
+        it = g_sequence_get_iter_at_pos (priv->items, ummrce->position);
+        if (it) {
+            beginInsertRows(QModelIndex(), ummrce->position, ummrce->position);
+
+            it = g_sequence_insert_before (it, g_object_ref (ummrce->item));
+            g_object_set_qdata (G_OBJECT (ummrce->item), unity_menu_model_quark (), this);
+            g_signal_connect (ummrce->item, "notify", G_CALLBACK (UnityMenuModelPrivate::menuItemChanged), it);
+
+            endInsertRows();
+        }
+        return true;
+    } else if (e->type() == UnityMenuModelRemoveRowEvent::eventType) {
+        UnityMenuModelRemoveRowEvent *ummrre = static_cast<UnityMenuModelRemoveRowEvent*>(e);
+
+        GSequenceIter *it;
+        it = g_sequence_get_iter_at_pos (priv->items, ummrre->position);
+        if (it) {
+            beginRemoveRows(QModelIndex(), ummrre->position, ummrre->position);
+
+            g_sequence_remove (it);
+
+            endRemoveRows();
+        }
+        return true;
+    } else if (e->type() == UnityMenuModelDataChangeEvent::eventType) {
+        UnityMenuModelDataChangeEvent *ummdce = static_cast<UnityMenuModelDataChangeEvent*>(e);
+
+        Q_EMIT dataChanged(index(ummdce->position, 0), index(ummdce->position, 0));
+        return true;
+    }
+    return QAbstractListModel::event(e);
+}
diff --git a/libqmenumodel/src/unitymenumodel.h b/libqmenumodel/src/unitymenumodel.h
index 79dbaa9..5cce732 100644
--- a/libqmenumodel/src/unitymenumodel.h
+++ b/libqmenumodel/src/unitymenumodel.h
@@ -65,6 +65,9 @@ Q_SIGNALS:
     void menuObjectPathChanged(const QByteArray &path);
     void actionStateParserChanged(ActionStateParser* parser);
 
+protected:
+    virtual bool event(QEvent* e);
+
 private:
     class UnityMenuModelPrivate *priv;
     friend class UnityMenuModelPrivate;
diff --git a/libqmenumodel/src/unitymenumodelevents.cpp b/libqmenumodel/src/unitymenumodelevents.cpp
new file mode 100644
index 0000000..e03d1c7
--- /dev/null
+++ b/libqmenumodel/src/unitymenumodelevents.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nicholas Dedekind <nick.dedekind@canonical.com
+ */
+
+extern "C" {
+#include <glib-object.h>
+#include <gio/gio.h>
+}
+
+#include "unitymenumodelevents.h"
+#include "unitymenumodel.h"
+
+const QEvent::Type UnityMenuModelClearEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type UnityMenuModelAddRowEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type UnityMenuModelRemoveRowEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type UnityMenuModelDataChangeEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+
+UnityMenuModelClearEvent::UnityMenuModelClearEvent(bool _reset)
+    : QEvent(UnityMenuModelClearEvent::eventType),
+      reset(_reset)
+{}
+
+UnityMenuModelAddRowEvent::UnityMenuModelAddRowEvent(GtkMenuTrackerItem *_item, int _position)
+    : QEvent(UnityMenuModelAddRowEvent::eventType),
+      item(_item),
+      position(_position)
+{
+    if (item) {
+        g_object_ref(item);
+    }
+}
+
+UnityMenuModelAddRowEvent::~UnityMenuModelAddRowEvent()
+{
+    if (item) {
+        g_object_unref(item);
+    }
+}
+
+UnityMenuModelRemoveRowEvent::UnityMenuModelRemoveRowEvent(int _position)
+    : QEvent(UnityMenuModelRemoveRowEvent::eventType),
+      position(_position)
+{}
+
+UnityMenuModelDataChangeEvent::UnityMenuModelDataChangeEvent(int _position)
+    : QEvent(UnityMenuModelDataChangeEvent::eventType),
+      position(_position)
+{}
diff --git a/libqmenumodel/src/unitymenumodelevents.h b/libqmenumodel/src/unitymenumodelevents.h
new file mode 100644
index 0000000..dcb27ff
--- /dev/null
+++ b/libqmenumodel/src/unitymenumodelevents.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nicholas Dedekind <nick.dedekind@canonical.com
+ */
+
+#ifndef UNITYMENUMODELEVENTS_H
+#define UNITYMENUMODELEVENTS_H
+
+#include <QEvent>
+
+typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
+
+/* Event for a unitymenumodel clear */
+class UnityMenuModelClearEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+    UnityMenuModelClearEvent(bool reset);
+
+    bool reset;
+};
+
+/* Event for a row add for unitymenumodel */
+class UnityMenuModelAddRowEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+    UnityMenuModelAddRowEvent(GtkMenuTrackerItem *item, int position);
+    ~UnityMenuModelAddRowEvent();
+
+    GtkMenuTrackerItem *item;
+    int position;
+};
+
+/* Event for a row remove for unitymenumodel */
+class UnityMenuModelRemoveRowEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+    UnityMenuModelRemoveRowEvent(int position);
+
+    int position;
+};
+
+/* Event for a row data change for unitymenumodel */
+class UnityMenuModelDataChangeEvent : public QEvent
+{
+public:
+    static const QEvent::Type eventType;
+    UnityMenuModelDataChangeEvent(int position);
+
+    int position;
+};
+
+#endif //UNITYMENUMODELEVENTS_H