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
compositor: Add support for subscribing to libweston scopes
[src/agl-compositor.git]
/
src
/
desktop.c
diff --git
a/src/desktop.c
b/src/desktop.c
index
1cda129
..
340f14f
100644
(file)
--- a/
src/desktop.c
+++ b/
src/desktop.c
@@
-211,8
+211,10
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
app_id = weston_desktop_surface_get_app_id(dsurface);
app_id = weston_desktop_surface_get_app_id(dsurface);
- if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
+ if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
{
ivi_set_pending_desktop_surface_remote(active_output, app_id);
ivi_set_pending_desktop_surface_remote(active_output, app_id);
+ shell_send_app_on_output(ivi, app_id, active_output->output->name);
+ }
/* reset any caps to make sure we apply the new caps */
ivi_seat_reset_caps_sent(ivi);
/* reset any caps to make sure we apply the new caps */
ivi_seat_reset_caps_sent(ivi);
@@
-241,14
+243,16
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
}
}
-static bool
-desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role)
+bool
+ivi_surface_count_one(struct ivi_output *ivi_output,
+ enum ivi_surface_role role)
{
int count = 0;
struct ivi_surface *surf;
{
int count = 0;
struct ivi_surface *surf;
- wl_list_for_each(surf, &ivi->surfaces, link)
- if (surf->role == role)
+ wl_list_for_each(surf, &ivi_output->ivi->surfaces, link)
+ if (surf->role == role &&
+ surf->current_completed_output == ivi_output)
count++;
return (count == 1);
count++;
return (count == 1);
@@
-288,8
+292,9
@@
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
* the DESKTOP role can happen here as well, because we can fall-back
* to that when we try to determine the role type. Application that
* do not set the app_id will be land here, when destroyed */
* the DESKTOP role can happen here as well, because we can fall-back
* to that when we try to determine the role type. Application that
* do not set the app_id will be land here, when destroyed */
- if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
- surface->role == IVI_SURFACE_ROLE_DESKTOP))
+ if ((output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
+ surface->role == IVI_SURFACE_ROLE_DESKTOP)) ||
+ output->output == NULL)
goto skip_output_asignment;
assert(output != NULL);
goto skip_output_asignment;
assert(output != NULL);
@@
-327,10
+332,10
@@
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
/* check if there's a last 'remote' surface and insert a black
* surface view if there's no background set for that output
*/
/* check if there's a last 'remote' surface and insert a black
* surface view if there's no background set for that output
*/
- if (
desktop_surface_check_last_remote_surfaces(output->ivi
, IVI_SURFACE_ROLE_REMOTE) ||
-
desktop_surface_check_last_remote_surfaces(output->ivi
, IVI_SURFACE_ROLE_DESKTOP))
+ if (
ivi_surface_count_one(output
, IVI_SURFACE_ROLE_REMOTE) ||
+
ivi_surface_count_one(output
, IVI_SURFACE_ROLE_DESKTOP))
if (!output->background)
if (!output->background)
- insert_black_
surface
(output);
+ insert_black_
curtain
(output);
if (weston_surface_is_mapped(wsurface)) {
if (weston_surface_is_mapped(wsurface)) {
@@
-365,9
+370,12
@@
skip_output_asignment:
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
app_id, ivi_layout_get_surface_role_name(surface));
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
app_id, ivi_layout_get_surface_role_name(surface));
- if (app_id && output
)
+ if (app_id && output
&& output->output) {
shell_advertise_app_state(output->ivi, app_id,
NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
shell_advertise_app_state(output->ivi, app_id,
NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
+ if (output->ivi->shell_client.ready)
+ shell_send_app_state(output->ivi, app_id, AGL_SHELL_APP_STATE_TERMINATED);
+ }
wl_list_remove(&surface->link);
wl_list_remove(&surface->link);
@@
-388,13
+396,26
@@
desktop_committed(struct weston_desktop_surface *dsurface,
return;
if (ivi->shell_client.ready && !surface->checked_pending) {
return;
if (ivi->shell_client.ready && !surface->checked_pending) {
- const char * app_id = weston_desktop_surface_get_app_id(dsurface);
+ struct ivi_output *remote_output = NULL;
+ const char *app_id = weston_desktop_surface_get_app_id(dsurface);
weston_log("Checking pending surface %p, app_id %s\n", surface,
app_id);
wl_list_remove(&surface->link);
wl_list_init(&surface->link);
weston_log("Checking pending surface %p, app_id %s\n", surface,
app_id);
wl_list_remove(&surface->link);
wl_list_init(&surface->link);
+
+ if ((remote_output = ivi_layout_find_with_app_id(app_id, ivi))) {
+ ivi_set_pending_desktop_surface_remote(remote_output, app_id);
+ shell_send_app_on_output(ivi, app_id, remote_output->output->name);
+ }
+
+
ivi_check_pending_desktop_surface(surface);
surface->checked_pending = true;
ivi_check_pending_desktop_surface(surface);
surface->checked_pending = true;
+
+ /* we'll do it now at commit time, because we might not have an
+ * appid by the time we've created the weston_desktop_surface
+ * */
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
}
if (!surface->advertised_on_launch &&
}
if (!surface->advertised_on_launch &&
@@
-416,9
+437,11
@@
desktop_committed(struct weston_desktop_surface *dsurface,
switch (surface->role) {
case IVI_SURFACE_ROLE_DESKTOP:
switch (surface->role) {
case IVI_SURFACE_ROLE_DESKTOP:
- case IVI_SURFACE_ROLE_REMOTE:
ivi_layout_desktop_committed(surface);
break;
ivi_layout_desktop_committed(surface);
break;
+ case IVI_SURFACE_ROLE_REMOTE:
+ ivi_layout_remote_committed(surface);
+ break;
case IVI_SURFACE_ROLE_POPUP:
ivi_layout_popup_committed(surface);
break;
case IVI_SURFACE_ROLE_POPUP:
ivi_layout_popup_committed(surface);
break;
@@
-521,6
+544,7
@@
ivi_shell_destroy(struct wl_listener *listener, void *data)
ivi_shell_finalize(ivi);
ivi_compositor_destroy_pending_surfaces(ivi);
ivi_shell_finalize(ivi);
ivi_compositor_destroy_pending_surfaces(ivi);
+ ivi_layout_destroy_saved_outputs(ivi);
weston_desktop_destroy(ivi->desktop);
wl_list_remove(&listener->link);
weston_desktop_destroy(ivi->desktop);
wl_list_remove(&listener->link);