aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sway/desktop/idle_inhibit_v1.h17
-rw-r--r--include/sway/server.h7
2 files changed, 16 insertions, 8 deletions
diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
index 1764713c..e5ed8a3d 100644
--- a/include/sway/desktop/idle_inhibit_v1.h
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -1,17 +1,28 @@
-
#ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
#define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
#include <wlr/types/wlr_idle_inhibit_v1.h>
+#include <wlr/types/wlr_idle.h>
#include "sway/server.h"
+struct sway_idle_inhibit_manager_v1 {
+ struct wlr_idle_inhibit_manager_v1 *wlr_manager;
+ struct wl_listener new_idle_inhibitor_v1;
+ struct wl_list inhibitors;
+
+ struct wlr_idle *idle;
+};
+
struct sway_idle_inhibitor_v1 {
- struct sway_server *server;
+ struct sway_idle_inhibit_manager_v1 *manager;
struct sway_view *view;
struct wl_list link;
struct wl_listener destroy;
};
-void idle_inhibit_v1_check_active(struct sway_server *server);
+void idle_inhibit_v1_check_active(
+ struct sway_idle_inhibit_manager_v1 *manager);
+struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
+ struct wl_display *wl_display, struct wlr_idle *idle);
#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 693e6b82..a3e32898 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -23,16 +23,13 @@ struct sway_server {
struct wlr_compositor *compositor;
struct wlr_data_device_manager *data_device_manager;
- struct wlr_idle *idle;
- struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
struct sway_input_manager *input;
struct wl_listener new_output;
- struct wlr_idle_inhibit_manager_v1 *idle_inhibit_v1;
- struct wl_listener new_idle_inhibitor_v1;
- struct wl_list idle_inhibitors_v1;
+ struct wlr_idle *idle;
+ struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1;
struct wlr_layer_shell *layer_shell;
struct wl_listener layer_shell_surface;