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
eb0dc8a
..
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,8
+243,9
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
}
}
-static bool
-desktop_surface_check_last_surfaces(struct ivi_output *ivi_output, 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;
@@
-329,8
+332,8
@@
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_surfaces
(output, IVI_SURFACE_ROLE_REMOTE) ||
-
desktop_surface_check_last_surfaces
(output, 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)
insert_black_curtain(output);
if (!output->background)
insert_black_curtain(output);
@@
-393,11
+396,19
@@
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;
@@
-426,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;