aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-28 10:46:50 -0400
committerDrew DeVault <sir@cmpwn.com>2018-03-28 10:46:50 -0400
commita35a5786b0e40cb1ffa87344d3cb21dff9fd99f4 (patch)
tree727523fb9b341f608827a0b848ef4798d346d65b /examples
parent330ee081269790922a46091399b616b12ce14f51 (diff)
Remove width_mm from wlr_pointer events
Diffstat (limited to 'examples')
-rw-r--r--examples/multi-pointer.c3
-rw-r--r--examples/pointer.c6
-rw-r--r--examples/support/shared.c4
3 files changed, 6 insertions, 7 deletions
diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c
index 1f869f50..46f0e78f 100644
--- a/examples/multi-pointer.c
+++ b/examples/multi-pointer.c
@@ -118,8 +118,7 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
struct sample_cursor *cursor =
wl_container_of(listener, cursor, cursor_motion_absolute);
struct wlr_event_pointer_motion_absolute *event = data;
- wlr_cursor_warp_absolute(cursor->cursor, event->device,
- event->x_mm / event->width_mm, event->y_mm / event->height_mm);
+ wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
}
static void handle_input_add(struct compositor_state *state,
diff --git a/examples/pointer.c b/examples/pointer.c
index 9794e6e5..12312092 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -154,8 +154,8 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
wl_container_of(listener, sample, cursor_motion_absolute);
struct wlr_event_pointer_motion_absolute *event = data;
- sample->cur_x = event->x_mm;
- sample->cur_y = event->y_mm;
+ sample->cur_x = event->x;
+ sample->cur_y = event->y;
wlr_cursor_warp_absolute(sample->cursor, event->device, sample->cur_x,
sample->cur_y);
@@ -252,7 +252,7 @@ static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) {
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
wlr_cursor_warp_absolute(sample->cursor, event->device,
- event->x_mm / event->width_mm, event->y_mm / event->height_mm);
+ event->x_mm / event->width_mm, event->y_mm / event->height_mm);
}
}
diff --git a/examples/support/shared.c b/examples/support/shared.c
index e6233206..c6460374 100644
--- a/examples/support/shared.c
+++ b/examples/support/shared.c
@@ -108,8 +108,8 @@ static void pointer_motion_absolute_notify(struct wl_listener *listener, void *d
struct wlr_event_pointer_motion_absolute *event = data;
struct pointer_state *pstate = wl_container_of(listener, pstate, motion_absolute);
if (pstate->compositor->pointer_motion_absolute_cb) {
- pstate->compositor->pointer_motion_absolute_cb(pstate,
- event->x_mm, event->y_mm);
+ pstate->compositor->pointer_motion_absolute_cb(
+ pstate, event->x, event->y);
}
}