[PATCH 1/2] input: adjust grab name field according protocol changes
Tiago Vignatti
vignatti at freedesktop.org
Mon Dec 12 08:55:43 PST 2011
From: Tiago Vignatti <tiago.vignatti at intel.com>
Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
compositor/compositor.c | 6 +++---
compositor/shell.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 4f25b6d..c2575ac 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -1254,13 +1254,13 @@ implicit_grab_motion(struct wl_grab *grab,
uint32_t time, int32_t x, int32_t y)
{
struct wlsc_input_device *device =
- (struct wlsc_input_device *) grab->input_device;
+ (struct wlsc_input_device *) grab->winput_dev;
struct wlsc_surface *es =
(struct wlsc_surface *) device->input_device.pointer_focus;
int32_t sx, sy;
struct wl_resource *resource;
- resource = grab->input_device->pointer_focus_resource;
+ resource = grab->winput_dev->pointer_focus_resource;
if (resource) {
wlsc_surface_transform(es, x, y, &sx, &sy);
wl_resource_post_event(resource, WL_INPUT_DEVICE_MOTION,
@@ -1274,7 +1274,7 @@ implicit_grab_button(struct wl_grab *grab,
{
struct wl_resource *resource;
- resource = grab->input_device->pointer_focus_resource;
+ resource = grab->winput_dev->pointer_focus_resource;
if (resource)
wl_resource_post_event(resource, WL_INPUT_DEVICE_BUTTON,
time, button, state);
diff --git a/compositor/shell.c b/compositor/shell.c
index 22004f9..bb09166 100644
--- a/compositor/shell.c
+++ b/compositor/shell.c
@@ -165,7 +165,7 @@ resize_grab_motion(struct wl_grab *grab,
uint32_t time, int32_t x, int32_t y)
{
struct wlsc_resize_grab *resize = (struct wlsc_resize_grab *) grab;
- struct wl_input_device *device = grab->input_device;
+ struct wl_input_device *device = grab->winput_dev;
int32_t width, height;
if (resize->edges & WL_SHELL_SURFACE_RESIZE_LEFT) {
--
1.7.5.4
More information about the wayland-devel
mailing list