diff --git a/.vscode/launch.json b/.vscode/launch.json index 4c1eb59..ec0ec61 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,10 +5,10 @@ "version": "0.2.0", "configurations": [ { - "name": "(gdb) start NCursesDemoApp", + "name": "(gdb) start kNCursesDemoApp", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/NCursesDemoApp", + "program": "${workspaceFolder}/build/kNCursesDemoApp", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}", @@ -29,10 +29,10 @@ ] }, { - "name": "(gdb) attach to running NCursesDemoApp", + "name": "(gdb) attach to running kNCursesDemoApp", "type": "cppdbg", "request": "attach", - "program": "${workspaceFolder}/build/NCursesDemoApp", + "program": "${workspaceFolder}/build/kNCursesDemoApp", "processId": "${command:pickProcess}", "MIMode": "gdb", "setupCommands": [ diff --git a/App.cpp b/App.cpp index 47e9d18..51f327a 100644 --- a/App.cpp +++ b/App.cpp @@ -4,9 +4,9 @@ #include "App.hpp" #include "Debug.hpp" -#include -#include -#include +#include +#include +#include #include #include diff --git a/CMakeLists.txt b/CMakeLists.txt index d6b353c..75cc7e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16.3) include("cmake/version.cmake") -project(NCurses +project(kNCurses HOMEPAGE_URL "https://gitea.xndr.de/christian/NCursesPtyWindow" VERSION ${SEMANTIC_VERSION}) @@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 17) include(CTest) enable_testing() -add_library(NCurses Window.cpp PtyWindow.cpp SingleUserInput.cpp Debug.cpp VerticalTilingWindowManager.cpp) +add_library(kNCurses Window.cpp PtyWindow.cpp SingleUserInput.cpp Debug.cpp VerticalTilingWindowManager.cpp) ### path to own system includes include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/include") @@ -21,34 +21,34 @@ include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/include") ### libraries include("cmake/ncurses.cmake") -target_link_libraries(NCurses ${CURSES_LIBRARIES}) +target_link_libraries(kNCurses ${CURSES_LIBRARIES}) include("cmake/gsl.cmake") include("cmake/libvterm.cmake") if(EXISTS libvtermProject) - add_dependencies(NCurses libvtermProject) + add_dependencies(kNCurses libvtermProject) endif() -target_link_libraries(NCurses ${LIBVTERM_LIBRARY}) +target_link_libraries(kNCurses ${LIBVTERM_LIBRARY}) find_library(UTIL_LIBRARY util) -target_link_libraries(NCurses ${UTIL_LIBRARY}) +target_link_libraries(kNCurses ${UTIL_LIBRARY}) set(THREADS_PREFER_PTHREAD_FLAG true) find_package(Threads REQUIRED) -target_link_libraries(NCurses Threads::Threads) +target_link_libraries(kNCurses Threads::Threads) ### demo application -add_executable(NCursesDemoApp main.cpp App.cpp) -target_link_libraries(NCursesDemoApp NCurses) +add_executable(kNCursesDemoApp main.cpp App.cpp) +target_link_libraries(kNCursesDemoApp kNCurses) ### installation and packaging -set(NCURSES_SYSTEM_INCLUDE "include/NCurses") -set_target_properties(NCurses PROPERTIES PUBLIC_HEADER "${NCURSES_SYSTEM_INCLUDE}/Window.hpp;${NCURSES_SYSTEM_INCLUDE}/SingleUserInput.hpp;${NCURSES_SYSTEM_INCLUDE}/PtyWindow.hpp;${NCURSES_SYSTEM_INCLUDE}/VerticalTilingWindowManager.hpp;" +set(NCURSES_SYSTEM_INCLUDE "include/kNCurses") +set_target_properties(kNCurses PROPERTIES PUBLIC_HEADER "${NCURSES_SYSTEM_INCLUDE}/Window.hpp;${NCURSES_SYSTEM_INCLUDE}/SingleUserInput.hpp;${NCURSES_SYSTEM_INCLUDE}/PtyWindow.hpp;${NCURSES_SYSTEM_INCLUDE}/VerticalTilingWindowManager.hpp;" VERSION "${CMAKE_PROJECT_VERSION}") include(GNUInstallDirs) -install(TARGETS NCurses ARCHIVE - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/NCurses/") +install(TARGETS kNCurses ARCHIVE + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/kNCurses/") set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) diff --git a/PtyWindow.cpp b/PtyWindow.cpp index 9355f85..6569e5f 100644 --- a/PtyWindow.cpp +++ b/PtyWindow.cpp @@ -2,7 +2,7 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include #include "Debug.hpp" #include diff --git a/SingleUserInput.cpp b/SingleUserInput.cpp index 12d8420..5253aa0 100644 --- a/SingleUserInput.cpp +++ b/SingleUserInput.cpp @@ -2,7 +2,7 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include #include "Debug.hpp" #include diff --git a/VerticalTilingWindowManager.cpp b/VerticalTilingWindowManager.cpp index 1ab77d9..cbae701 100644 --- a/VerticalTilingWindowManager.cpp +++ b/VerticalTilingWindowManager.cpp @@ -2,8 +2,8 @@ * @author Christian Burger (christian@krikkel.de) */ -#include -#include +#include +#include #include #include diff --git a/Window.cpp b/Window.cpp index 55bf085..89a127a 100644 --- a/Window.cpp +++ b/Window.cpp @@ -2,8 +2,8 @@ * @author Christian Burger (christian@krikkel.de) */ -#include -#include +#include +#include namespace krikkel::NCurses { diff --git a/include/NCurses/PtyWindow.hpp b/include/kNCurses/PtyWindow.hpp similarity index 100% rename from include/NCurses/PtyWindow.hpp rename to include/kNCurses/PtyWindow.hpp diff --git a/include/NCurses/SingleUserInput.hpp b/include/kNCurses/SingleUserInput.hpp similarity index 100% rename from include/NCurses/SingleUserInput.hpp rename to include/kNCurses/SingleUserInput.hpp diff --git a/include/NCurses/VerticalTilingWindowManager.hpp b/include/kNCurses/VerticalTilingWindowManager.hpp similarity index 100% rename from include/NCurses/VerticalTilingWindowManager.hpp rename to include/kNCurses/VerticalTilingWindowManager.hpp diff --git a/include/NCurses/Window.hpp b/include/kNCurses/Window.hpp similarity index 100% rename from include/NCurses/Window.hpp rename to include/kNCurses/Window.hpp