diff options
-rw-r--r-- | include/sway/desktop/idle_inhibit_v1.h | 1 | ||||
-rw-r--r-- | include/sway/server.h | 1 | ||||
-rw-r--r-- | sway/desktop/idle_inhibit_v1.c | 2 | ||||
-rw-r--r-- | sway/input/cursor.c | 1 | ||||
-rw-r--r-- | sway/input/keyboard.c | 1 | ||||
-rw-r--r-- | sway/input/seat.c | 2 | ||||
-rw-r--r-- | sway/input/switch.c | 1 | ||||
-rw-r--r-- | sway/server.c | 2 |
8 files changed, 0 insertions, 11 deletions
diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h index 6dda1af9..84cc666d 100644 --- a/include/sway/desktop/idle_inhibit_v1.h +++ b/include/sway/desktop/idle_inhibit_v1.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H | 1 | #ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H |
2 | #define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H | 2 | #define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H |
3 | #include <wlr/types/wlr_idle_inhibit_v1.h> | 3 | #include <wlr/types/wlr_idle_inhibit_v1.h> |
4 | #include <wlr/types/wlr_idle.h> | ||
5 | 4 | ||
6 | enum sway_idle_inhibit_mode { | 5 | enum sway_idle_inhibit_mode { |
7 | INHIBIT_IDLE_APPLICATION, // Application set inhibitor (when visible) | 6 | INHIBIT_IDLE_APPLICATION, // Application set inhibitor (when visible) |
diff --git a/include/sway/server.h b/include/sway/server.h index 1eb308a4..108561e6 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -52,7 +52,6 @@ struct sway_server { | |||
52 | struct wl_listener new_output; | 52 | struct wl_listener new_output; |
53 | struct wl_listener output_layout_change; | 53 | struct wl_listener output_layout_change; |
54 | 54 | ||
55 | struct wlr_idle *idle; | ||
56 | struct wlr_idle_notifier_v1 *idle_notifier_v1; | 55 | struct wlr_idle_notifier_v1 *idle_notifier_v1; |
57 | struct sway_idle_inhibit_manager_v1 idle_inhibit_manager_v1; | 56 | struct sway_idle_inhibit_manager_v1 idle_inhibit_manager_v1; |
58 | 57 | ||
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c index 1fa058e3..f3af7aa1 100644 --- a/sway/desktop/idle_inhibit_v1.c +++ b/sway/desktop/idle_inhibit_v1.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <wlr/types/wlr_idle.h> | ||
3 | #include <wlr/types/wlr_idle_notify_v1.h> | 2 | #include <wlr/types/wlr_idle_notify_v1.h> |
4 | #include "log.h" | 3 | #include "log.h" |
5 | #include "sway/desktop/idle_inhibit_v1.h" | 4 | #include "sway/desktop/idle_inhibit_v1.h" |
@@ -140,7 +139,6 @@ void sway_idle_inhibit_v1_check_active(void) { | |||
140 | break; | 139 | break; |
141 | } | 140 | } |
142 | } | 141 | } |
143 | wlr_idle_set_enabled(server.idle, NULL, !inhibited); | ||
144 | wlr_idle_notifier_v1_set_inhibited(server.idle_notifier_v1, inhibited); | 142 | wlr_idle_notifier_v1_set_inhibited(server.idle_notifier_v1, inhibited); |
145 | } | 143 | } |
146 | 144 | ||
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 44a5d6f7..36aab93e 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <strings.h> | 8 | #include <strings.h> |
9 | #include <wlr/types/wlr_cursor.h> | 9 | #include <wlr/types/wlr_cursor.h> |
10 | #include <wlr/types/wlr_cursor_shape_v1.h> | 10 | #include <wlr/types/wlr_cursor_shape_v1.h> |
11 | #include <wlr/types/wlr_idle.h> | ||
12 | #include <wlr/types/wlr_pointer.h> | 11 | #include <wlr/types/wlr_pointer.h> |
13 | #include <wlr/types/wlr_touch.h> | 12 | #include <wlr/types/wlr_touch.h> |
14 | #include <wlr/types/wlr_tablet_v2.h> | 13 | #include <wlr/types/wlr_tablet_v2.h> |
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index c3bf4fbb..8927287f 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <wlr/config.h> | 4 | #include <wlr/config.h> |
5 | #include <wlr/backend/multi.h> | 5 | #include <wlr/backend/multi.h> |
6 | #include <wlr/interfaces/wlr_keyboard.h> | 6 | #include <wlr/interfaces/wlr_keyboard.h> |
7 | #include <wlr/types/wlr_idle.h> | ||
8 | #include <wlr/types/wlr_keyboard.h> | 7 | #include <wlr/types/wlr_keyboard.h> |
9 | #include <wlr/types/wlr_keyboard_group.h> | 8 | #include <wlr/types/wlr_keyboard_group.h> |
10 | #include <xkbcommon/xkbcommon-names.h> | 9 | #include <xkbcommon/xkbcommon-names.h> |
diff --git a/sway/input/seat.c b/sway/input/seat.c index a84e4d52..f56de137 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <wlr/config.h> | 7 | #include <wlr/config.h> |
8 | #include <wlr/types/wlr_cursor.h> | 8 | #include <wlr/types/wlr_cursor.h> |
9 | #include <wlr/types/wlr_data_device.h> | 9 | #include <wlr/types/wlr_data_device.h> |
10 | #include <wlr/types/wlr_idle.h> | ||
11 | #include <wlr/types/wlr_idle_notify_v1.h> | 10 | #include <wlr/types/wlr_idle_notify_v1.h> |
12 | #include <wlr/types/wlr_keyboard_group.h> | 11 | #include <wlr/types/wlr_keyboard_group.h> |
13 | #include <wlr/types/wlr_output_layout.h> | 12 | #include <wlr/types/wlr_output_layout.h> |
@@ -103,7 +102,6 @@ void seat_idle_notify_activity(struct sway_seat *seat, | |||
103 | if ((source & seat->idle_inhibit_sources) == 0) { | 102 | if ((source & seat->idle_inhibit_sources) == 0) { |
104 | return; | 103 | return; |
105 | } | 104 | } |
106 | wlr_idle_notify_activity(server.idle, seat->wlr_seat); | ||
107 | wlr_idle_notifier_v1_notify_activity(server.idle_notifier_v1, seat->wlr_seat); | 105 | wlr_idle_notifier_v1_notify_activity(server.idle_notifier_v1, seat->wlr_seat); |
108 | } | 106 | } |
109 | 107 | ||
diff --git a/sway/input/switch.c b/sway/input/switch.c index fc7dfaff..7a539801 100644 --- a/sway/input/switch.c +++ b/sway/input/switch.c | |||
@@ -1,6 +1,5 @@ | |||
1 | #include "sway/config.h" | 1 | #include "sway/config.h" |
2 | #include "sway/input/switch.h" | 2 | #include "sway/input/switch.h" |
3 | #include <wlr/types/wlr_idle.h> | ||
4 | #include "log.h" | 3 | #include "log.h" |
5 | 4 | ||
6 | struct sway_switch *sway_switch_create(struct sway_seat *seat, | 5 | struct sway_switch *sway_switch_create(struct sway_seat *seat, |
diff --git a/sway/server.c b/sway/server.c index ba5c2a0c..fd0ab585 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <wlr/types/wlr_export_dmabuf_v1.h> | 17 | #include <wlr/types/wlr_export_dmabuf_v1.h> |
18 | #include <wlr/types/wlr_fractional_scale_v1.h> | 18 | #include <wlr/types/wlr_fractional_scale_v1.h> |
19 | #include <wlr/types/wlr_gamma_control_v1.h> | 19 | #include <wlr/types/wlr_gamma_control_v1.h> |
20 | #include <wlr/types/wlr_idle.h> | ||
21 | #include <wlr/types/wlr_idle_notify_v1.h> | 20 | #include <wlr/types/wlr_idle_notify_v1.h> |
22 | #include <wlr/types/wlr_layer_shell_v1.h> | 21 | #include <wlr/types/wlr_layer_shell_v1.h> |
23 | #include <wlr/types/wlr_linux_dmabuf_v1.h> | 22 | #include <wlr/types/wlr_linux_dmabuf_v1.h> |
@@ -145,7 +144,6 @@ bool server_init(struct sway_server *server) { | |||
145 | 144 | ||
146 | wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout); | 145 | wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout); |
147 | 146 | ||
148 | server->idle = wlr_idle_create(server->wl_display); | ||
149 | server->idle_notifier_v1 = wlr_idle_notifier_v1_create(server->wl_display); | 147 | server->idle_notifier_v1 = wlr_idle_notifier_v1_create(server->wl_display); |
150 | sway_idle_inhibit_manager_v1_init(); | 148 | sway_idle_inhibit_manager_v1_init(); |
151 | 149 | ||