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: Use sigaction to trap SIGINT
[src/agl-compositor.git]
/
src
/
ivi-compositor.h
diff --git
a/src/ivi-compositor.h
b/src/ivi-compositor.h
index
78d1acd
..
3cca0a0
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;
@@
-81,6
+86,7
@@
struct ivi_compositor {
struct wl_client *client;
struct wl_resource *resource;
bool ready;
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 */
} shell_client;
struct wl_list desktop_clients; /* desktop_client::link */
@@
-106,6
+112,8
@@
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;
+
+ struct wl_list child_process_list;
};
struct ivi_surface;
};
struct ivi_surface;
@@
-255,6
+263,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;
@@
-409,10
+419,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);
@@
-467,5
+480,7
@@
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);
#endif
#endif