mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-12-27 20:09:49 +01:00
43012f3740
All public resource creators now take a new ID for the resource and an optional list where the resource link is added. When the resource is destroyed it is its own responsibility to remove itself from the list. This removes the need for the caller to add a destroy listener. This commit fixes a few segfaults with resources not removed from the list when destroyed.
78 lines
2.3 KiB
C
78 lines
2.3 KiB
C
#include <assert.h>
|
|
#include <pixman.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <wayland-server.h>
|
|
#include <wlr/types/wlr_region.h>
|
|
|
|
static void region_add(struct wl_client *client, struct wl_resource *resource,
|
|
int32_t x, int32_t y, int32_t width, int32_t height) {
|
|
pixman_region32_t *region = wlr_region_from_resource(resource);
|
|
pixman_region32_union_rect(region, region, x, y, width, height);
|
|
}
|
|
|
|
static void region_subtract(struct wl_client *client, struct wl_resource *resource,
|
|
int32_t x, int32_t y, int32_t width, int32_t height) {
|
|
pixman_region32_t *region = wlr_region_from_resource(resource);
|
|
pixman_region32_union_rect(region, region, x, y, width, height);
|
|
|
|
pixman_region32_t rect;
|
|
pixman_region32_init_rect(&rect, x, y, width, height);
|
|
pixman_region32_subtract(region, region, &rect);
|
|
pixman_region32_fini(&rect);
|
|
}
|
|
|
|
static void region_destroy(struct wl_client *client, struct wl_resource *resource) {
|
|
wl_resource_destroy(resource);
|
|
}
|
|
|
|
static const struct wl_region_interface region_impl = {
|
|
.destroy = region_destroy,
|
|
.add = region_add,
|
|
.subtract = region_subtract,
|
|
};
|
|
|
|
static void region_handle_resource_destroy(struct wl_resource *resource) {
|
|
pixman_region32_t *reg = wlr_region_from_resource(resource);
|
|
|
|
wl_list_remove(wl_resource_get_link(resource));
|
|
|
|
pixman_region32_fini(reg);
|
|
free(reg);
|
|
}
|
|
|
|
struct wl_resource *wlr_region_create(struct wl_client *client,
|
|
uint32_t version, uint32_t id, struct wl_list *resource_list) {
|
|
pixman_region32_t *region = calloc(1, sizeof(pixman_region32_t));
|
|
if (region == NULL) {
|
|
wl_client_post_no_memory(client);
|
|
return NULL;
|
|
}
|
|
|
|
pixman_region32_init(region);
|
|
|
|
struct wl_resource *region_resource = wl_resource_create(client,
|
|
&wl_region_interface, version, id);
|
|
if (region_resource == NULL) {
|
|
free(region);
|
|
wl_client_post_no_memory(client);
|
|
return NULL;
|
|
}
|
|
wl_resource_set_implementation(region_resource, ®ion_impl, region,
|
|
region_handle_resource_destroy);
|
|
|
|
struct wl_list *resource_link = wl_resource_get_link(region_resource);
|
|
if (resource_list != NULL) {
|
|
wl_list_insert(resource_list, resource_link);
|
|
} else {
|
|
wl_list_init(resource_link);
|
|
}
|
|
|
|
return region_resource;
|
|
}
|
|
|
|
pixman_region32_t *wlr_region_from_resource(struct wl_resource *resource) {
|
|
assert(wl_resource_instance_of(resource, &wl_region_interface,
|
|
®ion_impl));
|
|
return wl_resource_get_user_data(resource);
|
|
}
|