mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-07 02:35:33 +08:00
[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.
This commit is contained in:
Roland Winklmeier
@@ -18,12 +18,13 @@
|
||||
|
||||
namespace XSwiftBus
|
||||
{
|
||||
CService::CService(QObject *parent) : QObject(parent)
|
||||
CService::CService(CDBusConnection *connection) : CDBusObject(connection)
|
||||
{
|
||||
registerDBusObjectPath(XSWIFTBUS_SERVICE_INTERFACENAME, XSWIFTBUS_SERVICE_OBJECTPATH);
|
||||
m_messages.addMessage( { "xswiftbus started.", 0, 255, 255 } );
|
||||
m_airportUpdater = new QTimer(this);
|
||||
m_airportUpdater = new QTimer();
|
||||
m_airportUpdater->start(60000);
|
||||
connect(m_airportUpdater, &QTimer::timeout, this, &CService::updateAirportsInRange);
|
||||
QObject::connect(m_airportUpdater, &QTimer::timeout, [this] () { updateAirportsInRange(); });
|
||||
updateAirportsInRange();
|
||||
}
|
||||
|
||||
@@ -33,8 +34,7 @@ namespace XSwiftBus
|
||||
char path[512];
|
||||
XPLMGetNthAircraftModel(XPLM_USER_AIRCRAFT, filename, path);
|
||||
const auto model = BlackMisc::Simulation::XPlane::CAircraftModelLoaderXPlane::extractAcfProperties(path, QFileInfo(path));
|
||||
emit aircraftModelChanged(path, filename, getAircraftLivery(), getAircraftIcaoCode(),
|
||||
model.getModelString(), model.getName(), getAircraftDescription());
|
||||
emitAircraftModelChanged(path, filename, getAircraftLivery(), getAircraftIcaoCode(), model.getModelString(), model.getName(), getAircraftDescription());
|
||||
}
|
||||
|
||||
void CService::addTextMessage(const QString &text, double red, double green, double blue)
|
||||
@@ -153,8 +153,8 @@ namespace XSwiftBus
|
||||
}
|
||||
using namespace BlackMisc::Math;
|
||||
using namespace BlackMisc::Geo;
|
||||
QStringList icaos, names;
|
||||
QDoubleList lats, lons, alts;
|
||||
std::vector<std::string> icaos, names;
|
||||
std::vector<double> lats, lons, alts;
|
||||
for (const auto &navref : m_airports.findClosest(20, CCoordinateGeodetic(getLatitude(), getLongitude(), 0)))
|
||||
{
|
||||
float lat, lon, alt;
|
||||
@@ -166,7 +166,499 @@ namespace XSwiftBus
|
||||
lons.push_back(lon);
|
||||
alts.push_back(alt);
|
||||
}
|
||||
emit airportsInRangeUpdated(icaos, names, lats, lons, alts);
|
||||
emitAirportsInRangeUpdated(icaos, names, lats, lons, alts);
|
||||
}
|
||||
|
||||
static const char *introspection_service =
|
||||
DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
|
||||
#include "org.swift_project.xswiftbus.service.xml"
|
||||
;
|
||||
|
||||
DBusHandlerResult CService::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_service);
|
||||
}
|
||||
}
|
||||
else if (message.getInterfaceName() == XSWIFTBUS_SERVICE_INTERFACENAME)
|
||||
{
|
||||
if (message.getMethodName() == "addTextMessage")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
std::string text;
|
||||
double red = 0;
|
||||
double green = 0;
|
||||
double blue = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(text);
|
||||
message.getArgument(red);
|
||||
message.getArgument(green);
|
||||
message.getArgument(blue);
|
||||
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
addTextMessage(QString::fromStdString(text), red, green, blue);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getOwnAircraftSituationData")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
double lat = m_latitude.get();
|
||||
double lon = m_longitude.get();
|
||||
double alt = m_elevation.get();
|
||||
double gs = m_groundSpeed.get();
|
||||
double pitch = m_pitch.get();
|
||||
double roll = m_roll.get();
|
||||
double trueHeading = m_heading.get();
|
||||
double qnh = m_qnhInhg.get();
|
||||
CDBusMessage reply = CDBusMessage::createReply(sender, serial);
|
||||
reply.beginArgumentWrite();
|
||||
reply.appendArgument(lat);
|
||||
reply.appendArgument(lon);
|
||||
reply.appendArgument(alt);
|
||||
reply.appendArgument(gs);
|
||||
reply.appendArgument(pitch);
|
||||
reply.appendArgument(roll);
|
||||
reply.appendArgument(trueHeading);
|
||||
reply.appendArgument(qnh);
|
||||
sendDBusMessage(reply);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "updateAirportsInRange")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
updateAirportsInRange();
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftModelPath")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftModelPath().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftModelFilename")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftModelFilename().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftModelString")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftModelString().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftName")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftName().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftLivery")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftLivery().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftIcaoCode")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftIcaoCode().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAircraftDescription")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAircraftDescription().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getXPlaneVersionMajor")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getXPlaneVersionMajor());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getXPlaneVersionMinor")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getXPlaneVersionMinor());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getXPlaneInstallationPath")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getXPlaneInstallationPath().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getXPlanePreferencesPath")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getXPlanePreferencesPath().toStdString());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "isPaused")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, isPaused());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "isUsingRealTime")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, isUsingRealTime());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getLatitude")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getLatitude());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getLongitude")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getLongitude());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAltitudeMSL")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAltitudeMSL());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getHeightAGL")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getHeightAGL());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getGroundSpeed")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getGroundSpeed());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getIndicatedAirspeed")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getIndicatedAirspeed());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getTrueAirspeed")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getTrueAirspeed());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getPitch")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getPitch());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getRoll")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getRoll());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getTrueHeading")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getTrueHeading());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAnyWheelOnGround")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAnyWheelOnGround());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getAllWheelsOnGround")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getAllWheelsOnGround());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getCom1Active")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getCom1Active());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getCom1Standby")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getCom1Standby());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getCom2Active")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getCom2Active());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getCom2Standby")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getCom2Standby());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getTransponderCode")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getTransponderCode());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getTransponderMode")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getTransponderMode());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getTransponderIdent")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getTransponderIdent());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getBeaconLightsOn")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getBeaconLightsOn());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getLandingLightsOn")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getLandingLightsOn());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getNavLightsOn")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getNavLightsOn());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getStrobeLightsOn")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getStrobeLightsOn());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getTaxiLightsOn")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getTaxiLightsOn());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getQNH")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getQNH());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "setCom1Active")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
int frequency = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(frequency);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
setCom1Active(frequency);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "setCom1Standby")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
int frequency = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(frequency);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
setCom1Standby(frequency);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "setCom2Active")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
int frequency = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(frequency);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
setCom2Active(frequency);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "setCom2Standby")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
int frequency = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(frequency);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
setCom2Standby(frequency);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "setTransponderCode")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
int code = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(code);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
setTransponderCode(code);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "setTransponderMode")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
int mode = 0;
|
||||
message.beginArgumentRead();
|
||||
message.getArgument(mode);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
setTransponderMode(mode);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getFlapsDeployRatio")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getFlapsDeployRatio());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getGearDeployRatio")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getGearDeployRatio());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getNumberOfEngines")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getNumberOfEngines());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getEngineN1Percentage")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
std::vector<double> array = getEngineN1Percentage().toVector().toStdVector();
|
||||
sendDBusReply(sender, serial, array);
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "getSpeedBrakeRatio")
|
||||
{
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
sendDBusReply(sender, serial, getSpeedBrakeRatio());
|
||||
});
|
||||
}
|
||||
else if (message.getMethodName() == "toggleMessageBoxVisibility")
|
||||
{
|
||||
maybeSendEmptyDBusReply(wantsReply, sender, serial);
|
||||
queueDBusCall([=]()
|
||||
{
|
||||
toggleMessageBoxVisibility();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
// Unknown message. Tell DBus that we cannot handle it
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
}
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
int CService::processDBus()
|
||||
{
|
||||
invokeQueuedDBusCalls();
|
||||
return 1;
|
||||
}
|
||||
|
||||
void CService::emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery,
|
||||
const QString &icao, const QString &modelString, const QString &name,
|
||||
const QString &description)
|
||||
{
|
||||
CDBusMessage signalAircraftModelChanged = CDBusMessage::createSignal(XSWIFTBUS_SERVICE_OBJECTPATH, XSWIFTBUS_SERVICE_INTERFACENAME, "aircraftModelChanged");
|
||||
signalAircraftModelChanged.beginArgumentWrite();
|
||||
signalAircraftModelChanged.appendArgument(path.toStdString());
|
||||
signalAircraftModelChanged.appendArgument(filename.toStdString());
|
||||
signalAircraftModelChanged.appendArgument(livery.toStdString());
|
||||
signalAircraftModelChanged.appendArgument(icao.toStdString());
|
||||
signalAircraftModelChanged.appendArgument(modelString.toStdString());
|
||||
signalAircraftModelChanged.appendArgument(name.toStdString());
|
||||
signalAircraftModelChanged.appendArgument(description.toStdString());
|
||||
sendDBusMessage(signalAircraftModelChanged);
|
||||
}
|
||||
|
||||
void CService::emitAirportsInRangeUpdated(const std::vector<std::string> &icaoCodes, const std::vector<std::string> &names,
|
||||
const std::vector<double> &lats, const std::vector<double> &lons, const std::vector<double> &alts)
|
||||
{
|
||||
CDBusMessage signalAirportsInRangeUpdated = CDBusMessage::createSignal(XSWIFTBUS_SERVICE_OBJECTPATH, XSWIFTBUS_SERVICE_INTERFACENAME, "airportsInRangeUpdated");
|
||||
signalAirportsInRangeUpdated.beginArgumentWrite();
|
||||
signalAirportsInRangeUpdated.appendArgument(icaoCodes);
|
||||
signalAirportsInRangeUpdated.appendArgument(names);
|
||||
signalAirportsInRangeUpdated.appendArgument(lats);
|
||||
signalAirportsInRangeUpdated.appendArgument(lons);
|
||||
signalAirportsInRangeUpdated.appendArgument(alts);
|
||||
sendDBusMessage(signalAirportsInRangeUpdated);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user