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

compositor: Split pointer motion code into its own function

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-02-25 16:49:29 -05:00
parent 9bcaaebfee
commit e2464fd414
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+20 -9
View File
@@ -1712,17 +1712,14 @@ clip_pointer_motion(struct weston_seat *seat, wl_fixed_t *fx, wl_fixed_t *fy)
} }
} }
WL_EXPORT void static void
notify_motion(struct weston_seat *seat, uint32_t time, wl_fixed_t x, wl_fixed_t y) move_pointer(struct weston_seat *seat, wl_fixed_t x, wl_fixed_t y)
{ {
const struct wl_pointer_grab_interface *interface;
struct weston_compositor *ec = seat->compositor; struct weston_compositor *ec = seat->compositor;
struct weston_output *output;
struct wl_pointer *pointer = seat->seat.pointer; struct wl_pointer *pointer = seat->seat.pointer;
struct weston_output *output;
int32_t ix, iy; int32_t ix, iy;
weston_compositor_wake(ec);
clip_pointer_motion(seat, &x, &y); clip_pointer_motion(seat, &x, &y);
weston_seat_update_drag_surface(seat, x - pointer->x, y - pointer->y); weston_seat_update_drag_surface(seat, x - pointer->x, y - pointer->y);
@@ -1740,9 +1737,6 @@ notify_motion(struct weston_seat *seat, uint32_t time, wl_fixed_t x, wl_fixed_t
weston_output_update_zoom(output, ZOOM_FOCUS_POINTER); weston_output_update_zoom(output, ZOOM_FOCUS_POINTER);
weston_device_repick(seat); weston_device_repick(seat);
interface = pointer->grab->interface;
interface->motion(pointer->grab, time,
pointer->grab->x, pointer->grab->y);
if (seat->sprite) { if (seat->sprite) {
weston_surface_set_position(seat->sprite, weston_surface_set_position(seat->sprite,
@@ -1752,6 +1746,23 @@ notify_motion(struct weston_seat *seat, uint32_t time, wl_fixed_t x, wl_fixed_t
} }
} }
WL_EXPORT void
notify_motion(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,
pointer->grab->x, pointer->grab->y);
}
WL_EXPORT void WL_EXPORT void
weston_surface_activate(struct weston_surface *surface, weston_surface_activate(struct weston_surface *surface,
struct weston_seat *seat) struct weston_seat *seat)