aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/wlr/types/wlr_surface.h3
-rw-r--r--types/wlr_surface.c57
-rw-r--r--types/wlr_viewporter.c2
-rw-r--r--types/xdg_shell/wlr_xdg_surface.c2
-rw-r--r--xwayland/xwm.c2
5 files changed, 16 insertions, 50 deletions
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index 4b464401..aa26726b 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -36,7 +36,6 @@ struct wlr_surface_state {
uint32_t seq;
struct wlr_buffer *buffer;
- struct wl_resource *buffer_resource;
int32_t dx, dy; // relative to previous position
pixman_region32_t surface_damage, buffer_damage; // clipped to bounds
pixman_region32_t opaque, input;
@@ -65,8 +64,6 @@ struct wlr_surface_state {
int dst_width, dst_height; // in surface-local coordinates
} viewport;
- struct wl_listener buffer_destroy;
-
// Number of locks that prevent this surface state from being committed.
size_t cached_state_locks;
struct wl_list cached_state_link; // wlr_surface.cached
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index f8c1dbd5..dbc78f25 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -32,32 +32,6 @@ static int max(int fst, int snd) {
}
}
-static void surface_state_reset_buffer(struct wlr_surface_state *state) {
- if (state->buffer_resource) {
- wl_list_remove(&state->buffer_destroy.link);
- state->buffer_resource = NULL;
- }
-}
-
-static void surface_handle_buffer_destroy(struct wl_listener *listener,
- void *data) {
- struct wlr_surface_state *state =
- wl_container_of(listener, state, buffer_destroy);
- surface_state_reset_buffer(state);
-}
-
-static void surface_state_set_buffer(struct wlr_surface_state *state,
- struct wl_resource *buffer_resource) {
- surface_state_reset_buffer(state);
-
- state->buffer_resource = buffer_resource;
- if (buffer_resource != NULL) {
- wl_resource_add_destroy_listener(buffer_resource,
- &state->buffer_destroy);
- state->buffer_destroy.notify = surface_handle_buffer_destroy;
- }
-}
-
static void surface_handle_destroy(struct wl_client *client,
struct wl_resource *resource) {
wl_resource_destroy(resource);
@@ -65,13 +39,21 @@ static void surface_handle_destroy(struct wl_client *client,
static void surface_handle_attach(struct wl_client *client,
struct wl_resource *resource,
- struct wl_resource *buffer, int32_t dx, int32_t dy) {
+ struct wl_resource *buffer_resource, int32_t dx, int32_t dy) {
struct wlr_surface *surface = wlr_surface_from_resource(resource);
+ struct wlr_buffer *buffer = wlr_buffer_from_resource(buffer_resource);
+ if (buffer == NULL) {
+ wl_resource_post_error(buffer_resource, 0, "unknown buffer type");
+ return;
+ }
+
surface->pending.committed |= WLR_SURFACE_STATE_BUFFER;
surface->pending.dx = dx;
surface->pending.dy = dy;
- surface_state_set_buffer(&surface->pending, buffer);
+
+ wlr_buffer_unlock(surface->pending.buffer);
+ surface->pending.buffer = buffer;
}
static void surface_handle_damage(struct wl_client *client,
@@ -171,15 +153,7 @@ static void surface_finalize_pending(struct wlr_surface *surface) {
struct wlr_surface_state *pending = &surface->pending;
if ((pending->committed & WLR_SURFACE_STATE_BUFFER)) {
- if (pending->buffer_resource) {
- wlr_buffer_unlock(pending->buffer);
- pending->buffer = wlr_buffer_from_resource(pending->buffer_resource);
- if (!pending->buffer) {
- wl_resource_post_error(pending->buffer_resource, 0,
- "unknown buffer type");
- return;
- }
-
+ if (pending->buffer != NULL) {
pending->buffer_width = pending->buffer->width;
pending->buffer_height = pending->buffer->height;
} else {
@@ -281,9 +255,6 @@ static void surface_state_move(struct wlr_surface_state *state,
state->dy = next->dy;
next->dx = next->dy = 0;
- surface_state_set_buffer(state, next->buffer_resource);
- surface_state_reset_buffer(next);
-
wlr_buffer_unlock(state->buffer);
state->buffer = NULL;
if (next->buffer) {
@@ -354,8 +325,7 @@ static void surface_damage_subsurfaces(struct wlr_subsurface *subsurface) {
}
static void surface_apply_damage(struct wlr_surface *surface) {
- struct wl_resource *resource = surface->current.buffer_resource;
- if (resource == NULL) {
+ if (surface->current.buffer == NULL) {
// NULL commit
if (surface->buffer != NULL) {
wlr_buffer_unlock(&surface->buffer->base);
@@ -657,7 +627,6 @@ static void surface_state_init(struct wlr_surface_state *state) {
}
static void surface_state_finish(struct wlr_surface_state *state) {
- surface_state_reset_buffer(state);
wlr_buffer_unlock(state->buffer);
struct wl_resource *resource, *tmp;
@@ -1127,7 +1096,7 @@ static void subsurface_role_precommit(struct wlr_surface *surface) {
}
if (surface->pending.committed & WLR_SURFACE_STATE_BUFFER &&
- surface->pending.buffer_resource == NULL) {
+ surface->pending.buffer == NULL) {
// This is a NULL commit
subsurface_unmap(subsurface);
}
diff --git a/types/wlr_viewporter.c b/types/wlr_viewporter.c
index 0bfc3333..f07c18fe 100644
--- a/types/wlr_viewporter.c
+++ b/types/wlr_viewporter.c
@@ -143,7 +143,7 @@ static void viewport_handle_surface_commit(struct wl_listener *listener,
return;
}
- if (current->viewport.has_src && current->buffer_resource != NULL &&
+ if (current->viewport.has_src && current->buffer != NULL &&
(current->viewport.src.x + current->viewport.src.width >
current->buffer_width ||
current->viewport.src.y + current->viewport.src.height >
diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c
index 33cf3319..2afa9dc5 100644
--- a/types/xdg_shell/wlr_xdg_surface.c
+++ b/types/xdg_shell/wlr_xdg_surface.c
@@ -398,7 +398,7 @@ void handle_xdg_surface_precommit(struct wlr_surface *wlr_surface) {
}
if (wlr_surface->pending.committed & WLR_SURFACE_STATE_BUFFER &&
- wlr_surface->pending.buffer_resource == NULL) {
+ wlr_surface->pending.buffer == NULL) {
// This is a NULL commit
if (surface->configured && surface->mapped) {
unmap_xdg_surface(surface);
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 516a061d..b8b152fb 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -850,7 +850,7 @@ static void xwayland_surface_role_precommit(struct wlr_surface *wlr_surface) {
}
if (wlr_surface->pending.committed & WLR_SURFACE_STATE_BUFFER &&
- wlr_surface->pending.buffer_resource == NULL) {
+ wlr_surface->pending.buffer == NULL) {
// This is a NULL commit
if (surface->mapped) {
wlr_signal_emit_safe(&surface->events.unmap, surface);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:39:45 +0000