diff options
Diffstat (limited to 'src/wayland/backend.c')
| -rw-r--r-- | src/wayland/backend.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/wayland/backend.c b/src/wayland/backend.c index 31e412f..5c34def 100644 --- a/src/wayland/backend.c +++ b/src/wayland/backend.c @@ -16,11 +16,6 @@ static uint32_t impl_display_caps(const struct yasl_display *d) return wayland_display_caps((const struct wayland_display *)d); } -static void impl_display_dispatch(struct yasl_display *d) -{ - wayland_display_dispatch((struct wayland_display *)d); -} - static int impl_display_dispatch_timeout(struct yasl_display *d, int timeout_ms) { return wayland_display_dispatch_timeout((struct wayland_display *)d, timeout_ms); @@ -56,9 +51,10 @@ static void impl_display_drag_cancel(struct yasl_display *d) wayland_display_drag_cancel((struct wayland_display *)d); } -static struct yasl_surface *impl_surface_create_toplevel(struct yasl_display *d, const struct yasl_surface_spec *spec) +static struct yasl_surface *impl_surface_create_toplevel(struct yasl_display *d, + const struct yasl_surface_spec *spec, void *graphics_device) { - struct wayland_surface *result = wayland_surface_create_toplevel((struct wayland_display *)d, spec); + struct wayland_surface *result = wayland_surface_create_toplevel((struct wayland_display *)d, spec, graphics_device); return result ? &result->base : NULL; } @@ -109,14 +105,9 @@ static bool impl_surface_input_poll(struct yasl_surface *s, struct yasl_input_ev return wayland_surface_input_poll((struct wayland_surface *)s, ev); } -static struct yasl_vector2i impl_surface_size(const struct yasl_surface *s) -{ - return wayland_surface_size((const struct wayland_surface *)s); -} - -static uint32_t impl_surface_scale_120(const struct yasl_surface *s) +static struct yasl_geometry impl_surface_geometry(const struct yasl_surface *s) { - return wayland_surface_scale_120((const struct wayland_surface *)s); + return wayland_surface_geometry((const struct wayland_surface *)s); } static uint32_t impl_surface_state(const struct yasl_surface *s) @@ -199,7 +190,6 @@ const struct yasl_backend_ops yasl_wayland_backend = { .display_open = impl_display_open, .display_close = impl_display_close, .display_caps = impl_display_caps, - .display_dispatch = impl_display_dispatch, .display_dispatch_timeout = impl_display_dispatch_timeout, .display_flush = impl_display_flush, .display_modifiers = impl_display_modifiers, @@ -217,8 +207,7 @@ const struct yasl_backend_ops yasl_wayland_backend = { .surface_schedule_redraw = impl_surface_schedule_redraw, .surface_present = impl_surface_present, .surface_input_poll = impl_surface_input_poll, - .surface_size = impl_surface_size, - .surface_scale_120 = impl_surface_scale_120, + .surface_geometry = impl_surface_geometry, .surface_state = impl_surface_state, .surface_timing = impl_surface_timing, .surface_frame_time_ns = impl_surface_frame_time_ns, |