Internal. Move Connector API to separate file

premake5.lua

@@ -402,6 +402,7 @@ project "ConEmuHk"
     "src/ConEmuHk/*.h",
     "src/ConEmuHk/*.rc",
     "src/ConEmuHk/hde.c",
+    "src/modules/terminals/ConnectorAPI.h",
     "src/modules/minhook/src/**.c",
     "src/modules/minhook/src/**.h",
     "src/modules/minhook/include/*.h",
@@ -428,6 +429,7 @@ project "ConEmuHk"
     { ["MinHook/Trampoline"] = {"**/minhook/src/*.*"} },
     { ["MinHook"] = {"**/minhook/**.*", "**/hde.c"} },
     { ["Hooks"] = {"**/hk*.*"} },
+    { ["Connector"] = {"**/Connector*.*"} },
     { ["Headers"] = {"**.h"} },
     { ["Sources"] = {"**.cpp"} },
     { ["Resources"] = {"**.rc", "**.rc2", "**.manifest"} },

src/ConEmuHk.vcxproj

@@ -315,6 +315,7 @@
     <ClInclude Include="modules\minhook\src\HDE\table64.h" />
     <ClInclude Include="modules\minhook\src\buffer.h" />
     <ClInclude Include="modules\minhook\src\trampoline.h" />
+    <ClInclude Include="modules\terminals\ConnectorAPI.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ConEmuHk\Ansi.cpp" />

src/ConEmuHk.vcxproj.filters

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <Filter Include="Connector">
+      <UniqueIdentifier>{30ECB2FA-9C56-6771-E594-1817513E45C6}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Exports">
       <UniqueIdentifier>{BA9346E3-2673-C57E-2F8B-50559BE92BE0}</UniqueIdentifier>
     </Filter>
@@ -34,7 +37,7 @@
       <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="ConEmuHk\Connector.h">
-      <Filter>Headers</Filter>
+      <Filter>Connector</Filter>
     </ClInclude>
     <ClInclude Include="ConEmuHk\Console2.h">
       <Filter>Headers</Filter>
@@ -138,6 +141,9 @@
     <ClInclude Include="modules\minhook\src\trampoline.h">
       <Filter>MinHook\Trampoline</Filter>
     </ClInclude>
+    <ClInclude Include="modules\terminals\ConnectorAPI.h">
+      <Filter>Connector</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ConEmuHk\Ansi.cpp">
@@ -147,7 +153,7 @@
       <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="ConEmuHk\Connector.cpp">
-      <Filter>Sources</Filter>
+      <Filter>Connector</Filter>
     </ClCompile>
     <ClCompile Include="ConEmuHk\DefTermHk.cpp">
       <Filter>Sources</Filter>

src/ConEmuHk/Ansi.h

@@ -46,6 +46,7 @@ extern DWORD AnsiTlsIndex;
 
 struct MSectionSimple;
 
+/* !!! Duplicated in the ConnectorAPI.h !!! */
 enum WriteProcessedStream
 {
 	wps_None   = 0,
@@ -54,6 +55,7 @@ enum WriteProcessedStream
 	wps_Input  = 4, // Reserved for StdInput
 	wps_Ansi   = 8, // Reserved as a Flag for IsAnsiCapable
 };
+#define WRITE_PROCESSED_STREAM_DEFINED
 
 #if defined(__GNUC__)
 extern "C" {

src/ConEmuHk/Connector.h

@@ -1,6 +1,5 @@
 
 // gh-1314, gh-1311
-// #CONNECTOR 1. Move definitions to modules/terminals
 // #CONNECTOR 2. Add callback function to implement read ConIn
 //   * ConEmuHk should create server pipe and pass it to GUI
 //   * ConEmu should use MArray<wchar_t> instead of CEStr to make xterm conversions
@@ -41,46 +40,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "Ansi.h"
 
-enum RequestTermConnectorMode
-{
-	rtc_Start = 1,
-	rtc_Stop  = 2,
-};
 
-/* excerpt from Ansi.h begin *
-enum WriteProcessedStream
-{
-	// ...
-	wps_Output = 1,
-	wps_Error  = 2,
-	// ...
-};
- * excerpt from Ansi.h end */
+// enum RequestTermConnectorMode
+// enum WriteProcessedStream
+// struct RequestTermConnectorParm
+#include "../modules/terminals/ConnectorAPI.h"
 
-struct RequestTermConnectorParm
-{
-	// [IN]  size in bytes of this structure
-	DWORD cbSize;
-	// [IN]  requrested operation
-	RequestTermConnectorMode Mode;
-
-	// [IN]  dump initialization steps to console
-	BOOL bVerbose;
-
-	// [IN]  ttyname(STDOUT_FILENO)
-	LPCSTR pszTtyName;
-	// [IN]  $TERM
-	LPCSTR pszTerm;
-
-	// [OUT] If there were any errors, here may be some details
-	LPCSTR pszError;
-
-	// [OUT] This one is UNICODE
-	BOOL (WINAPI* ReadInput)(PINPUT_RECORD,DWORD,PDWORD);
-	// [OUT] But this is ANSI (UTF-8 is expected)
-	//       cbWrite==-1 : pBuffer contains ASCIIZ string, call strlen on it
-	BOOL (WINAPI* WriteText)(LPCSTR pBuffer, DWORD cbWrite, PDWORD pcbWritten, WriteProcessedStream nStream);
-};
 
 #if defined(__GNUC__)
 extern "C" {

src/modules/terminals

@@ -1 +1 @@
-Subproject commit c12cd1fd2cf60601cfd0141bac9c4675d84862b0
+Subproject commit 083e73c6cf8d530740e0236a118df8a2bf7c7b31