X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=0c9d604c5b0aecd87ebafaa61960bdf9e5822233;hb=d510c44dcbe8e4302a7660ec11c3fb849e45b5e6;hp=b3cc3afb29945ee83786b88750db80d18c4c48ce;hpb=5c90f1639cada9e0d41bd1538bf62c0a12152ace;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index b3cc3af..0c9d604 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;
@@ -51,6 +53,7 @@ struct ivi_compositor {
 	struct wl_listener heads_changed;
 
 	bool init_failed;
+	bool hide_cursor;
 
 	/*
 	 * Options parsed from command line arugments.
@@ -66,6 +69,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;
@@ -82,6 +86,7 @@ struct ivi_compositor {
 	struct wl_list surfaces; /* ivi_surface.link */
 
 	struct weston_desktop *desktop;
+	struct wl_listener seat_created_listener;
 	struct ivi_policy *policy;
 
 	struct wl_list pending_surfaces;
@@ -136,6 +141,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 +157,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 +201,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 {
@@ -222,6 +235,7 @@ struct ivi_surface {
 	struct weston_view *view;
 
 	struct wl_list link;
+	int focus_count;
 
 	struct {
 		enum ivi_surface_flags flags;
@@ -229,6 +243,7 @@ struct ivi_surface {
 		int32_t width, height;
 	} pending;
 	bool activated_by_default;
+	bool advertised_on_launch;
 
 	enum ivi_surface_role role;
 	union {
@@ -240,6 +255,9 @@ struct ivi_surface {
 		struct ivi_split_surface split;
 		struct ivi_remote_surface remote;
 	};
+
+	struct wl_listener listener_advertise_app;
+	struct wl_signal signal_advertise_app;
 };
 
 struct ivi_shell_client {
@@ -323,10 +341,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);
@@ -353,4 +371,29 @@ insert_black_surface(struct ivi_output *output);
 void
 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);
+void
+ivi_screenshooter_create(struct ivi_compositor *ivi);
+
+void
+ivi_seat_init(struct ivi_compositor *ivi);
+
+void
+ivi_seat_reset_caps_sent(struct ivi_compositor *ivi);
+
+void
+agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
+					   struct ivi_surface *surface);
 #endif