From 6f5b697c3c9d0fbbba0f7aaf158c2da2ea48dcb2 Mon Sep 17 00:00:00 2001
From: Leon Henrik Plickat <leonhenrik.plickat@stud.uni-goettingen.de>
Date: Sat, 26 Sep 2020 07:02:34 +0200
Subject: `--position` instead of `--anchor`

---
 doc/wlclock.1.scd | 17 ++++++++--------
 src/surface.c     | 16 ---------------
 src/wlclock.c     | 61 +++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/doc/wlclock.1.scd b/doc/wlclock.1.scd
index bf4181e..77c31ee 100644
--- a/doc/wlclock.1.scd
+++ b/doc/wlclock.1.scd
@@ -24,10 +24,6 @@ but a desktop-widget.
 *-v*, *--verbose*
 	Increase verbosity of logging.
 
-*--anchor* <top> <right> <bottom> <left>
-	Set the directional anchors of the layer surface. Requires 4 arguments,
-	each being a boolean "true" or "false". By default all anchors are "false".
-
 *--background-colour* <colour>
 	The background colour of the clock. The default is "#FFFFFF".
 
@@ -51,7 +47,7 @@ but a desktop-widget.
 	default radius is 5. If set to sufficiently high values, wlclock will be
 	completely round. Set to 0 to disable corner roundness.
 
-*--exclusive-zone* <true|false|stationary>
+*--exclusive-zone* <option>
 	Exclusive zone of the surface. Can be "true", "false" or "stationary". If
 	"true", the compositor is informed that it should not obstruct the surface
 	of wlclock with other surfaces. If "false", the compositor is informed that
@@ -62,12 +58,12 @@ but a desktop-widget.
 	default is "stationary". The exact implementation is compositor dependant;
 	A compositor may choose to ignore the requested exclusive zone of surfaces.
 
-*--hand-style* <xclock|lines>
+*--hand-style* <style>
 	Style of the clock hands. Can be "xclock", where wlclock draws xclock-esque
 	triangles, and "lines", where wlclock draws straight lines. The default is
 	"xclock".
 
-*--layer* <background|bottom|top|overlay>
+*--layer* <layer>
 	Layer of the layer surface. Can be "overlay", "top", "bottom" or
 	"background". Typically, "bottom" and "background" will be underneath
 	regular windows, while "top" and "overlay" will be above them, however
@@ -87,11 +83,16 @@ but a desktop-widget.
 	input events; This will make mouse events pass through wlclock to windows
 	beneath it.
 
-*--output* <output|all>
+*--output* <output name>
 	Name of the output on which wlclock should be displayed. Output names
 	are compositor dependant. If set to "all" or "\*", wlclock will be displayed
 	on all outputs, which is the default behaviour.
 
+*--position* <position>
+	Set the position of the clock. Can be "center", "top", "right", "bottom",
+	"left", "top-right", "top-left", "bottom-right" and "bottom-left". Defaults
+	to "center".
+
 *--size* <size>
 	The size of the clock, without borders. The default size is 165.
 
