X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=6969a7dd28bb0bd463e31c5ceb4c9999ad6fa752;hb=794a54e763b293da7743c23311c276601554c759;hp=b506ce1d8e75956161e94619dabbbaa20f2311a7;hpb=f235042e4cd88197ade414795382ba227f924332;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index b506ce1..6969a7d 100644
--- 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 "remote.h"
+
 #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;
+	const struct weston_remoting_api *remoting_api;
 
 	struct wl_global *agl_shell;
 	struct wl_global *agl_shell_desktop;
@@ -136,6 +139,8 @@ struct ivi_output {
 	/* Temporary: only used during configuration */
 	size_t add_len;
 	struct weston_head *add[8];
+
+	char *app_id;
 };
 
 enum ivi_surface_role {
@@ -150,10 +155,16 @@ enum ivi_surface_role {
 	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 ivi_bounding_box bb;
 
 	struct wl_list link;	/** ivi_compositor::popup_pending_surfaces */
 };
@@ -188,8 +199,8 @@ struct ivi_background_surface {
 
 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 {
@@ -323,10 +334,10 @@ void
 ivi_layout_activate(struct ivi_output *output, const char *app_id);
 
 void
-ivi_layout_desktop_committed(struct ivi_surface *surf);
+ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf);
 
 void
-ivi_layout_panel_committed(struct ivi_surface *surface);
+ivi_layout_desktop_committed(struct ivi_surface *surf);
 
 void
 ivi_layout_popup_committed(struct ivi_surface *surface);
@@ -356,4 +367,15 @@ remove_black_surface(struct ivi_output *output);
 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);
+
+void
+shell_advertise_app_state(struct ivi_compositor *ivi, const char *app_id,
+			  const char *data, uint32_t app_state);
+
 #endif