Reorganize wlr-common

3 files changed, 174 insertions, 0 deletions

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
new file mode 100644
index 00000000..5a057889
--- /dev/null
+++ b/util/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_library(wlr-util STATIC
+	list.c
+    log.c
+)
+
+target_link_libraries(wlr-util m)
diff --git a/util/list.c b/util/list.c
new file mode 100644
index 00000000..94159036
--- /dev/null
+++ b/util/list.c
@@ -0,0 +1,91 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>
+#include <wlr/util/list.h>
+
+list_t *list_create(void) {
+	list_t *list = malloc(sizeof(list_t));
+	list->capacity = 10;
+	list->length = 0;
+	list->items = malloc(sizeof(void*) * list->capacity);
+	return list;
+}
+
+static void list_resize(list_t *list) {
+	if (list->length == list->capacity) {
+		list->capacity += 10;
+		list->items = realloc(list->items, sizeof(void*) * list->capacity);
+	}
+}
+
+void list_free(list_t *list) {
+	if (list == NULL) {
+		return;
+	}
+	free(list->items);
+	free(list);
+}
+
+void list_foreach(list_t *list, void (*callback)(void *item)) {
+	if (list == NULL || callback == NULL) {
+		return;
+	}
+	for (size_t i = 0; i < list->length; i++) {
+		callback(list->items[i]);
+	}
+}
+
+void list_add(list_t *list, void *item) {
+	list_resize(list);
+	list->items[list->length++] = item;
+}
+
+void list_push(list_t *list, void *item) {
+	list_add(list, item);
+}
+
+void list_insert(list_t *list, size_t index, void *item) {
+	list_resize(list);
+	memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index));
+	list->length++;
+	list->items[index] = item;
+}
+
+void list_del(list_t *list, size_t index) {
+	list->length--;
+	memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index));
+}
+
+void *list_pop(list_t *list) {
+	void *_ = list->items[list->length - 1];
+	list_del(list, list->length - 1);
+	return _;
+}
+
+void *list_peek(list_t *list) {
+	return list->items[list->length - 1];
+}
+
+void list_cat(list_t *list, list_t *source) {
+	size_t i;
+	for (i = 0; i < source->length; ++i) {
+		list_add(list, source->items[i]);
+	}
+}
+
+void list_qsort(list_t* list, int compare(const void *left, const void *right)) {
+	qsort(list->items, list->length, sizeof(void *), compare);
+}
+
+int list_seq_find(list_t *list,
+		int compare(const void *item, const void *data),
+		const void *data) {
+	for (size_t i = 0; i < list->length; i++) {
+		void *item = list->items[i];
+		if (compare(item, data) == 0) {
+			return i;
+		}
+	}
+	return -1;
+}
diff --git a/util/log.c b/util/log.c
new file mode 100644
index 00000000..760ef18a
--- /dev/null
+++ b/util/log.c
@@ -0,0 +1,77 @@
+#define _POSIX_C_SOURCE 1
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <time.h>
+#include <wlr/util/log.h>
+
+static bool colored = true;
+
+static const char *verbosity_colors[] = {
+	[L_SILENT] = "",
+	[L_ERROR ] = "\x1B[1;31m",
+	[L_INFO  ] = "\x1B[1;34m",
+	[L_DEBUG ] = "\x1B[1;30m",
+};
+
+void wlr_log_stderr(log_importance_t verbosity, const char *fmt, va_list args) {
+	// prefix the time to the log message
+	struct tm result;
+	time_t t = time(NULL);
+	struct tm *tm_info = localtime_r(&t, &result);
+	char buffer[26];
+
+	// generate time prefix
+	strftime(buffer, sizeof(buffer), "%F %T - ", tm_info);
+	fprintf(stderr, "%s", buffer);
+
+	unsigned c = (verbosity < L_LAST) ? verbosity : L_LAST - 1;
+
+	if (colored && isatty(STDERR_FILENO)) {
+		fprintf(stderr, "%s", verbosity_colors[c]);
+	}
+
+	vfprintf(stderr, fmt, args);
+
+	if (colored && isatty(STDERR_FILENO)) {
+		fprintf(stderr, "\x1B[0m");
+	}
+	fprintf(stderr, "\n");
+}
+
+static log_callback_t log_callback = wlr_log_stderr;
+
+void wlr_log_init(log_callback_t callback) {
+	log_callback = callback;
+}
+
+void _wlr_vlog(log_importance_t verbosity, const char *fmt, va_list args) {
+	log_callback(verbosity, fmt, args);
+}
+
+void _wlr_log(log_importance_t verbosity, const char *fmt, ...) {
+	va_list args;
+	va_start(args, fmt);
+	log_callback(verbosity, fmt, args);
+	va_end(args);
+}
+
+// strips the path prefix from filepath
+// will try to strip WLR_SRC_DIR as well as a relative src dir
+// e.g. '/src/build/wlroots/backend/wayland/backend.c' and
+// '../backend/wayland/backend.c' will both be stripped to
+// 'backend/wayland/backend.c'
+const char *_strip_path(const char *filepath) {
+	static int srclen = strlen(WLR_SRC_DIR) + 1;
+	if(*filepath == '.') {
+		while(*filepath == '.' || *filepath == '/') {
+			++filepath;
+		}
+	} else {
+		filepath += srclen;
+	}
+	return filepath;
+}