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
shell: Store the ivi compositor in the desktop_client
[src/agl-compositor.git]
/
src
/
desktop.c
diff --git
a/src/desktop.c
b/src/desktop.c
index
da28fc6
..
03a2186
100644
(file)
--- a/
src/desktop.c
+++ b/
src/desktop.c
@@
-80,6
+80,7
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
+ surface->activated_by_default = false;
if (ivi->policy && ivi->policy->api.surface_create &&
!ivi->policy->api.surface_create(surface, ivi)) {
if (ivi->policy && ivi->policy->api.surface_create &&
!ivi->policy->api.surface_create(surface, ivi)) {
@@
-91,7
+92,10
@@
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
weston_desktop_surface_set_user_data(dsurface, surface);
if (ivi->shell_client.ready) {
weston_desktop_surface_set_user_data(dsurface, surface);
if (ivi->shell_client.ready) {
- ivi_set_desktop_surface(surface);
+ if (ivi_check_pending_desktop_surface_popup(surface))
+ ivi_set_desktop_surface_popup(surface);
+ else
+ ivi_set_desktop_surface(surface);
} else {
/*
* We delay creating "normal" desktop surfaces until later, to
} else {
/*
* We delay creating "normal" desktop surfaces until later, to
@@
-110,10
+114,13
@@
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
- struct ivi_output *output
= surface->desktop.last_output
;
+ struct ivi_output *output;
- /* TODO */
- if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
+ if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
+ output = surface->desktop.last_output;
+ else if (surface->role == IVI_SURFACE_ROLE_POPUP)
+ output = surface->popup.output;
+ else
return;
/* reset the active surface as well */
return;
/* reset the active surface as well */
@@
-154,6
+161,9
@@
desktop_committed(struct weston_desktop_surface *dsurface,
case IVI_SURFACE_ROLE_PANEL:
ivi_layout_panel_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_NONE:
case IVI_SURFACE_ROLE_BACKGROUND:
default: /* fall through */
case IVI_SURFACE_ROLE_NONE:
case IVI_SURFACE_ROLE_BACKGROUND:
default: /* fall through */