diff --git a/src/surface.c b/src/surface.c
index da3666d..18e6131 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -66,27 +66,11 @@ static int32_t get_exclusive_zone (struct Wlclock_surface *surface)
 	if ( clock->exclusive_zone == 1 ) switch (clock->anchor)
 	{
 		case ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM:
-		case ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT:
 		case ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP:
-		case ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT:
-		case ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT:
 			return surface->dimensions.h;
 
 		case ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT:
-		case ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM:
 		case ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT:
-		case ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM:
-		case ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
-			| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM:
 			return surface->dimensions.w;
 
 		default:
diff --git a/src/wlclock.c b/src/wlclock.c
index c3ad2a4..affb641 100644
--- a/src/wlclock.c
+++ b/src/wlclock.c
@@ -177,22 +177,22 @@ static bool handle_command_flags (struct Wlclock *clock, int argc, char *argv[])
 {
 	enum
 	{
-		ANCHOR,
 		BACKGROUND_COLOUR,
 		BORDER_COLOUR,
 		BORDER_SIZE,
 		CLOCK_COLOUR,
 		CLOCK_FACE_SIZE,
+		CORNER_RADIUS,
 		EXCLUSIVE_ZONE,
+		HAND_STYLE,
 		LAYER,
 		MARGIN,
 		NAMEPSACE,
 		NO_INPUT,
-		SNAP,
 		OUTPUT,
-		CORNER_RADIUS,
+		POSITION,
 		SIZE,
-		HAND_STYLE
+		SNAP
 	};
 
 	static struct option opts[] = {
@@ -200,22 +200,22 @@ static bool handle_command_flags (struct Wlclock *clock, int argc, char *argv[])
 		{"verbose",  no_argument,       NULL, 'v'},
 		{"version",  no_argument,       NULL, 'V'},
 
-		{"anchor",            required_argument, NULL, ANCHOR},
 		{"background-colour", required_argument, NULL, BACKGROUND_COLOUR},
 		{"border-colour",     required_argument, NULL, BORDER_COLOUR},
 		{"border-size",       required_argument, NULL, BORDER_SIZE},
 		{"clock-colour",      required_argument, NULL, CLOCK_COLOUR},
 		{"clock-face-size",   required_argument, NULL, CLOCK_FACE_SIZE},
+		{"corner-radius",     required_argument, NULL, CORNER_RADIUS},
 		{"exclusive-zone",    required_argument, NULL, EXCLUSIVE_ZONE},
+		{"hand-style",        required_argument, NULL, HAND_STYLE},
 		{"layer",             required_argument, NULL, LAYER},
 		{"margin",            required_argument, NULL, MARGIN},
 		{"namespace",         required_argument, NULL, NAMEPSACE},
 		{"no-input",          no_argument,       NULL, NO_INPUT},
-		{"snap",              no_argument,       NULL, SNAP},
 		{"output",            required_argument, NULL, OUTPUT},
-		{"corner-radius",     required_argument, NULL, CORNER_RADIUS},
+		{"position",          required_argument, NULL, POSITION},
 		{"size",              required_argument, NULL, SIZE},
-		{"hand-style",        required_argument, NULL, HAND_STYLE}
+		{"snap",              no_argument,       NULL, SNAP}
 	};
 
 	const char *usage =
@@ -224,7 +224,6 @@ static bool handle_command_flags (struct Wlclock *clock, int argc, char *argv[])
 		"  -h, --help               Show this help text.\n"
 		"  -v, --verbose            Increase verbosity of output.\n"
 		"  -V, --version            Show the version.\n"
-		"      --anchor             Set the layer shell anchors.\n"
 		"      --background-colour  Background colour.\n"
 		"      --border-colour      Border colour.\n"
 		"      --border-size        Size of the border.\n"
@@ -238,6 +237,7 @@ static bool handle_command_flags (struct Wlclock *clock, int argc, char *argv[])
 		"      --namespace          Namespace of the layer surface.\n"
 		"      --no-input           Let inputs surface pass trough the layer surface.\n"
 		"      --output             The output which the clock will be displayed.\n"
+		"      --position           Set the position of the clock.\n"
 		"      --size               Size of the clock.\n"
 		"      --snap               Let the hour hand snap to the next position instead of slowly progressing.\n"
 		"\n";
@@ -261,22 +261,39 @@ static bool handle_command_flags (struct Wlclock *clock, int argc, char *argv[])
 			clock->ret = EXIT_SUCCESS;
 			return false;
 
-		case ANCHOR:
-			args = count_args(optind, argc, argv);
-			if ( args != 4 )
+		case POSITION:
+			if (! strcmp(optarg, "center"))
+				clock->anchor = 0;
+			else if (! strcmp(optarg, "top"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
+			else if (! strcmp(optarg, "right"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+			else if (! strcmp(optarg, "bottom"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+			else if (! strcmp(optarg, "left"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
+			else if (! strcmp(optarg, "top-left"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
+					| ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
+			else if (! strcmp(optarg, "top-right"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
+					| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+			else if (! strcmp(optarg, "bottom-left"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
+					| ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
+			else if (! strcmp(optarg, "bottom-right"))
+				clock->anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
+					| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+			else
 			{
-				clocklog(NULL, 0, "ERROR: Anchor configuration requires four arguments.\n");
+				clocklog(NULL, 0, "ERROR: Unrecognized position \"%s\".\n"
+						"INFO: Possible positisions are 'center', "
+						"'top', 'right', 'bottom', 'left', "
+						"'top-right', 'top-left', 'bottom-right', 'bottom-left'.\n",
+						optarg);
 				return false;
 			}
-			if (is_boolean_true(argv[optind-1]))
-				clock->anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
-			if (is_boolean_true(argv[optind]))
-				clock->anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-			if (is_boolean_true(argv[optind+1]))
-				clock->anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
-			if (is_boolean_true(argv[optind+2]))
-				clock->anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
-			optind += 3; /* Tell getopt() to skip three argv fields. */
+			break;
 			break;
 
 		case BACKGROUND_COLOUR:
-- 
cgit v1.2.3