diff options
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/backend.h | 2 | ||||
| -rw-r--r-- | include/wlr/backend/interface.h | 2 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_output.h | 18 | ||||
| -rw-r--r-- | include/wlr/render/egl.h (renamed from include/wlr/egl.h) | 0 | ||||
| -rw-r--r-- | include/wlr/types/wlr_gamma_control.h | 16 | ||||
| -rw-r--r-- | include/wlr/types/wlr_input_device.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_list.h (renamed from include/wlr/util/list.h) | 28 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output.h | 10 | ||||
| -rw-r--r-- | include/wlr/types/wlr_surface.h | 8 | ||||
| -rw-r--r-- | include/wlr/xwayland.h | 3 |
10 files changed, 58 insertions, 31 deletions
diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 6c11152f..78d01edf 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -3,7 +3,7 @@ #include <wayland-server.h> #include <wlr/backend/session.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> struct wlr_backend_impl; diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h index ea41400a..3f0aaadb 100644 --- a/include/wlr/backend/interface.h +++ b/include/wlr/backend/interface.h @@ -3,7 +3,7 @@ #include <stdbool.h> #include <wlr/backend.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> struct wlr_backend_impl { bool (*start)(struct wlr_backend *backend); diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index b7927569..d365e8f5 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -1,8 +1,9 @@ #ifndef WLR_INTERFACES_WLR_OUTPUT_H #define WLR_INTERFACES_WLR_OUTPUT_H -#include <wlr/types/wlr_output.h> #include <stdbool.h> +#include <wlr/types/wlr_output.h> +#include <wlr/backend.h> struct wlr_output_impl { void (*enable)(struct wlr_output *output, bool enable); @@ -17,14 +18,17 @@ struct wlr_output_impl { void (*make_current)(struct wlr_output *output); void (*swap_buffers)(struct wlr_output *output); void (*set_gamma)(struct wlr_output *output, - uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); - uint16_t (*get_gamma_size)(struct wlr_output *output); + uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b); + uint32_t (*get_gamma_size)(struct wlr_output *output); }; -void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *impl); +void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend, + const struct wlr_output_impl *impl); void wlr_output_free(struct wlr_output *output); -void wlr_output_update_matrix(struct wlr_output *output); -struct wl_global *wlr_output_create_global( - struct wlr_output *wlr_output, struct wl_display *display); +void wlr_output_update_size(struct wlr_output *output, int32_t width, + int32_t height); +struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output, + struct wl_display *display); +void wlr_output_destroy_global(struct wlr_output *wlr_output); #endif diff --git a/include/wlr/egl.h b/include/wlr/render/egl.h index 9ab4d9ce..9ab4d9ce 100644 --- a/include/wlr/egl.h +++ b/include/wlr/render/egl.h diff --git a/include/wlr/types/wlr_gamma_control.h b/include/wlr/types/wlr_gamma_control.h index 96c9f545..59f18494 100644 --- a/include/wlr/types/wlr_gamma_control.h +++ b/include/wlr/types/wlr_gamma_control.h @@ -5,18 +5,28 @@ struct wlr_gamma_control_manager { struct wl_global *wl_global; + struct wl_list controls; // list of wlr_gamma_control void *data; }; struct wlr_gamma_control { struct wl_resource *resource; - struct wl_resource *output; + struct wlr_output *output; + struct wl_list link; + + struct wl_listener output_destroy_listener; + + struct { + struct wl_signal destroy; + } events; void* data; }; -struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(struct wl_display *display); -void wlr_gamma_control_manager_destroy(struct wlr_gamma_control_manager *gamma_control_manager); +struct wlr_gamma_control_manager *wlr_gamma_control_manager_create( + struct wl_display *display); +void wlr_gamma_control_manager_destroy( + struct wlr_gamma_control_manager *gamma_control_manager); #endif diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index 50b0fb88..306a1166 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -45,6 +45,8 @@ struct wlr_input_device { } events; void *data; + + struct wl_list link; }; #endif diff --git a/include/wlr/util/list.h b/include/wlr/types/wlr_list.h index 02039d89..8ddd30b6 100644 --- a/include/wlr/util/list.h +++ b/include/wlr/types/wlr_list.h @@ -3,57 +3,57 @@ #include <stddef.h> -typedef struct { +struct wlr_list { size_t capacity; size_t length; void **items; -} list_t; +}; /** * Creates a new list, may return `NULL` on failure */ -list_t *list_create(void); -void list_free(list_t *list); -void list_foreach(list_t *list, void (*callback)(void *item)); +struct wlr_list *wlr_list_create(void); +void wlr_list_free(struct wlr_list *list); +void wlr_list_foreach(struct wlr_list *list, void (*callback)(void *item)); /** * Add `item` to the end of a list. * Returns: new list length or `-1` on failure */ -int list_add(list_t *list, void *item); +int wlr_list_add(struct wlr_list *list, void *item); /** * Add `item` to the end of a list. * Returns: new list length or `-1` on failure */ -int list_push(list_t *list, void *item); +int wlr_list_push(struct wlr_list *list, void *item); /** * Place `item` into index `index` in the list * Returns: new list length or `-1` on failure */ -int list_insert(list_t *list, size_t index, void *item); +int wlr_list_insert(struct wlr_list *list, size_t index, void *item); /** * Remove an item from the list */ -void list_del(list_t *list, size_t index); +void wlr_list_del(struct wlr_list *list, size_t index); /** * Remove and return an item from the end of the list */ -void *list_pop(list_t *list); +void *wlr_list_pop(struct wlr_list *list); /** * Get a reference to the last item of a list without removal */ -void *list_peek(list_t *list); +void *wlr_list_peek(struct wlr_list *list); /** * Append each item in `source` to `list` * Does not modify `source` * Returns: new list length or `-1` on failure */ -int list_cat(list_t *list, list_t *source); +int wlr_list_cat(struct wlr_list *list, struct wlr_list *source); // See qsort. Remember to use *_qsort functions as compare functions, // because they dereference the left and right arguments first! -void list_qsort(list_t *list, int compare(const void *left, const void *right)); +void wlr_list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)); // Return index for first item in list that returns 0 for given compare // function or -1 if none matches. -int list_seq_find(list_t *list, +int wlr_list_seq_find(struct wlr_list *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 312b51f8..74eb15ed 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -1,20 +1,22 @@ #ifndef WLR_TYPES_WLR_OUTPUT_H #define WLR_TYPES_WLR_OUTPUT_H +#include <wayland-util.h> #include <wayland-server.h> -#include <wlr/util/list.h> #include <stdbool.h> struct wlr_output_mode { uint32_t flags; // enum wl_output_mode int32_t width, height; int32_t refresh; // mHz + struct wl_list link; }; struct wlr_output_impl; struct wlr_output { const struct wlr_output_impl *impl; + struct wlr_backend *backend; struct wl_global *wl_global; struct wl_list wl_resources; @@ -32,7 +34,7 @@ struct wlr_output { float transform_matrix[16]; /* Note: some backends may have zero modes */ - list_t *modes; + struct wl_list modes; struct wlr_output_mode *current_mode; struct { @@ -82,7 +84,7 @@ void wlr_output_effective_resolution(struct wlr_output *output, void wlr_output_make_current(struct wlr_output *output); void wlr_output_swap_buffers(struct wlr_output *output); void wlr_output_set_gamma(struct wlr_output *output, - uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); -uint16_t wlr_output_get_gamma_size(struct wlr_output *output); + uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b); +uint32_t wlr_output_get_gamma_size(struct wlr_output *output); #endif diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 461e593f..ea4184aa 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -110,6 +110,14 @@ int wlr_surface_set_role(struct wlr_surface *surface, const char *role, struct wl_resource *error_resource, uint32_t error_code); /** + * Whether or not this surface currently has an attached buffer. A surface has + * an attached buffer when it commits with a non-null buffer in its pending + * state. A surface will not have a buffer if it has never committed one, has + * committed a null buffer, or something went wrong with uploading the buffer. + */ +bool wlr_surface_has_buffer(struct wlr_surface *surface); + +/** * Create the subsurface implementation for this surface. */ void wlr_surface_make_subsurface(struct wlr_surface *surface, diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 09f9fbac..c25d0eb0 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -5,6 +5,7 @@ #include <stdbool.h> #include <wlr/types/wlr_compositor.h> #include <xcb/xcb.h> +#include <wlr/types/wlr_list.h> #ifdef HAS_XCB_ICCCM #include <xcb/xcb_icccm.h> @@ -78,7 +79,7 @@ struct wlr_xwayland_surface { char *class; char *instance; struct wlr_xwayland_surface *parent; - list_t *state; // list of xcb_atom_t + struct wlr_list *state; // list of xcb_atom_t pid_t pid; xcb_atom_t *window_type; |