From 3eb9d75fa4578b79ba1f3864d47019206246cc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 3 Jul 2022 19:41:58 -0300 Subject: [PATCH] eterm code refactor. --- premake4.lua | 10 ++++ premake5.lua | 10 ++++ projects/linux/ee.creator.user | 4 +- projects/linux/ee.files | 51 +++++++++--------- projects/linux/ee.includes | 3 +- projects/macos/ee.files | 53 ++++++++++--------- projects/macos/ee.includes | 9 ++-- projects/windows/ee.files | 32 +++++++++++ projects/windows/ee.includes | 9 ++-- .../include}/eterm/system/autohandle.hpp | 9 ++-- .../eterm/include}/eterm/system/ipipe.hpp | 6 ++- .../eterm/include}/eterm/system/iprocess.hpp | 5 +- .../include}/eterm/system/iprocessfactory.hpp | 10 ++-- .../eterm/include}/eterm/system/pipe.hpp | 12 ++--- .../eterm/include}/eterm/system/process.hpp | 10 ++-- .../include}/eterm/system/processfactory.hpp | 8 +-- .../eterm/terminal/ipseudoterminal.hpp | 8 +-- .../eterm/terminal/iterminaldisplay.hpp | 8 +-- .../eterm/terminal/pseudoterminal.hpp | 14 +++-- .../eterm/terminal/terminaldisplay.hpp | 12 ++--- .../eterm/terminal/terminalemulator.hpp | 14 ++--- .../include/eterm/terminal/terminaltypes.hpp} | 4 ++ .../eterm/src}/eterm/system/autohandle.cpp | 33 ++++++------ .../eterm/src}/eterm/system/pipe.cpp | 4 +- .../eterm/src}/eterm/system/process.cpp | 8 +-- .../src}/eterm/system/processfactory.cpp | 6 +-- .../eterm/src}/eterm/terminal/boxdrawdata.hpp | 4 ++ .../src}/eterm/terminal/iterminaldisplay.cpp | 4 +- .../eterm/src}/eterm/terminal/nonspacing.hpp | 0 .../src}/eterm/terminal/pseudoterminal.cpp | 6 +-- .../src}/eterm/terminal/terminaldisplay.cpp | 6 +-- .../src}/eterm/terminal/terminalemulator.cpp | 4 +- .../eterm/src}/eterm/terminal/wide.hpp | 0 .../src}/eterm/terminal/windowserrors.hpp | 5 +- src/tools/eterm/eterm.cpp | 2 +- 35 files changed, 240 insertions(+), 143 deletions(-) rename src/{tools => modules/eterm/include}/eterm/system/autohandle.hpp (94%) rename src/{tools => modules/eterm/include}/eterm/system/ipipe.hpp (96%) rename src/{tools => modules/eterm/include}/eterm/system/iprocess.hpp (95%) rename src/{tools => modules/eterm/include}/eterm/system/iprocessfactory.hpp (93%) rename src/{tools => modules/eterm/include}/eterm/system/pipe.hpp (91%) rename src/{tools => modules/eterm/include}/eterm/system/process.hpp (94%) rename src/{tools => modules/eterm/include}/eterm/system/processfactory.hpp (94%) rename src/{tools => modules/eterm/include}/eterm/terminal/ipseudoterminal.hpp (94%) rename src/{tools => modules/eterm/include}/eterm/terminal/iterminaldisplay.hpp (95%) rename src/{tools => modules/eterm/include}/eterm/terminal/pseudoterminal.hpp (92%) rename src/{tools => modules/eterm/include}/eterm/terminal/terminaldisplay.hpp (96%) rename src/{tools => modules/eterm/include}/eterm/terminal/terminalemulator.hpp (97%) rename src/{tools/eterm/terminal/types.hpp => modules/eterm/include/eterm/terminal/terminaltypes.hpp} (98%) rename src/{tools => modules/eterm/src}/eterm/system/autohandle.cpp (70%) rename src/{tools => modules/eterm/src}/eterm/system/pipe.cpp (92%) rename src/{tools => modules/eterm/src}/eterm/system/process.cpp (98%) rename src/{tools => modules/eterm/src}/eterm/system/processfactory.cpp (91%) rename src/{tools => modules/eterm/src}/eterm/terminal/boxdrawdata.hpp (98%) rename src/{tools => modules/eterm/src}/eterm/terminal/iterminaldisplay.cpp (96%) rename src/{tools => modules/eterm/src}/eterm/terminal/nonspacing.hpp (100%) rename src/{tools => modules/eterm/src}/eterm/terminal/pseudoterminal.cpp (98%) rename src/{tools => modules/eterm/src}/eterm/terminal/terminaldisplay.cpp (99%) rename src/{tools => modules/eterm/src}/eterm/terminal/terminalemulator.cpp (99%) rename src/{tools => modules/eterm/src}/eterm/terminal/wide.hpp (100%) rename src/{tools => modules/eterm/src}/eterm/terminal/windowserrors.hpp (96%) diff --git a/premake4.lua b/premake4.lua index d5e581808..1ab418144 100644 --- a/premake4.lua +++ b/premake4.lua @@ -1065,6 +1065,14 @@ solution "eepp" build_base_cpp_configuration( "efsw" ) + project "eterm-static" + kind "StaticLib" + language "C++" + set_targetdir("libs/" .. os.get_real() .. "/") + includedirs { "src/modules/eterm/include/","src/modules/eterm/src/" } + files { "src/modules/eterm/src/**.cpp" } + build_base_cpp_configuration( "eterm" ) + -- Library project "eepp-static" kind "StaticLib" @@ -1184,12 +1192,14 @@ solution "eepp" set_kind() language "C++" files { "src/tools/eterm/**.cpp" } + links { "eterm-static" } if os.is_real("linux") then links { "util" } end if os.is("haiku") then links { "bsd" } end + includedirs { "src/modules/eterm/include/" } build_link_configuration( "eterm", true ) project "eepp-texturepacker" diff --git a/premake5.lua b/premake5.lua index 424ac344a..7b5a808d7 100644 --- a/premake5.lua +++ b/premake5.lua @@ -816,6 +816,14 @@ workspace "eepp" filter "system:not windows" files { "src/thirdparty/efsw/src/efsw/platform/posix/*.cpp" } + project "eterm-static" + kind "StaticLib" + language "C++" + targetdir("libs/" .. os.target() .. "/") + incdirs { "include", "src/modules/eterm/include/","src/modules/eterm/src/" } + files { "src/modules/eterm/src/**.cpp" } + build_base_cpp_configuration( "eterm" ) + -- Library project "eepp-static" kind "StaticLib" @@ -926,7 +934,9 @@ workspace "eepp" project "eterm" set_kind() language "C++" + incdirs { "src/modules/eterm/include/" } files { "src/tools/eterm/**.cpp" } + links { "eterm-static" } build_link_configuration( "eterm", true ) filter "system:linux" links { "util" } diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index cc8a4bb77..fb21b8afe 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -107,7 +107,7 @@ Desktop Desktop {388e5431-b31b-42b3-b9ad-9002d279d75d} - 10 + 12 0 19 diff --git a/projects/linux/ee.files b/projects/linux/ee.files index a4faac67f..08495769c 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -1000,6 +1000,32 @@ ../../src/examples/strobe/strobe.cpp ../../src/examples/ui_hello_world/ui_hello_world.cpp ../../src/examples/vbo_fbo_batch/vbo_fbo_batch.cpp +../../src/modules/eterm/include/eterm/system/autohandle.hpp +../../src/modules/eterm/include/eterm/system/ipipe.hpp +../../src/modules/eterm/include/eterm/system/iprocess.hpp +../../src/modules/eterm/include/eterm/system/iprocessfactory.hpp +../../src/modules/eterm/include/eterm/system/pipe.hpp +../../src/modules/eterm/include/eterm/system/process.hpp +../../src/modules/eterm/include/eterm/system/processfactory.hpp +../../src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp +../../src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp +../../src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp +../../src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp +../../src/modules/eterm/include/eterm/terminal/terminalemulator.hpp +../../src/modules/eterm/include/eterm/terminal/terminaltypes.hpp +../../src/modules/eterm/src/eterm/system/autohandle.cpp +../../src/modules/eterm/src/eterm/system/pipe.cpp +../../src/modules/eterm/src/eterm/system/process.cpp +../../src/modules/eterm/src/eterm/system/processfactory.cpp +../../src/modules/eterm/src/eterm/terminal/boxdrawdata.hpp +../../src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp +../../src/modules/eterm/src/eterm/terminal/nonspacing.hpp +../../src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp +../../src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp +../../src/modules/eterm/src/eterm/terminal/terminalemulator.cpp +../../src/modules/eterm/src/eterm/terminal/types.hpp +../../src/modules/eterm/src/eterm/terminal/wide.hpp +../../src/modules/eterm/src/eterm/terminal/windowserrors.hpp ../../src/test/eetest.cpp ../../src/tests/test_all/test.cpp ../../src/tests/test_all/test.hpp @@ -1134,31 +1160,6 @@ ../../src/tools/ecode/version.hpp ../../src/tools/ecode/widgetcommandexecuter.hpp ../../src/tools/eterm/eterm.cpp -../../src/tools/eterm/system/autohandle.cpp -../../src/tools/eterm/system/autohandle.hpp -../../src/tools/eterm/system/ipipe.hpp -../../src/tools/eterm/system/iprocess.hpp -../../src/tools/eterm/system/iprocessfactory.hpp -../../src/tools/eterm/system/pipe.cpp -../../src/tools/eterm/system/pipe.hpp -../../src/tools/eterm/system/process.cpp -../../src/tools/eterm/system/process.hpp -../../src/tools/eterm/system/processfactory.cpp -../../src/tools/eterm/system/processfactory.hpp -../../src/tools/eterm/terminal/boxdrawdata.hpp -../../src/tools/eterm/terminal/ipseudoterminal.hpp -../../src/tools/eterm/terminal/iterminaldisplay.cpp -../../src/tools/eterm/terminal/iterminaldisplay.hpp -../../src/tools/eterm/terminal/nonspacing.hpp -../../src/tools/eterm/terminal/pseudoterminal.cpp -../../src/tools/eterm/terminal/pseudoterminal.hpp -../../src/tools/eterm/terminal/terminaldisplay.cpp -../../src/tools/eterm/terminal/terminaldisplay.hpp -../../src/tools/eterm/terminal/terminalemulator.cpp -../../src/tools/eterm/terminal/terminalemulator.hpp -../../src/tools/eterm/terminal/types.hpp -../../src/tools/eterm/terminal/wide.hpp -../../src/tools/eterm/terminal/windowserrors.hpp ../../src/tools/mapeditor/mapeditor.cpp ../../src/tools/textureatlaseditor/textureatlaseditor.cpp ../../src/tools/texturepacker/texturepacker.cpp diff --git a/projects/linux/ee.includes b/projects/linux/ee.includes index c8228f235..4a587d98d 100644 --- a/projects/linux/ee.includes +++ b/projects/linux/ee.includes @@ -8,4 +8,5 @@ ../../src/thirdparty/mbedtls/include /usr/include/freetype2/ /usr/lib64/gcc/x86_64-suse-linux/10/include -../../src/tools/eterm +../../src/modules/eterm/src/ +../../src/modules/eterm/include/ diff --git a/projects/macos/ee.files b/projects/macos/ee.files index 8c493bf7e..08495769c 100644 --- a/projects/macos/ee.files +++ b/projects/macos/ee.files @@ -1000,6 +1000,32 @@ ../../src/examples/strobe/strobe.cpp ../../src/examples/ui_hello_world/ui_hello_world.cpp ../../src/examples/vbo_fbo_batch/vbo_fbo_batch.cpp +../../src/modules/eterm/include/eterm/system/autohandle.hpp +../../src/modules/eterm/include/eterm/system/ipipe.hpp +../../src/modules/eterm/include/eterm/system/iprocess.hpp +../../src/modules/eterm/include/eterm/system/iprocessfactory.hpp +../../src/modules/eterm/include/eterm/system/pipe.hpp +../../src/modules/eterm/include/eterm/system/process.hpp +../../src/modules/eterm/include/eterm/system/processfactory.hpp +../../src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp +../../src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp +../../src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp +../../src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp +../../src/modules/eterm/include/eterm/terminal/terminalemulator.hpp +../../src/modules/eterm/include/eterm/terminal/terminaltypes.hpp +../../src/modules/eterm/src/eterm/system/autohandle.cpp +../../src/modules/eterm/src/eterm/system/pipe.cpp +../../src/modules/eterm/src/eterm/system/process.cpp +../../src/modules/eterm/src/eterm/system/processfactory.cpp +../../src/modules/eterm/src/eterm/terminal/boxdrawdata.hpp +../../src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp +../../src/modules/eterm/src/eterm/terminal/nonspacing.hpp +../../src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp +../../src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp +../../src/modules/eterm/src/eterm/terminal/terminalemulator.cpp +../../src/modules/eterm/src/eterm/terminal/types.hpp +../../src/modules/eterm/src/eterm/terminal/wide.hpp +../../src/modules/eterm/src/eterm/terminal/windowserrors.hpp ../../src/test/eetest.cpp ../../src/tests/test_all/test.cpp ../../src/tests/test_all/test.hpp @@ -1125,6 +1151,7 @@ ../../src/tools/ecode/projectdirectorytree.hpp ../../src/tools/ecode/projectsearch.cpp ../../src/tools/ecode/projectsearch.hpp +../../src/tools/ecode/scopedop.hpp ../../src/tools/ecode/uicodeeditorsplitter.cpp ../../src/tools/ecode/uicodeeditorsplitter.hpp ../../src/tools/ecode/uitreeviewglobalsearch.cpp @@ -1133,32 +1160,6 @@ ../../src/tools/ecode/version.hpp ../../src/tools/ecode/widgetcommandexecuter.hpp ../../src/tools/eterm/eterm.cpp -../../src/tools/eterm/eterminaldisplay.cpp -../../src/tools/eterm/eterminaldisplay.hpp -../../src/tools/eterm/system/autohandle.cpp -../../src/tools/eterm/system/autohandle.hpp -../../src/tools/eterm/system/ipipe.hpp -../../src/tools/eterm/system/iprocess.hpp -../../src/tools/eterm/system/iprocessfactory.hpp -../../src/tools/eterm/system/pipe.hpp -../../src/tools/eterm/system/pipe.win32.cpp -../../src/tools/eterm/system/process.cpp -../../src/tools/eterm/system/process.hpp -../../src/tools/eterm/system/processfactory.cpp -../../src/tools/eterm/system/processfactory.hpp -../../src/tools/eterm/terminal/boxdraw.hpp -../../src/tools/eterm/terminal/boxdrawdata.hpp -../../src/tools/eterm/terminal/ipseudoterminal.hpp -../../src/tools/eterm/terminal/nonspacing.hpp -../../src/tools/eterm/terminal/pseudoterminal.cpp -../../src/tools/eterm/terminal/pseudoterminal.hpp -../../src/tools/eterm/terminal/terminaldisplay.cpp -../../src/tools/eterm/terminal/terminaldisplay.hpp -../../src/tools/eterm/terminal/terminalemulator.cpp -../../src/tools/eterm/terminal/terminalemulator.hpp -../../src/tools/eterm/terminal/types.hpp -../../src/tools/eterm/terminal/wide.hpp -../../src/tools/eterm/terminal/windowserrors.hpp ../../src/tools/mapeditor/mapeditor.cpp ../../src/tools/textureatlaseditor/textureatlaseditor.cpp ../../src/tools/texturepacker/texturepacker.cpp diff --git a/projects/macos/ee.includes b/projects/macos/ee.includes index 97f498c2e..4a587d98d 100644 --- a/projects/macos/ee.includes +++ b/projects/macos/ee.includes @@ -3,9 +3,10 @@ ../../src/thirdparty ../../include/eepp/thirdparty ../../src/thirdparty/efsw/include +../../src/thirdparty/efsw/src ../../src/thirdparty/libvorbis/include -/usr/include/freetype2/ -../../include/eepp/ui/css -../../src/eepp/ui/css ../../src/thirdparty/mbedtls/include -../../src/thirdparty/freetype2/include +/usr/include/freetype2/ +/usr/lib64/gcc/x86_64-suse-linux/10/include +../../src/modules/eterm/src/ +../../src/modules/eterm/include/ diff --git a/projects/windows/ee.files b/projects/windows/ee.files index 9e81aba2d..08495769c 100644 --- a/projects/windows/ee.files +++ b/projects/windows/ee.files @@ -392,6 +392,7 @@ ../../include/eepp/ui/uipushbutton.hpp ../../include/eepp/ui/uiradiobutton.hpp ../../include/eepp/ui/uirelativelayout.hpp +../../include/eepp/ui/uiroot.hpp ../../include/eepp/ui/uiscenenode.hpp ../../include/eepp/ui/uiscrollablewidget.hpp ../../include/eepp/ui/uiscrollbar.hpp @@ -870,6 +871,7 @@ ../../src/eepp/ui/uipushbutton.cpp ../../src/eepp/ui/uiradiobutton.cpp ../../src/eepp/ui/uirelativelayout.cpp +../../src/eepp/ui/uiroot.cpp ../../src/eepp/ui/uiscenenode.cpp ../../src/eepp/ui/uiscrollablewidget.cpp ../../src/eepp/ui/uiscrollbar.cpp @@ -998,6 +1000,32 @@ ../../src/examples/strobe/strobe.cpp ../../src/examples/ui_hello_world/ui_hello_world.cpp ../../src/examples/vbo_fbo_batch/vbo_fbo_batch.cpp +../../src/modules/eterm/include/eterm/system/autohandle.hpp +../../src/modules/eterm/include/eterm/system/ipipe.hpp +../../src/modules/eterm/include/eterm/system/iprocess.hpp +../../src/modules/eterm/include/eterm/system/iprocessfactory.hpp +../../src/modules/eterm/include/eterm/system/pipe.hpp +../../src/modules/eterm/include/eterm/system/process.hpp +../../src/modules/eterm/include/eterm/system/processfactory.hpp +../../src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp +../../src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp +../../src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp +../../src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp +../../src/modules/eterm/include/eterm/terminal/terminalemulator.hpp +../../src/modules/eterm/include/eterm/terminal/terminaltypes.hpp +../../src/modules/eterm/src/eterm/system/autohandle.cpp +../../src/modules/eterm/src/eterm/system/pipe.cpp +../../src/modules/eterm/src/eterm/system/process.cpp +../../src/modules/eterm/src/eterm/system/processfactory.cpp +../../src/modules/eterm/src/eterm/terminal/boxdrawdata.hpp +../../src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp +../../src/modules/eterm/src/eterm/terminal/nonspacing.hpp +../../src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp +../../src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp +../../src/modules/eterm/src/eterm/terminal/terminalemulator.cpp +../../src/modules/eterm/src/eterm/terminal/types.hpp +../../src/modules/eterm/src/eterm/terminal/wide.hpp +../../src/modules/eterm/src/eterm/terminal/windowserrors.hpp ../../src/test/eetest.cpp ../../src/tests/test_all/test.cpp ../../src/tests/test_all/test.hpp @@ -1123,11 +1151,15 @@ ../../src/tools/ecode/projectdirectorytree.hpp ../../src/tools/ecode/projectsearch.cpp ../../src/tools/ecode/projectsearch.hpp +../../src/tools/ecode/scopedop.hpp ../../src/tools/ecode/uicodeeditorsplitter.cpp ../../src/tools/ecode/uicodeeditorsplitter.hpp ../../src/tools/ecode/uitreeviewglobalsearch.cpp ../../src/tools/ecode/uitreeviewglobalsearch.hpp +../../src/tools/ecode/version.cpp +../../src/tools/ecode/version.hpp ../../src/tools/ecode/widgetcommandexecuter.hpp +../../src/tools/eterm/eterm.cpp ../../src/tools/mapeditor/mapeditor.cpp ../../src/tools/textureatlaseditor/textureatlaseditor.cpp ../../src/tools/texturepacker/texturepacker.cpp diff --git a/projects/windows/ee.includes b/projects/windows/ee.includes index 20628943b..4a587d98d 100644 --- a/projects/windows/ee.includes +++ b/projects/windows/ee.includes @@ -3,9 +3,10 @@ ../../src/thirdparty ../../include/eepp/thirdparty ../../src/thirdparty/efsw/include +../../src/thirdparty/efsw/src ../../src/thirdparty/libvorbis/include -/usr/include/freetype2/ ../../src/thirdparty/mbedtls/include -../../docs/articles -../../include/eepp/ui/doc -../../src/eepp/ui/doc +/usr/include/freetype2/ +/usr/lib64/gcc/x86_64-suse-linux/10/include +../../src/modules/eterm/src/ +../../src/modules/eterm/include/ diff --git a/src/tools/eterm/system/autohandle.hpp b/src/modules/eterm/include/eterm/system/autohandle.hpp similarity index 94% rename from src/tools/eterm/system/autohandle.hpp rename to src/modules/eterm/include/eterm/system/autohandle.hpp index 89e812458..c677677b5 100644 --- a/src/tools/eterm/system/autohandle.hpp +++ b/src/modules/eterm/include/eterm/system/autohandle.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_AUTOHANDLE_HPP +#define ETERM_AUTOHANDLE_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,9 +21,8 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once -namespace EE { +namespace EE { namespace System { // This class is designed to automatically free a resource handle when destructed class AutoHandle final { @@ -68,4 +69,6 @@ class AutoHandle final { mutable type mHandle; }; -} // namespace EE +}} // namespace EE::System + +#endif diff --git a/src/tools/eterm/system/ipipe.hpp b/src/modules/eterm/include/eterm/system/ipipe.hpp similarity index 96% rename from src/tools/eterm/system/ipipe.hpp rename to src/modules/eterm/include/eterm/system/ipipe.hpp index 2ecad13c3..5293ad4ad 100644 --- a/src/tools/eterm/system/ipipe.hpp +++ b/src/modules/eterm/include/eterm/system/ipipe.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_IPIPE_HPP +#define ETERM_IPIPE_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,8 +21,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - #include #include @@ -48,3 +48,5 @@ class IPipe { }; }} // namespace EE::System + +#endif diff --git a/src/tools/eterm/system/iprocess.hpp b/src/modules/eterm/include/eterm/system/iprocess.hpp similarity index 95% rename from src/tools/eterm/system/iprocess.hpp rename to src/modules/eterm/include/eterm/system/iprocess.hpp index 6cb22b32d..89766cadb 100644 --- a/src/tools/eterm/system/iprocess.hpp +++ b/src/modules/eterm/include/eterm/system/iprocess.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_PROCESSSTATUS_HPP +#define ETERM_PROCESSSTATUS_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,7 +21,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once namespace EE { namespace System { @@ -51,3 +52,5 @@ class IProcess { }; }} // namespace EE::System + +#endif diff --git a/src/tools/eterm/system/iprocessfactory.hpp b/src/modules/eterm/include/eterm/system/iprocessfactory.hpp similarity index 93% rename from src/tools/eterm/system/iprocessfactory.hpp rename to src/modules/eterm/include/eterm/system/iprocessfactory.hpp index f3e3ca73d..e60a84fc7 100644 --- a/src/tools/eterm/system/iprocessfactory.hpp +++ b/src/modules/eterm/include/eterm/system/iprocessfactory.hpp @@ -1,3 +1,5 @@ +#ifndef IPROCESSFACTORY_HPP +#define IPROCESSFACTORY_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,10 +21,8 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "../terminal/ipseudoterminal.hpp" -#include "iprocess.hpp" +#include +#include #include #include @@ -59,3 +59,5 @@ class IProcessFactory { }; }} // namespace EE::System + +#endif diff --git a/src/tools/eterm/system/pipe.hpp b/src/modules/eterm/include/eterm/system/pipe.hpp similarity index 91% rename from src/tools/eterm/system/pipe.hpp rename to src/modules/eterm/include/eterm/system/pipe.hpp index 3d0e30316..cc791a250 100644 --- a/src/tools/eterm/system/pipe.hpp +++ b/src/modules/eterm/include/eterm/system/pipe.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_PIPE_HPP +#define ETERM_PIPE_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,10 +21,8 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "../system/ipipe.hpp" -#include "autohandle.hpp" +#include +#include #include namespace EE { namespace System { @@ -47,8 +47,6 @@ class Pipe : public IPipe { virtual int read( char* buf, size_t n, bool block = false ) override; - static bool CreatePipePair( std::unique_ptr& outPipeA, std::unique_ptr& outPipeB ); - private: friend class Process; #ifdef _WIN32 @@ -64,3 +62,5 @@ class Pipe : public IPipe { }; }} // namespace EE::System + +#endif diff --git a/src/tools/eterm/system/process.hpp b/src/modules/eterm/include/eterm/system/process.hpp similarity index 94% rename from src/tools/eterm/system/process.hpp rename to src/modules/eterm/include/eterm/system/process.hpp index dc6a64b43..889fa6329 100644 --- a/src/tools/eterm/system/process.hpp +++ b/src/modules/eterm/include/eterm/system/process.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_PROCESS_HPP +#define ETERM_PROCESS_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,14 +21,12 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - #include #include #include -#include "../terminal/pseudoterminal.hpp" -#include "iprocess.hpp" +#include +#include namespace EE { namespace System { @@ -80,3 +80,5 @@ class Process final : public IProcess { }; }} // namespace EE::System + +#endif diff --git a/src/tools/eterm/system/processfactory.hpp b/src/modules/eterm/include/eterm/system/processfactory.hpp similarity index 94% rename from src/tools/eterm/system/processfactory.hpp rename to src/modules/eterm/include/eterm/system/processfactory.hpp index 80cd2ce98..302f2c0aa 100644 --- a/src/tools/eterm/system/processfactory.hpp +++ b/src/modules/eterm/include/eterm/system/processfactory.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_PROCESSFACTORY_HPP +#define ETERM_PROCESSFACTORY_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,9 +21,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "iprocessfactory.hpp" +#include using namespace EE::Terminal; @@ -54,3 +54,5 @@ class ProcessFactory : public IProcessFactory { }; }} // namespace EE::System + +#endif diff --git a/src/tools/eterm/terminal/ipseudoterminal.hpp b/src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp similarity index 94% rename from src/tools/eterm/terminal/ipseudoterminal.hpp rename to src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp index b4227d8c4..2abf14704 100644 --- a/src/tools/eterm/terminal/ipseudoterminal.hpp +++ b/src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_IPSEUDOTERMINAL_HPP +#define ETERM_IPSEUDOTERMINAL_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,9 +21,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "../system/ipipe.hpp" +#include #include namespace EE { namespace Terminal { @@ -48,3 +48,5 @@ class IPseudoTerminal : public EE::System::IPipe { }; }} // namespace EE::Terminal + +#endif diff --git a/src/tools/eterm/terminal/iterminaldisplay.hpp b/src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp similarity index 95% rename from src/tools/eterm/terminal/iterminaldisplay.hpp rename to src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp index 3181f977c..f0ded5003 100644 --- a/src/tools/eterm/terminal/iterminaldisplay.hpp +++ b/src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_IETERMINALDISPLAY_HPP +#define ETERM_IETERMINALDISPLAY_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,10 +21,8 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "types.hpp" #include +#include namespace EE { namespace Terminal { @@ -88,3 +88,5 @@ class ITerminalDisplay { }; }} // namespace EE::Terminal + +#endif diff --git a/src/tools/eterm/terminal/pseudoterminal.hpp b/src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp similarity index 92% rename from src/tools/eterm/terminal/pseudoterminal.hpp rename to src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp index 7ef459d9c..34107154d 100644 --- a/src/tools/eterm/terminal/pseudoterminal.hpp +++ b/src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_PSEUDOTERMINAL_HPP +#define ETERM_PSEUDOTERMINAL_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,21 +21,23 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "../system/autohandle.hpp" -#include "ipseudoterminal.hpp" #include +#include +#include #include using namespace EE::Math; namespace EE { + namespace System { class Process; } +using namespace EE::System; + namespace Terminal { + class PseudoTerminal final : public IPseudoTerminal { public: virtual ~PseudoTerminal(); @@ -81,3 +85,5 @@ class PseudoTerminal final : public IPseudoTerminal { }; } // namespace Terminal } // namespace EE + +#endif diff --git a/src/tools/eterm/terminal/terminaldisplay.hpp b/src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp similarity index 96% rename from src/tools/eterm/terminal/terminaldisplay.hpp rename to src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp index e7976379c..84b75c657 100644 --- a/src/tools/eterm/terminal/terminaldisplay.hpp +++ b/src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp @@ -1,9 +1,6 @@ -#ifndef ETERMINALDISPLAY_HPP -#define ETERMINALDISPLAY_HPP +#ifndef ETERM_TERMINALDISPLAY_HPP +#define ETERM_TERMINALDISPLAY_HPP -#include "../system/iprocessfactory.hpp" -#include "iterminaldisplay.hpp" -#include "terminalemulator.hpp" #include #include #include @@ -11,6 +8,9 @@ #include #include #include +#include +#include +#include #include #include @@ -286,4 +286,4 @@ class TerminalDisplay : public ITerminalDisplay { void drawFrameBuffer(); }; -#endif // ETERMINALDISPLAY_HPP +#endif // ETERM_TERMINALDISPLAY_HPP diff --git a/src/tools/eterm/terminal/terminalemulator.hpp b/src/modules/eterm/include/eterm/terminal/terminalemulator.hpp similarity index 97% rename from src/tools/eterm/terminal/terminalemulator.hpp rename to src/modules/eterm/include/eterm/terminal/terminalemulator.hpp index e7c202ed3..cc5434f14 100644 --- a/src/tools/eterm/terminal/terminalemulator.hpp +++ b/src/modules/eterm/include/eterm/terminal/terminalemulator.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_TERMINALEMULATOR_HPP +#define ETERM_TERMINALEMULATOR_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -33,14 +35,12 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once - -#include "../system/iprocess.hpp" -#include "ipseudoterminal.hpp" -#include "iterminaldisplay.hpp" -#include "types.hpp" #include #include +#include +#include +#include +#include #include #include #include @@ -325,3 +325,5 @@ class TerminalEmulator final { }; }} // namespace EE::Terminal + +#endif diff --git a/src/tools/eterm/terminal/types.hpp b/src/modules/eterm/include/eterm/terminal/terminaltypes.hpp similarity index 98% rename from src/tools/eterm/terminal/types.hpp rename to src/modules/eterm/include/eterm/terminal/terminaltypes.hpp index 3f293dc2d..8261e7fda 100644 --- a/src/tools/eterm/terminal/types.hpp +++ b/src/modules/eterm/include/eterm/terminal/terminaltypes.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_TERMINALTYPES_HPP +#define ETERM_TERMINALTYPES_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -173,3 +175,5 @@ struct TerminalSelection { }; }} // namespace EE::Terminal + +#endif diff --git a/src/tools/eterm/system/autohandle.cpp b/src/modules/eterm/src/eterm/system/autohandle.cpp similarity index 70% rename from src/tools/eterm/system/autohandle.cpp rename to src/modules/eterm/src/eterm/system/autohandle.cpp index 4bfe8250a..9bf5cc28d 100644 --- a/src/tools/eterm/system/autohandle.cpp +++ b/src/modules/eterm/src/eterm/system/autohandle.cpp @@ -20,22 +20,24 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#include "autohandle.hpp" +#include #ifndef _WIN32 #include #else #include #endif -EE::AutoHandle::AutoHandle() : mHandle( invalid_value() ) {} -EE::AutoHandle::AutoHandle( AutoHandle&& other ) : mHandle( other.mHandle ) { +namespace EE { namespace System { + +AutoHandle::AutoHandle() : mHandle( invalid_value() ) {} +AutoHandle::AutoHandle( AutoHandle&& other ) : mHandle( other.mHandle ) { other.mHandle = invalid_value(); } -EE::AutoHandle::~AutoHandle() { +AutoHandle::~AutoHandle() { release(); } -EE::AutoHandle& EE::AutoHandle::operator=( AutoHandle&& other ) { +AutoHandle& AutoHandle::operator=( AutoHandle&& other ) { if ( mHandle == other.mHandle ) return *this; release(); @@ -45,50 +47,51 @@ EE::AutoHandle& EE::AutoHandle::operator=( AutoHandle&& other ) { } #ifdef _WIN32 -EE::AutoHandle::AutoHandle( HANDLE handle ) : mHandle( handle ) {} +AutoHandle::AutoHandle( HANDLE handle ) : mHandle( handle ) {} -void EE::AutoHandle::release() const { +void AutoHandle::release() const { if ( mHandle != INVALID_HANDLE_VALUE ) { CloseHandle( mHandle ); mHandle = INVALID_HANDLE_VALUE; } } #else -EE::AutoHandle::AutoHandle( int fd ) : mHandle( fd ) {} +AutoHandle::AutoHandle( int fd ) : mHandle( fd ) {} -void EE::AutoHandle::release() const { +void AutoHandle::release() const { if ( mHandle != -1 ) { close( mHandle ); } } #endif -EE::AutoHandle::operator bool() const noexcept { +AutoHandle::operator bool() const noexcept { return mHandle != invalid_value(); } -EE::AutoHandle::type* EE::AutoHandle::get() { +AutoHandle::type* AutoHandle::get() { return &mHandle; } -const EE::AutoHandle::type* EE::AutoHandle::get() const { +const AutoHandle::type* AutoHandle::get() const { return &mHandle; } -EE::AutoHandle::operator EE::AutoHandle::type() const noexcept { +AutoHandle::operator AutoHandle::type() const noexcept { return mHandle; } #ifdef _WIN32 // On Windows we deal with the Windows API, which means HANDLE is used as the handle to files // and pipes -constexpr EE::AutoHandle::type EE::AutoHandle::invalid_value() { +constexpr AutoHandle::type AutoHandle::invalid_value() { return nullptr; } #else // On non-Windows OS'es we deal with file descriptors -constexpr EE::AutoHandle::type EE::AutoHandle::invalid_value() { +constexpr AutoHandle::type AutoHandle::invalid_value() { return -1; } #endif +}} // namespace EE::System diff --git a/src/tools/eterm/system/pipe.cpp b/src/modules/eterm/src/eterm/system/pipe.cpp similarity index 92% rename from src/tools/eterm/system/pipe.cpp rename to src/modules/eterm/src/eterm/system/pipe.cpp index 38ed2129b..5a8c37a03 100644 --- a/src/tools/eterm/system/pipe.cpp +++ b/src/modules/eterm/src/eterm/system/pipe.cpp @@ -1,6 +1,6 @@ #ifdef _WIN32 -#include "pipe.hpp" -#include "../terminal/windowserrors.hpp" +#include +#include #include using namespace EE::System; diff --git a/src/tools/eterm/system/process.cpp b/src/modules/eterm/src/eterm/system/process.cpp similarity index 98% rename from src/tools/eterm/system/process.cpp rename to src/modules/eterm/src/eterm/system/process.cpp index f9d319536..b2e72cd8c 100644 --- a/src/tools/eterm/system/process.cpp +++ b/src/modules/eterm/src/eterm/system/process.cpp @@ -21,8 +21,8 @@ // DEALINGS IN THE SOFTWARE. #ifndef _WIN32 -#include "process.hpp" #include +#include #include #include #include @@ -199,10 +199,10 @@ Process::createWithPseudoTerminal( const std::string& program, const std::vector #else -#include "../terminal/windowserrors.hpp" -#include "pipe.hpp" -#include "process.hpp" #include +#include +#include +#include #include #include #define NTDDI_VERSION NTDDI_WIN10_RS5 diff --git a/src/tools/eterm/system/processfactory.cpp b/src/modules/eterm/src/eterm/system/processfactory.cpp similarity index 91% rename from src/tools/eterm/system/processfactory.cpp rename to src/modules/eterm/src/eterm/system/processfactory.cpp index 73f6bc883..31a5b6573 100644 --- a/src/tools/eterm/system/processfactory.cpp +++ b/src/modules/eterm/src/eterm/system/processfactory.cpp @@ -1,6 +1,6 @@ -#include "../system/processfactory.hpp" -#include "../system/process.hpp" -#include "../terminal/pseudoterminal.hpp" +#include +#include +#include using namespace EE::System; diff --git a/src/tools/eterm/terminal/boxdrawdata.hpp b/src/modules/eterm/src/eterm/terminal/boxdrawdata.hpp similarity index 98% rename from src/tools/eterm/terminal/boxdrawdata.hpp rename to src/modules/eterm/src/eterm/terminal/boxdrawdata.hpp index 76dc2cc85..ac389008e 100644 --- a/src/tools/eterm/terminal/boxdrawdata.hpp +++ b/src/modules/eterm/src/eterm/terminal/boxdrawdata.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_BOXDRAWDATA_HPP +#define ETERM_BOXDRAWDATA_HPP /* * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih * MIT/X Consortium License @@ -265,3 +267,5 @@ static const unsigned short boxdata[256] = { BBQ + BL + TR, BBQ + BL + TR + BR, }; + +#endif diff --git a/src/tools/eterm/terminal/iterminaldisplay.cpp b/src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp similarity index 96% rename from src/tools/eterm/terminal/iterminaldisplay.cpp rename to src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp index 7cc90ce02..f38f1d160 100644 --- a/src/tools/eterm/terminal/iterminaldisplay.cpp +++ b/src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp @@ -19,9 +19,9 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#include "../terminal/iterminaldisplay.hpp" -#include "../terminal/terminalemulator.hpp" #include +#include +#include #define MODBIT( x, set, bit ) ( ( set ) ? ( ( x ) |= ( bit ) ) : ( ( x ) &= ~( bit ) ) ) diff --git a/src/tools/eterm/terminal/nonspacing.hpp b/src/modules/eterm/src/eterm/terminal/nonspacing.hpp similarity index 100% rename from src/tools/eterm/terminal/nonspacing.hpp rename to src/modules/eterm/src/eterm/terminal/nonspacing.hpp diff --git a/src/tools/eterm/terminal/pseudoterminal.cpp b/src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp similarity index 98% rename from src/tools/eterm/terminal/pseudoterminal.cpp rename to src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp index 70868f479..3a541ba0d 100644 --- a/src/tools/eterm/terminal/pseudoterminal.cpp +++ b/src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp @@ -22,8 +22,8 @@ #ifndef _WIN32 // Windows has its own source file -#include "pseudoterminal.hpp" #include +#include #include #if defined( __linux ) #include @@ -187,9 +187,9 @@ std::unique_ptr PseudoTerminal::create( int columns, int rows ) } #else -#include "pseudoterminal.hpp" -#include "windowserrors.hpp" #include +#include +#include #define NTDDI_VERSION NTDDI_WIN10_RS5 #include diff --git a/src/tools/eterm/terminal/terminaldisplay.cpp b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp similarity index 99% rename from src/tools/eterm/terminal/terminaldisplay.cpp rename to src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp index 3477c3624..d4b817a1b 100644 --- a/src/tools/eterm/terminal/terminaldisplay.cpp +++ b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp @@ -1,6 +1,3 @@ -#include "terminaldisplay.hpp" -#include "../system/processfactory.hpp" -#include "boxdrawdata.hpp" #include #include #include @@ -9,6 +6,9 @@ #include #include #include +#include +#include +#include #define BETWEEN( x, a, b ) ( ( a ) <= ( x ) && ( x ) <= ( b ) ) #define IS_SET( flag ) ( ( mMode & ( flag ) ) != 0 ) diff --git a/src/tools/eterm/terminal/terminalemulator.cpp b/src/modules/eterm/src/eterm/terminal/terminalemulator.cpp similarity index 99% rename from src/tools/eterm/terminal/terminalemulator.cpp rename to src/modules/eterm/src/eterm/terminal/terminalemulator.cpp index b54c92752..3ba7e36d8 100644 --- a/src/tools/eterm/terminal/terminalemulator.cpp +++ b/src/modules/eterm/src/eterm/terminal/terminalemulator.cpp @@ -33,8 +33,8 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#include "../terminal/terminalemulator.hpp" -#include "boxdrawdata.hpp" +#include +#include #include #include diff --git a/src/tools/eterm/terminal/wide.hpp b/src/modules/eterm/src/eterm/terminal/wide.hpp similarity index 100% rename from src/tools/eterm/terminal/wide.hpp rename to src/modules/eterm/src/eterm/terminal/wide.hpp diff --git a/src/tools/eterm/terminal/windowserrors.hpp b/src/modules/eterm/src/eterm/terminal/windowserrors.hpp similarity index 96% rename from src/tools/eterm/terminal/windowserrors.hpp rename to src/modules/eterm/src/eterm/terminal/windowserrors.hpp index b2365d766..2b8642649 100644 --- a/src/tools/eterm/terminal/windowserrors.hpp +++ b/src/modules/eterm/src/eterm/terminal/windowserrors.hpp @@ -1,3 +1,5 @@ +#ifndef ETERM_WINDOWSERRORS_HPP +#define ETERM_WINDOWSERRORS_HPP // The MIT License (MIT) // Copyright (c) 2020 Fredrik A. Kristiansen @@ -19,7 +21,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#pragma once #ifdef _WIN32 #define NTDDI_VERSION NTDDI_WIN10_RS5 #include @@ -54,3 +55,5 @@ static void PrintLastWinApiError( void ) { } #endif + +#endif diff --git a/src/tools/eterm/eterm.cpp b/src/tools/eterm/eterm.cpp index afc75d98d..36e7e5753 100644 --- a/src/tools/eterm/eterm.cpp +++ b/src/tools/eterm/eterm.cpp @@ -1,5 +1,5 @@ -#include "terminal/terminaldisplay.hpp" #include +#include EE::Window::Window* win = NULL; std::shared_ptr terminal = nullptr;