diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-30 15:50:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 15:50:31 -0400 |
| commit | ebca06bfe46d18763c79f99382ce7c9717b538a6 (patch) | |
| tree | 171dfa1636c409cc5b4fbf8f5ddadea035e99a3d /backend/libinput/tablet_tool.c | |
| parent | 2e7cfd21e4c884910a703fab44009ba18c20f002 (diff) | |
| parent | 875a5b446fcf04314ee102624bda7ae18939837e (diff) | |
Merge pull request #358 from acrisci/refactor/sec-to-msec
refactor input time_sec to time_msec
Diffstat (limited to 'backend/libinput/tablet_tool.c')
| -rw-r--r-- | backend/libinput/tablet_tool.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 472e8506..3caaf3f7 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -31,8 +31,8 @@ void handle_tablet_tool_axis(struct libinput_event *event, libinput_event_get_tablet_tool_event(event); struct wlr_event_tablet_tool_axis wlr_event = { 0 }; wlr_event.device = wlr_dev; - wlr_event.time_sec = libinput_event_tablet_tool_get_time(tevent); - wlr_event.time_usec = libinput_event_tablet_tool_get_time_usec(tevent); + wlr_event.time_msec = + usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm); if (libinput_event_tablet_tool_x_has_changed(tevent)) { wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_X; @@ -85,8 +85,8 @@ void handle_tablet_tool_proximity(struct libinput_event *event, libinput_event_get_tablet_tool_event(event); struct wlr_event_tablet_tool_proximity wlr_event = { 0 }; wlr_event.device = wlr_dev; - wlr_event.time_sec = libinput_event_tablet_tool_get_time(tevent); - wlr_event.time_usec = libinput_event_tablet_tool_get_time_usec(tevent); + wlr_event.time_msec = + usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); switch (libinput_event_tablet_tool_get_proximity_state(tevent)) { case LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT: wlr_event.state = WLR_TABLET_TOOL_PROXIMITY_OUT; @@ -112,8 +112,8 @@ void handle_tablet_tool_tip(struct libinput_event *event, libinput_event_get_tablet_tool_event(event); struct wlr_event_tablet_tool_tip wlr_event = { 0 }; wlr_event.device = wlr_dev; - wlr_event.time_sec = libinput_event_tablet_tool_get_time(tevent); - wlr_event.time_usec = libinput_event_tablet_tool_get_time_usec(tevent); + wlr_event.time_msec = + usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); switch (libinput_event_tablet_tool_get_tip_state(tevent)) { case LIBINPUT_TABLET_TOOL_TIP_UP: wlr_event.state = WLR_TABLET_TOOL_TIP_UP; @@ -138,8 +138,8 @@ void handle_tablet_tool_button(struct libinput_event *event, libinput_event_get_tablet_tool_event(event); struct wlr_event_tablet_tool_button wlr_event = { 0 }; wlr_event.device = wlr_dev; - wlr_event.time_sec = libinput_event_tablet_tool_get_time(tevent); - wlr_event.time_usec = libinput_event_tablet_tool_get_time_usec(tevent); + wlr_event.time_msec = + usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); wlr_event.button = libinput_event_tablet_tool_get_button(tevent); switch (libinput_event_tablet_tool_get_button_state(tevent)) { case LIBINPUT_BUTTON_STATE_RELEASED: |