diff options
| -rw-r--r-- | src/desktop.c | 37 | ||||
| -rw-r--r-- | src/ivi-compositor.h | 1 | ||||
| -rw-r--r-- | src/shell.c | 3 |
3 files changed, 27 insertions, 14 deletions
diff --git a/src/desktop.c b/src/desktop.c index ad1ce44..8fe6f7d 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -95,6 +95,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) 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); @@ -119,20 +120,17 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) /* 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); + } static bool @@ -251,6 +249,7 @@ static void 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; @@ -259,6 +258,16 @@ desktop_committed(struct weston_desktop_surface *dsurface, !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); diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 189cd8c..efa6373 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -262,6 +262,7 @@ struct ivi_surface { } pending; bool activated_by_default; bool advertised_on_launch; + bool checked_pending; enum ivi_surface_role role; union { diff --git a/src/shell.c b/src/shell.c index fb15dfc..941257a 100644 --- a/src/shell.c +++ b/src/shell.c @@ -747,6 +747,7 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res) 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; } } @@ -786,6 +787,7 @@ shell_set_background(struct wl_client *client, return; } + surface->checked_pending = true; surface->role = IVI_SURFACE_ROLE_BACKGROUND; surface->bg.output = output; wl_list_remove(&surface->link); @@ -858,6 +860,7 @@ shell_set_panel(struct wl_client *client, return; } + surface->checked_pending = true; surface->role = IVI_SURFACE_ROLE_PANEL; surface->panel.output = output; surface->panel.edge = edge; |