X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=11e7290d432c716acf3242756e1e4e17b2cb085d;hb=0acbca5d1a9ca5aad361dfc2807f3822223c739d;hp=efa637318aee0a865d037e043f6bc986384c18f1;hpb=308078596396326017e18a8ae81cba89770c3f7a;p=src%2Fagl-compositor.git diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index efa6373..11e7290 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. @@ -79,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 */ @@ -96,6 +104,10 @@ 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 weston_layer hidden; struct weston_layer background; struct weston_layer normal; @@ -165,6 +177,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 { @@ -172,6 +185,18 @@ struct ivi_bounding_box { int width; int height; }; +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; +}; + struct pending_popup { struct ivi_output *ioutput; char *app_id; @@ -260,9 +285,17 @@ 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; + + uint32_t orientation; enum ivi_surface_role role; union { @@ -280,6 +313,19 @@ struct ivi_surface { 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 { struct wl_list link; char *command; @@ -418,4 +464,31 @@ 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