Refactor theme-find functions

Author: johanmalm

main.c

@@ -8,7 +8,6 @@
 #include <sys/stat.h>
 #include "state.h"
 #include "tab-appearance.h"
-#include "tweaks.h"
 #include "xml.h"
 
 static void

meson.build

@@ -15,7 +15,7 @@ executable(
   files(
     'main.c',
     'xml.c',
-    'find-themes.c',
+    'theme.c',
     'keyboard-layouts.c',
     'tab-appearance.c',
     'update.c',

tab-appearance.c

@@ -2,38 +2,22 @@
 #include "keyboard-layouts.h"
 #include "state.h"
 #include "tab-appearance.h"
-#include "tweaks.h"
+#include "theme.h"
 #include "update.h"
 #include "xml.h"
 
-static struct themes openbox_themes = { 0 };
-static struct themes gtk_themes = { 0 };
-static struct themes icon_themes = { 0 };
-static struct themes cursor_themes = { 0 };
-
-static void
-free_theme_vector(struct themes *themes)
-{
-	for (int i = 0; i < themes->nr; ++i) {
-		struct theme *theme = themes->data + i;
-		if (theme->name) {
-			free(theme->name);
-		}
-		if (theme->path) {
-			free(theme->path);
-		}
-	}
-	free(themes->data);
-}
-
 void
 tab_appearance_init(struct state *state, GtkWidget *stack)
 {
 	/* load themes */
-	find_themes(&openbox_themes, "themes", "openbox-3/themerc");
-	find_themes(&gtk_themes, "themes", "gtk-3.0/gtk.css");
-	find_themes(&cursor_themes, "icons", "cursors");
-	find_themes(&icon_themes, "icons", NULL);
+	struct themes openbox_themes = { 0 };
+	struct themes gtk_themes = { 0 };
+	struct themes icon_themes = { 0 };
+	struct themes cursor_themes = { 0 };
+	theme_find(&openbox_themes, "themes", "openbox-3/themerc");
+	theme_find(&gtk_themes, "themes", "gtk-3.0/gtk.css");
+	theme_find(&cursor_themes, "icons", "cursors");
+	theme_find(&icon_themes, "icons", NULL);
 
 	GtkWidget *vbox, *widget, *hbbox;
 
@@ -186,9 +170,9 @@ tab_appearance_init(struct state *state, GtkWidget *stack)
 	gtk_container_add(GTK_CONTAINER(hbbox), widget);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
 
-	free_theme_vector(&openbox_themes);
-	free_theme_vector(&gtk_themes);
-	free_theme_vector(&icon_themes);
-	free_theme_vector(&cursor_themes);
+	theme_free_vector(&openbox_themes);
+	theme_free_vector(&gtk_themes);
+	theme_free_vector(&icon_themes);
+	theme_free_vector(&cursor_themes);
 }
 

find-themes.c renamed to theme.c

@@ -9,7 +9,7 @@
 #include <strings.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "tweaks.h"
+#include "theme.h"
 
 static struct theme *
 grow_vector_by_one_theme(struct themes *themes)
@@ -180,7 +180,7 @@ static struct {
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 void
-find_themes(struct themes *themes, const char *middle, const char *end)
+theme_find(struct themes *themes, const char *middle, const char *end)
 {
 	char path[4096];
 	for (uint32_t i = 0; i < ARRAY_SIZE(dirs); ++i) {
@@ -224,3 +224,19 @@ find_themes(struct themes *themes, const char *middle, const char *end)
 
 	qsort(themes->data, themes->nr, sizeof(struct theme), compare);
 }
+
+void
+theme_free_vector(struct themes *themes)
+{
+	for (int i = 0; i < themes->nr; ++i) {
+		struct theme *theme = themes->data + i;
+		if (theme->name) {
+			free(theme->name);
+		}
+		if (theme->path) {
+			free(theme->path);
+		}
+	}
+	free(themes->data);
+}
+

theme.h

@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef THEME_H
+#define THEME_H
+#include <stdbool.h>
+
+struct theme {
+	char *name;
+	char *path;
+};
+
+struct themes {
+	struct theme *data;
+	int nr, alloc;
+};
+
+void theme_find(struct themes *themes, const char *middle, const char *end);
+void theme_free_vector(struct themes *themes);
+
+#endif /* THEME_H */