Some frameworks like GTK-3 delay the set_app_id until title and
parent are set, which makes ivi_check_pending_desktop_surface
unable to set the proper role on surface_added. A consequence
of this behaviour is that is not possible to use set_app_property
to configure an application as popup.
Instead, delay the creation of the surface until committed to give
the chance to have a valid app_id configured.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Change-Id: I3f672fb365f48659711c866c45a21df6058a5a02
surface->role = IVI_SURFACE_ROLE_NONE;
surface->activated_by_default = false;
surface->advertised_on_launch = false;
surface->role = IVI_SURFACE_ROLE_NONE;
surface->activated_by_default = false;
surface->advertised_on_launch = false;
+ surface->checked_pending = false;
wl_signal_init(&surface->signal_advertise_app);
wl_signal_init(&surface->signal_advertise_app);
/* reset any caps to make sure we apply the new caps */
ivi_seat_reset_caps_sent(ivi);
/* reset any caps to make sure we apply the new caps */
ivi_seat_reset_caps_sent(ivi);
- if (ivi->shell_client.ready) {
- ivi_check_pending_desktop_surface(surface);
- weston_log("Added surface %p, app_id %s, role %s\n", surface,
- app_id, ivi_layout_get_surface_role_name(surface));
- } else {
- /*
- * We delay creating "normal" desktop surfaces until later, to
- * give the shell-client an oppurtunity to set the surface as a
- * background/panel.
- */
- weston_log("Added surface %p, app_id %s to pending list\n",
- surface, app_id);
- wl_list_insert(&ivi->pending_surfaces, &surface->link);
- }
+ /*
+ * We delay creating "normal" desktop surfaces until later, to
+ * give the shell-client an oppurtunity to set the surface as a
+ * background/panel.
+ * Also delay the creation in order to have a valid app_id
+ * which will be used to set the proper role.
+ */
+ weston_log("Added surface %p, app_id %s to pending list\n",
+ surface, app_id);
+ wl_list_insert(&ivi->pending_surfaces, &surface->link);
+
desktop_committed(struct weston_desktop_surface *dsurface,
int32_t sx, int32_t sy, void *userdata)
{
desktop_committed(struct weston_desktop_surface *dsurface,
int32_t sx, int32_t sy, void *userdata)
{
+ struct ivi_compositor *ivi = userdata;
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
struct ivi_policy *policy = surface->ivi->policy;
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
struct ivi_policy *policy = surface->ivi->policy;
!policy->api.surface_commited(surface, surface->ivi))
return;
!policy->api.surface_commited(surface, surface->ivi))
return;
+ if (ivi->shell_client.ready && !surface->checked_pending) {
+ const char * app_id = weston_desktop_surface_get_app_id(dsurface);
+ weston_log("Checking pending surface %p, app_id %s\n", surface,
+ app_id);
+ wl_list_remove(&surface->link);
+ wl_list_init(&surface->link);
+ ivi_check_pending_desktop_surface(surface);
+ surface->checked_pending = true;
+ }
+
if (!surface->advertised_on_launch)
wl_signal_emit(&surface->signal_advertise_app, surface);
if (!surface->advertised_on_launch)
wl_signal_emit(&surface->signal_advertise_app, surface);
} pending;
bool activated_by_default;
bool advertised_on_launch;
} pending;
bool activated_by_default;
bool advertised_on_launch;
enum ivi_surface_role role;
union {
enum ivi_surface_role role;
union {
wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) {
wl_list_remove(&surface->link);
ivi_check_pending_desktop_surface(surface);
wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) {
wl_list_remove(&surface->link);
ivi_check_pending_desktop_surface(surface);
+ surface->checked_pending = true;
+ surface->checked_pending = true;
surface->role = IVI_SURFACE_ROLE_BACKGROUND;
surface->bg.output = output;
wl_list_remove(&surface->link);
surface->role = IVI_SURFACE_ROLE_BACKGROUND;
surface->bg.output = output;
wl_list_remove(&surface->link);
+ surface->checked_pending = true;
surface->role = IVI_SURFACE_ROLE_PANEL;
surface->panel.output = output;
surface->panel.edge = edge;
surface->role = IVI_SURFACE_ROLE_PANEL;
surface->panel.output = output;
surface->panel.edge = edge;