mirrors/waybox
1
0
Fork 0
mirror of https://github.com/wizbright/waybox.git synced 2025-10-29 05:40:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

idle-inhibit take 2

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
include/waybox/server.h
View file

@ -46,7 +46,7 @@ struct wb_server {
struct wlr_backend *backend; struct wlr_backend *backend;
struct wlr_compositor *compositor; struct wlr_compositor *compositor;
struct wlr_gamma_control_manager_v1 *gamma_control_manager; struct wlr_gamma_control_manager_v1 *gamma_control_manager;
struct wlr_idle_inhibit_manager_v1 *idle_inhibitor; struct wlr_idle_inhibit_manager_v1 *idle_inhibit_manager;
struct wlr_idle_notifier_v1 *idle_notifier; struct wlr_idle_notifier_v1 *idle_notifier;
struct wlr_output_layout *output_layout; struct wlr_output_layout *output_layout;
struct wlr_xdg_output_manager_v1 *output_manager; struct wlr_xdg_output_manager_v1 *output_manager;
@ -54,6 +54,7 @@ struct wb_server {
struct wlr_scene *scene; struct wlr_scene *scene;
struct wlr_scene_output_layout *scene_layout; struct wlr_scene_output_layout *scene_layout;
struct wlr_subcompositor *subcompositor; struct wlr_subcompositor *subcompositor;
struct wlr_output_manager_v1 *wlr_output_manager;
struct wb_config *config; struct wb_config *config;
char *config_file; char *config_file;
@ -70,8 +71,6 @@ struct wb_server {
struct wlr_layer_shell_v1 *layer_shell; struct wlr_layer_shell_v1 *layer_shell;
struct wlr_xdg_shell *xdg_shell; struct wlr_xdg_shell *xdg_shell;
struct wlr_output_manager_v1 *wlr_output_manager;
struct wl_listener gamma_control_set_gamma; struct wl_listener gamma_control_set_gamma;
struct wl_listener new_layer_surface; struct wl_listener new_layer_surface;
struct wl_listener new_xdg_decoration; struct wl_listener new_xdg_decoration;
@ -82,6 +81,11 @@ struct wb_server {
struct wl_listener new_xdg_surface; struct wl_listener new_xdg_surface;
#endif #endif
struct wl_listener destroy_inhibit_manager;
struct wl_listener destroy_inhibitor;
struct wl_listener new_inhibitor;
struct wl_list inhibitors;
struct wl_listener new_input; struct wl_listener new_input;
struct wl_listener new_output; struct wl_listener new_output;
struct wl_listener output_configuration_applied; struct wl_listener output_configuration_applied;

3
include/waybox/xdg_shell.h
View file

@ -20,12 +20,9 @@ struct wb_toplevel {
struct wl_listener request_minimize; struct wl_listener request_minimize;
struct wl_listener request_move; struct wl_listener request_move;
struct wl_listener request_resize; struct wl_listener request_resize;
struct wl_listener new_inhibitor;
struct wl_listener destroy_inhibitor;
struct wlr_box geometry; struct wlr_box geometry;
struct wlr_box previous_geometry; struct wlr_box previous_geometry;
bool inhibited;
}; };
void init_xdg_shell(struct wb_server *server); void init_xdg_shell(struct wb_server *server);

43
waybox/idle.c
View file

@ -2,27 +2,38 @@
#include "idle.h" #include "idle.h"
void idle_inhibitor_new(struct wl_listener *listener, void *data) { static void idle_inhibit_manager_destroy(struct wl_listener *listener, void *data) {
struct wb_toplevel *toplevel = wl_container_of(listener, toplevel, new_inhibitor); struct wb_server *server = wl_container_of(listener, server, destroy_inhibit_manager);
toplevel->inhibited = true; wl_list_remove(&server->inhibitors);
} }
void idle_inhibitor_destroy(struct wl_listener *listener, void *data) { static void idle_inhibitor_destroy(struct wl_listener *listener, void *data) {
struct wb_toplevel *toplevel = wl_container_of(listener, toplevel, new_inhibitor); struct wb_server *server = wl_container_of(listener, server, destroy_inhibitor);
toplevel->inhibited = false; /* 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) { bool create_idle_manager(struct wb_server *server) {
server->idle_notifier = wlr_idle_notifier_v1_create(server->wl_display); server->idle_notifier = wlr_idle_notifier_v1_create(server->wl_display);
server->idle_inhibitor = wlr_idle_inhibit_v1_create(server->wl_display); server->idle_inhibit_manager = wlr_idle_inhibit_v1_create(server->wl_display);
return true;
} wl_list_init(&server->inhibitors);
server->new_inhibitor.notify = idle_inhibitor_new;
bool install_inhibitor(struct wb_toplevel *toplevel) { wl_signal_add(&server->idle_inhibit_manager->events.new_inhibitor, &server->new_inhibitor);
server->destroy_inhibit_manager.notify = idle_inhibit_manager_destroy;
toplevel->new_inhibitor.notify = idle_inhibitor_new; wl_signal_add(&server->idle_inhibit_manager->events.destroy, &server->destroy_inhibit_manager);
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);
return true; return true;
} }

1
waybox/idle.h
View file

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

3
waybox/xdg_shell.c
View file

@ -75,7 +75,6 @@ void focus_toplevel(struct wb_toplevel *toplevel, struct wlr_surface *surface) {
* clients without additional work on your part. * clients without additional work on your part.
*/ */
seat_focus_surface(server->seat, toplevel->xdg_toplevel->base->surface); 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) { 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; toplevel->new_popup.notify = handle_new_popup;
wl_signal_add(&xdg_toplevel->base->events.new_popup, &toplevel->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->scene_tree = wlr_scene_xdg_surface_create(
&toplevel->server->scene->tree, xdg_toplevel->base); &toplevel->server->scene->tree, xdg_toplevel->base);
toplevel->scene_tree->node.data = toplevel; toplevel->scene_tree->node.data = toplevel;