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: Remove explicit damage call
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
1895a07
..
322fa80
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-215,10
+215,9
@@
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_
view_schedule_repaint(view
);
/*
* 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
@@
-241,6
+240,9
@@
ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
{
struct ivi_output *out;
{
struct ivi_output *out;
+ if (!app_id)
+ return NULL;
+
wl_list_for_each(out, &ivi->outputs, link) {
if (!out->app_id)
continue;
wl_list_for_each(out, &ivi->outputs, link) {
if (!out->app_id)
continue;
@@
-325,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) {
@@
-495,9
+503,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;
@@
-508,9
+514,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;
@@
-551,6
+555,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)
{
@@
-562,6
+575,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;
@@
-578,7
+593,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
@@
-732,7
+750,6
@@
ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
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);
}
}
}
}
@@
-742,6
+759,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;
@@
-795,6
+815,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;
@@
-823,7
+846,7
@@
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_damage_below(view
);
ivi_output->active = NULL;
}
} else {
ivi_output->active = NULL;
}
} else {