mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tearing-control-v1: synchronize state with surface

Browse source
This commit is contained in:
Simon Ser 2023-12-08 14:22:19 +01:00
parent 0ea6b6e2cc
commit 1968ada213
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/wlr/types/wlr_tearing_control_v1.h
View file

@ -17,11 +17,12 @@
#include "tearing-control-v1-protocol.h" #include "tearing-control-v1-protocol.h"
struct wlr_tearing_control_v1 { struct wlr_tearing_control_v1 {
uint32_t hint;
struct wl_client *client; struct wl_client *client;
struct wl_list link; struct wl_list link;
struct wl_resource *resource; struct wl_resource *resource;
enum wp_tearing_control_v1_presentation_hint current, pending;
struct { struct {
struct wl_signal set_hint; struct wl_signal set_hint;
struct wl_signal destroy; struct wl_signal destroy;
@ -29,7 +30,13 @@ struct wlr_tearing_control_v1 {
struct wlr_surface *surface; struct wlr_surface *surface;
// private state
enum wp_tearing_control_v1_presentation_hint previous;
struct wlr_addon addon; struct wlr_addon addon;
struct wlr_surface_synced synced;
struct wl_listener surface_commit;
}; };
struct wlr_tearing_control_manager_v1 { struct wlr_tearing_control_manager_v1 {

38
types/wlr_tearing_control_v1.c
View file

@ -39,6 +39,8 @@ static void destroy_tearing_hint(struct wlr_tearing_control_v1 *hint) {
wl_resource_set_user_data(hint->resource, NULL); wl_resource_set_user_data(hint->resource, NULL);
wlr_addon_finish(&hint->addon); wlr_addon_finish(&hint->addon);
wlr_surface_synced_finish(&hint->synced);
wl_list_remove(&hint->surface_commit.link);
free(hint); free(hint);
} }
@ -64,21 +66,32 @@ static void destroy_tearing_resource_impl(struct wl_resource *resource) {
destroy_tearing_hint(hint); destroy_tearing_hint(hint);
} }
static void tearing_control_handle_presentation_hint(struct wl_client *client, static void tearing_control_handle_set_presentation_hint(struct wl_client *client,
struct wl_resource *resource, uint32_t hint) { struct wl_resource *resource, uint32_t hint) {
struct wlr_tearing_control_v1 *surface_hint = struct wlr_tearing_control_v1 *surface_hint =
tearing_surface_hint_from_resource(resource); tearing_surface_hint_from_resource(resource);
surface_hint->pending = hint;
surface_hint->hint = hint;
wl_signal_emit_mutable(&surface_hint->events.set_hint, NULL);
} }
static const struct wp_tearing_control_v1_interface tearing_control_impl = { static const struct wp_tearing_control_v1_interface tearing_control_impl = {
.destroy = resource_handle_destroy, .destroy = resource_handle_destroy,
.set_presentation_hint = tearing_control_handle_presentation_hint .set_presentation_hint = tearing_control_handle_set_presentation_hint,
}; };
static const struct wlr_surface_synced_impl surface_synced_impl = {
.state_size = sizeof(enum wp_tearing_control_v1_presentation_hint),
};
static void hint_handle_surface_commit(struct wl_listener *listener, void *data) {
struct wlr_tearing_control_v1 *hint = wl_container_of(listener, hint, surface_commit);
if (hint->current != hint->previous) {
wl_signal_emit_mutable(&hint->events.set_hint, NULL);
}
hint->previous = hint->current;
}
static void tearing_control_manager_handle_get_tearing_control( static void tearing_control_manager_handle_get_tearing_control(
struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_client *client, struct wl_resource *resource, uint32_t id,
struct wl_resource *surface_resource) { struct wl_resource *surface_resource) {
@ -98,6 +111,13 @@ static void tearing_control_manager_handle_get_tearing_control(
return; return;
} }
if (!wlr_surface_synced_init(&hint->synced, surface,
&surface_synced_impl, &hint->pending, &hint->current)) {
free(hint);
wl_client_post_no_memory(client);
return;
}
struct wl_resource *created_resource = struct wl_resource *created_resource =
wl_resource_create(client, &wp_tearing_control_v1_interface, wl_resource_create(client, &wp_tearing_control_v1_interface,
wl_resource_get_version(resource), id); wl_resource_get_version(resource), id);
@ -110,7 +130,6 @@ static void tearing_control_manager_handle_get_tearing_control(
wl_resource_set_implementation(created_resource, &tearing_control_impl, wl_resource_set_implementation(created_resource, &tearing_control_impl,
hint, destroy_tearing_resource_impl); hint, destroy_tearing_resource_impl);
hint->hint = WP_TEARING_CONTROL_V1_PRESENTATION_HINT_VSYNC;
hint->client = client; hint->client = client;
hint->resource = created_resource; hint->resource = created_resource;
hint->surface = surface; hint->surface = surface;
@ -119,6 +138,9 @@ static void tearing_control_manager_handle_get_tearing_control(
wl_signal_init(&hint->events.set_hint); wl_signal_init(&hint->events.set_hint);
wl_signal_init(&hint->events.destroy); wl_signal_init(&hint->events.destroy);
hint->surface_commit.notify = hint_handle_surface_commit;
wl_signal_add(&surface->events.commit, &hint->surface_commit);
wl_list_insert(&manager->surface_hints, &hint->link); wl_list_insert(&manager->surface_hints, &hint->link);
wl_signal_emit_mutable(&manager->events.new_object, hint); wl_signal_emit_mutable(&manager->events.new_object, hint);
@ -198,5 +220,5 @@ wlr_tearing_control_manager_v1_surface_hint_from_surface(struct wlr_tearing_cont
struct wlr_tearing_control_v1 *hint = wl_container_of(addon, hint, addon); struct wlr_tearing_control_v1 *hint = wl_container_of(addon, hint, addon);
return hint->hint; return hint->current;
} }