X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fivi-compositor.h;h=efa637318aee0a865d037e043f6bc986384c18f1;hb=bdd8dd718496dc8e4330209c46c196442bcf7d3e;hp=0c9d604c5b0aecd87ebafaa61960bdf9e5822233;hpb=fe771c084c2f0192ca08dd3b7f85088960703e36;p=src%2Fagl-compositor.git diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 0c9d604..efa6373 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -70,6 +70,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; @@ -105,6 +106,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 +152,7 @@ struct ivi_output { struct weston_head *add[8]; char *app_id; + enum ivi_output_type type; }; enum ivi_surface_role { @@ -229,6 +239,14 @@ 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; @@ -244,6 +262,7 @@ struct ivi_surface { } pending; bool activated_by_default; bool advertised_on_launch; + bool checked_pending; enum ivi_surface_role role; union { @@ -256,6 +275,7 @@ 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; }; @@ -396,4 +416,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); #endif