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 the ability to load the remote plugin
[src/agl-compositor.git]
/
src
/
desktop.c
diff --git
a/src/desktop.c
b/src/desktop.c
index
b8b88db
..
3dc1ceb
100644
(file)
--- a/
src/desktop.c
+++ b/
src/desktop.c
@@
-61,6
+61,7
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
struct weston_desktop_client *dclient;
struct wl_client *client;
struct ivi_surface *surface;
struct weston_desktop_client *dclient;
struct wl_client *client;
struct ivi_surface *surface;
+ const char *app_id = NULL;
dclient = weston_desktop_surface_get_client(dsurface);
client = weston_desktop_client_get_client(dclient);
dclient = weston_desktop_surface_get_client(dsurface);
client = weston_desktop_client_get_client(dclient);
@@
-92,26
+93,32
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
weston_desktop_surface_set_user_data(dsurface, surface);
weston_desktop_surface_set_user_data(dsurface, surface);
+ app_id = weston_desktop_surface_get_app_id(dsurface);
+
if (ivi->shell_client.ready) {
ivi_check_pending_desktop_surface(surface);
if (ivi->shell_client.ready) {
ivi_check_pending_desktop_surface(surface);
+ weston_log("Added surface %p, app_id %s, role %s\n", surface,
+ app_id, ivi_layout_get_surface_role_name(surface));
} else {
/*
* We delay creating "normal" desktop surfaces until later, to
* give the shell-client an oppurtunity to set the surface as a
* background/panel.
*/
} else {
/*
* We delay creating "normal" desktop surfaces until later, to
* give the shell-client an oppurtunity to set the surface as a
* background/panel.
*/
+ weston_log("Added surface %p, app_id %s to pending list\n",
+ surface, app_id);
wl_list_insert(&ivi->pending_surfaces, &surface->link);
}
}
static bool
wl_list_insert(&ivi->pending_surfaces, &surface->link);
}
}
static bool
-desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi)
+desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi
, enum ivi_surface_role role
)
{
int count = 0;
struct ivi_surface *surf;
wl_list_for_each(surf, &ivi->surfaces, link)
{
int count = 0;
struct ivi_surface *surf;
wl_list_for_each(surf, &ivi->surfaces, link)
- if (surf->role ==
IVI_SURFACE_ROLE_REMOTE
)
+ if (surf->role ==
role
)
count++;
return (count == 1);
count++;
return (count == 1);
@@
-150,7
+157,13
@@
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))
+ if (desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_REMOTE))
+ if (!output->background)
+ insert_black_surface(output);
+
+ if (desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_DESKTOP))
if (!output->background)
insert_black_surface(output);
if (!output->background)
insert_black_surface(output);
@@
-182,6
+195,9
@@
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
output->background = NULL;
}
output->background = NULL;
}
+ weston_log("Removed surface %p, app_id %s, role %s\n", surface,
+ weston_desktop_surface_get_app_id(dsurface),
+ ivi_layout_get_surface_role_name(surface));
wl_list_remove(&surface->link);
free(surface);
}
wl_list_remove(&surface->link);
free(surface);
}
@@
-205,9
+221,6
@@
desktop_committed(struct weston_desktop_surface *dsurface,
case IVI_SURFACE_ROLE_REMOTE:
ivi_layout_desktop_committed(surface);
break;
case IVI_SURFACE_ROLE_REMOTE:
ivi_layout_desktop_committed(surface);
break;
- case IVI_SURFACE_ROLE_PANEL:
- ivi_layout_panel_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;
@@
-220,6
+233,7
@@
desktop_committed(struct weston_desktop_surface *dsurface,
break;
case IVI_SURFACE_ROLE_NONE:
case IVI_SURFACE_ROLE_BACKGROUND:
break;
case IVI_SURFACE_ROLE_NONE:
case IVI_SURFACE_ROLE_BACKGROUND:
+ case IVI_SURFACE_ROLE_PANEL:
default: /* fall through */
break;
}
default: /* fall through */
break;
}