if (weston_view_is_mapped(view)) {
weston_layer_entry_remove(&view->layer_link);
+ } else {
+ weston_view_update_transform(view);
}
weston_view_set_output(view, woutput);
woutput->y + output->area.y);
view->is_mapped = true;
+ surf->mapped = true;
view->surface->is_mapped = true;
if (output->active) {
output->active = surf;
weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
-
weston_view_geometry_dirty(view);
- weston_view_schedule_repaint(view);
+ weston_surface_damage(view->surface);
/*
* the 'remote' role now makes use of this part so make sure we don't
return NULL;
}
-
-static struct ivi_output *
+struct ivi_output *
ivi_layout_find_bg_output(struct ivi_compositor *ivi)
{
struct ivi_output *out;
* 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)
return;
/* we can only activate it again by using the protocol */
- if (surf->activated_by_default)
+ if (surf->mapped)
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);
- surf->activated_by_default = true;
} 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);
- surf->activated_by_default = true;
}
}
* 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)
return;
if (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;
}
return;
}
struct ivi_output *output = surface->split.output;
struct weston_output *woutput = output->output;
+ struct ivi_output *bg_output = ivi_layout_find_bg_output(ivi);
struct weston_view *view = surface->view;
- struct weston_geometry geom;
+ struct weston_geometry geom =
+ weston_desktop_surface_get_geometry(dsurface);
+
+ bool is_fullscreen = weston_desktop_surface_get_fullscreen(dsurface);
+ bool is_dim_same =
+ geom.width == bg_output->output->width &&
+ geom.height == bg_output->output->height;
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
- !surface->activated_by_default)
+ !surface->mapped)
return;
- if (surface->view->is_mapped)
+ assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
+
+ if (weston_view_is_mapped(view))
return;
- geom = weston_desktop_surface_get_geometry(dsurface);
- weston_log("(fs) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
- geom.width, geom.height);
+ /* if we still get here but we haven't resized so far, send configure
+ * events to do so */
+ if (surface->state != RESIZING && (!is_fullscreen || !is_dim_same)) {
+ struct ivi_output *bg_output =
+ ivi_layout_find_bg_output(surface->ivi);
- assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
+ weston_log("Placing fullscreen app_id %s, type %s in hidden layer\n",
+ app_id, ivi_layout_get_surface_role_name(surface));
+ weston_desktop_surface_set_fullscreen(dsurface, true);
+ weston_desktop_surface_set_size(dsurface,
+ bg_output->output->width,
+ bg_output->output->height);
- weston_desktop_surface_set_fullscreen(dsurface, true);
+ surface->state = RESIZING;
+ weston_view_set_output(view, output->output);
+ weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
+ return;
+ }
- weston_view_set_output(view, woutput);
- weston_view_set_position(view, woutput->x, woutput->y);
- weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
+ /* eventually, we would set the surface fullscreen, but the client
+ * hasn't resized correctly by this point, so terminate connection */
+ if (surface->state == RESIZING && is_fullscreen && !is_dim_same) {
+ struct weston_desktop_client *desktop_client =
+ weston_desktop_surface_get_client(dsurface);
+ struct wl_client *client =
+ weston_desktop_client_get_client(desktop_client);
+ wl_client_post_implementation_error(client,
+ "can not display surface due to invalid geometry."
+ " Client should perform a geometry resize!");
+ return;
+ }
- weston_view_update_transform(view);
- weston_view_damage_below(view);
+ /* this implies we resized correctly */
+ if (!weston_view_is_mapped(view)) {
+ weston_layer_entry_remove(&view->layer_link);
- wsurface->is_mapped = true;
- surface->view->is_mapped = true;
+ weston_view_set_output(view, woutput);
+ weston_view_set_position(view, woutput->x, woutput->y);
+ weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
- shell_advertise_app_state(ivi, app_id,
- NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
+ wsurface->is_mapped = true;
+ surface->view->is_mapped = true;
+ surface->state = FULLSCREEN;
- weston_log("Activation completed for app_id %s, role %s, output %s\n",
- app_id, ivi_layout_get_surface_role_name(surface), output->name);
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
+
+ shell_advertise_app_state(ivi, app_id,
+ NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
+
+ weston_log("Activation completed for app_id %s, role %s, "
+ "output %s\n", app_id,
+ ivi_layout_get_surface_role_name(surface),
+ output->name);
+
+ }
}
void
width, height);
weston_view_set_position(view, x, y);
- weston_view_update_transform(view);
- weston_view_damage_below(view);
+
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
}
void
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
- !surface->activated_by_default)
+ !surface->mapped)
return;
if (surface->view->is_mapped)
weston_view_set_position(view, x, y);
weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
- weston_view_update_transform(view);
- weston_view_damage_below(view);
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
wsurface->is_mapped = true;
surface->view->is_mapped = true;
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surface, surface->ivi) &&
- !surface->activated_by_default)
+ !surface->mapped)
return;
if (surface->view->is_mapped)
weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link);
- weston_view_update_transform(view);
- weston_view_damage_below(view);
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
wsurface->is_mapped = true;
surface->view->is_mapped = true;
/* 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);
}
/* 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)
view->surface->is_mapped = false;
weston_layer_entry_remove(&view->layer_link);
- weston_view_damage_below(view);
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
ivi_output->active = NULL;
}
} else {
struct weston_view *view = surf->view;
weston_layer_entry_remove(&view->layer_link);
- weston_view_damage_below(view);
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
}
}