X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=73023480b9b89b42a4f5c34b8587c206044018f3;hb=372eb222b17bbc9d40357187aa9700eddcd21f50;hp=4708b5d89bf8e006a09619f581add392b1bca0b9;hpb=3ba840cd3a5a2fa1966b01ef286de0347e64aa46;p=src%2Fagl-compositor.git diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 4708b5d..7302348 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -46,6 +46,11 @@ struct desktop_client { struct wl_list link; /* ivi_compositor::desktop_clients */ }; +enum agl_shell_bound_status { + BOUND_OK, + BOUND_FAILED, +}; + struct ivi_compositor { struct weston_compositor *compositor; struct weston_config *config; @@ -54,6 +59,8 @@ struct ivi_compositor { bool init_failed; bool hide_cursor; + bool activate_by_default; + bool keep_pending_surfaces; /* * Options parsed from command line arugments. @@ -70,6 +77,7 @@ 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; @@ -78,6 +86,7 @@ struct ivi_compositor { struct wl_client *client; struct wl_resource *resource; bool ready; + enum agl_shell_bound_status status; } shell_client; struct wl_list desktop_clients; /* desktop_client::link */ @@ -95,6 +104,8 @@ struct ivi_compositor { struct wl_list split_pending_apps; struct wl_list remote_pending_apps; + struct wl_listener destroy_listener; + struct weston_layer hidden; struct weston_layer background; struct weston_layer normal; @@ -105,6 +116,14 @@ struct ivi_compositor { 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 { struct wl_list link; /* ivi_compositor.outputs */ struct ivi_compositor *ivi; @@ -143,6 +162,7 @@ struct ivi_output { struct weston_head *add[8]; char *app_id; + enum ivi_output_type type; }; enum ivi_surface_role { @@ -229,10 +249,19 @@ 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; struct weston_desktop_surface *dsurface; struct weston_view *view; + struct ivi_output *hidden_layer_output; struct wl_list link; int focus_count; @@ -242,7 +271,15 @@ struct ivi_surface { int32_t x, y; int32_t width, height; } pending; - bool activated_by_default; + bool mapped; + bool advertised_on_launch; + bool checked_pending; + enum { + NORMAL, + RESIZING, + FULLSCREEN, + HIDDEN, + } state; enum ivi_surface_role role; union { @@ -254,6 +291,23 @@ struct ivi_surface { struct ivi_split_surface split; struct ivi_remote_surface remote; }; + + struct ivi_surface_waltham waltham_surface; + struct wl_listener listener_advertise_app; + struct wl_signal signal_advertise_app; +}; + +struct ivi_shell_seat { + struct weston_seat *seat; + struct weston_surface *focused_surface; + + bool hide_cursor; + bool new_caps_sent; + + struct wl_listener seat_destroy_listener; + struct wl_listener caps_changed_listener; + struct wl_listener keyboard_focus_listener; + struct wl_listener pointer_focus_listener; }; struct ivi_shell_client { @@ -389,4 +443,36 @@ 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); +void +ivi_destroy_waltham_destroy(struct ivi_surface *surface); + +void +ivi_check_pending_surface_desktop(struct ivi_surface *surface, + enum ivi_surface_role *role); + +struct ivi_output * +ivi_layout_find_bg_output(struct ivi_compositor *ivi); +void +ivi_compositor_destroy_pending_surfaces(struct ivi_compositor *ivi); + +void +ivi_shell_finalize(struct ivi_compositor *ivi); + +struct ivi_surface * +get_ivi_shell_surface(struct weston_surface *surface); + +struct ivi_shell_seat * +get_ivi_shell_seat(struct weston_seat *seat); + +struct weston_seat * +get_ivi_shell_weston_first_seat(struct ivi_compositor *ivi); + +void +ivi_shell_activate_surface(struct ivi_surface *ivi_surf, + struct ivi_shell_seat *ivi_seat, + uint32_t flags); + #endif