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;
 void transaction_commit_dirty(void);
 
 /**
+ * Same as above, but runs the specific callback when the transaction is
+ * applied.
+ */
+void transaction_commit_dirty_with_callback(
+		void (*callback)(void *data), void *data);
+
+/**
  * Notify the transaction system that a view is ready for the new layout.
  *
  * 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 {
 	VIEW_PROP_WINDOW_ROLE,
 #ifdef HAVE_XWAYLAND
 	VIEW_PROP_X11_WINDOW_ID,
+	VIEW_PROP_X11_PARENT_ID,
 #endif
 };
 
@@ -256,6 +257,8 @@ const char *view_get_instance(struct sway_view *view);
 
 uint32_t view_get_x11_window_id(struct sway_view *view);
 
+uint32_t view_get_x11_parent_id(struct sway_view *view);
+
 const char *view_get_window_role(struct sway_view *view);
 
 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 {
 	struct xkb_keymap *keymap;
 };
 
+struct swaylock_seat {
+	struct swaylock_state *state;
+	struct wl_pointer *pointer;
+	struct wl_keyboard *keyboard;
+};
+
 extern const struct wl_seat_listener seat_listener;
 
 #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 {
 	struct wl_compositor *compositor;
 	struct zwlr_layer_shell_v1 *layer_shell;
 	struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager;
-	struct wl_pointer *pointer;
-	struct wl_keyboard *keyboard;
 	struct wl_shm *shm;
 	struct wl_list surfaces;
 	struct wl_list images;