diff options
author | emersion <contact@emersion.fr> | 2018-07-02 09:06:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-02 09:06:23 +0100 |
commit | f611a4f9b10ee3e5c8115c3bd89e9fda51ade104 (patch) | |
tree | 83939d888351ba8818599a69bece4412fd203b64 /sway/desktop | |
parent | defb73596fedec846280b9155bb3e9d210da49bb (diff) | |
parent | 71224781c48f98f43f5836de663ef6e01604419c (diff) | |
download | sway-f611a4f9b10ee3e5c8115c3bd89e9fda51ade104.tar.xz |
Merge pull request #2187 from martinetd/idle-inhibit
Idle inhibit
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/idle_inhibit_v1.c | 79 | ||||
-rw-r--r-- | sway/desktop/transaction.c | 3 |
2 files changed, 82 insertions, 0 deletions
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c new file mode 100644 index 00000000..c02ca26e --- /dev/null +++ b/sway/desktop/idle_inhibit_v1.c @@ -0,0 +1,79 @@ +#include <stdlib.h> +#include <wlr/types/wlr_idle.h> +#include "log.h" +#include "sway/desktop/idle_inhibit_v1.h" +#include "sway/tree/view.h" +#include "sway/server.h" + + +static void handle_destroy(struct wl_listener *listener, void *data) { + struct sway_idle_inhibitor_v1 *inhibitor = + wl_container_of(listener, inhibitor, destroy); + wlr_log(L_DEBUG, "Sway idle inhibitor destroyed"); + wl_list_remove(&inhibitor->link); + wl_list_remove(&inhibitor->destroy.link); + idle_inhibit_v1_check_active(inhibitor->manager); + free(inhibitor); +} + +void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) { + struct wlr_idle_inhibitor_v1 *wlr_inhibitor = data; + struct sway_idle_inhibit_manager_v1 *manager = + wl_container_of(listener, manager, new_idle_inhibitor_v1); + wlr_log(L_DEBUG, "New sway idle inhibitor"); + + struct sway_idle_inhibitor_v1 *inhibitor = + calloc(1, sizeof(struct sway_idle_inhibitor_v1)); + if (!inhibitor) { + return; + } + + inhibitor->manager = manager; + inhibitor->view = view_from_wlr_surface(wlr_inhibitor->surface); + wl_list_insert(&manager->inhibitors, &inhibitor->link); + + + inhibitor->destroy.notify = handle_destroy; + wl_signal_add(&wlr_inhibitor->events.destroy, &inhibitor->destroy); + + idle_inhibit_v1_check_active(manager); +} + +void idle_inhibit_v1_check_active( + struct sway_idle_inhibit_manager_v1 *manager) { + struct sway_idle_inhibitor_v1 *inhibitor; + bool inhibited = false; + wl_list_for_each(inhibitor, &manager->inhibitors, link) { + if (!inhibitor->view) { + /* Cannot guess if view is visible so assume it is */ + inhibited = true; + break; + } + if (view_is_visible(inhibitor->view)) { + inhibited = true; + break; + } + } + wlr_idle_set_enabled(manager->idle, NULL, !inhibited); +} + +struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create( + struct wl_display *wl_display, struct wlr_idle *idle) { + struct sway_idle_inhibit_manager_v1 *manager = + calloc(1, sizeof(struct sway_idle_inhibit_manager_v1)); + if (!manager) { + return NULL; + } + + manager->wlr_manager = wlr_idle_inhibit_v1_create(wl_display); + if (!manager->wlr_manager) { + return NULL; + } + manager->idle = idle; + wl_signal_add(&manager->wlr_manager->events.new_inhibitor, + &manager->new_idle_inhibitor_v1); + manager->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1; + wl_list_init(&manager->inhibitors); + + return manager; +} diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index cb524999..7b670aec 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -6,6 +6,7 @@ #include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_linux_dmabuf.h> #include "sway/debug.h" +#include "sway/desktop/idle_inhibit_v1.h" #include "sway/desktop/transaction.h" #include "sway/output.h" #include "sway/tree/container.h" @@ -245,6 +246,7 @@ static void transaction_progress_queue() { transaction_destroy(transaction); } server.transactions->length = 0; + idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1); } static int handle_timeout(void *data) { @@ -320,6 +322,7 @@ void transaction_commit(struct sway_transaction *transaction) { wlr_log(L_DEBUG, "Transaction %p has nothing to wait for", transaction); transaction_apply(transaction); transaction_destroy(transaction); + idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1); return; } |