aboutsummaryrefslogtreecommitdiff
path: root/src/greeter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/greeter.cpp')
-rw-r--r--src/greeter.cpp189
1 files changed, 119 insertions, 70 deletions
diff --git a/src/greeter.cpp b/src/greeter.cpp
index f9cd965..9bd5db0 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -26,117 +26,166 @@ class UnityGreeter::Impl
{
public:
- Impl():
- m_cancellable{g_cancellable_new()}
+ Impl()
{
- g_bus_get(G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready_static, this);
+ m_cancellable.reset(
+ g_cancellable_new(),
+ [](GCancellable* o){
+ g_cancellable_cancel(o);
+ g_clear_object(&o);
+ }
+ );
+
+ g_bus_get(G_BUS_TYPE_SESSION, m_cancellable.get(), on_bus_ready, this);
}
- ~Impl()
- {
- g_cancellable_cancel(m_cancellable);
- g_clear_object(&m_cancellable);
-
- if (m_subscription_id != 0)
- g_dbus_connection_signal_unsubscribe (m_bus, m_subscription_id);
+ ~Impl() =default;
- g_clear_object(&m_bus);
- }
-
- core::Property<bool>& is_active()
+ core::Property<State>& state()
{
- return m_is_active;
+ return m_state;
}
private:
- static void on_bus_ready_static(GObject* /*source*/, GAsyncResult* res, gpointer gself)
+ void set_state(const State& state)
+ {
+ m_state.set(state);
+ }
+
+ static void on_bus_ready(
+ GObject* /*source*/,
+ GAsyncResult* res,
+ gpointer gself)
{
GError* error {};
- auto bus = g_bus_get_finish (res, &error);
- if (error != nullptr) {
+ auto bus = g_bus_get_finish(res, &error);
+ if (error != nullptr)
+ {
if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning("UsbSnap: Error getting session bus: %s", error->message);
+ g_warning("Greeter: Error getting bus: %s", error->message);
g_clear_error(&error);
- } else {
- static_cast<Impl*>(gself)->on_bus_ready(bus);
}
- g_clear_object(&bus);
+ else
+ {
+ auto self = static_cast<Impl*>(gself);
+
+ const auto watcher_id = g_bus_watch_name_on_connection(
+ bus,
+ DBusNames::UnityGreeter::NAME,
+ G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+ on_greeter_appeared,
+ on_greeter_vanished,
+ gself,
+ nullptr);
+
+ const auto subscription_id = g_dbus_connection_signal_subscribe(
+ bus,
+ DBusNames::UnityGreeter::NAME,
+ DBusNames::Properties::INTERFACE,
+ DBusNames::Properties::PropertiesChanged::NAME,
+ DBusNames::UnityGreeter::PATH,
+ DBusNames::UnityGreeter::INTERFACE,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ on_properties_changed_signal,
+ gself,
+ nullptr);
+
+ self->m_bus.reset(
+ bus,
+ [watcher_id, subscription_id](GDBusConnection* o){
+ g_bus_unwatch_name(watcher_id);
+ g_dbus_connection_signal_unsubscribe(o, subscription_id);
+ g_clear_object(&o);
+ }
+ );
+ }
}
- void on_bus_ready(GDBusConnection* bus)
+ static void on_greeter_appeared(
+ GDBusConnection* bus,
+ const char* /*name*/,
+ const char* name_owner,
+ gpointer gself)
{
- m_bus = G_DBUS_CONNECTION(g_object_ref(G_OBJECT(bus)));
-
- g_dbus_connection_call(m_bus,
- DBusNames::UnityGreeter::NAME,
- DBusNames::UnityGreeter::PATH,
- DBusNames::Properties::INTERFACE,
- "Get",
- g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"),
- G_VARIANT_TYPE("(v)"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- m_cancellable,
- on_get_is_active_ready,
- this);
-
- m_subscription_id = g_dbus_connection_signal_subscribe(m_bus,
- DBusNames::UnityGreeter::NAME,
- DBusNames::Properties::INTERFACE,
- DBusNames::Properties::PropertiesChanged::NAME,
- DBusNames::UnityGreeter::PATH,
- DBusNames::UnityGreeter::INTERFACE,
- G_DBUS_SIGNAL_FLAGS_NONE,
- on_properties_changed_signal,
- this,
- nullptr);
+ auto self = static_cast<Impl*>(gself);
+
+ self->m_owner = name_owner;
+
+ g_dbus_connection_call(
+ bus,
+ DBusNames::UnityGreeter::NAME,
+ DBusNames::UnityGreeter::PATH,
+ DBusNames::Properties::INTERFACE,
+ "Get",
+ g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"),
+ G_VARIANT_TYPE("(v)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ self->m_cancellable.get(),
+ on_get_is_active_ready,
+ gself);
}
- static void on_get_is_active_ready(GObject* source, GAsyncResult* res, gpointer gself)
+ static void on_greeter_vanished(
+ GDBusConnection* /*bus*/,
+ const char* /*name*/,
+ gpointer gself)
+ {
+ auto self = static_cast<Impl*>(gself);
+
+ self->m_owner.clear();
+ self->set_state(State::UNAVAILABLE);
+ }
+
+ static void on_get_is_active_ready(
+ GObject* source,
+ GAsyncResult* res,
+ gpointer gself)
{
GError* error {};
auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
if (error != nullptr) {
if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning("UsbSnap: Error getting session bus: %s", error->message);
+ g_warning("Greeter: Error getting IsActive property: %s", error->message);
g_clear_error(&error);
} else {
GVariant* is_active {};
g_variant_get_child(v, 0, "v", &is_active);
- static_cast<Impl*>(gself)->m_is_active.set(g_variant_get_boolean(is_active));
+ static_cast<Impl*>(gself)->set_state(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE);
g_clear_pointer(&is_active, g_variant_unref);
}
g_clear_pointer(&v, g_variant_unref);
}
- static void on_properties_changed_signal(GDBusConnection* /*connection*/,
- const gchar* /*sender_name*/,
- const gchar* object_path,
- const gchar* interface_name,
- const gchar* signal_name,
- GVariant* parameters,
- gpointer gself)
+ static void on_properties_changed_signal(
+ GDBusConnection* /*bus*/,
+ const gchar* sender_name,
+ const gchar* object_path,
+ const gchar* interface_name,
+ const gchar* signal_name,
+ GVariant* parameters,
+ gpointer gself)
{
+ auto self = static_cast<Impl*>(gself);
+
+ g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str()));
g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH));
g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Properties::INTERFACE));
g_return_if_fail(!g_strcmp0(signal_name, DBusNames::Properties::PropertiesChanged::NAME));
g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE)));
- auto v = g_variant_get_child_value (parameters, 1);
+ auto v = g_variant_get_child_value(parameters, 1);
gboolean is_active {};
if (g_variant_lookup(v, "IsActive", "b", &is_active))
- {
- g_debug("%s is_active changed to %d", G_STRLOC, int(is_active));
- static_cast<Impl*>(gself)->m_is_active.set(is_active);
- }
+ self->set_state(is_active ? State::ACTIVE : State::INACTIVE);
g_clear_pointer(&v, g_variant_unref);
}
- core::Property<bool> m_is_active;
- GCancellable* m_cancellable {};
- GDBusConnection* m_bus {};
- unsigned int m_subscription_id {};
+ core::Property<State> m_state {State::UNAVAILABLE};
+ std::shared_ptr<GCancellable> m_cancellable;
+ std::shared_ptr<GDBusConnection> m_bus;
+ std::string m_owner;
};
/***
@@ -154,8 +203,8 @@ UnityGreeter::UnityGreeter():
UnityGreeter::~UnityGreeter() =default;
-core::Property<bool>&
-UnityGreeter::is_active()
+core::Property<Greeter::State>&
+UnityGreeter::state()
{
- return impl->is_active();
+ return impl->state();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:26:01 +0000