Merge branch 'release-4.16.1'

[i3/i3] / include / load_layout.h

diff --git a/include/load_layout.h b/include/load_layout.h
index f3a60a097a8cdf4dd0a99bbf4d41c286633bb856..9205800f6fd3c4d390db4119010a702f3b6cd3d8 100644 (file)
--- a/include/load_layout.h
+++ b/include/load_layout.h
@@ -1,6 +1,42 @@
-#ifndef _LOAD_LAYOUT_H
-#define _LOAD_LAYOUT_H
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * load_layout.c: Restore (parts of) the layout, for example after an inplace
+ *                restart.
+ *
+ */
+#pragma once
 
-void tree_append_json(const char *filename);
+#include <config.h>
 
-#endif
+typedef enum {
+    // We could not determine the content of the JSON file. This typically
+    // means it’s unreadable or contains garbage.
+    JSON_CONTENT_UNKNOWN = 0,
+
+    // The JSON file contains a “normal” container, i.e. a container to be
+    // appended to an existing workspace (or split container!).
+    JSON_CONTENT_CON = 1,
+
+    // The JSON file contains a workspace container, which needs to be appended
+    // to the output (next to the other workspaces) with special care to avoid
+    // naming conflicts and ensuring that the workspace _has_ a name.
+    JSON_CONTENT_WORKSPACE = 2,
+} json_content_t;
+
+/* Parses the given JSON file until it encounters the first “type” property to
+ * determine whether the file contains workspaces or regular containers, which
+ * is important to know when deciding where (and how) to append the contents.
+ * */
+json_content_t json_determine_content(const char *buf, const size_t len);
+
+/**
+ * Returns true if the provided JSON could be parsed by yajl.
+ *
+ */
+bool json_validate(const char *buf, const size_t len);
+
+void tree_append_json(Con *con, const char *buf, const size_t len, char **errormsg);