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
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
0e7aaaf
..
629290f
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-32,6
+32,8
@@
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
+#include "agl-shell-desktop-server-protocol.h"
+
#define AGL_COMP_DEBUG
static void
#define AGL_COMP_DEBUG
static void
@@
-165,7
+167,7
@@
ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
output->area.x, output->area.y);
}
output->area.x, output->area.y);
}
-st
atic st
ruct ivi_surface *
+struct ivi_surface *
ivi_find_app(struct ivi_compositor *ivi, const char *app_id)
{
struct ivi_surface *surf;
ivi_find_app(struct ivi_compositor *ivi, const char *app_id)
{
struct ivi_surface *surf;
@@
-470,7
+472,6
@@
ivi_layout_activate(struct ivi_output *output, const char *app_id)
/* force repaint of the entire output */
weston_output_damage(output->output);
}
/* force repaint of the entire output */
weston_output_damage(output->output);
}
-
}
static struct ivi_output *
}
static struct ivi_output *
@@
-503,11
+504,17
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
{
struct ivi_surface *surf;
struct ivi_output *ivi_output;
{
struct ivi_surface *surf;
struct ivi_output *ivi_output;
+ struct ivi_policy *policy = ivi->policy;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
+ if (policy && policy->api.surface_deactivate &&
+ !policy->api.surface_deactivate(surf, surf->ivi)) {
+ return;
+ }
+
ivi_output = ivi_layout_get_output_from_surface(surf);
weston_log("deactiving %s\n", app_id);
ivi_output = ivi_layout_get_output_from_surface(surf);
weston_log("deactiving %s\n", app_id);