mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-15 06:59:43 -05:00
Merge pull request #936 from emersion/full-hardware-cursors
output: always use hardware cursors if available
This commit is contained in:
commit
caf9f9022c
6 changed files with 120 additions and 147 deletions
|
|
@ -40,25 +40,22 @@ struct wlr_wl_output {
|
|||
struct wlr_output wlr_output;
|
||||
|
||||
struct wlr_wl_backend *backend;
|
||||
struct wl_list link;
|
||||
|
||||
struct wl_surface *surface;
|
||||
struct wl_callback *frame_callback;
|
||||
struct zxdg_surface_v6 *xdg_surface;
|
||||
struct zxdg_toplevel_v6 *xdg_toplevel;
|
||||
struct wl_egl_window *egl_window;
|
||||
struct wl_callback *frame_callback;
|
||||
|
||||
struct {
|
||||
struct wl_shm_pool *pool;
|
||||
void *buffer; // actually a (client-side) struct wl_buffer *
|
||||
uint32_t buf_size;
|
||||
uint8_t *data;
|
||||
struct wl_surface *surface;
|
||||
int32_t hotspot_x, hotspot_y;
|
||||
} cursor;
|
||||
EGLSurface egl_surface;
|
||||
|
||||
uint32_t enter_serial;
|
||||
|
||||
void *egl_surface;
|
||||
struct wl_list link;
|
||||
struct {
|
||||
struct wl_surface *surface;
|
||||
struct wl_egl_window *egl_window;
|
||||
int32_t hotspot_x, hotspot_y;
|
||||
} cursor;
|
||||
};
|
||||
|
||||
struct wlr_wl_input_device {
|
||||
|
|
|
|||
|
|
@ -13,9 +13,8 @@ struct wlr_output_impl {
|
|||
int32_t height, int32_t refresh);
|
||||
void (*transform)(struct wlr_output *output,
|
||||
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, bool update_pixels);
|
||||
bool (*set_cursor)(struct wlr_output *output, struct wlr_texture *texture,
|
||||
int32_t hotspot_x, int32_t hotspot_y, bool update_texture);
|
||||
bool (*move_cursor)(struct wlr_output *output, int x, int y);
|
||||
void (*destroy)(struct wlr_output *output);
|
||||
bool (*make_current)(struct wlr_output *output, int *buffer_age);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue