Merge pull request #28 from M-griffin/3.0-Demo

3.x demo merge
M-griffin · Dec 4, 2017 · c833bd3 · c833bd3
2 parents 4ae83b9 + 0d6f2a9
commit c833bd3
Show file tree

Hide file tree

Showing 115 changed files with 13,777 additions and 11,588 deletions.
diff --git a/EtherTerm-DEBUG.mk b/EtherTerm-DEBUG.mk
diff --git a/EtherTerm-release.mk b/EtherTerm-release.mk
diff --git a/EtherTerm.linux-DEBUG.mk b/EtherTerm.linux-DEBUG.mk
diff --git a/EtherTerm.linux-arch-DEBUG.mk b/EtherTerm.linux-arch-DEBUG.mk
diff --git a/EtherTerm.linux-arch.mk b/EtherTerm.linux-arch.mk
diff --git a/EtherTerm.mk b/EtherTerm.mk
diff --git a/EtherTerm.osx-DEBUG.mk b/EtherTerm.osx-DEBUG.mk
diff --git a/EtherTerm.osx.mk b/EtherTerm.osx.mk
diff --git a/EtherTerm.project b/EtherTerm.project
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CodeLite_Project Name="EtherTerm" InternalType="Console">
+  <Plugins>
+    <Plugin Name="qmake">
+      <![CDATA[00010001N0005Debug000000000000]]>
+    </Plugin>
+    <Plugin Name="CMakePlugin">
+      <![CDATA[[{
+  "name": "Debug",
+  "enabled": false,
+  "buildDirectory": "build",
+  "sourceDirectory": "$(ProjectPath)",
+  "generator": "",
+  "buildType": "",
+  "arguments": [],
+  "parentProject": ""
+ }]]]>
+    </Plugin>
+  </Plugins>
+  <Description/>
+  <Dependencies/>
+  <VirtualDirectory Name="src">
+    <File Name="src/main.cpp"/>
+    <File Name="src/window_manager.hpp"/>
+    <File Name="src/window_manager.cpp"/>
+    <File Name="src/session.hpp"/>
+    <File Name="src/surface_manager.hpp"/>
+    <File Name="src/surface_manager.cpp"/>
+    <File Name="src/interface.hpp"/>
+    <File Name="src/input_handler.cpp"/>
+    <File Name="src/input_handler.hpp"/>
+    <File Name="src/tcp_connection.hpp"/>
+    <File Name="src/renderer.cpp"/>
+    <File Name="src/renderer.hpp"/>
+    <File Name="src/surface.hpp"/>
+    <File Name="src/texture.hpp"/>
+    <File Name="src/sequence_parser.cpp"/>
+    <File Name="src/sequence_parser.hpp"/>
+    <File Name="src/screen_buffer.cpp"/>
+    <File Name="src/screen_buffer.hpp"/>
+    <File Name="src/sequence_decoder.cpp"/>
+    <File Name="src/sequence_decoder.hpp"/>
+    <File Name="src/safe_queue.hpp"/>
+    <File Name="src/message_queue.hpp"/>
+    <File Name="src/menu_io.hpp"/>
+    <File Name="src/menu_io.cpp"/>
+    <File Name="src/menu_config.cpp"/>
+    <File Name="src/menu_config.hpp"/>
+    <File Name="src/menu_function.cpp"/>
+    <File Name="src/menu_function.hpp"/>
+    <File Name="src/link_list.cpp"/>
+    <File Name="src/link_list.hpp"/>
+    <File Name="src/menu_manager.cpp"/>
+    <File Name="src/menu_manager.hpp"/>
+    <File Name="src/tinystr.cpp"/>
+    <File Name="src/tinystr.hpp"/>
+    <File Name="src/tinyxml.cpp"/>
+    <File Name="src/tinyxml.hpp"/>
+    <File Name="src/tinyxmlerror.cpp"/>
+    <File Name="src/tinyxmlparser.cpp"/>
+    <File Name="src/session_manager.cpp"/>
+    <File Name="src/session_manager.hpp"/>
+    <File Name="src/telnet.hpp"/>
+    <File Name="src/telnet_manager.cpp"/>
+    <File Name="src/telnet_manager.hpp"/>
+  </VirtualDirectory>
+  <Dependencies Name="Debug"/>
+  <Dependencies Name="Release"/>
+  <Settings Type="Executable">
+    <GlobalSettings>
+      <Compiler Options="" C_Options="" Assembler="">
+        <IncludePath Value="."/>
+      </Compiler>
+      <Linker Options="">
+        <LibraryPath Value="."/>
+      </Linker>
+      <ResourceCompiler Options=""/>
+    </GlobalSettings>
+    <Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
+      <Compiler Options="-g;-O0;-pedantic;-W;-std=c++11;-Wall;-Wno-deprecated -Wno-unused-local-typedefs" C_Options="-g;-O0;-pedantic;-W;-std=c++11;-Wall;-Wno-deprecated -Wno-unused-local-typedefs" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+        <IncludePath Value="."/>
+        <IncludePath Value="C:/Users/Blue/Downloads/SDL2-devel-2.0.4-mingw/SDL2-2.0.4/include"/>
+        <IncludePath Value="C:/Users/Blue/Downloads/SDL2_ttf-2.0.12/i686-w64-mingw32/include/SDL2"/>
+        <IncludePath Value="C:/boost/include/boost-1_58"/>
+        <IncludePath Value="C:/boost_1_58_0/boost"/>
+        <IncludePath Value="C:/OpenSSL-Win32/include"/>
+        <IncludePath Value="C:/Users/Blue/Downloads/SDL2_gfx-1.0.1"/>
+      </Compiler>
+      <Linker Options="" Required="yes">
+        <LibraryPath Value="C:/Users/Blue/Downloads/SDL2_ttf-2.0.12/i686-w64-mingw32/lib"/>
+        <LibraryPath Value="C:/libz-1.2.7-1-mingw32-dev/lib"/>
+        <LibraryPath Value="C:/boost/lib"/>
+        <LibraryPath Value="C:/msys/1.0/icu/source/lib"/>
+        <LibraryPath Value="C:/OpenSSL-Win32/lib/MinGW"/>
+        <LibraryPath Value="C:/OpenSSL-Win32/lib/"/>
+        <Library Value="mingw32"/>
+        <Library Value="SDL2main"/>
+        <Library Value="SDL2"/>
+        <Library Value="libSDL2_ttf"/>
+        <Library Value="libboost_system-mgw51-mt-1_58"/>
+        <Library Value="libboost_thread-mgw51-mt-1_58"/>
+        <Library Value="libboost_chrono-mgw51-mt-1_58"/>
+        <Library Value="libboost_serialization-mgw51-mt-1_58"/>
+        <Library Value="libboost_locale-mgw51-mt-1_58"/>
+        <Library Value="libboost_filesystem-mgw51-mt-1_58"/>
+        <Library Value="libboost_timer-mgw51-mt-1_58"/>
+        <Library Value="libboost_regex-mgw51-mt-1_58"/>
+        <Library Value="libws2_32.a"/>
+        <Library Value="libwsock32.a"/>
+        <Library Value="libiconv.a"/>
+        <Library Value="libicuuc.dll.a"/>
+        <Library Value="libicuin.dll.a"/>
+        <Library Value="ssleay32.a"/>
+        <Library Value="libeay32.a"/>
+      </Linker>
+      <ResourceCompiler Options="" Required="no"/>
+      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="yes" IsEnabled="yes"/>
+      <Environment EnvVarSetName="Default" DbgSetName="&lt;Use Defaults&gt;">
+        <![CDATA[]]>
+      </Environment>
+      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
+        <DebuggerSearchPaths/>
+        <PostConnectCommands/>
+        <StartupCommands/>
+      </Debugger>
+      <PreBuild/>
+      <PostBuild/>
+      <CustomBuild Enabled="no">
+        <RebuildCommand/>
+        <CleanCommand/>
+        <BuildCommand/>
+        <PreprocessFileCommand/>
+        <SingleFileCommand/>
+        <MakefileGenerationCommand/>
+        <ThirdPartyToolName>None</ThirdPartyToolName>
+        <WorkingDirectory/>
+      </CustomBuild>
+      <AdditionalRules>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
+      </AdditionalRules>
+      <Completion EnableCpp11="no" EnableCpp14="no">
+        <ClangCmpFlagsC/>
+        <ClangCmpFlags/>
+        <ClangPP/>
+        <SearchPaths/>
+      </Completion>
+    </Configuration>
+    <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
+      <Compiler Options="-O2;-Wall" C_Options="-O2;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+        <IncludePath Value="."/>
+        <Preprocessor Value="NDEBUG"/>
+      </Compiler>
+      <Linker Options="" Required="yes"/>
+      <ResourceCompiler Options="" Required="no"/>
+      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
+        <![CDATA[]]>
+      </Environment>
+      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
+        <DebuggerSearchPaths/>
+        <PostConnectCommands/>
+        <StartupCommands/>
+      </Debugger>
+      <PreBuild/>
+      <PostBuild/>
+      <CustomBuild Enabled="no">
+        <RebuildCommand/>
+        <CleanCommand/>
+        <BuildCommand/>
+        <PreprocessFileCommand/>
+        <SingleFileCommand/>
+        <MakefileGenerationCommand/>
+        <ThirdPartyToolName>None</ThirdPartyToolName>
+        <WorkingDirectory/>
+      </CustomBuild>
+      <AdditionalRules>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
+      </AdditionalRules>
+      <Completion EnableCpp11="no" EnableCpp14="no">
+        <ClangCmpFlagsC/>
+        <ClangCmpFlags/>
+        <ClangPP/>
+        <SearchPaths/>
+      </Completion>
+    </Configuration>
+  </Settings>
+</CodeLite_Project>
diff --git a/EtherTerm.workspace b/EtherTerm.workspace
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CodeLite_Workspace Name="EtherTerm" Database="">
+  <Project Name="EtherTerm" Path="EtherTerm.project" Active="Yes"/>
+  <Environment>
+    <![CDATA[]]>
+  </Environment>
+  <Project Name="UnitTests" Path="UnitTests/UnitTests.project" Active="No"/>
+  <BuildMatrix>
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
+      <Project Name="EtherTerm" ConfigName="Debug"/>
+      <Project Name="UnitTests" ConfigName="Debug"/>
+      <Project Name="InputTest" ConfigName="Debug"/>
+    </WorkspaceConfiguration>
+    <WorkspaceConfiguration Name="Release" Selected="yes">
+      <Project Name="EtherTerm" ConfigName="Release"/>
+      <Project Name="UnitTests" ConfigName="Release"/>
+      <Project Name="InputTest" ConfigName="Release"/>
+    </WorkspaceConfiguration>
+  </BuildMatrix>
+</CodeLite_Workspace>
+
diff --git a/Makefile b/Makefile
@@ -1,52 +1,9 @@
 .PHONY: clean All
 
 All:
-	@echo "----------------Building EtherTerm-------------------"
-	@echo "make win        = Windows Build"
-	@echo "make linux      = Linux (Debian, Mint, Ubuntu)"
-	@echo "make linux-arch = Arch Linux"
-	@echo "make osx        = Mac OSX Lion - Yosemite"
-	@echo "-------------Clean EtherTerm Project-----------------"
-	@echo "make clean-win"
-	@echo "make clean-linux"
-	@echo "make clean-osx"
-
-win:
-	@echo "----------Building project:[ EtherTerm - (WIN) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.mk"
-
-osx:
-	@echo "----------Building project:[ EtherTerm - (OSX) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.osx.mk"
-
-linux:
-	@echo "----------Building project:[ EtherTerm - (LINUX) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.linux.mk"
-
-linux-arch:
-	@echo "----------Building project:[ EtherTerm - (ARCH LINUX) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.linux-arch.mk"
-
+	@echo "----------Building project:[ EtherTerm - Debug ]----------"
+	@"$(MAKE)" -f  "EtherTerm.mk"
 clean:
-	@echo "----------------Building EtherTerm-------------------"
-	@echo "make win        = Windows Build"
-	@echo "make linux      = Linux (Debian, Mint, Ubuntu)"
-	@echo "make linux-arch = Arch Linux"
-	@echo "make osx        = Mac OSX Lion - Yosemite"
-	@echo "-------------Clean EtherTerm Project-----------------"
-	@echo "make clean-win"
-	@echo "make clean-linux"
-	@echo "make clean-osx"
-
-clean-win:
-	@echo "----------Cleaning project:[ EtherTerm - (WIN) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.mk" clean
-
-clean-osx:
-	@echo "----------Cleaning project:[ EtherTerm - (OSX) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.osx.mk" clean
-
-clean-linux:
-	@echo "----------Cleaning project:[ EtherTerm - (LINUX) Release ]----------"
-	@$(MAKE) -f  "EtherTerm.linux.mk" clean
+	@echo "----------Cleaning project:[ EtherTerm - Debug ]----------"
+	@"$(MAKE)" -f  "EtherTerm.mk" clean
 
diff --git a/README.rst b/README.rst
@@ -1,7 +1,17 @@
+<<<<<<< HEAD
+3.0 Demo Branch
+===============
+The 3.0 Demo branch is a fork and rewrite of the internals for EtherTerm.  This version differs a bit as asynchronous sockets were added along with the ability to open several connections at the same each in their own window.  Other telnet option fixes and updated to the terminal have also been added along with some pre-testing of file upload/downloads.  Still very raw (Dialing Directory is still unfinished, and SSH support is disconnected at the moment).  This more of a POC (Proof of concept) rewrite to see what can be done differently.   Also some rendering changes were made and are in testing such as recolor blocks using alpha channels for a slight speed up.  Although some kinks need to be worked out on some background / foreground color swaps, this isn't 100% yet.  Blinking cursor code has also been improved however some issues the color of the cursor following the color of the current x/y position on the screen due to using Alpha channels for quick color changes.
+
+
+A second fork for 4.0 Demo should be in the near future as time permits.
+
+=======
 
 Notes: Latest work has been done in 3.0 Demo Branch
 ============
 _3.0 Demo Branch is the last fork of the code: https://github.com/M-griffin/EtherTerm/tree/3.0-Demo
+>>>>>>> master