Merge pull request #358 from acrisci/refactor/sec-to-msec

refactor input time_sec to time_msec

6 files changed, 18 insertions, 32 deletions

diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 78d01edf..2c8fd982 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -23,4 +23,6 @@ bool wlr_backend_start(struct wlr_backend *backend);
 void wlr_backend_destroy(struct wlr_backend *backend);
 struct wlr_egl *wlr_backend_get_egl(struct wlr_backend *backend);
 
+uint32_t usec_to_msec(uint64_t usec);
+
 #endif
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index a6726a7c..af837ff5 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -63,8 +63,7 @@ enum wlr_key_state {
 };
 
 struct wlr_event_keyboard_key {
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	uint32_t keycode;
 	bool update_state;
 	enum wlr_key_state state;
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index a59d8817..3a6d2175 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -22,23 +22,20 @@ struct wlr_pointer {
 
 struct wlr_event_pointer_motion {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	double delta_x, delta_y;
 };
 
 struct wlr_event_pointer_motion_absolute {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
 };
 
 struct wlr_event_pointer_button {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	uint32_t button;
 	enum wlr_button_state state;
 };
@@ -57,8 +54,7 @@ enum wlr_axis_orientation {
 
 struct wlr_event_pointer_axis {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	enum wlr_axis_source source;
 	enum wlr_axis_orientation orientation;
 	double delta;
diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index b747e6f1..51a65dd1 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -26,8 +26,7 @@ struct wlr_tablet_pad {
 };
 
 struct wlr_event_tablet_pad_button {
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	uint32_t button;
 	enum wlr_button_state state;
 };
@@ -38,8 +37,7 @@ enum wlr_tablet_pad_ring_source {
 };
 
 struct wlr_event_tablet_pad_ring {
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	enum wlr_tablet_pad_ring_source source;
 	uint32_t ring;
 	double position;
@@ -51,8 +49,7 @@ enum wlr_tablet_pad_strip_source {
 };
 
 struct wlr_event_tablet_pad_strip {
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	enum wlr_tablet_pad_strip_source source;
 	uint32_t strip;
 	double position;
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index f04dfe15..c6984d4d 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -34,8 +34,7 @@ enum wlr_tablet_tool_axes {
 
 struct wlr_event_tablet_tool_axis {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	uint32_t updated_axes;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
@@ -54,8 +53,7 @@ enum wlr_tablet_tool_proximity_state {
 
 struct wlr_event_tablet_tool_proximity {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
 	enum wlr_tablet_tool_proximity_state state;
@@ -68,8 +66,7 @@ enum wlr_tablet_tool_tip_state {
 
 struct wlr_event_tablet_tool_tip {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
 	enum wlr_tablet_tool_tip_state state;
@@ -77,8 +74,7 @@ struct wlr_event_tablet_tool_tip {
 
 struct wlr_event_tablet_tool_button {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	uint32_t button;
 	enum wlr_button_state state;
 };
diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h
index f1165c87..072e25fd 100644
--- a/include/wlr/types/wlr_touch.h
+++ b/include/wlr/types/wlr_touch.h
@@ -21,8 +21,7 @@ struct wlr_touch {
 
 struct wlr_event_touch_down {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	int32_t slot;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
@@ -30,15 +29,13 @@ struct wlr_event_touch_down {
 
 struct wlr_event_touch_up {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	int32_t slot;
 };
 
 struct wlr_event_touch_motion {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	int32_t slot;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
@@ -46,8 +43,7 @@ struct wlr_event_touch_motion {
 
 struct wlr_event_touch_cancel {
 	struct wlr_input_device *device;
-	uint32_t time_sec;
-	uint64_t time_usec;
+	uint32_t time_msec;
 	int32_t slot;
 };