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
main: Add activate_by_default ini option
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
dd7e75f
..
b1d8b3d
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-241,6
+241,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
+328,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) {
@@
-742,6
+751,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
+807,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;
@@
-824,6
+839,7
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
weston_layer_entry_remove(&view->layer_link);
weston_output_damage(ivi_output->output);
weston_layer_entry_remove(&view->layer_link);
weston_output_damage(ivi_output->output);
+ ivi_output->active = NULL;
}
} else {
struct weston_desktop_surface *dsurface;
}
} else {
struct weston_desktop_surface *dsurface;