idle-inhibit take 2

This commit is contained in:
Keith Bowes 2024-01-03 19:28:04 -05:00
parent 0294b25f27
commit bce423cd72
5 changed files with 34 additions and 26 deletions

View file

@ -2,27 +2,38 @@
#include "idle.h"
void idle_inhibitor_new(struct wl_listener *listener, void *data) {
struct wb_toplevel *toplevel = wl_container_of(listener, toplevel, new_inhibitor);
toplevel->inhibited = true;
static void idle_inhibit_manager_destroy(struct wl_listener *listener, void *data) {
struct wb_server *server = wl_container_of(listener, server, destroy_inhibit_manager);
wl_list_remove(&server->inhibitors);
}
void idle_inhibitor_destroy(struct wl_listener *listener, void *data) {
struct wb_toplevel *toplevel = wl_container_of(listener, toplevel, new_inhibitor);
toplevel->inhibited = false;
static void idle_inhibitor_destroy(struct wl_listener *listener, void *data) {
struct wb_server *server = wl_container_of(listener, server, destroy_inhibitor);
/* wlroots will destroy the inhibitor after this callback, so this number will be 1 if the
* last inhibitor is being destroyed. */
wlr_idle_notifier_v1_set_inhibited(server->idle_notifier,
wl_list_length(&server->inhibitors) > 1);
}
static void idle_inhibitor_new(struct wl_listener *listener, void *data) {
struct wb_server *server = wl_container_of(listener, server, new_inhibitor);
struct wlr_idle_inhibitor_v1 *inhibitor = data;
server->destroy_inhibitor.notify = idle_inhibitor_destroy;
wl_signal_add(&inhibitor->events.destroy, &server->destroy_inhibitor);
wl_list_remove(&inhibitor->link);
wl_list_insert(&server->inhibitors, &inhibitor->link);
wlr_idle_notifier_v1_set_inhibited(server->idle_notifier, true);
}
bool create_idle_manager(struct wb_server *server) {
server->idle_notifier = wlr_idle_notifier_v1_create(server->wl_display);
server->idle_inhibitor = wlr_idle_inhibit_v1_create(server->wl_display);
return true;
}
bool install_inhibitor(struct wb_toplevel *toplevel) {
toplevel->new_inhibitor.notify = idle_inhibitor_new;
wl_signal_add(&toplevel->server->idle_inhibitor->events.new_inhibitor, &toplevel->new_inhibitor);
toplevel->destroy_inhibitor.notify = idle_inhibitor_destroy;
wl_signal_add(&toplevel->server->idle_inhibitor->events.destroy, &toplevel->destroy_inhibitor);
server->idle_inhibit_manager = wlr_idle_inhibit_v1_create(server->wl_display);
wl_list_init(&server->inhibitors);
server->new_inhibitor.notify = idle_inhibitor_new;
wl_signal_add(&server->idle_inhibit_manager->events.new_inhibitor, &server->new_inhibitor);
server->destroy_inhibit_manager.notify = idle_inhibit_manager_destroy;
wl_signal_add(&server->idle_inhibit_manager->events.destroy, &server->destroy_inhibit_manager);
return true;
}

View file

@ -1,4 +1,3 @@
#include "waybox/server.h"
bool create_idle_manager(struct wb_server *server);
bool install_inhibitor(struct wb_toplevel *toplevel);

View file

@ -75,7 +75,6 @@ void focus_toplevel(struct wb_toplevel *toplevel, struct wlr_surface *surface) {
* clients without additional work on your part.
*/
seat_focus_surface(server->seat, toplevel->xdg_toplevel->base->surface);
wlr_idle_notifier_v1_set_inhibited(server->idle_notifier, toplevel->inhibited);
}
struct wlr_output *get_active_output(struct wb_toplevel *toplevel) {
@ -368,8 +367,6 @@ static void handle_new_xdg_toplevel(struct wl_listener *listener, void *data) {
toplevel->new_popup.notify = handle_new_popup;
wl_signal_add(&xdg_toplevel->base->events.new_popup, &toplevel->new_popup);
install_inhibitor(toplevel);
toplevel->scene_tree = wlr_scene_xdg_surface_create(
&toplevel->server->scene->tree, xdg_toplevel->base);
toplevel->scene_tree->node.data = toplevel;