mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-17 06:46:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: associate launch contexts with views

Browse source 
Views now maintain a reference to a launch context which, as a last
resort, is populated at map time with a context associated with its pid.
This opens the possibility of populating it before map via another
source, e.g. xdga-tokens or configuration.
This commit is contained in:
Ronan Pigott 2022-11-16 15:50:34 -07:00 • committed by Simon Ser
parent d75c9f9722
commit 864b3a9a18
4 changed files with 64 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sway/tree/view.c
View file

@ -64,6 +64,8 @@ void view_destroy(struct sway_view *view) {
}
list_free(view->executed_criteria);
view_assign_ctx(view, NULL);
free(view->title_format);
if (view->impl->destroy) {
@ -534,6 +536,20 @@ static void view_populate_pid(struct sway_view *view) {
view->pid = pid;
}
void view_assign_ctx(struct sway_view *view, struct launcher_ctx *ctx) {
if (view->ctx) {
// This ctx has been replaced
launcher_ctx_destroy(view->ctx);
view->ctx = NULL;
}
if (ctx == NULL) {
return;
}
launcher_ctx_consume(ctx);
view->ctx = ctx;
}
static struct sway_workspace *select_workspace(struct sway_view *view) {
struct sway_seat *seat = input_manager_current_seat();
@ -569,13 +585,14 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
}
list_free(criterias);
if (ws) {
remove_workspace_pid(view->pid);
view_assign_ctx(view, NULL);
return ws;
}
// Check if there's a PID mapping
ws = workspace_for_pid(view->pid);
ws = view->ctx ? launcher_ctx_get_workspace(view->ctx) : NULL;
if (ws) {
view_assign_ctx(view, NULL);
return ws;
}
@ -718,6 +735,13 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
view_populate_pid(view);
view->container = container_create(view);
if (view->ctx == NULL) {
struct launcher_ctx *ctx = launcher_ctx_find_pid(view->pid);
if (ctx != NULL) {
view_assign_ctx(view, ctx);
}
}
// If there is a request to be opened fullscreen on a specific output, try
// to honor that request. Otherwise, fallback to assigns, pid mappings,
// focused workspace, etc