Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
layout: Make the view mapped at activation completion
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
0345807
..
c98ae76
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-203,6
+203,7
@@
ivi_layout_activate_complete(struct ivi_output *output,
woutput->y + output->area.y);
view->is_mapped = true;
woutput->y + output->area.y);
view->is_mapped = true;
+ surf->mapped = true;
view->surface->is_mapped = true;
if (output->active) {
view->surface->is_mapped = true;
if (output->active) {
@@
-215,10
+216,8
@@
ivi_layout_activate_complete(struct ivi_output *output,
output->active = surf;
weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
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
/*
* the 'remote' role now makes use of this part so make sure we don't
@@
-286,7
+285,7
@@
ivi_layout_desktop_committed(struct ivi_surface *surf)
* 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)
@@
-302,7
+301,7
@@
ivi_layout_desktop_committed(struct ivi_surface *surf)
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
)
+ if (surf->
mapped
)
return;
/* check first if there aren't any outputs being set */
return;
/* check first if there aren't any outputs being set */
@@
-328,6
+327,12
@@
ivi_layout_desktop_committed(struct ivi_surface *surf)
return;
}
return;
}
+ if (!surf->ivi->activate_by_default) {
+ weston_log("Refusing to activate surface role %d, app_id %s\n",
+ surf->role, app_id);
+ return;
+ }
+
/* use the output of the bg to activate the app on start-up by
* default */
if (surf->view && r_output) {
/* use the output of the bg to activate the app on start-up by
* default */
if (surf->view && r_output) {
@@
-336,7
+341,6
@@
ivi_layout_desktop_committed(struct ivi_surface *surf)
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
@@
-348,7
+352,6
@@
ivi_layout_desktop_committed(struct ivi_surface *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);
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;
}
}
}
}
@@
-365,7
+368,7
@@
ivi_layout_desktop_committed(struct ivi_surface *surf)
* 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)
return;
if (app_id) {
return;
if (app_id) {
@@
-373,7
+376,6
@@
ivi_layout_desktop_committed(struct ivi_surface *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;
}
return;
}
}
return;
}
@@
-405,7
+407,7
@@
ivi_layout_fullscreen_committed(struct ivi_surface *surface)
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
)
+ !surface->
mapped
)
return;
if (surface->view->is_mapped)
return;
if (surface->view->is_mapped)
@@
-423,8
+425,8
@@
ivi_layout_fullscreen_committed(struct ivi_surface *surface)
weston_view_set_position(view, woutput->x, woutput->y);
weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
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;
wsurface->is_mapped = true;
surface->view->is_mapped = true;
@@
-452,8
+454,9
@@
ivi_layout_desktop_resize(struct ivi_surface *surface,
width, height);
weston_view_set_position(view, x, y);
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
}
void
@@
-481,7
+484,7
@@
ivi_layout_split_committed(struct ivi_surface *surface)
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
)
+ !surface->
mapped
)
return;
if (surface->view->is_mapped)
return;
if (surface->view->is_mapped)
@@
-498,9
+501,7
@@
ivi_layout_split_committed(struct ivi_surface *surface)
switch (surface->role) {
case IVI_SURFACE_ROLE_SPLIT_V:
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;
x += woutput->width - geom.width;
output->area.width -= geom.width;
@@
-511,9
+512,7
@@
ivi_layout_split_committed(struct ivi_surface *surface)
break;
case IVI_SURFACE_ROLE_SPLIT_H:
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;
y = output->area.y;
output->area.y += geom.height;
@@
-541,8
+540,8
@@
ivi_layout_split_committed(struct ivi_surface *surface)
weston_view_set_position(view, x, y);
weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
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;
wsurface->is_mapped = true;
surface->view->is_mapped = true;
@@
-554,6
+553,15
@@
ivi_layout_split_committed(struct ivi_surface *surface)
app_id, ivi_layout_get_surface_role_name(surface), output->name);
}
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)
{
void
ivi_layout_popup_committed(struct ivi_surface *surface)
{
@@
-565,6
+573,8
@@
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);
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;
struct ivi_output *output = surface->popup.output;
struct weston_output *woutput = output->output;
@@
-572,7
+582,7
@@
ivi_layout_popup_committed(struct ivi_surface *surface)
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
)
+ !surface->
mapped
)
return;
if (surface->view->is_mapped)
return;
if (surface->view->is_mapped)
@@
-581,7
+591,10
@@
ivi_layout_popup_committed(struct ivi_surface *surface)
assert(surface->role == IVI_SURFACE_ROLE_POPUP);
weston_view_set_output(view, woutput);
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
/* 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
@@
-592,8
+605,8
@@
ivi_layout_popup_committed(struct ivi_surface *surface)
weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link);
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;
wsurface->is_mapped = true;
surface->view->is_mapped = true;
@@
-624,8
+637,8
@@
ivi_layout_popup_re_add(struct ivi_surface *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 (!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);
}
@@
-643,8
+656,8
@@
ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
/* 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)
@@
-731,11
+744,8
@@
ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
weston_view_set_output(view, output->output);
weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
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_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);
}
}
}
}
@@
-745,6
+755,9
@@
ivi_layout_activate(struct ivi_output *output, const char *app_id)
struct ivi_surface *surf;
struct ivi_compositor *ivi = output->ivi;
struct ivi_surface *surf;
struct ivi_compositor *ivi = output->ivi;
+ if (!app_id)
+ return;
+
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
@@
-798,6
+811,9
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
struct ivi_output *ivi_output;
struct ivi_policy *policy = ivi->policy;
struct ivi_output *ivi_output;
struct ivi_policy *policy = ivi->policy;
+ if (!app_id)
+ return;
+
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
@@
-826,7
+842,8
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
view->surface->is_mapped = false;
weston_layer_entry_remove(&view->layer_link);
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 {
ivi_output->active = NULL;
}
} else {
@@
-842,6
+859,7
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
struct weston_view *view = surf->view;
weston_layer_entry_remove(&view->layer_link);
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);
}
}
}
}