blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

implement compositor create region 

Complete the implementation of wlr_region_create and put it in the compositor.
This commit is contained in:
Tony Crisci 2017-08-10 05:57:58 -04:00
parent 750d0ad458
commit 14654ecb77
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/compositor/wl_compositor.c
View File

@ -3,6 +3,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_region.h>
#include "compositor.h" #include "compositor.h"
static void destroy_surface_listener(struct wl_listener *listener, void *data) { static void destroy_surface_listener(struct wl_listener *listener, void *data) {
@ -31,7 +32,7 @@ static void wl_compositor_create_surface(struct wl_client *client,
static void wl_compositor_create_region(struct wl_client *client, static void wl_compositor_create_region(struct wl_client *client,
struct wl_resource *resource, uint32_t id) { struct wl_resource *resource, uint32_t id) {
wlr_log(L_DEBUG, "TODO: implement create_region"); wlr_region_create(client, resource, id);
} }
struct wl_compositor_interface wl_compositor_impl = { struct wl_compositor_interface wl_compositor_impl = {

3
include/wlr/types/wlr_region.h
View File

@ -5,6 +5,7 @@ struct wl_resource;
// Implements the given resource as region. // Implements the given resource as region.
// Sets the associated pixman_region32_t as userdata. // Sets the associated pixman_region32_t as userdata.
void wlr_region_create(struct wl_resource *res); void wlr_region_create(struct wl_client *client, struct wl_resource *res,
uint32_t id);
#endif #endif

19
types/wlr_region.c
View File

@ -37,8 +37,23 @@ static void destroy_region(struct wl_resource *resource) {
free(reg); free(reg);
} }
void wlr_region_create(struct wl_resource *res) { void wlr_region_create(struct wl_client *client, struct wl_resource *res,
uint32_t id) {
pixman_region32_t *region = calloc(1, sizeof(pixman_region32_t)); pixman_region32_t *region = calloc(1, sizeof(pixman_region32_t));
if (region == NULL) {
wl_resource_post_no_memory(res);
return;
}
pixman_region32_init(region); pixman_region32_init(region);
wl_resource_set_implementation(res, &region_interface, region, destroy_region);
struct wl_resource *region_resource = wl_resource_create(client,
&wl_region_interface, 1, id);
if (region_resource == NULL) {
free(region);
wl_resource_post_no_memory(res);
return;
}
wl_resource_set_implementation(region_resource, &region_interface, region,
destroy_region);
} }