diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2014-06-26 10:37:36 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2014-07-05 01:03:55 -0700 |
| commit | ef5400843ff53c76ccfac99a80ef84baaee3dc38 (patch) | |
| tree | fe83e860caa0cc02851ce2873911aa90c4554570 /src/data-device.c | |
| parent | 32abdbbad97e99cc76409ecfa4b446db63907cc3 (diff) | |
| download | weston-ef5400843ff53c76ccfac99a80ef84baaee3dc38.tar.gz | |
Use pixman_region32_clear instead of our own empty_region
This requires pixman 0.25.2
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Diffstat (limited to 'src/data-device.c')
| -rw-r--r-- | src/data-device.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/data-device.c b/src/data-device.c index 88c6de36..a069b3c0 100644 --- a/src/data-device.c +++ b/src/data-device.c @@ -53,13 +53,6 @@ struct weston_touch_drag { }; static void -empty_region(pixman_region32_t *region) -{ - pixman_region32_fini(region); - pixman_region32_init(region); -} - -static void data_offer_accept(struct wl_client *client, struct wl_resource *resource, uint32_t serial, const char *mime_type) { @@ -203,7 +196,7 @@ drag_surface_configure(struct weston_drag *drag, wl_list_remove(&drag->icon->layer_link); wl_list_insert(list, &drag->icon->layer_link); weston_view_update_transform(drag->icon); - empty_region(&es->pending.input); + pixman_region32_clear(&es->pending.input); } drag->dx += sx; @@ -358,7 +351,7 @@ data_device_end_drag_grab(struct weston_drag *drag, weston_view_unmap(drag->icon); drag->icon->surface->configure = NULL; - empty_region(&drag->icon->surface->pending.input); + pixman_region32_clear(&drag->icon->surface->pending.input); wl_list_remove(&drag->icon_destroy_listener.link); weston_view_destroy(drag->icon); } |