Add clang-format configuration, clean up

6 files changed, 33 insertions, 5 deletions

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..a9e4a51
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,27 @@
+# clang-format is fairly limited, and these rules are approximate:
+#  - array initializers can get terribly mangled with clang-format 12.0,
+#  - sometimes it still aligns with space characters,
+#  - struct name NL { NL ... NL } NL name; is unachievable.
+BasedOnStyle: GNU
+ColumnLimit: 80
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+BreakBeforeBraces: Allman
+SpaceAfterCStyleCast: true
+AlignAfterOpenBracket: DontAlign
+AlignOperands: DontAlign
+AlignConsecutiveMacros: Consecutive
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+IndentGotoLabels: false
+
+# IncludeCategories has some potential, but it may also break the build.
+# Note that the documentation says the value should be "Never".
+SortIncludes: false
+
+# This is a compromise, it generally works out aesthetically better.
+BinPackArguments: false
+
+# Unfortunately, this can't be told to align to column 40 or so.
+SpacesBeforeTrailingComments: 2
diff --git a/demo.c b/demo.c
index bc416c0..0eca4ba 100644
--- a/demo.c
+++ b/demo.c
@@ -10,7 +10,7 @@
 #include "termo.h"
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
 	TERMO_CHECK_VERSION;
 	setlocale (LC_CTYPE, "");
diff --git a/termo.c b/termo.c
index 88d2ff9..5a5d74c 100644
--- a/termo.c
+++ b/termo.c
@@ -1856,4 +1856,3 @@ termo_keycmp (termo_t *tk,
 	}
 	return key1.modifiers - key2.modifiers;
 }
-
diff --git a/tests/06buffer.c b/tests/06buffer.c
index ed79193..340728b 100644
--- a/tests/06buffer.c
+++ b/tests/06buffer.c
@@ -2,7 +2,8 @@
 #include "../termo.h"
 #include "taplib.h"
 
-int main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
 	termo_t *tk;
 	termo_key_t key;
diff --git a/tests/31position.c b/tests/31position.c
index 07ff09f..ad3e6f6 100644
--- a/tests/31position.c
+++ b/tests/31position.c
@@ -1,7 +1,8 @@
 #include "../termo.h"
 #include "taplib.h"
 
-int main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
 	termo_t *tk;
 	termo_key_t key;
diff --git a/tests/taplib.c b/tests/taplib.c
index bfb70f8..b0588b0 100644
--- a/tests/taplib.c
+++ b/tests/taplib.c
@@ -73,7 +73,7 @@ is_str (const char *got, const char *expect, char *name)
 }
 
 int
-exit_status(void)
+exit_status (void)
 {
 	return g_exit_status;
 }