moved and renamed movement-unit parsing to common

1 files changed, 34 insertions, 0 deletions

diff --git a/common/util.c b/common/util.c
index cb142a5e..5ea94f48 100644
--- a/common/util.c
+++ b/common/util.c
@@ -71,6 +71,40 @@ float parse_float(const char *value) {
 	return flt;
 }
 
+enum movement_unit parse_movement_unit(const char *unit) {
+	if (strcasecmp(unit, "px") == 0) {
+		return MOVEMENT_UNIT_PX;
+	}
+	if (strcasecmp(unit, "ppt") == 0) {
+		return MOVEMENT_UNIT_PPT;
+	}
+	if (strcasecmp(unit, "default") == 0) {
+		return MOVEMENT_UNIT_DEFAULT;
+	}
+	return MOVEMENT_UNIT_INVALID;
+}
+
+int parse_movement_amount(int argc, char **argv,
+		struct movement_amount *amount) {
+	char *err;
+	amount->amount = (int)strtol(argv[0], &err, 10);
+	if (*err) {
+		// e.g. 10px
+		amount->unit = parse_movement_unit(err);
+		return 1;
+	}
+	if (argc == 1) {
+		amount->unit = MOVEMENT_UNIT_DEFAULT;
+		return 1;
+	}
+	// Try the second argument
+	amount->unit = parse_movement_unit(argv[1]);
+	if (amount->unit == MOVEMENT_UNIT_INVALID) {
+		amount->unit = MOVEMENT_UNIT_DEFAULT;
+		return 1;
+	}
+	return 2;
+}
 
 const char *sway_wl_output_subpixel_to_string(enum wl_output_subpixel subpixel) {
 	switch (subpixel) {