backend/session: replace session_signal with events.active

This is more idiomatic wlroots API. The new name makes it clear that the
signal is emitted when wlr_session.active changes.
This commit is contained in:
Simon Ser 2020-11-06 11:34:55 +01:00
parent cd95d70df0
commit 0e76f92de7
8 changed files with 16 additions and 16 deletions

View file

@ -115,7 +115,7 @@ static int vt_handler(int signo, void *data) {
if (session->base.active) {
session->base.active = false;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
wl_list_for_each(dev, &session->base.devices, link) {
if (ioctl(dev->fd, DRM_IOCTL_VERSION, &dv) == 0) {
@ -134,7 +134,7 @@ static int vt_handler(int signo, void *data) {
}
session->base.active = true;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
return 1;

View file

@ -126,7 +126,7 @@ static int vt_handler(int signo, void *data) {
if (session->base.active) {
session->base.active = false;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
struct wlr_device *dev;
wl_list_for_each(dev, &session->base.devices, link) {
@ -149,7 +149,7 @@ static int vt_handler(int signo, void *data) {
}
session->base.active = true;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
return 1;

View file

@ -35,13 +35,13 @@ struct libseat_session {
static void handle_enable_seat(struct libseat *seat, void *data) {
struct libseat_session *session = data;
session->base.active = true;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
static void handle_disable_seat(struct libseat *seat, void *data) {
struct libseat_session *session = data;
session->base.active = false;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
libseat_disable_seat(session->seat);
}

View file

@ -306,7 +306,7 @@ static int pause_device(sd_bus_message *msg, void *userdata,
if (major == DRM_MAJOR && strcmp(type, "gone") != 0) {
assert(session->has_drm);
session->base.active = false;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
if (strcmp(type, "pause") == 0) {
@ -348,7 +348,7 @@ static int resume_device(sd_bus_message *msg, void *userdata,
if (!session->base.active) {
session->base.active = true;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
}
@ -407,7 +407,7 @@ static int session_properties_changed(sd_bus_message *msg, void *userdata,
if (session->base.active != active) {
session->base.active = active;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
return 0;
} else {
@ -447,7 +447,7 @@ static int session_properties_changed(sd_bus_message *msg, void *userdata,
if (session->base.active != active) {
session->base.active = active;
wlr_signal_emit_safe(&session->base.session_signal, session);
wlr_signal_emit_safe(&session->base.events.active, NULL);
}
return 0;
}

View file

@ -101,7 +101,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
}
void session_init(struct wlr_session *session) {
wl_signal_init(&session->session_signal);
wl_signal_init(&session->events.active);
wl_signal_init(&session->events.add_drm_card);
wl_signal_init(&session->events.destroy);
wl_list_init(&session->devices);