From 01b90fe0efcf9e13ceeddbe6396306f3345df70a Mon Sep 17 00:00:00 2001 From: Christian Burger Date: Sat, 28 May 2022 12:39:03 +0200 Subject: [PATCH] closes #17: own headers are not system headers This was stupid as it prevented the compiler from doing code analysis and discovering the bug leading to a segmentation fault when using compiler optimization (see christian/shellipt#44). Long overdue update of `README.md`. --- CMakeLists.txt | 4 ++-- DemoApp.cpp | 8 ++++---- HorizontalTilingWindowManager.cpp | 5 +++-- PtyWindow.cpp | 2 +- README.md | 3 ++- SingleUserInput.cpp | 2 +- TilingWindowManager.cpp | 4 ++-- VerticalTilingWindowManager.cpp | 5 +++-- Window.cpp | 4 ++-- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0b99a9..6633437 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ add_library(kNCurses Window.cpp PtyWindow.cpp SingleUserInput.cpp Debug.cpp ### let's be annoyingly pedantic target_compile_options(kNCurses PRIVATE "-Wall" "-Wextra" "-Werror" "-pedantic") -### path to own system includes -include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/include") +### path to own includes +include_directories("${CMAKE_SOURCE_DIR}/include") ### libraries diff --git a/DemoApp.cpp b/DemoApp.cpp index 851ce7d..e179679 100644 --- a/DemoApp.cpp +++ b/DemoApp.cpp @@ -3,11 +3,11 @@ */ #include "DemoApp.hpp" +#include "kNCurses/VerticalTilingWindowManager.hpp" +#include "kNCurses/HorizontalTilingWindowManager.hpp" +#include "kNCurses/Window.hpp" +#include "kNCurses/PtyWindow.hpp" #include "Debug.hpp" -#include -#include -#include -#include #include #include diff --git a/HorizontalTilingWindowManager.cpp b/HorizontalTilingWindowManager.cpp index c244a7c..40b475d 100644 --- a/HorizontalTilingWindowManager.cpp +++ b/HorizontalTilingWindowManager.cpp @@ -2,9 +2,10 @@ * @author Christian Burger (christian@krikkel.de) */ +#include "kNCurses/HorizontalTilingWindowManager.hpp" +#include "kNCurses/Window.hpp" #include "Debug.hpp" -#include -#include + #include #include diff --git a/PtyWindow.cpp b/PtyWindow.cpp index 4ff0096..75d1b34 100644 --- a/PtyWindow.cpp +++ b/PtyWindow.cpp @@ -2,7 +2,7 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include "kNCurses/PtyWindow.hpp" #include "Debug.hpp" #include diff --git a/README.md b/README.md index 49bec5e..2726565 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ **WARNING**: This is a prototype. Things will probably break; in spectacular ways. -`NCursesPtyWindow` provides a pseudo terminal in a ncurses window. +`kNCurses` extends the existing C++ library shipping with ncurses and provides a +tiling window manager and a pseudo terminal in a ncurses window. ## Building diff --git a/SingleUserInput.cpp b/SingleUserInput.cpp index 5253aa0..1773cc6 100644 --- a/SingleUserInput.cpp +++ b/SingleUserInput.cpp @@ -2,7 +2,7 @@ * @author Christian Burger (christian@krikkel.de) */ -#include +#include "kNCurses/SingleUserInput.hpp" #include "Debug.hpp" #include diff --git a/TilingWindowManager.cpp b/TilingWindowManager.cpp index 808299e..0206326 100644 --- a/TilingWindowManager.cpp +++ b/TilingWindowManager.cpp @@ -2,8 +2,8 @@ * @author Christian Burger (christian@krikkel.de) */ -#include -#include +#include "kNCurses/TilingWindowManager.hpp" +#include "kNCurses/Window.hpp" #include "Debug.hpp" #include diff --git a/VerticalTilingWindowManager.cpp b/VerticalTilingWindowManager.cpp index dbe95c0..f955112 100644 --- a/VerticalTilingWindowManager.cpp +++ b/VerticalTilingWindowManager.cpp @@ -2,9 +2,10 @@ * @author Christian Burger (christian@krikkel.de) */ +#include "kNCurses/VerticalTilingWindowManager.hpp" +#include "kNCurses/Window.hpp" #include "Debug.hpp" -#include -#include + #include #include diff --git a/Window.cpp b/Window.cpp index d7e1b1a..a1876c6 100644 --- a/Window.cpp +++ b/Window.cpp @@ -2,8 +2,8 @@ * @author Christian Burger (christian@krikkel.de) */ -#include -#include +#include "kNCurses/Window.hpp" +#include "kNCurses/VerticalTilingWindowManager.hpp" namespace krikkel::NCurses {