X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=695cf95a8f8e6d8cfec3bbd7f535ecaa2d8cadea;hb=HEAD;hp=0ccbb52ce5227dcc0d24cadcd7700fa60d2236d1;hpb=53a039ff1c4b05aaacce118a04563620e676d7c6;p=src%2Fagl-compositor.git diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 0ccbb52..695cf95 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -29,10 +29,11 @@ #include #include "config.h" +#include #include #include #include -#include +#include #include "remote.h" @@ -51,17 +52,29 @@ enum agl_shell_bound_status { BOUND_FAILED, }; +struct ivi_output_config { + int width; + int height; + int32_t scale; + uint32_t transform; +}; + struct ivi_compositor { struct weston_compositor *compositor; + struct weston_backend *backend; struct weston_config *config; + struct ivi_output_config *parsed_options; struct wl_listener heads_changed; + int (*simple_output_configure)(struct weston_output *output); bool init_failed; bool disable_cursor; bool activate_by_default; bool keep_pending_surfaces; + struct wl_listener screenshot_auth; + /* * Options parsed from command line arugments. * Overrides what is found in the config file. @@ -77,7 +90,6 @@ struct ivi_compositor { const struct weston_windowed_output_api *window_api; const struct weston_drm_output_api *drm_api; const struct weston_remoting_api *remoting_api; - const struct weston_transmitter_api *waltham_transmitter_api; struct wl_global *agl_shell; struct wl_global *agl_shell_desktop; @@ -98,12 +110,14 @@ struct ivi_compositor { struct wl_client *client; struct wl_resource *resource; bool doas_requested; + bool doas_requested_pending_bind; enum agl_shell_bound_status status; } shell_client_ext; struct wl_list desktop_clients; /* desktop_client::link */ struct wl_list outputs; /* ivi_output.link */ + struct wl_list saved_outputs; /* ivi_output.link */ struct wl_list surfaces; /* ivi_surface.link */ struct weston_desktop *desktop; @@ -116,7 +130,11 @@ struct ivi_compositor { struct wl_list split_pending_apps; struct wl_list remote_pending_apps; + struct wl_list pending_apps; /** pending_app::link */ + struct wl_listener destroy_listener; + struct wl_listener transform_listener; + const struct weston_xwayland_surface_api *xwayland_surface_api; struct weston_layer hidden; struct weston_layer background; @@ -125,6 +143,7 @@ struct ivi_compositor { struct weston_layer popup; struct weston_layer fullscreen; + bool need_ivi_output_relayout; struct wl_list child_process_list; }; @@ -133,9 +152,6 @@ struct ivi_surface; enum ivi_output_type { OUTPUT_LOCAL, OUTPUT_REMOTE, - /* same as remote but we need to signal the transmitter plug-in - * for the surfaces to have to be forwarded to those remoted outputs */ - OUTPUT_WALTHAM, }; struct ivi_output { @@ -157,6 +173,7 @@ struct ivi_output { struct fullscreen_view { struct ivi_surface *fs; struct wl_listener fs_destroy; + struct weston_buffer_reference *buffer_ref; } fullscreen_view; struct wl_listener output_destroy; @@ -193,6 +210,7 @@ enum ivi_surface_role { IVI_SURFACE_ROLE_SPLIT_V, IVI_SURFACE_ROLE_SPLIT_H, IVI_SURFACE_ROLE_REMOTE, + IVI_SURFACE_ROLE_TILE, }; struct ivi_bounding_box { @@ -228,6 +246,20 @@ struct pending_remote { struct wl_list link; /** ivi_compositor::remote_pending_apps */ }; +struct pending_app { + struct ivi_output *ioutput; + enum ivi_surface_role role; + char *app_id; + struct wl_list link; /** ivi_compositor::pending_apps */ +}; + +struct pending_app_tile { + struct pending_app base; + uint32_t orientation; + uint32_t width; + int32_t sticky; +}; + struct ivi_desktop_surface { struct ivi_output *pending_output; struct ivi_output *last_output; @@ -267,13 +299,6 @@ enum ivi_surface_flags { IVI_SURFACE_PROP_POSITION = (1 << 1), }; -/* the waltham surface is a pointer type as well and - * in order to avoid adding ifdef for waltham use a - * generic pointer, which will be only be valid when the - * surface is a remote out on a waltham type of output */ -struct ivi_surface_waltham { - void *transmitter_surface; -}; struct ivi_surface { struct ivi_compositor *ivi; @@ -284,6 +309,8 @@ struct ivi_surface { struct wl_list link; int focus_count; + uint32_t orientation; + int32_t sticky; struct { enum ivi_surface_flags flags; @@ -301,6 +328,7 @@ struct ivi_surface { } state; enum ivi_surface_role role; + enum ivi_surface_role prev_role; union { struct ivi_desktop_surface desktop; struct ivi_background_surface bg; @@ -311,9 +339,14 @@ struct ivi_surface { struct ivi_remote_surface remote; }; - struct ivi_surface_waltham waltham_surface; struct wl_listener listener_advertise_app; struct wl_signal signal_advertise_app; + + struct { + bool is_set; + int32_t x; + int32_t y; + } xwayland; }; struct ivi_shell_seat { @@ -414,6 +447,8 @@ 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_remote_committed(struct ivi_surface *surf); void ivi_layout_popup_committed(struct ivi_surface *surface); @@ -468,9 +503,6 @@ ivi_seat_reset_caps_sent(struct ivi_compositor *ivi); void agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi, struct ivi_surface *surface); -void -ivi_destroy_waltham_destroy(struct ivi_surface *surface); - void ivi_check_pending_surface_desktop(struct ivi_surface *surface, enum ivi_surface_role *role); @@ -502,5 +534,42 @@ sigchld_handler(int signal_number, void *data); void shell_send_app_state(struct ivi_compositor *ivi, const char *app_id, enum agl_shell_app_state state); +void +ivi_layout_restore(struct ivi_compositor *ivi, struct ivi_output *n_output); + +void +ivi_layout_save(struct ivi_compositor *ivi, struct ivi_output *output); + +struct weston_output * +get_default_output(struct weston_compositor *compositor); + +struct weston_output * +get_focused_output(struct weston_compositor *compositor); + +void +shell_send_app_on_output(struct ivi_compositor *ivi, const char *app_id, + const char *output_name); +bool +ivi_surface_count_one(struct ivi_output *ivi_output, + enum ivi_surface_role role); + +int +parse_activation_area(const char *geometry, struct ivi_output *output); + +bool +is_shell_surface_xwayland(struct ivi_surface *surf); + +void +ivi_layout_reset_split_surfaces(struct ivi_compositor *ivi); + +void +_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output, + uint32_t orientation, uint32_t width, int32_t sticky, + bool to_activate); +struct ivi_output_config * +ivi_init_parsed_options(struct weston_compositor *compositor); + +void +ivi_process_destroy(struct wet_process *process, int status, bool call_cleanup); #endif