Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
shell: Reset active view to allow further activation
[src/agl-compositor.git]
/
src
/
ivi-compositor.h
diff --git
a/src/ivi-compositor.h
b/src/ivi-compositor.h
index
207fd82
..
1c1d678
100644
(file)
--- a/
src/ivi-compositor.h
+++ b/
src/ivi-compositor.h
@@
-97,6
+97,7
@@
struct ivi_compositor {
struct wl_client *client;
struct wl_resource *resource;
bool doas_requested;
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;
enum agl_shell_bound_status status;
} shell_client_ext;
@@
-116,7
+117,11
@@
struct ivi_compositor {
struct wl_list split_pending_apps;
struct wl_list remote_pending_apps;
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 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 hidden;
struct weston_layer background;
@@
-191,6
+196,7
@@
enum ivi_surface_role {
IVI_SURFACE_ROLE_SPLIT_V,
IVI_SURFACE_ROLE_SPLIT_H,
IVI_SURFACE_ROLE_REMOTE,
IVI_SURFACE_ROLE_SPLIT_V,
IVI_SURFACE_ROLE_SPLIT_H,
IVI_SURFACE_ROLE_REMOTE,
+ IVI_SURFACE_ROLE_TILE,
};
struct ivi_bounding_box {
};
struct ivi_bounding_box {
@@
-226,6
+232,18
@@
struct pending_remote {
struct wl_list link; /** ivi_compositor::remote_pending_apps */
};
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;
+};
+
struct ivi_desktop_surface {
struct ivi_output *pending_output;
struct ivi_output *last_output;
struct ivi_desktop_surface {
struct ivi_output *pending_output;
struct ivi_output *last_output;
@@
-275,6
+293,7
@@
struct ivi_surface {
struct wl_list link;
int focus_count;
struct wl_list link;
int focus_count;
+ uint32_t orientation;
struct {
enum ivi_surface_flags flags;
struct {
enum ivi_surface_flags flags;
@@
-304,6
+323,12
@@
struct ivi_surface {
struct wl_listener listener_advertise_app;
struct wl_signal signal_advertise_app;
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 ivi_shell_seat {
@@
-510,4
+535,10
@@
ivi_surface_count_one(struct ivi_output *ivi_output,
int
parse_activation_area(const char *geometry, struct ivi_output *output);
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);
+
#endif
#endif