update sources and fix conhost build failure

microsoft · Mar 10, 2020 · 996e9ef · 996e9ef
1 parent 55a6cee
commit 996e9ef
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/src/host/consoleInformation.cpp b/src/host/consoleInformation.cpp
@@ -35,7 +35,6 @@ CONSOLE_INFORMATION::CONSOLE_INFORMATION() :
     // OutputCPInfo initialized below
     _cookedReadData(nullptr),
     ConsoleIme{},
-    terminalMouseInput(HandleTerminalKeyEventCallback),
     _vtIo(),
     _blinker{},
     renderData{}
@@ -180,18 +179,6 @@ void CONSOLE_INFORMATION::SetCookedReadData(COOKED_READ_DATA* readData) noexcept
     _cookedReadData = readData;
 }
 
-// Routine Description:
-// - Handler for inserting key sequences into the buffer when the terminal emulation layer
-//   has determined a key can be converted appropriately into a sequence of inputs
-// Arguments:
-// - events - the input events to write to the input buffer
-// Return Value:
-// - <none>
-void CONSOLE_INFORMATION::HandleTerminalKeyEventCallback(_Inout_ std::deque<std::unique_ptr<IInputEvent>>& events)
-{
-    ServiceLocator::LocateGlobals().getConsoleInformation().pInputBuffer->Write(events);
-}
-
 // Method Description:
 // - Return the active screen buffer of the console.
 // Arguments:

diff --git a/src/host/server.h b/src/host/server.h
@@ -21,7 +21,6 @@ Revision History:
 #include "settings.hpp"
 
 #include "conimeinfo.h"
-#include "..\terminal\input\terminalInput.hpp"
 #include "VtIo.hpp"
 #include "CursorBlinker.hpp"
 
@@ -115,8 +114,6 @@ class CONSOLE_INFORMATION :
 
     Microsoft::Console::VirtualTerminal::VtIo* GetVtIo();
 
-    static void HandleTerminalKeyEventCallback(_Inout_ std::deque<std::unique_ptr<IInputEvent>>& events);
-
     SCREEN_INFORMATION& GetActiveOutputBuffer() override;
     const SCREEN_INFORMATION& GetActiveOutputBuffer() const override;
     bool HasActiveOutputBuffer() const;

diff --git a/src/terminal/adapter/sources.inc b/src/terminal/adapter/sources.inc
@@ -34,7 +34,6 @@ SOURCES= \
     ..\DispatchCommon.cpp \
     ..\InteractDispatch.cpp \
     ..\adaptDispatchGraphics.cpp \
-    ..\MouseInput.cpp \
     ..\terminalOutput.cpp \
     ..\telemetry.cpp \
     ..\tracing.cpp \

diff --git a/src/terminal/input/sources.inc b/src/terminal/input/sources.inc
@@ -29,6 +29,8 @@ PRECOMPILED_INCLUDE     = ..\precomp.h
 
 SOURCES= \
     ..\terminalInput.cpp \
+    ..\mouseInput.cpp \
+    ..\mouseInputState.cpp \
 
 INCLUDES = \
     $(INCLUDES); \