From 7fe983af16dbeb949f0019f77a6f85b69673fc2d Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Tue, 4 Oct 2022 18:10:48 +0200
Subject: [PATCH] keyboard: Extract logic to parse keyboard layer list

The user can optionally override the list of keyboard layers compiled
into the executable. Right now this only works for non-landscape mode
though.

Pull out the logic to parse the list of keyboard layers so that we can
reuse it to also optionally override layers in landscape mode.
---
 keyboard.c | 75 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/keyboard.c b/keyboard.c
index 33f0a73..d8fd9c3 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -45,11 +45,48 @@ kbd_get_rows(struct layout *l) {
 	return rows + 1;
 }
 
-void
-kbd_init(struct kbd *kb, struct layout *layouts, char *layer_names_list) {
+enum layout_id *
+kbd_init_layers(char *layer_names_list) {
+	enum layout_id *layers;
+	uint8_t numlayers = 0;
+	bool found;
 	char *s;
 	int i;
-	bool found;
+
+	layers = malloc(MAX_LAYERS * sizeof(enum layout_id));
+	s = strtok(layer_names_list, ",");
+	while (s != NULL) {
+		if (numlayers + 1 == MAX_LAYERS) {
+			fprintf(stderr, "too many layers specified");
+			exit(3);
+		}
+		found = false;
+		for (i = 0; i < NumLayouts - 1; i++) {
+			if (layouts[i].name && strcmp(layouts[i].name, s) == 0) {
+				fprintf(stderr, "layer #%d = %s\n", numlayers + 1, s);
+				layers[numlayers++] = i;
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			fprintf(stderr, "No such layer: %s\n", s);
+			exit(3);
+		}
+		s = strtok(NULL, ",");
+	}
+	layers[numlayers] = NumLayouts; // mark the end of the sequence
+	if (numlayers == 0) {
+		fprintf(stderr, "No layers defined\n");
+		exit(3);
+	}
+
+	return layers;
+}
+
+void
+kbd_init(struct kbd *kb, struct layout *layouts, char *layer_names_list) {
+	int i;
 
 	fprintf(stderr, "Initializing keyboard\n");
 
@@ -61,36 +98,8 @@ kbd_init(struct kbd *kb, struct layout *layouts, char *layer_names_list) {
 
 	kb->layer_index = 0;
 
-	if (layer_names_list) {
-		uint8_t numlayers = 0;
-		kb->layers = malloc(MAX_LAYERS * sizeof(enum layout_id));
-		s = strtok(layer_names_list, ",");
-		while (s != NULL) {
-			if (numlayers + 1 == MAX_LAYERS) {
-				fprintf(stderr, "too many layers specified");
-				exit(3);
-			}
-			found = false;
-			for (i = 0; i < NumLayouts - 1; i++) {
-				if (kb->layouts[i].name && strcmp(kb->layouts[i].name, s) == 0) {
-					fprintf(stderr, "layer #%d = %s\n", numlayers + 1, s);
-					kb->layers[numlayers++] = i;
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				fprintf(stderr, "No such layer: %s\n", s);
-				exit(3);
-			}
-			s = strtok(NULL, ",");
-		}
-		kb->layers[numlayers] = NumLayouts; // mark the end of the sequence
-		if (numlayers == 0) {
-			fprintf(stderr, "No layers defined\n");
-			exit(3);
-		}
-	}
+	if (layer_names_list)
+		kb->layers = kbd_init_layers(layer_names_list);
 
 	i = 0;
 	enum layout_id lid = kb->layers[0];