From 04f75e6acc0aa12947be6f6d56ed593bedd4395a Mon Sep 17 00:00:00 2001
From: Kenny Levinsen <kl@kl.wtf>
Date: Sun, 20 Jun 2021 19:24:55 +0200
Subject: [PATCH] input: Move get_current_time_msec in from util

get_current_time_msec is only used in cursor.c, so we can move it in and
make it static. This is primarily intended to avoid a symbol collision
with wlroots, which we unfortunately do not have a good solution for
yet.

(cherry picked from commit 80315217f76e923cb19cdb76aaf9a5d177f11f61)
---
 common/util.c       | 6 ------
 include/util.h      | 6 ------
 sway/input/cursor.c | 7 +++++++
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/common/util.c b/common/util.c
index 5ea94f48..199f3ee1 100644
--- a/common/util.c
+++ b/common/util.c
@@ -10,12 +10,6 @@
 #include "log.h"
 #include "util.h"
 
-uint32_t get_current_time_msec(void) {
-	struct timespec now;
-	clock_gettime(CLOCK_MONOTONIC, &now);
-	return now.tv_sec * 1000 + now.tv_nsec / 1000000;
-}
-
 int wrap(int i, int max) {
 	return ((i % max) + max) % max;
 }
diff --git a/include/util.h b/include/util.h
index c80da1cb..f887d489 100644
--- a/include/util.h
+++ b/include/util.h
@@ -29,12 +29,6 @@ enum movement_unit parse_movement_unit(const char *unit);
 int parse_movement_amount(int argc, char **argv,
 		struct movement_amount *amount);
 
-/**
- * Get the current time, in milliseconds.
- */
-
-uint32_t get_current_time_msec(void);
-
 /**
  * Wrap i into the range [0, max]
  */
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index cbb5c6e9..c89d5166 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -4,6 +4,7 @@
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <errno.h>
+#include <time.h>
 #include <strings.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_cursor.h>
@@ -31,6 +32,12 @@
 #include "sway/tree/workspace.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 
+static uint32_t get_current_time_msec(void) {
+	struct timespec now;
+	clock_gettime(CLOCK_MONOTONIC, &now);
+	return now.tv_sec * 1000 + now.tv_nsec / 1000000;
+}
+
 static struct wlr_surface *layer_surface_at(struct sway_output *output,
 		struct wl_list *layer, double ox, double oy, double *sx, double *sy) {
 	struct sway_layer_surface *sway_layer;