X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=4506a5a93866c50312dc27d0a6ef8c3777dd59db;hb=991714fc7f92aea3d07c7225247a821e3461027e;hp=5d210fb0b4179fc7aeb0fbbd7239560b3e1999dd;hpb=b43a012824af0165f3716c7986888213420885aa;p=src%2Fagl-compositor.git diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 5d210fb..4506a5a 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -29,14 +29,22 @@ #include #include "config.h" -#include -#include -#include -#include +#include +#include +#include +#include + +#include "remote.h" #include "agl-shell-server-protocol.h" -#define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0])) +struct ivi_compositor; + +struct desktop_client { + struct wl_resource *resource; + struct ivi_compositor *ivi; + struct wl_list link; /* ivi_compositor::desktop_clients */ +}; struct ivi_compositor { struct weston_compositor *compositor; @@ -60,11 +68,10 @@ 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 { - int activate_apps_by_default; /* switches once xdg top level has been 'created' */ - } quirks; + struct wl_global *agl_shell_desktop; struct { struct wl_client *client; @@ -72,17 +79,25 @@ struct ivi_compositor { bool ready; } shell_client; + struct wl_list desktop_clients; /* desktop_client::link */ + struct wl_list outputs; /* ivi_output.link */ struct wl_list surfaces; /* ivi_surface.link */ struct weston_desktop *desktop; + struct ivi_policy *policy; struct wl_list pending_surfaces; + struct wl_list popup_pending_apps; + struct wl_list fullscreen_pending_apps; + struct wl_list split_pending_apps; + struct wl_list remote_pending_apps; struct weston_layer hidden; struct weston_layer background; struct weston_layer normal; struct weston_layer panel; + struct weston_layer popup; struct weston_layer fullscreen; }; @@ -116,12 +131,16 @@ struct ivi_output { * In output-coorrdinate space. */ struct weston_geometry area; + struct weston_geometry area_saved; struct ivi_surface *active; + struct ivi_surface *previous_active; /* Temporary: only used during configuration */ size_t add_len; struct weston_head *add[8]; + + char *app_id; }; enum ivi_surface_role { @@ -129,6 +148,44 @@ enum ivi_surface_role { IVI_SURFACE_ROLE_DESKTOP, IVI_SURFACE_ROLE_BACKGROUND, IVI_SURFACE_ROLE_PANEL, + IVI_SURFACE_ROLE_POPUP, + IVI_SURFACE_ROLE_FULLSCREEN, + IVI_SURFACE_ROLE_SPLIT_V, + IVI_SURFACE_ROLE_SPLIT_H, + 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 */ +}; + +struct pending_fullscreen { + struct ivi_output *ioutput; + char *app_id; + struct wl_list link; /** ivi_compositor::fullscreen_pending_apps */ +}; + +struct pending_split { + struct ivi_output *ioutput; + char *app_id; + uint32_t orientation; + struct wl_list link; /** ivi_compositor::split_pending_apps */ +}; + +struct pending_remote { + struct ivi_output *ioutput; + char *app_id; + struct wl_list link; /** ivi_compositor::remote_pending_apps */ }; struct ivi_desktop_surface { @@ -140,6 +197,25 @@ struct ivi_background_surface { struct ivi_output *output; }; +struct ivi_popup_surface { + struct ivi_output *output; + int x; int y; /* initial position */ + struct ivi_bounding_box bb; /* bounding box */ +}; + +struct ivi_fullscreen_surface { + struct ivi_output *output; +}; + +struct ivi_split_surface { + struct ivi_output *output; + uint32_t orientation; +}; + +struct ivi_remote_surface { + struct ivi_output *output; +}; + struct ivi_panel_surface { struct ivi_output *output; enum agl_shell_edge edge; @@ -163,12 +239,17 @@ struct ivi_surface { int32_t x, y; int32_t width, height; } pending; + bool activated_by_default; enum ivi_surface_role role; union { struct ivi_desktop_surface desktop; struct ivi_background_surface bg; struct ivi_panel_surface panel; + struct ivi_popup_surface popup; + struct ivi_fullscreen_surface fullscreen; + struct ivi_split_surface split; + struct ivi_remote_surface remote; }; }; @@ -220,6 +301,12 @@ to_ivi_output(struct weston_output *o); void ivi_set_desktop_surface(struct ivi_surface *surface); +/* + * removes the pending popup one + */ +void +ivi_check_pending_desktop_surface(struct ivi_surface *surface); + void ivi_reflow_outputs(struct ivi_compositor *ivi); @@ -234,6 +321,9 @@ ivi_layout_set_position(struct ivi_surface *surface, int32_t x, int32_t y, int32_t width, int32_t height); +struct ivi_surface * +ivi_find_app(struct ivi_compositor *ivi, const char *app_id); + void ivi_layout_commit(struct ivi_compositor *ivi); @@ -243,10 +333,51 @@ ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output); void ivi_layout_activate(struct ivi_output *output, const char *app_id); +void +ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf); + void ivi_layout_desktop_committed(struct ivi_surface *surf); void -ivi_layout_panel_committed(struct ivi_surface *surface); +ivi_layout_popup_committed(struct ivi_surface *surface); + +void +ivi_layout_fullscreen_committed(struct ivi_surface *surface); + +void +ivi_layout_split_committed(struct ivi_surface *surface); + +void +ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id); + +void +ivi_layout_desktop_resize(struct ivi_surface *surface, + struct weston_geometry area); + +struct ivi_output * +ivi_layout_get_output_from_surface(struct ivi_surface *surf); + +void +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); #endif