mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-14 08:22:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_raster: Use wlr_surface_consume()

Browse source
This commit is contained in:
Alexander Orzechowski 2024-06-08 16:11:25 -04:00
parent e20c0290c1
commit 477c556019
2 changed files with 2 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

63
tinywl/tinywl.c
View file

@ -17,7 +17,6 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_pointer.h> #include <wlr/types/wlr_pointer.h>
#include <wlr/types/wlr_raster.h>
#include <wlr/types/wlr_scene.h> #include <wlr/types/wlr_scene.h>
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include <wlr/types/wlr_subcompositor.h> #include <wlr/types/wlr_subcompositor.h>
@ -55,7 +54,6 @@ struct tinywl_server {
struct wl_listener cursor_frame; struct wl_listener cursor_frame;
struct wlr_seat *seat; struct wlr_seat *seat;
struct wl_listener new_surface;
struct wl_listener new_input; struct wl_listener new_input;
struct wl_listener request_cursor; struct wl_listener request_cursor;
struct wl_listener request_set_selection; struct wl_listener request_set_selection;
@ -111,12 +109,6 @@ struct tinywl_keyboard {
struct wl_listener destroy; struct wl_listener destroy;
}; };
struct tinywl_surface {
struct wlr_surface *surface;
struct wl_listener commit;
struct wl_listener destroy;
};
static void focus_toplevel(struct tinywl_toplevel *toplevel, struct wlr_surface *surface) { static void focus_toplevel(struct tinywl_toplevel *toplevel, struct wlr_surface *surface) {
/* Note: this function only deals with keyboard focus. */ /* Note: this function only deals with keyboard focus. */
if (toplevel == NULL) { if (toplevel == NULL) {
@ -878,48 +870,6 @@ static void server_new_xdg_popup(struct wl_listener *listener, void *data) {
wl_signal_add(&xdg_popup->events.destroy, &popup->destroy); wl_signal_add(&xdg_popup->events.destroy, &popup->destroy);
} }
static void surface_handle_commit(struct wl_listener *listener, void *data) {
struct tinywl_surface *surface = wl_container_of(listener, surface, commit);
/*
* wlr_raster_from_surface will not automatically latch onto a surface and
* update itself as the surface commits new buffers. We have to handle that
* ourselves. Every time a surface is committed, we have to make sure to
* read from the surface buffer before it is unlocked at the end of the
* commit. Since wlr_raster_from_surface will de-duplicate rasters created
* from the same surface, wlr_scene will consume rasters that are created
* here.
*/
struct wlr_raster *raster = wlr_raster_from_surface(surface->surface);
// unlock the raster immediately as we're only prepping the surface
wlr_raster_unlock(raster);
}
static void surface_handle_destroy(struct wl_listener *listener, void *data) {
struct tinywl_surface *surface = wl_container_of(listener, surface, destroy);
wl_list_remove(&surface->commit.link);
wl_list_remove(&surface->destroy.link);
free(surface);
}
static void handle_new_surface(struct wl_listener *listener, void *data) {
struct wlr_surface *wlr_surface = data;
struct tinywl_surface *surface = calloc(1, sizeof(*surface));
if (!surface) {
return;
}
surface->surface = wlr_surface;
surface->commit.notify = surface_handle_commit;
wl_signal_add(&wlr_surface->events.commit, &surface->commit);
surface->destroy.notify = surface_handle_destroy;
wl_signal_add(&wlr_surface->events.destroy, &surface->destroy);
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
wlr_log_init(WLR_DEBUG, NULL); wlr_log_init(WLR_DEBUG, NULL);
char *startup_cmd = NULL; char *startup_cmd = NULL;
@ -984,18 +934,7 @@ int main(int argc, char *argv[]) {
* to dig your fingers in and play with their behavior if you want. Note that * to dig your fingers in and play with their behavior if you want. Note that
* the clients cannot set the selection directly without compositor approval, * the clients cannot set the selection directly without compositor approval,
* see the handling of the request_set_selection event below.*/ * see the handling of the request_set_selection event below.*/
struct wlr_compositor *compositor = wlr_compositor_create(server.wl_display, 5, NULL); wlr_compositor_create(server.wl_display, 5, NULL);
/*
* Surfaces act as a container for state that come from a wayland surface
* of a client. Surfaces provide buffers that act as the pixel data that the
* client wants to show. However, buffers aren't immetiately useful for us.
* We need to upload them to the GPU and for this, we'll use wlr_raster to
* help us do that.
*/
server.new_surface.notify = handle_new_surface;
wl_signal_add(&compositor->events.new_surface, &server.new_surface);
wlr_subcompositor_create(server.wl_display); wlr_subcompositor_create(server.wl_display);
wlr_data_device_manager_create(server.wl_display); wlr_data_device_manager_create(server.wl_display);

1
types/wlr_raster.c
View file

@ -388,5 +388,6 @@ struct wlr_raster *wlr_raster_from_surface(struct wlr_surface *surface) {
wl_list_remove(&surface_raster->buffer_prerelease.link); wl_list_remove(&surface_raster->buffer_prerelease.link);
wl_signal_add(&surface->current.buffer->events.prerelease, &surface_raster->buffer_prerelease); wl_signal_add(&surface->current.buffer->events.prerelease, &surface_raster->buffer_prerelease);
wlr_surface_consume(surface);
return raster; return raster;
} }