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: Avoid compiler warning and build failure
[src/agl-compositor.git]
/
src
/
ivi-compositor.h
diff --git
a/src/ivi-compositor.h
b/src/ivi-compositor.h
index
9f3cc47
..
62e70e1
100644
(file)
--- a/
src/ivi-compositor.h
+++ b/
src/ivi-compositor.h
@@
-51,11
+51,20
@@
enum agl_shell_bound_status {
BOUND_FAILED,
};
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_compositor {
struct weston_compositor *compositor;
struct weston_config *config;
+ struct ivi_output_config *parsed_options;
struct wl_listener heads_changed;
struct wl_listener heads_changed;
+ int (*simple_output_configure)(struct weston_output *output);
bool init_failed;
bool disable_cursor;
bool init_failed;
bool disable_cursor;
@@
-242,6
+251,8
@@
struct pending_app {
struct pending_app_tile {
struct pending_app base;
uint32_t orientation;
struct pending_app_tile {
struct pending_app base;
uint32_t orientation;
+ uint32_t width;
+ int32_t sticky;
};
struct ivi_desktop_surface {
};
struct ivi_desktop_surface {
@@
-294,6
+305,7
@@
struct ivi_surface {
struct wl_list link;
int focus_count;
uint32_t orientation;
struct wl_list link;
int focus_count;
uint32_t orientation;
+ int32_t sticky;
struct {
enum ivi_surface_flags flags;
struct {
enum ivi_surface_flags flags;
@@
-311,6
+323,7
@@
struct ivi_surface {
} state;
enum ivi_surface_role role;
} state;
enum ivi_surface_role role;
+ enum ivi_surface_role prev_role;
union {
struct ivi_desktop_surface desktop;
struct ivi_background_surface bg;
union {
struct ivi_desktop_surface desktop;
struct ivi_background_surface bg;
@@
-543,6
+556,9
@@
ivi_layout_reset_split_surfaces(struct ivi_compositor *ivi);
void
_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output,
void
_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output,
- uint32_t orientation, bool to_activate);
+ 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
#endif