This variable is about surface being displayed, rather than being
activatred so use mapped to better reflect that.
It also makes things easier to keep track per surface about surfaces
being activated by default or not. No functional change whatsoever.
Bug-AGL: SPEC-4302
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Ib0c508dff3eef593d86f259b55ff4e7087313a69
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
- surface->activated_by_default = false;
+ surface->mapped = false;
surface->advertised_on_launch = false;
surface->checked_pending = false;
wl_list_init(&surface->link);
surface->advertised_on_launch = false;
surface->checked_pending = false;
wl_list_init(&surface->link);
int32_t x, y;
int32_t width, height;
} pending;
int32_t x, y;
int32_t width, height;
} pending;
- bool activated_by_default;
bool advertised_on_launch;
bool checked_pending;
bool advertised_on_launch;
bool checked_pending;
* we can't make use here of the ivi_layout_get_output_from_surface()
* due to the fact that we'll always land here when a surface performs
* a commit and pending_output will not bet set. This works in tandem
* we can't make use here of the ivi_layout_get_output_from_surface()
* due to the fact that we'll always land here when a surface performs
* a commit and pending_output will not bet set. This works in tandem
- * with 'activated_by_default' at this point to avoid tripping over
+ * with 'mapped' at this point to avoid tripping over
* to a surface that continuously updates its content
*/
if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
* to a surface that continuously updates its content
*/
if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
return;
/* we can only activate it again by using the protocol */
return;
/* we can only activate it again by using the protocol */
- if (surf->activated_by_default)
return;
/* check first if there aren't any outputs being set */
return;
/* check first if there aren't any outputs being set */
weston_desktop_surface_get_app_id(surf->dsurface),
ivi_layout_get_surface_role_name(surf));
ivi_layout_activate(r_output, app_id);
weston_desktop_surface_get_app_id(surf->dsurface),
ivi_layout_get_surface_role_name(surf));
ivi_layout_activate(r_output, app_id);
- surf->activated_by_default = true;
} else if (!app_id) {
/*
* applications not setting an app_id, or
} else if (!app_id) {
/*
* applications not setting an app_id, or
weston_log("Surface no app_id, role %s activating by default\n",
ivi_layout_get_surface_role_name(surf));
ivi_layout_activate_by_surf(r_output, surf);
weston_log("Surface no app_id, role %s activating by default\n",
ivi_layout_get_surface_role_name(surf));
ivi_layout_activate_by_surf(r_output, surf);
- surf->activated_by_default = true;
* ivi_layout_activate_complete() terminates so we use the
* current active surface to avoid hitting this again and again
* */
* ivi_layout_activate_complete() terminates so we use the
* current active surface to avoid hitting this again and again
* */
- if (surf->activated_by_default && output->active == surf)
+ if (surf->mapped && output->active == surf)
weston_desktop_surface_get_app_id(surf->dsurface),
ivi_layout_get_surface_role_name(surf));
ivi_layout_activate(output, app_id);
weston_desktop_surface_get_app_id(surf->dsurface),
ivi_layout_get_surface_role_name(surf));
ivi_layout_activate(output, app_id);
- surf->activated_by_default = true;
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
- !surface->activated_by_default)
return;
if (surface->view->is_mapped)
return;
if (surface->view->is_mapped)
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
- !surface->activated_by_default)
return;
if (surface->view->is_mapped)
return;
if (surface->view->is_mapped)
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
- !surface->activated_by_default)
return;
if (surface->view->is_mapped)
return;
if (surface->view->is_mapped)
/* reset the activate by default in order to (still) allow the surface
* to be activaved using the request */
/* reset the activate by default in order to (still) allow the surface
* to be activaved using the request */
- if (!surface->activated_by_default)
- surface->activated_by_default = true;
+ if (!surface->mapped)
+ surface->mapped = true;
ivi_layout_popup_committed(surface);
}
ivi_layout_popup_committed(surface);
}
/* reset the activate by default in order to (still) allow the surface
* to be activaved using the request */
/* reset the activate by default in order to (still) allow the surface
* to be activaved using the request */
- if (!surf->activated_by_default)
- surf->activated_by_default = true;
+ if (!surf->mapped)
+ surf->mapped = true;
wl_list_for_each(is, &ivi->surfaces, link)
if (is == surf)
wl_list_for_each(is, &ivi->surfaces, link)
if (is == surf)