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
desktop: Fix destruction of applications that fallback to the desktop role
[src/agl-compositor.git]
/
src
/
ivi-compositor.h
diff --git
a/src/ivi-compositor.h
b/src/ivi-compositor.h
index
bc3a81d
..
7b5c18f
100644
(file)
--- a/
src/ivi-compositor.h
+++ b/
src/ivi-compositor.h
@@
-34,6
+34,8
@@
#include <libweston/windowed-output-api.h>
#include <libweston-desktop/libweston-desktop.h>
#include <libweston/windowed-output-api.h>
#include <libweston-desktop/libweston-desktop.h>
+#include "remote.h"
+
#include "agl-shell-server-protocol.h"
struct ivi_compositor;
#include "agl-shell-server-protocol.h"
struct ivi_compositor;
@@
-66,6
+68,7
@@
struct ivi_compositor {
} cmdline;
const struct weston_windowed_output_api *window_api;
const struct weston_drm_output_api *drm_api;
} cmdline;
const struct weston_windowed_output_api *window_api;
const struct weston_drm_output_api *drm_api;
+ const struct weston_remoting_api *remoting_api;
struct wl_global *agl_shell;
struct wl_global *agl_shell_desktop;
struct wl_global *agl_shell;
struct wl_global *agl_shell_desktop;
@@
-152,10
+155,16
@@
enum ivi_surface_role {
IVI_SURFACE_ROLE_REMOTE,
};
IVI_SURFACE_ROLE_REMOTE,
};
+struct ivi_bounding_box {
+ int x; int y;
+ int width; int height;
+};
+
struct pending_popup {
struct ivi_output *ioutput;
char *app_id;
int x; int y;
struct pending_popup {
struct ivi_output *ioutput;
char *app_id;
int x; int y;
+ struct ivi_bounding_box bb;
struct wl_list link; /** ivi_compositor::popup_pending_surfaces */
};
struct wl_list link; /** ivi_compositor::popup_pending_surfaces */
};
@@
-190,8
+199,8
@@
struct ivi_background_surface {
struct ivi_popup_surface {
struct ivi_output *output;
struct ivi_popup_surface {
struct ivi_output *output;
- int x;
- int y;
+ int x;
int y; /* initial position */
+ struct ivi_bounding_box bb; /* bounding box */
};
struct ivi_fullscreen_surface {
};
struct ivi_fullscreen_surface {
@@
-327,9
+336,6
@@
ivi_layout_activate(struct ivi_output *output, const char *app_id);
void
ivi_layout_desktop_committed(struct ivi_surface *surf);
void
ivi_layout_desktop_committed(struct ivi_surface *surf);
-void
-ivi_layout_panel_committed(struct ivi_surface *surface);
-
void
ivi_layout_popup_committed(struct ivi_surface *surface);
void
ivi_layout_popup_committed(struct ivi_surface *surface);
@@
-358,4
+364,11
@@
remove_black_surface(struct ivi_output *output);
const char *
ivi_layout_get_surface_role_name(struct ivi_surface *surf);
const char *
ivi_layout_get_surface_role_name(struct ivi_surface *surf);
+void
+ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
+ const char *app_id);
+
+struct ivi_output *
+ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi);
+
#endif
#endif