Fix certain non-GNU build configurations

Sadly, the 3.5 deprecation warning doesn't go away after this.

.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

.gitignore

@@ -7,3 +7,5 @@
 /termo.files
 /termo.creator*
 /termo.includes
+/termo.cflags
+/termo.cxxflags

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.0...3.27)
 project (termo VERSION 0.1.0 LANGUAGES C)
 
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
@@ -61,6 +61,8 @@ else ()
 endif ()
 
 # -liconv may or may not be a part of libc
+find_path (iconv_INCLUDE_DIRS iconv.h)
+include_directories (${iconv_INCLUDE_DIRS})
 find_library (iconv_LIBRARIES iconv)
 if (iconv_LIBRARIES)
 	list (APPEND lib_libraries ${iconv_LIBRARIES})
@@ -164,9 +166,9 @@ file (WRITE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc"
 	"Name: ${PROJECT_NAME}\n"
 	"Description: Terminal key input library\n"
 	"Version: ${PROJECT_VERSION}\n"
-	"Libs: -L${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} -l${project_LIB_NAME}\n"
+	"Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -l${project_LIB_NAME}\n"
 	"Libs.private: ${lib_libraries}\n"
-	"Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${project_INCLUDE_NAME}\n")
+	"Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}/${project_INCLUDE_NAME}\n")
 install (FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc"
 	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 

cmake/FindNcursesw.cmake

@@ -7,7 +7,7 @@ pkg_check_modules (Ncursesw QUIET ncursesw)
 set (required_vars Ncursesw_LIBRARIES)
 if (NOT Ncursesw_FOUND)
 	find_library (Ncursesw_LIBRARIES NAMES ncursesw)
-	find_path (Ncursesw_INCLUDE_DIRS ncurses.h)
+	find_path (Ncursesw_INCLUDE_DIRS ncurses.h PATH_SUFFIXES ncurses)
 	list (APPEND required_vars Ncursesw_INCLUDE_DIRS)
 endif (NOT Ncursesw_FOUND)
 

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, "");

driver-ti.c

@@ -246,30 +246,28 @@ load_terminfo (termo_ti_t *ti, const char *term)
 	set_mouse_string = tigetstr ("XM");
 #endif
 	if (!set_mouse_string || set_mouse_string == (char *) -1)
-		ti->set_mouse_string = strdup ("\E[?1000%?%p1%{1}%=%th%el%;");
+		ti->set_mouse_string = strdup ("\x1b[?1000%?%p1%{1}%=%th%el%;");
 	else
 		ti->set_mouse_string = strdup (set_mouse_string);
 
-	bool have_mouse = false;
-	if (!mouse_report_string && strstr (term, "xterm"))
-		mouse_report_string = "\x1b[M";
+	// We handle 1006 and 1015 unconditionally in driver-csi.c,
+	// and don't want to have the handling diverted by recent terminfo;
+	// let's hardcode the ancient 1000 sequence locally
 	if (mouse_report_string)
 	{
-		have_mouse = true;
-
 		trie_node_t *node = malloc (sizeof *node);
 		if (!node)
 			goto fail;
 
 		node->type = TYPE_MOUSE;
-		if (!insert_seq (ti, mouse_report_string, node))
+		if (!insert_seq (ti, "\x1b[M", node))
 		{
 			free (node);
 			goto fail;
 		}
 	}
 
-	if (!have_mouse)
+	if (!mouse_report_string && strstr (term, "xterm") != term)
 		ti->tk->guessed_mouse_proto = TERMO_MOUSE_PROTO_NONE;
 	else if (strstr (term, "rxvt") == term)
 		// urxvt didn't understand the SGR protocol until version 9.25,

termo.c

@@ -1856,4 +1856,3 @@ termo_keycmp (termo_t *tk,
 	}
 	return key1.modifiers - key2.modifiers;
 }
-

tests/01base.c

@@ -5,6 +5,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 
 	plan_tests (6);

tests/02getkey.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 

tests/03utf8.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 

tests/04flags.c

@@ -5,6 +5,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 

tests/05read.c

@@ -9,6 +9,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	int fd[2];
 	termo_t *tk;
 	termo_key_t key;

tests/06buffer.c

@@ -2,8 +2,12 @@
 #include "../termo.h"
 #include "taplib.h"
 
-int main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 

tests/10keyname.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_sym_t sym;
 	const char *end;

tests/11strfkey.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	char buffer[16];

tests/12strpkey.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	const char *endp;

tests/13cmpkey.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key1, key2;
 

tests/20canon.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	const char *endp;

tests/30mouse.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	termo_mouse_event_t ev;

tests/31position.c

@@ -1,8 +1,12 @@
 #include "../termo.h"
 #include "taplib.h"
 
-int main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	int line, col;

tests/32modereport.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	int initial, mode, value;

tests/33focus.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 

tests/39csi.c

@@ -4,6 +4,9 @@
 int
 main (int argc, char *argv[])
 {
+	(void) argc;
+	(void) argv;
+
 	termo_t *tk;
 	termo_key_t key;
 	long args[16];

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;
 }