diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/desktop/transaction.h | 7 | ||||
-rw-r--r-- | include/sway/tree/view.h | 3 | ||||
-rw-r--r-- | include/swaylock/seat.h | 6 | ||||
-rw-r--r-- | include/swaylock/swaylock.h | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h index 66e8c9a2..f38f033c 100644 --- a/include/sway/desktop/transaction.h +++ b/include/sway/desktop/transaction.h | |||
@@ -29,6 +29,13 @@ struct sway_view; | |||
29 | void transaction_commit_dirty(void); | 29 | void transaction_commit_dirty(void); |
30 | 30 | ||
31 | /** | 31 | /** |
32 | * Same as above, but runs the specific callback when the transaction is | ||
33 | * applied. | ||
34 | */ | ||
35 | void transaction_commit_dirty_with_callback( | ||
36 | void (*callback)(void *data), void *data); | ||
37 | |||
38 | /** | ||
32 | * Notify the transaction system that a view is ready for the new layout. | 39 | * Notify the transaction system that a view is ready for the new layout. |
33 | * | 40 | * |
34 | * When all views in the transaction are ready, the layout will be applied. | 41 | * When all views in the transaction are ready, the layout will be applied. |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index a0b4dd46..0240f294 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -30,6 +30,7 @@ enum sway_view_prop { | |||
30 | VIEW_PROP_WINDOW_ROLE, | 30 | VIEW_PROP_WINDOW_ROLE, |
31 | #ifdef HAVE_XWAYLAND | 31 | #ifdef HAVE_XWAYLAND |
32 | VIEW_PROP_X11_WINDOW_ID, | 32 | VIEW_PROP_X11_WINDOW_ID, |
33 | VIEW_PROP_X11_PARENT_ID, | ||
33 | #endif | 34 | #endif |
34 | }; | 35 | }; |
35 | 36 | ||
@@ -256,6 +257,8 @@ const char *view_get_instance(struct sway_view *view); | |||
256 | 257 | ||
257 | uint32_t view_get_x11_window_id(struct sway_view *view); | 258 | uint32_t view_get_x11_window_id(struct sway_view *view); |
258 | 259 | ||
260 | uint32_t view_get_x11_parent_id(struct sway_view *view); | ||
261 | |||
259 | const char *view_get_window_role(struct sway_view *view); | 262 | const char *view_get_window_role(struct sway_view *view); |
260 | 263 | ||
261 | uint32_t view_get_window_type(struct sway_view *view); | 264 | uint32_t view_get_window_type(struct sway_view *view); |
diff --git a/include/swaylock/seat.h b/include/swaylock/seat.h index 4bcf40c0..c79afcd0 100644 --- a/include/swaylock/seat.h +++ b/include/swaylock/seat.h | |||
@@ -10,6 +10,12 @@ struct swaylock_xkb { | |||
10 | struct xkb_keymap *keymap; | 10 | struct xkb_keymap *keymap; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | struct swaylock_seat { | ||
14 | struct swaylock_state *state; | ||
15 | struct wl_pointer *pointer; | ||
16 | struct wl_keyboard *keyboard; | ||
17 | }; | ||
18 | |||
13 | extern const struct wl_seat_listener seat_listener; | 19 | extern const struct wl_seat_listener seat_listener; |
14 | 20 | ||
15 | #endif | 21 | #endif |
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 25b41a71..18af7ab4 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -62,8 +62,6 @@ struct swaylock_state { | |||
62 | struct wl_compositor *compositor; | 62 | struct wl_compositor *compositor; |
63 | struct zwlr_layer_shell_v1 *layer_shell; | 63 | struct zwlr_layer_shell_v1 *layer_shell; |
64 | struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; | 64 | struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; |
65 | struct wl_pointer *pointer; | ||
66 | struct wl_keyboard *keyboard; | ||
67 | struct wl_shm *shm; | 65 | struct wl_shm *shm; |
68 | struct wl_list surfaces; | 66 | struct wl_list surfaces; |
69 | struct wl_list images; | 67 | struct wl_list images; |