mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor: Support notifying with absolute position too 

With evdev input devices that generate absolute positions we need to provide
an infrastructure in the compositor for supporting those.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=61997
This commit is contained in:
Rob Bradford 2013-03-27 15:59:43 +00:00 committed by Kristian Høgsberg
parent 32069c09ea
commit c088e2c011
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compositor.c
View File

@ -1782,17 +1782,15 @@ clip_pointer_motion(struct weston_seat *seat, wl_fixed_t *fx, wl_fixed_t *fy)
}
}
/* Takes absolute values */
static void
move_pointer(struct weston_seat *seat, wl_fixed_t dx, wl_fixed_t dy)
move_pointer(struct weston_seat *seat, wl_fixed_t x, wl_fixed_t y)
{
struct weston_compositor *ec = seat->compositor;
struct wl_pointer *pointer = seat->seat.pointer;
struct weston_output *output;
wl_fixed_t x, y;
int32_t ix, iy;
x = pointer->x + dx;
y = pointer->y + dy;
clip_pointer_motion(seat, &x, &y);
weston_seat_update_drag_surface(seat, x - pointer->x, y - pointer->y);
@ -1829,7 +1827,24 @@ notify_motion(struct weston_seat *seat,
weston_compositor_wake(ec);
move_pointer(seat, dx, dy);
move_pointer(seat, pointer->x + dx, pointer->y + dy);
interface = pointer->grab->interface;
interface->motion(pointer->grab, time,
pointer->grab->x, pointer->grab->y);
}
WL_EXPORT void
notify_motion_absolute(struct weston_seat *seat,
uint32_t time, wl_fixed_t x, wl_fixed_t y)
{
const struct wl_pointer_grab_interface *interface;
struct weston_compositor *ec = seat->compositor;
struct wl_pointer *pointer = seat->seat.pointer;
weston_compositor_wake(ec);
move_pointer(seat, x, y);
interface = pointer->grab->interface;
interface->motion(pointer->grab, time,

5
src/compositor.h
View File

@ -556,7 +556,10 @@ weston_surface_activate(struct weston_surface *surface,
struct weston_seat *seat);
void
notify_motion(struct weston_seat *seat, uint32_t time,
wl_fixed_t x, wl_fixed_t y);
wl_fixed_t dx, wl_fixed_t dy);
void
notify_motion_absolute(struct weston_seat *seat, uint32_t time,
wl_fixed_t x, wl_fixed_t y);
void
notify_button(struct weston_seat *seat, uint32_t time, int32_t button,
enum wl_pointer_button_state state);

2
src/evdev.c
View File

@ -284,7 +284,7 @@ evdev_flush_motion(struct evdev_device *device, uint32_t time)
}
if (device->pending_events & EVDEV_ABSOLUTE_MOTION) {
transform_absolute(device);
notify_motion(master, time,
notify_motion_absolute(master, time,
wl_fixed_from_int(device->abs.x),
wl_fixed_from_int(device->abs.y));
device->pending_events &= ~EVDEV_ABSOLUTE_MOTION;