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_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 hide_cursor;
+ bool disable_cursor;
bool activate_by_default;
bool keep_pending_surfaces;
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;
+ struct wl_global *agl_shell_ext;
struct {
struct wl_client *client;
struct wl_resource *resource;
+
+ /* this is for another agl-shell client, potentially used by
+ * the grpc-proxy */
+ struct wl_resource *resource_ext;
bool ready;
enum agl_shell_bound_status status;
} shell_client;
+ struct {
+ 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;
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;
struct weston_layer panel;
struct weston_layer popup;
struct weston_layer fullscreen;
+
+ bool need_ivi_output_relayout;
+ struct wl_list child_process_list;
};
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 weston_geometry area;
struct weston_geometry area_saved;
+ /*
+ * Potential user-specified non-default activation area
+ */
+ struct weston_geometry area_activation;
struct ivi_surface *active;
struct ivi_surface *previous_active;
size_t add_len;
struct weston_head *add[8];
- char *app_id;
+ char *app_ids;
enum ivi_output_type type;
};
IVI_SURFACE_ROLE_SPLIT_V,
IVI_SURFACE_ROLE_SPLIT_H,
IVI_SURFACE_ROLE_REMOTE,
+ IVI_SURFACE_ROLE_TILE,
};
struct ivi_bounding_box {
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;
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 wl_list link;
int focus_count;
+ uint32_t orientation;
+ int32_t sticky;
struct {
enum ivi_surface_flags flags;
} state;
enum ivi_surface_role role;
+ enum ivi_surface_role prev_role;
union {
struct ivi_desktop_surface desktop;
struct ivi_background_surface bg;
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 {
struct weston_seat *seat;
struct weston_surface *focused_surface;
- bool hide_cursor;
+ bool disable_cursor;
bool new_caps_sent;
struct wl_listener seat_destroy_listener;
ivi_shell_create_global(struct ivi_compositor *ivi);
int
-ivi_launch_shell_client(struct ivi_compositor *ivi);
+ivi_launch_shell_client(struct ivi_compositor *ivi, const char *cmd_section, struct wl_client **client);
int
ivi_desktop_init(struct ivi_compositor *ivi);
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);
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);
ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
struct ivi_shell_seat *ivi_seat,
uint32_t flags);
+int
+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_destroy_saved_outputs(struct ivi_compositor *ivi);
+
+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);
#endif
Code Review / src / agl-compositor.git / blobdiff