feat: 1.9 merge (#277)

Co-authored-by: William McKinnon <[email protected]>
Co-authored-by: Erik Reider <[email protected]>

1 files changed, 10 insertions, 2 deletions

diff --git a/include/sway/desktop/launcher.h b/include/sway/desktop/launcher.h
index 3b577f74..412068a9 100644
--- a/include/sway/desktop/launcher.h
+++ b/include/sway/desktop/launcher.h
@@ -2,14 +2,19 @@
 #define _SWAY_LAUNCHER_H
 
 #include <stdlib.h>
+#include <wayland-server-core.h>
+#include "sway/input/seat.h"
 
 struct launcher_ctx {
 	pid_t pid;
-	char *name;
+	char *fallback_name;
 	struct wlr_xdg_activation_token_v1 *token;
 	struct wl_listener token_destroy;
+	struct sway_seat *seat;
+	struct wl_listener seat_destroy;
 
 	bool activated;
+	bool had_focused_surface;
 
 	struct sway_node *node;
 	struct wl_listener node_destroy;
@@ -25,7 +30,10 @@ void launcher_ctx_consume(struct launcher_ctx *ctx);
 
 void launcher_ctx_destroy(struct launcher_ctx *ctx);
 
-struct launcher_ctx *launcher_ctx_create(void);
+struct launcher_ctx *launcher_ctx_create_internal(void);
+
+struct launcher_ctx *launcher_ctx_create(
+	struct wlr_xdg_activation_token_v1 *token, struct sway_node *node);
 
 const char *launcher_ctx_get_token_name(struct launcher_ctx *ctx);