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: We don't have weston-debug extension available
[src/agl-compositor.git]
/
src
/
desktop.c
diff --git
a/src/desktop.c
b/src/desktop.c
index
26569d6
..
03a2186
100644
(file)
--- a/
src/desktop.c
+++ b/
src/desktop.c
@@
-24,9
+24,10
@@
*/
#include "ivi-compositor.h"
*/
#include "ivi-compositor.h"
+#include "policy.h"
-#include <libweston
-6/compositor
.h>
-#include <libweston-
6
/libweston-desktop.h>
+#include <libweston
/libweston
.h>
+#include <libweston-
desktop
/libweston-desktop.h>
#if 0
static struct weston_output *
#if 0
static struct weston_output *
@@
-79,11
+80,22
@@
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)) {
+ free(surface);
+ wl_client_post_no_memory(client);
+ return;
+ }
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
@@
-102,14
+114,17
@@
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 */
- if (output && output->active) {
+ if (output && output->active
&& output->active == surface
) {
output->active->view->is_mapped = false;
output->active->view->surface->is_mapped = false;
output->active->view->is_mapped = false;
output->active->view->surface->is_mapped = false;
@@
-119,9
+134,9
@@
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
if (weston_surface_is_mapped(wsurface)) {
weston_desktop_surface_unlink_view(surface->view);
weston_view_destroy(surface->view);
if (weston_surface_is_mapped(wsurface)) {
weston_desktop_surface_unlink_view(surface->view);
weston_view_destroy(surface->view);
- wl_list_remove(&surface->link);
}
}
+ wl_list_remove(&surface->link);
free(surface);
}
free(surface);
}
@@
-131,6
+146,12
@@
desktop_committed(struct weston_desktop_surface *dsurface,
{
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
{
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
+ struct ivi_policy *policy = surface->ivi->policy;
+
+ if (policy && policy->api.surface_commited &&
+ !policy->api.surface_commited(surface, surface->ivi))
+ return;
+
weston_compositor_schedule_repaint(surface->ivi->compositor);
switch (surface->role) {
weston_compositor_schedule_repaint(surface->ivi->compositor);
switch (surface->role) {
@@
-140,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 */