diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-17 16:01:17 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-17 16:01:17 -0400 |
| commit | b7c622a319aff00a1c825a4f16bd9443faa6b7c4 (patch) | |
| tree | 873b760bd9288724028841159fdad22d18e62fb3 /include/wlr | |
| parent | 09f16058c890cc3329c8aa39593f229b2bf31443 (diff) | |
| parent | 9129687ad6dcf162b3af8d91b2fc582f185d0943 (diff) | |
Merge branch 'master' into feature/data-device-selection
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/interfaces/wlr_output.h | 10 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output_layout.h | 6 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell_v6.h | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 7d2821e0..b7927569 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -8,16 +8,16 @@ struct wlr_output_impl { void (*enable)(struct wlr_output *output, bool enable); bool (*set_mode)(struct wlr_output *output, struct wlr_output_mode *mode); void (*transform)(struct wlr_output *output, - enum wl_output_transform transform); + enum wl_output_transform transform); bool (*set_cursor)(struct wlr_output *output, const uint8_t *buf, - int32_t stride, uint32_t width, uint32_t height, - int32_t hotspot_x, int32_t hotspot_y); + int32_t stride, uint32_t width, uint32_t height, + int32_t hotspot_x, int32_t hotspot_y, bool update_pixels); bool (*move_cursor)(struct wlr_output *output, int x, int y); void (*destroy)(struct wlr_output *output); 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 size, uint16_t *r, uint16_t *g, uint16_t *b); uint16_t (*get_gamma_size)(struct wlr_output *output); }; @@ -25,6 +25,6 @@ void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *im 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); + struct wlr_output *wlr_output, struct wl_display *display); #endif diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index fe09106f..ea8dbcd2 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -84,4 +84,10 @@ struct wlr_box *wlr_output_layout_get_box( void wlr_output_layout_add_auto(struct wlr_output_layout *layout, struct wlr_output *output); +/** + * Get the output closest to the center of the layout extents. + */ +struct wlr_output *wlr_output_layout_get_center_output( + struct wlr_output_layout *layout); + #endif diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 48da6604..b0de41e2 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -106,6 +106,7 @@ struct wlr_xdg_surface_v6 { struct wl_list popup_link; bool configured; + bool added; struct wl_event_source *configure_idle; struct wl_list configure_list; |