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_update_transform(view);
-
- /* force repaint of the entire output */
- weston_output_damage(output->output);
+ weston_view_geometry_dirty(view);
+ weston_surface_damage(view->surface);
/*
* the 'remote' role now makes use of this part so make sure we don't
* 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;
}
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, woutput->x, woutput->y);
weston_layer_entry_insert(&ivi->fullscreen.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;
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)
switch (surface->role) {
case IVI_SURFACE_ROLE_SPLIT_V:
- if (geom.width == woutput->width &&
- geom.height == woutput->height)
- geom.width = (output->area.width / 2);
+ geom.width = (output->area.width / 2);
x += woutput->width - geom.width;
output->area.width -= geom.width;
break;
case IVI_SURFACE_ROLE_SPLIT_H:
- if (geom.width == woutput->width &&
- geom.height == woutput->height)
- geom.height = (output->area.height / 2);
+ geom.height = (output->area.height / 2);
y = output->area.y;
output->area.y += geom.height;
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;
app_id, ivi_layout_get_surface_role_name(surface), output->name);
}
+static void
+ivi_compute_popup_position(const struct weston_output *output, struct weston_view *view,
+ int initial_x, int initial_y, int *new_x, int *new_y)
+{
+ *new_x = output->x + initial_x;
+ *new_y = output->y + initial_y;
+}
+
+
void
ivi_layout_popup_committed(struct ivi_surface *surface)
{
weston_desktop_surface_get_surface(dsurface);
const char *app_id = weston_desktop_surface_get_app_id(dsurface);
+ int new_x, new_y;
+
struct ivi_output *output = surface->popup.output;
struct weston_output *woutput = output->output;
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_POPUP);
weston_view_set_output(view, woutput);
- weston_view_set_position(view, surface->popup.x, surface->popup.y);
+
+ ivi_compute_popup_position(woutput, view,
+ surface->popup.x, surface->popup.y, &new_x, &new_y);
+ weston_view_set_position(view, new_x, new_y);
/* only clip the pop-up dialog window if we have a valid
* width and height being passed on. Users might not want to have one
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)
weston_view_set_output(view, output->output);
weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
- /* force repaint of the entire output */
-
weston_log("Placed app_id %s, type %s in hidden layer\n",
app_id, ivi_layout_get_surface_role_name(surf));
- weston_output_damage(output->output);
}
}
view->surface->is_mapped = false;
weston_layer_entry_remove(&view->layer_link);
- weston_output_damage(ivi_output->output);
+ 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);
}
}
Code Review / src / agl-compositor.git / blobdiff