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

Convert wl_pointer::axis to wl_fixed_t

Browse Source 
To go with the matching protocol change.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
dev
Daniel Stone 13 years ago committed by Kristian Høgsberg
parent 0c1e46eb18
commit 2fce4028d6
5 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      clients/simple-egl.c
  2. 2
      clients/window.c
  3. 4
      src/compositor-wayland.c
  4. 2
      src/compositor.c
  5. 2
      tests/test-client.c

2
clients/simple-egl.c
Unescape View File

@ -385,7 +385,7 @@ pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
static void static void
pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
uint32_t time, uint32_t axis, int32_t value) uint32_t time, uint32_t axis, wl_fixed_t value)
{ {
} }

2
clients/window.c
Unescape View File

@ -1813,7 +1813,7 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
static void static void
pointer_handle_axis(void *data, struct wl_pointer *pointer, pointer_handle_axis(void *data, struct wl_pointer *pointer,
uint32_t time, uint32_t axis, int32_t value) uint32_t time, uint32_t axis, wl_fixed_t value)
{ {
} }

4
src/compositor-wayland.c
Unescape View File

@ -559,12 +559,12 @@ input_handle_button(void *data, struct wl_pointer *pointer,
static void static void
input_handle_axis(void *data, struct wl_pointer *pointer, input_handle_axis(void *data, struct wl_pointer *pointer,
uint32_t time, uint32_t axis, int32_t value) uint32_t time, uint32_t axis, wl_fixed_t value)
{ {
struct wayland_input *input = data; struct wayland_input *input = data;
struct wayland_compositor *c = input->compositor; struct wayland_compositor *c = input->compositor;
notify_axis(&c->base.seat->seat, time, axis, wl_fixed_from_int(value)); notify_axis(&c->base.seat->seat, time, axis, value);
} }
static const struct wl_pointer_listener pointer_listener = { static const struct wl_pointer_listener pointer_listener = {

2
src/compositor.c
Unescape View File

@ -1728,7 +1728,7 @@ notify_axis(struct wl_seat *seat, uint32_t time, uint32_t axis,
if (seat->pointer->focus_resource) if (seat->pointer->focus_resource)
wl_pointer_send_axis(seat->pointer->focus_resource, time, axis, wl_pointer_send_axis(seat->pointer->focus_resource, time, axis,
wl_fixed_to_int(value)); value);
} }
static int static int

2
tests/test-client.c
Unescape View File

@ -107,7 +107,7 @@ pointer_handle_button(void *data, struct wl_pointer *pointer,
static void static void
pointer_handle_axis(void *data, struct wl_pointer *pointer, pointer_handle_axis(void *data, struct wl_pointer *pointer,
uint32_t time, uint32_t axis, int32_t value) uint32_t time, uint32_t axis, wl_fixed_t value)
{ {
} }

Write Preview
Loading…
Cancel
Save