Compare commits

...

6 Commits

Author SHA1 Message Date
f9a102456f Fix certain non-GNU build configurations
All checks were successful
Alpine 3.19 Success
2024-04-10 18:33:23 +02:00
63dde38bff CMakeLists.txt: declare compatibility with 3.27
All checks were successful
Alpine 3.19 Success
Sadly, the 3.5 deprecation warning doesn't go away after this.
2023-08-01 03:23:25 +02:00
8844026f26 Silence compiler warnings in test targets
-Wunused-parameter
2023-08-01 03:06:39 +02:00
c64457d4cd Find ncursesw on OpenIndiana 2023-07-24 08:09:41 +02:00
97cbd7e80c Make the generated pkg-config file more reliable 2023-06-29 02:39:28 +02:00
2518b53e5a Fix usage of a nonstandard escape sequence 2023-06-14 16:23:08 +02:00
19 changed files with 55 additions and 5 deletions

View File

@@ -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")

View File

@@ -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)

View File

@@ -246,7 +246,7 @@ 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);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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