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 /include | |
parent | Merge pull request #2186 from martinetd/static-analysis (diff) | |
parent | idle_inhibit: move server data to its own struct (diff) | |
download | sway-f611a4f9b10ee3e5c8115c3bd89e9fda51ade104.tar.gz sway-f611a4f9b10ee3e5c8115c3bd89e9fda51ade104.tar.zst sway-f611a4f9b10ee3e5c8115c3bd89e9fda51ade104.zip |
Merge pull request #2187 from martinetd/idle-inhibit
Idle inhibit
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/desktop/idle_inhibit_v1.h | 28 | ||||
-rw-r--r-- | include/sway/server.h | 5 |
2 files changed, 32 insertions, 1 deletions
diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h new file mode 100644 index 00000000..e5ed8a3d --- /dev/null +++ b/include/sway/desktop/idle_inhibit_v1.h | |||
@@ -0,0 +1,28 @@ | |||
1 | #ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H | ||
2 | #define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H | ||
3 | #include <wlr/types/wlr_idle_inhibit_v1.h> | ||
4 | #include <wlr/types/wlr_idle.h> | ||
5 | #include "sway/server.h" | ||
6 | |||
7 | struct sway_idle_inhibit_manager_v1 { | ||
8 | struct wlr_idle_inhibit_manager_v1 *wlr_manager; | ||
9 | struct wl_listener new_idle_inhibitor_v1; | ||
10 | struct wl_list inhibitors; | ||
11 | |||
12 | struct wlr_idle *idle; | ||
13 | }; | ||
14 | |||
15 | struct sway_idle_inhibitor_v1 { | ||
16 | struct sway_idle_inhibit_manager_v1 *manager; | ||
17 | struct sway_view *view; | ||
18 | |||
19 | struct wl_list link; | ||
20 | struct wl_listener destroy; | ||
21 | }; | ||
22 | |||
23 | void idle_inhibit_v1_check_active( | ||
24 | struct sway_idle_inhibit_manager_v1 *manager); | ||
25 | |||
26 | struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create( | ||
27 | struct wl_display *wl_display, struct wlr_idle *idle); | ||
28 | #endif | ||
diff --git a/include/sway/server.h b/include/sway/server.h index 1e1aa3cc..a3e32898 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -23,12 +23,14 @@ struct sway_server { | |||
23 | 23 | ||
24 | struct wlr_compositor *compositor; | 24 | struct wlr_compositor *compositor; |
25 | struct wlr_data_device_manager *data_device_manager; | 25 | struct wlr_data_device_manager *data_device_manager; |
26 | struct wlr_idle *idle; | ||
27 | 26 | ||
28 | struct sway_input_manager *input; | 27 | struct sway_input_manager *input; |
29 | 28 | ||
30 | struct wl_listener new_output; | 29 | struct wl_listener new_output; |
31 | 30 | ||
31 | struct wlr_idle *idle; | ||
32 | struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1; | ||
33 | |||
32 | struct wlr_layer_shell *layer_shell; | 34 | struct wlr_layer_shell *layer_shell; |
33 | struct wl_listener layer_shell_surface; | 35 | struct wl_listener layer_shell_surface; |
34 | 36 | ||
@@ -61,6 +63,7 @@ void server_run(struct sway_server *server); | |||
61 | 63 | ||
62 | void handle_new_output(struct wl_listener *listener, void *data); | 64 | void handle_new_output(struct wl_listener *listener, void *data); |
63 | 65 | ||
66 | void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); | ||
64 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); | 67 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); |
65 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 68 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
66 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); | 69 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); |