From f8db9dc660dc2f6e0d32fbdb8b97476fe15276ae Mon Sep 17 00:00:00 2001 From: Christian Burger Date: Fri, 29 Apr 2022 20:25:47 +0200 Subject: [PATCH] renamed project to `NCurses` --- .vscode/launch.json | 8 +++--- App.cpp | 8 +++--- App.hpp | 6 ++--- CMakeLists.txt | 26 +++++++++---------- PtyWindow.cpp | 4 +-- SingleUserInput.cpp | 4 +-- Window.cpp | 4 +-- .../PtyWindow.hpp | 2 +- .../SingleUserInput.hpp | 2 +- .../{NCursesPtyWindow => NCurses}/Window.hpp | 2 +- main.cpp | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) rename include/{NCursesPtyWindow => NCurses}/PtyWindow.hpp (98%) rename include/{NCursesPtyWindow => NCurses}/SingleUserInput.hpp (95%) rename include/{NCursesPtyWindow => NCurses}/Window.hpp (97%) diff --git a/.vscode/launch.json b/.vscode/launch.json index 0553753..4c1eb59 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,10 +5,10 @@ "version": "0.2.0", "configurations": [ { - "name": "(gdb) start NCursesPtyApp", + "name": "(gdb) start NCursesDemoApp", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/NCursesPtyApp", + "program": "${workspaceFolder}/build/NCursesDemoApp", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}", @@ -29,10 +29,10 @@ ] }, { - "name": "(gdb) attach to running NCursesPtyApp", + "name": "(gdb) attach to running NCursesDemoApp", "type": "cppdbg", "request": "attach", - "program": "${workspaceFolder}/build/NCursesPtyApp", + "program": "${workspaceFolder}/build/NCursesDemoApp", "processId": "${command:pickProcess}", "MIMode": "gdb", "setupCommands": [ diff --git a/App.cpp b/App.cpp index 137e614..e3d2e8b 100644 --- a/App.cpp +++ b/App.cpp @@ -4,21 +4,21 @@ #include "App.hpp" #include "Debug.hpp" -#include +#include #include #include #include #include -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { - App::App() : NCursesApplication(false) + DemoApp::DemoApp() : NCursesApplication(false) { } - int App::run() + int DemoApp::run() { std::mutex writeMutex; diff --git a/App.hpp b/App.hpp index b3174fe..72a11eb 100644 --- a/App.hpp +++ b/App.hpp @@ -8,12 +8,12 @@ #include -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { - class App : public NCursesApplication + class DemoApp : public NCursesApplication { public: - App(); + DemoApp(); private: int run() override; diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ea619d..4be58ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16.3) include("cmake/version.cmake") -project(NCursesPtyWindow +project(NCurses 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(NCursesPtyWindow Window.cpp PtyWindow.cpp SingleUserInput.cpp Debug.cpp) +add_library(NCurses Window.cpp PtyWindow.cpp SingleUserInput.cpp Debug.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(NCursesPtyWindow ${CURSES_LIBRARIES}) +target_link_libraries(NCurses ${CURSES_LIBRARIES}) include("cmake/gsl.cmake") include("cmake/libvterm.cmake") if(EXISTS libvtermProject) - add_dependencies(NCursesPtyWindow libvtermProject) + add_dependencies(NCurses libvtermProject) endif() -target_link_libraries(NCursesPtyWindow ${LIBVTERM_LIBRARY}) +target_link_libraries(NCurses ${LIBVTERM_LIBRARY}) find_library(UTIL_LIBRARY util) -target_link_libraries(NCursesPtyWindow ${UTIL_LIBRARY}) +target_link_libraries(NCurses ${UTIL_LIBRARY}) set(THREADS_PREFER_PTHREAD_FLAG true) find_package(Threads REQUIRED) -target_link_libraries(NCursesPtyWindow Threads::Threads) +target_link_libraries(NCurses Threads::Threads) ### demo application -add_executable(NCursesPtyApp main.cpp App.cpp) -target_link_libraries(NCursesPtyApp NCursesPtyWindow) +add_executable(NCursesDemoApp main.cpp App.cpp) +target_link_libraries(NCursesDemoApp NCurses) ### installation and packaging -set(NCURSES_PTY_WINDOW_SYSTEM_INCLUDE "include/NCursesPtyWindow") -set_target_properties(NCursesPtyWindow PROPERTIES PUBLIC_HEADER "${NCURSES_PTY_WINDOW_SYSTEM_INCLUDE}/Window.hpp;${NCURSES_PTY_WINDOW_SYSTEM_INCLUDE}/SingleUserInput.hpp;${NCURSES_PTY_WINDOW_SYSTEM_INCLUDE}/PtyWindow.hpp" +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" VERSION "${CMAKE_PROJECT_VERSION}") include(GNUInstallDirs) -install(TARGETS NCursesPtyWindow ARCHIVE - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/NCursesPtyWindow/") +install(TARGETS NCurses ARCHIVE + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/NCurses/") set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) diff --git a/PtyWindow.cpp b/PtyWindow.cpp index f9e3b7b..53cbe3b 100644 --- a/PtyWindow.cpp +++ b/PtyWindow.cpp @@ -2,7 +2,7 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include #include "Debug.hpp" #include @@ -13,7 +13,7 @@ #include #include -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { using gsl::narrow; using std::lock_guard; diff --git a/SingleUserInput.cpp b/SingleUserInput.cpp index ec01285..f10a8fa 100644 --- a/SingleUserInput.cpp +++ b/SingleUserInput.cpp @@ -2,7 +2,7 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include #include "Debug.hpp" #include @@ -13,7 +13,7 @@ #define KEY_ALT_BACKSPACE 127 #define KEY_ALT_ALT_BACKSPACE '\b' -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { SingleUserInput::SingleUserInput(int _resultGetWchCall, wint_t _input) : input(_input), resultGetWchCall(_resultGetWchCall) diff --git a/Window.cpp b/Window.cpp index 46a3fec..b2fe52b 100644 --- a/Window.cpp +++ b/Window.cpp @@ -2,9 +2,9 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { Window::Window(int lines, int columns, int y, int x) : NCursesWindow(lines, columns, y, x) diff --git a/include/NCursesPtyWindow/PtyWindow.hpp b/include/NCurses/PtyWindow.hpp similarity index 98% rename from include/NCursesPtyWindow/PtyWindow.hpp rename to include/NCurses/PtyWindow.hpp index d050521..d54f934 100644 --- a/include/NCursesPtyWindow/PtyWindow.hpp +++ b/include/NCurses/PtyWindow.hpp @@ -16,7 +16,7 @@ #include #include -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { class PtyWindow : public Window { diff --git a/include/NCursesPtyWindow/SingleUserInput.hpp b/include/NCurses/SingleUserInput.hpp similarity index 95% rename from include/NCursesPtyWindow/SingleUserInput.hpp rename to include/NCurses/SingleUserInput.hpp index 7d21e5b..db8ef2f 100644 --- a/include/NCursesPtyWindow/SingleUserInput.hpp +++ b/include/NCurses/SingleUserInput.hpp @@ -9,7 +9,7 @@ #include #include -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { class SingleUserInput { diff --git a/include/NCursesPtyWindow/Window.hpp b/include/NCurses/Window.hpp similarity index 97% rename from include/NCursesPtyWindow/Window.hpp rename to include/NCurses/Window.hpp index fb91c63..6e6b2fb 100644 --- a/include/NCursesPtyWindow/Window.hpp +++ b/include/NCurses/Window.hpp @@ -34,7 +34,7 @@ inline int UNDEF(get_wch)(wint_t *character) { get_wch(character); } #define get_wch UNDEF(get_wch) #endif -namespace krikkel::NCursesPtyWindow +namespace krikkel::NCurses { class Window : public NCursesWindow { diff --git a/main.cpp b/main.cpp index 3675a16..6a67c26 100644 --- a/main.cpp +++ b/main.cpp @@ -6,4 +6,4 @@ #include "App.hpp" -krikkel::NCursesPtyWindow::App cursesPtyApp; \ No newline at end of file +krikkel::NCurses::DemoApp demoApp; \ No newline at end of file