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
compositor: Added layout_save/layout_restore
[src/agl-compositor.git]
/
src
/
ivi-compositor.h
diff --git
a/src/ivi-compositor.h
b/src/ivi-compositor.h
index
5137d19
..
ed56c7f
100644
(file)
--- 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 */
};
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;
struct ivi_compositor {
struct weston_compositor *compositor;
struct weston_config *config;
@@
-53,7
+58,7
@@
struct ivi_compositor {
struct wl_listener heads_changed;
bool init_failed;
struct wl_listener heads_changed;
bool init_failed;
- bool
hid
e_cursor;
+ bool
disabl
e_cursor;
bool activate_by_default;
bool keep_pending_surfaces;
bool activate_by_default;
bool keep_pending_surfaces;
@@
-76,16
+81,30
@@
struct ivi_compositor {
struct wl_global *agl_shell;
struct wl_global *agl_shell_desktop;
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;
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;
bool ready;
+ enum agl_shell_bound_status status;
} shell_client;
} shell_client;
+ struct {
+ struct wl_client *client;
+ struct wl_resource *resource;
+ bool doas_requested;
+ 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 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 surfaces; /* ivi_surface.link */
struct weston_desktop *desktop;
@@
-106,6
+125,9
@@
struct ivi_compositor {
struct weston_layer panel;
struct weston_layer popup;
struct weston_layer fullscreen;
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;
};
struct ivi_surface;
@@
-147,6
+169,10
@@
struct ivi_output {
*/
struct weston_geometry area;
struct weston_geometry area_saved;
*/
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;
struct ivi_surface *active;
struct ivi_surface *previous_active;
@@
-155,7
+181,7
@@
struct ivi_output {
size_t add_len;
struct weston_head *add[8];
size_t add_len;
struct weston_head *add[8];
- char *app_id;
+ char *app_id
s
;
enum ivi_output_type type;
};
enum ivi_output_type type;
};
@@
-255,6
+281,8
@@
struct ivi_surface {
struct ivi_compositor *ivi;
struct weston_desktop_surface *dsurface;
struct weston_view *view;
struct ivi_compositor *ivi;
struct weston_desktop_surface *dsurface;
struct weston_view *view;
+ struct ivi_output *hidden_layer_output;
+ struct ivi_output *current_completed_output;
struct wl_list link;
int focus_count;
struct wl_list link;
int focus_count;
@@
-271,6
+299,7
@@
struct ivi_surface {
NORMAL,
RESIZING,
FULLSCREEN,
NORMAL,
RESIZING,
FULLSCREEN,
+ HIDDEN,
} state;
enum ivi_surface_role role;
} state;
enum ivi_surface_role role;
@@
-293,7
+322,7
@@
struct ivi_shell_seat {
struct weston_seat *seat;
struct weston_surface *focused_surface;
struct weston_seat *seat;
struct weston_surface *focused_surface;
- bool
hid
e_cursor;
+ bool
disabl
e_cursor;
bool new_caps_sent;
struct wl_listener seat_destroy_listener;
bool new_caps_sent;
struct wl_listener seat_destroy_listener;
@@
-336,7
+365,7
@@
int
ivi_shell_create_global(struct ivi_compositor *ivi);
int
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);
int
ivi_desktop_init(struct ivi_compositor *ivi);
@@
-408,10
+437,13
@@
struct ivi_output *
ivi_layout_get_output_from_surface(struct ivi_surface *surf);
void
ivi_layout_get_output_from_surface(struct ivi_surface *surf);
void
-insert_black_
surface
(struct ivi_output *output);
+insert_black_
curtain
(struct ivi_output *output);
void
void
-remove_black_surface(struct ivi_output *output);
+remove_black_curtain(struct ivi_output *output);
+
+bool
+output_has_black_curtain(struct ivi_output *output);
const char *
ivi_layout_get_surface_role_name(struct ivi_surface *surf);
const char *
ivi_layout_get_surface_role_name(struct ivi_surface *surf);
@@
-466,5
+498,13
@@
void
ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
struct ivi_shell_seat *ivi_seat,
uint32_t flags);
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);
#endif
#endif