diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2018-07-02 09:26:57 +0900 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-07-02 09:29:16 +0900 |
commit | 71224781c48f98f43f5836de663ef6e01604419c (patch) | |
tree | 7c2336020076f123184d1c18bbcb7db3e95be526 /sway/server.c | |
parent | idle_inhibit: stop inhibitor when views become invisible (diff) | |
download | sway-71224781c48f98f43f5836de663ef6e01604419c.tar.gz sway-71224781c48f98f43f5836de663ef6e01604419c.tar.zst sway-71224781c48f98f43f5836de663ef6e01604419c.zip |
idle_inhibit: move server data to its own struct
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sway/server.c b/sway/server.c index ee6b7cde..8106f3c8 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <wlr/types/wlr_export_dmabuf_v1.h> | 10 | #include <wlr/types/wlr_export_dmabuf_v1.h> |
11 | #include <wlr/types/wlr_gamma_control.h> | 11 | #include <wlr/types/wlr_gamma_control.h> |
12 | #include <wlr/types/wlr_idle.h> | 12 | #include <wlr/types/wlr_idle.h> |
13 | #include <wlr/types/wlr_idle_inhibit_v1.h> | ||
14 | #include <wlr/types/wlr_layer_shell.h> | 13 | #include <wlr/types/wlr_layer_shell.h> |
15 | #include <wlr/types/wlr_linux_dmabuf.h> | 14 | #include <wlr/types/wlr_linux_dmabuf.h> |
16 | #include <wlr/types/wlr_primary_selection.h> | 15 | #include <wlr/types/wlr_primary_selection.h> |
@@ -23,6 +22,7 @@ | |||
23 | // TODO WLR: make Xwayland optional | 22 | // TODO WLR: make Xwayland optional |
24 | #include "list.h" | 23 | #include "list.h" |
25 | #include "sway/config.h" | 24 | #include "sway/config.h" |
25 | #include "sway/desktop/idle_inhibit_v1.h" | ||
26 | #include "sway/input/input-manager.h" | 26 | #include "sway/input/input-manager.h" |
27 | #include "sway/server.h" | 27 | #include "sway/server.h" |
28 | #include "sway/tree/layout.h" | 28 | #include "sway/tree/layout.h" |
@@ -53,7 +53,6 @@ bool server_init(struct sway_server *server) { | |||
53 | server->data_device_manager = | 53 | server->data_device_manager = |
54 | wlr_data_device_manager_create(server->wl_display); | 54 | wlr_data_device_manager_create(server->wl_display); |
55 | 55 | ||
56 | server->idle = wlr_idle_create(server->wl_display); | ||
57 | wlr_screenshooter_create(server->wl_display); | 56 | wlr_screenshooter_create(server->wl_display); |
58 | wlr_gamma_control_manager_create(server->wl_display); | 57 | wlr_gamma_control_manager_create(server->wl_display); |
59 | wlr_primary_selection_device_manager_create(server->wl_display); | 58 | wlr_primary_selection_device_manager_create(server->wl_display); |
@@ -64,11 +63,9 @@ bool server_init(struct sway_server *server) { | |||
64 | wlr_xdg_output_manager_create(server->wl_display, | 63 | wlr_xdg_output_manager_create(server->wl_display, |
65 | root_container.sway_root->output_layout); | 64 | root_container.sway_root->output_layout); |
66 | 65 | ||
67 | server->idle_inhibit = wlr_idle_inhibit_v1_create(server->wl_display); | 66 | server->idle = wlr_idle_create(server->wl_display); |
68 | wl_signal_add(&server->idle_inhibit->events.new_inhibitor, | 67 | server->idle_inhibit_manager_v1 = |
69 | &server->new_idle_inhibitor_v1); | 68 | sway_idle_inhibit_manager_v1_create(server->wl_display, server->idle); |
70 | server->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1; | ||
71 | wl_list_init(&server->idle_inhibitors_v1); | ||
72 | 69 | ||
73 | server->layer_shell = wlr_layer_shell_create(server->wl_display); | 70 | server->layer_shell = wlr_layer_shell_create(server->wl_display); |
74 | wl_signal_add(&server->layer_shell->events.new_surface, | 71 | wl_signal_add(&server->layer_shell->events.new_surface, |