[xswiftbus] Replace QtDBus with a libevent driven C++ wrapper on top of libdbus

QtDBus was the main component of xswiftbus' Qt dependency. This is the first preparation step to get xswiftbus Qt free. The new implementation is based on the low level libdbus library, which was also in use by QtDBus itself. But instead of QtDBus, we use now a thin C++ wrapper. To keep DBus handling async, libevent is used to monitor timeouts and fds.
2026-04-14 00:25:35 +08:00 · 2018-03-19 17:08:25 +01:00
parent 849124fe7c
commit d77931e5ec
24 changed files with 2437 additions and 139 deletions
--- a/src/xswiftbus/weather.cpp
+++ b/src/xswiftbus/weather.cpp
@@ -14,6 +14,11 @@

 namespace XSwiftBus
 {
+    CWeather::CWeather(CDBusConnection *dbusConnection)
+        : CDBusObject(dbusConnection)
+    {
+        registerDBusObjectPath(InterfaceName(), ObjectPath());
+    }

    //! Set cloud layer
    template <class T>
@@ -59,6 +64,191 @@ namespace XSwiftBus
        }
    }

+    const char *introspection_weather =
+        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
+    #include "org.swift_project.xswiftbus.weather.xml"
+        ;
+
+    DBusHandlerResult CWeather::dbusMessageHandler(const CDBusMessage &message_)
+    {
+        CDBusMessage message(message_);
+        const std::string sender = message.getSender();
+        const dbus_uint32_t serial = message.getSerial();
+        const bool wantsReply = message.wantsReply();
+
+        if (message.getInterfaceName() == DBUS_INTERFACE_INTROSPECTABLE)
+        {
+            if (message.getMethodName() == "Introspect")
+            {
+                sendDBusReply(sender, serial, introspection_weather);
+            }
+        }
+        else if (message.getInterfaceName() == XSWIFTBUS_WEATHER_INTERFACENAME)
+        {
+            if (message.getMethodName() == "isUsingRealWeather")
+            {
+                queueDBusCall([=]()
+                {
+                    sendDBusReply(sender, serial, isUsingRealWeather());
+                });
+            }
+            else if (message.getMethodName() == "setUseRealWeather")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                bool enable = false;
+                message.beginArgumentRead();
+                message.getArgument(enable);
+                queueDBusCall([=]()
+                {
+                    setUseRealWeather(enable);
+                });
+            }
+            else if (message.getMethodName() == "setVisibility")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                double visibilityM = 10.0;
+                message.beginArgumentRead();
+                message.getArgument(visibilityM);
+                queueDBusCall([=]()
+                {
+                    setVisibility(visibilityM);
+                });
+            }
+            else if (message.getMethodName() == "setTemperature")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                int degreesC = 10;
+                message.beginArgumentRead();
+                message.getArgument(degreesC);
+                queueDBusCall([=]()
+                {
+                    setTemperature(degreesC);
+                });
+            }
+            else if (message.getMethodName() == "setDewPoint")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                int degreesC = 10;
+                message.beginArgumentRead();
+                message.getArgument(degreesC);
+                queueDBusCall([=]()
+                {
+                    setDewPoint(degreesC);
+                });
+            }
+            else if (message.getMethodName() == "setQNH")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                double inHg = 29.92;
+                message.beginArgumentRead();
+                message.getArgument(inHg);
+                queueDBusCall([=]()
+                {
+                    setQNH(inHg);
+                });
+            }
+            else if (message.getMethodName() == "setPrecipitationRatio")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                double precipRatio = 0.0;
+                message.beginArgumentRead();
+                message.getArgument(precipRatio);
+                queueDBusCall([=]()
+                {
+                    setPrecipitationRatio(precipRatio);
+                });
+            }
+            else if (message.getMethodName() == "setThunderstormRatio")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                double cbRatio = 0.0;
+                message.beginArgumentRead();
+                message.getArgument(cbRatio);
+                queueDBusCall([=]()
+                {
+                    setThunderstormRatio(cbRatio);
+                });
+
+            }
+            else if (message.getMethodName() == "setTurbulenceRatio")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                double turbulenceRatio = 0.0;
+                message.beginArgumentRead();
+                message.getArgument(turbulenceRatio);
+                queueDBusCall([=]()
+                {
+                    setTurbulenceRatio(turbulenceRatio);
+                });
+            }
+            else if (message.getMethodName() == "setRunwayFriction")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                int friction = 10;
+                message.beginArgumentRead();
+                message.getArgument(friction);
+                queueDBusCall([=]()
+                {
+                    setRunwayFriction(friction);
+                });
+            }
+            else if (message.getMethodName() == "setCloudLayer")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                int layer = 0;
+                int base = 0;
+                int tops = 0;
+                int type = 0;
+                int coverage = 0;
+                message.beginArgumentRead();
+                message.getArgument(layer);
+                message.getArgument(base);
+                message.getArgument(tops);
+                message.getArgument(type);
+                message.getArgument(coverage);
+                queueDBusCall([=]()
+                {
+                    setCloudLayer(layer, base, tops, type, coverage);
+                });
+            }
+            else if (message.getMethodName() == "setWindLayer")
+            {
+                maybeSendEmptyDBusReply(wantsReply, sender, serial);
+                int layer = 0;
+                int altitude = 0;
+                double direction = 0;
+                int speed = 0;
+                int shearDirection = 0;
+                int shearSpeed = 0;
+                int turbulence = 0;
+                message.beginArgumentRead();
+                message.getArgument(layer);
+                message.getArgument(altitude);
+                message.getArgument(direction);
+                message.getArgument(speed);
+                message.getArgument(shearDirection);
+                message.getArgument(shearSpeed);
+                message.getArgument(turbulence);
+                queueDBusCall([=]()
+                {
+                    setWindLayer(layer, altitude, direction, speed, shearDirection, shearSpeed, turbulence);
+                });
+            }
+            else
+            {
+                // Unknown message. Tell DBus that we cannot handle it
+                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+            }
+        }
+        return DBUS_HANDLER_RESULT_HANDLED;
+    }
+
+    int CWeather::processDBus()
+    {
+        invokeQueuedDBusCalls();
+        return 1;
+    }
+
 }

 //! \endcond