tree/view: Make foreign-toplevel app_id fallback to class

It is not a part of the foreign-toplevel-management protocol to get the
class of a toplevel, only for getting the app_id.
For xwayland clients this is an issue because that means that you cannot
identify what application the toplevel refers to which is the point of
the app_id property.

By falling back to class when an app_id does not exist solves this problem.

Phoc also uses app_id and class interchangeably in their implementation
of foreign-toplevel-management, in fact they always do that and not only
for just this protocol.
c8d8a4c544/src/xwayland.c (L236)
master
Johan Bjäreholt 5 years ago committed by Simon Ser
parent 76adcc3fd3
commit 1f8dbb320a

@ -738,10 +738,14 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
input_manager_set_focus(&view->container->node); input_manager_set_focus(&view->container->node);
} }
const char *app_id = view_get_app_id(view); const char *app_id;
if (app_id != NULL) { const char *class;
if ((app_id = view_get_app_id(view)) != NULL) {
wlr_foreign_toplevel_handle_v1_set_app_id( wlr_foreign_toplevel_handle_v1_set_app_id(
view->foreign_toplevel, app_id); view->foreign_toplevel, app_id);
} else if ((class = view_get_class(view)) != NULL) {
wlr_foreign_toplevel_handle_v1_set_app_id(
view->foreign_toplevel, class);
} }
} }

Loading…
Cancel
Save