mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data-device: Fix surface configure function type

Browse Source 
The commit "Remove the weston_view.geometry.width/height fields" changed
the type of the surface configure callback function, but did not change
the callbacks in data-device.c. This commit fixes the type of the
functions left needed to be changed.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl
2013-12-03 22:30:17 +01:00
committed by Kristian Høgsberg
parent aedc7732eb
commit 767d891c35
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data-device.c
+9 -8
View File
@@ -182,10 +182,10 @@ static struct wl_data_source_interface data_source_interface = {
static void static void
drag_surface_configure(struct weston_drag *drag, drag_surface_configure(struct weston_drag *drag,
struct weston_pointer *pointer, struct weston_pointer *pointer,
struct weston_touch *touch, struct weston_touch *touch,
struct weston_surface *es, int32_t sx, int32_t sy, struct weston_surface *es,
int32_t width, int32_t height) int32_t sx, int32_t sy)
{ {
struct wl_list *list; struct wl_list *list;
float fx, fy; float fx, fy;
@@ -222,25 +222,26 @@ drag_surface_configure(struct weston_drag *drag,
} }
static void static void
pointer_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height) pointer_drag_surface_configure(struct weston_surface *es,
int32_t sx, int32_t sy)
{ {
struct weston_pointer_drag *drag = es->configure_private; struct weston_pointer_drag *drag = es->configure_private;
struct weston_pointer *pointer = drag->grab.pointer; struct weston_pointer *pointer = drag->grab.pointer;
assert(es->configure == pointer_drag_surface_configure); assert(es->configure == pointer_drag_surface_configure);
drag_surface_configure(&drag->base, pointer, NULL, es, sx, sy, width, height); drag_surface_configure(&drag->base, pointer, NULL, es, sx, sy);
} }
static void static void
touch_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height) touch_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
{ {
struct weston_touch_drag *drag = es->configure_private; struct weston_touch_drag *drag = es->configure_private;
struct weston_touch *touch = drag->grab.touch; struct weston_touch *touch = drag->grab.touch;
assert(es->configure == touch_drag_surface_configure); assert(es->configure == touch_drag_surface_configure);
drag_surface_configure(&drag->base, NULL, touch, es, sx, sy, width, height); drag_surface_configure(&drag->base, NULL, touch, es, sx, sy);
} }
static void static void