mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

view: always populate pid

Browse Source 
If the view was mapped as fullscreen or the view was assigned either a
workspace or output, the pid was not being populated since it was
occurring as part of the pid mapping check in select_workspace. This
extracts the pid population and makes it so it is always executed
This commit is contained in:
Brian Ashworth 2019-09-20 11:58:19 -04:00 committed by Simon Ser
parent 3a2e860848
commit da0ad4c39e
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sway/tree/view.c
View File

@ -449,6 +449,25 @@ void view_execute_criteria(struct sway_view *view) {
list_free(criterias); list_free(criterias);
} }
static void view_populate_pid(struct sway_view *view) {
pid_t pid;
switch (view->type) {
#if HAVE_XWAYLAND
case SWAY_VIEW_XWAYLAND:;
struct wlr_xwayland_surface *surf =
wlr_xwayland_surface_from_wlr_surface(view->surface);
pid = surf->pid;
break;
#endif
case SWAY_VIEW_XDG_SHELL:;
struct wl_client *client =
wl_resource_get_client(view->surface->resource);
wl_client_get_credentials(client, &pid, NULL, NULL);
break;
}
view->pid = pid;
}
static struct sway_workspace *select_workspace(struct sway_view *view) { static struct sway_workspace *select_workspace(struct sway_view *view) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
@ -488,24 +507,7 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
} }
// Check if there's a PID mapping // Check if there's a PID mapping
pid_t pid; ws = root_workspace_for_pid(view->pid);
#if HAVE_XWAYLAND
if (view->type == SWAY_VIEW_XWAYLAND) {
struct wlr_xwayland_surface *surf =
wlr_xwayland_surface_from_wlr_surface(view->surface);
pid = surf->pid;
} else {
struct wl_client *client =
wl_resource_get_client(view->surface->resource);
wl_client_get_credentials(client, &pid, NULL, NULL);
}
#else
struct wl_client *client =
wl_resource_get_client(view->surface->resource);
wl_client_get_credentials(client, &pid, NULL, NULL);
#endif
view->pid = pid;
ws = root_workspace_for_pid(pid);
if (ws) { if (ws) {
return ws; return ws;
} }
@ -563,6 +565,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
return; return;
} }
view->surface = wlr_surface; view->surface = wlr_surface;
view_populate_pid(view);
// If there is a request to be opened fullscreen on a specific output, try // If there is a request to be opened fullscreen on a specific output, try
// to honor that request. Otherwise, fallback to assigns, pid mappings, // to honor that request. Otherwise, fallback to assigns, pid mappings,