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
protocol/agl-shell.xml: Add an app_state event -- app state notification
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
15858ff
..
25221e2
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-194,6
+194,7
@@
ivi_layout_activate_complete(struct ivi_output *output,
struct weston_view *view = surf->view;
struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
struct weston_view *view = surf->view;
struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
+ const char *app_id = weston_desktop_surface_get_app_id(surf->dsurface);
if (weston_view_is_mapped(view)) {
weston_layer_entry_remove(&view->layer_link);
if (weston_view_is_mapped(view)) {
weston_layer_entry_remove(&view->layer_link);
@@
-281,8
+282,13
@@
ivi_layout_activate_complete(struct ivi_output *output,
}
weston_log("Activation completed for app_id %s, role %s, output %s\n",
}
weston_log("Activation completed for app_id %s, role %s, output %s\n",
-
weston_desktop_surface_get_app_id(surf->dsurface)
,
+
app_id
,
ivi_layout_get_surface_role_name(surf), output->name);
ivi_layout_get_surface_role_name(surf), output->name);
+
+ if (wl_resource_get_version(ivi->shell_client.resource) >= AGL_SHELL_APP_STATE_SINCE_VERSION)
+ agl_shell_send_app_state(ivi->shell_client.resource,
+ app_id, AGL_SHELL_APP_STATE_ACTIVATED);
+
}
struct ivi_output *
}
struct ivi_output *
@@
-1031,4
+1037,8
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
weston_view_geometry_dirty(view);
weston_surface_damage(view->surface);
}
weston_view_geometry_dirty(view);
weston_surface_damage(view->surface);
}
+
+ if (wl_resource_get_version(ivi->shell_client.resource) >= AGL_SHELL_APP_STATE_SINCE_VERSION)
+ agl_shell_send_app_state(ivi->shell_client.resource, app_id,
+ AGL_SHELL_APP_STATE_DEACTIVATED);
}
}