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

libweston: Use struct timespec for axis events

Browse Source 
Change code related to axis events to use struct timespec to represent
time.

This commit is part of a larger effort to transition the Weston codebase
to struct timespec.

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Alexandros Frantzis
2017-11-16 18:20:56 +02:00
committed by Pekka Paalanen
parent 215bedc88b
commit 80321942e7
13 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/exposay.c
+2 -1
View File
@@ -390,7 +390,8 @@ exposay_button(struct weston_pointer_grab *grab, const struct timespec *time,
static void
exposay_axis(struct weston_pointer_grab *grab,
uint32_t time, struct weston_pointer_axis_event *event)
const struct timespec *time,
struct weston_pointer_axis_event *event)
{
}
desktop-shell/shell.c
+12 -6
View File
@@ -1431,7 +1431,8 @@ noop_grab_focus(struct weston_pointer_grab *grab)
static void
noop_grab_axis(struct weston_pointer_grab *grab,
uint32_t time, struct weston_pointer_axis_event *event)
const struct timespec *time,
struct weston_pointer_axis_event *event)
{
}
@@ -3344,7 +3345,8 @@ resize_binding(struct weston_pointer *pointer, const struct timespec *time,
}
static void
surface_opacity_binding(struct weston_pointer *pointer, uint32_t time,
surface_opacity_binding(struct weston_pointer *pointer,
const struct timespec *time,
struct weston_pointer_axis_event *event,
void *data)
{
@@ -3374,8 +3376,8 @@ surface_opacity_binding(struct weston_pointer *pointer, uint32_t time,
}
static void
do_zoom(struct weston_seat *seat, uint32_t time, uint32_t key, uint32_t axis,
double value)
do_zoom(struct weston_seat *seat, const struct timespec *time, uint32_t key,
uint32_t axis, double value)
{
struct weston_compositor *compositor = seat->compositor;
struct weston_pointer *pointer = weston_seat_get_pointer(seat);
@@ -3424,7 +3426,7 @@ do_zoom(struct weston_seat *seat, uint32_t time, uint32_t key, uint32_t axis,
}
static void
zoom_axis_binding(struct weston_pointer *pointer, uint32_t time,
zoom_axis_binding(struct weston_pointer *pointer, const struct timespec *time,
struct weston_pointer_axis_event *event,
void *data)
{
@@ -3435,7 +3437,11 @@ static void
zoom_key_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
do_zoom(keyboard->seat, time, key, 0, 0);
struct timespec ts;
timespec_from_msec(&ts, time);
do_zoom(keyboard->seat, &ts, key, 0, 0);
}
static void