d4640890cf
* Unfreeze the console while changing the buffer size. Changing the
buffer size hangs conhost.exe. See:
- https://github.com/rprichard/winpty/issues/31
- https://wpdev.uservoice.com/forums/266908-command-prompt/suggestions/9941292-conhost-exe-hangs-in-win10-if-setconsolescreenbuff
* Detect buffer size changes and switch to a "direct mode". Direct mode
makes no attempt to track incremental console changes. Instead, the
content of the current console window is printed. This mode is
intended for full-screen apps that resize the console.
* Reopen CONOUT$, which detects apps that change the active screen buffer.
Fixes https://github.com/rprichard/winpty/issues/34.
* In the scroll scraping (scrollingScrapeOutput), consider a line changed
if the new content is truncated relative to the content previously
output. Previously, we only compared against the line-buffer up to the
current console width. e.g.
If this:
|C:\Program|
turns into:
|C:\Prog|
|ram |
we previously left |C:\Program| in the line-buffer for the first line
and did not re-output the first line.
We *should* reoutput the first line at this point so that, if the line
scrolls upward, and the terminal is later expanded, we will have
output an "Erase in Line" CSI command to clear the obscured "ram" text.
We need to update the line-buffer for the sake of Windows 10 combined
with terminals like xterm and putty. On such a terminal, if the
terminal later widened, Windows 10 will restore the console to the
first state. At that point, we need to reoutput the line, because
xterm and putty do not save and restore truncated line content extending
past the current terminal width.
110 lines
3.3 KiB
C++
110 lines
3.3 KiB
C++
// Copyright (c) 2011-2012 Ryan Prichard
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to
|
|
// deal in the Software without restriction, including without limitation the
|
|
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
// sell copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// 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.
|
|
|
|
#ifndef AGENT_H
|
|
#define AGENT_H
|
|
|
|
#include <string>
|
|
#include <windows.h>
|
|
#include "EventLoop.h"
|
|
#include "DsrSender.h"
|
|
#include "Coord.h"
|
|
#include "SmallRect.h"
|
|
|
|
class Win32Console;
|
|
class ConsoleInput;
|
|
class Terminal;
|
|
class ReadBuffer;
|
|
class NamedPipe;
|
|
struct ConsoleScreenBufferInfo;
|
|
|
|
const int BUFFER_LINE_COUNT = 3000; // TODO: Use something like 9000.
|
|
const int MAX_CONSOLE_WIDTH = 500;
|
|
const int SYNC_MARKER_LEN = 16;
|
|
|
|
class Agent : public EventLoop, public DsrSender
|
|
{
|
|
public:
|
|
Agent(LPCWSTR controlPipeName,
|
|
LPCWSTR dataPipeName,
|
|
int initialCols,
|
|
int initialRows);
|
|
virtual ~Agent();
|
|
void sendDsr();
|
|
|
|
private:
|
|
NamedPipe *makeSocket(LPCWSTR pipeName);
|
|
void resetConsoleTracking(bool sendClear = true);
|
|
|
|
private:
|
|
void pollControlSocket();
|
|
void handlePacket(ReadBuffer &packet);
|
|
int handleStartProcessPacket(ReadBuffer &packet);
|
|
int handleSetSizePacket(ReadBuffer &packet);
|
|
void pollDataSocket();
|
|
|
|
protected:
|
|
virtual void onPollTimeout();
|
|
virtual void onPipeIo(NamedPipe *namedPipe);
|
|
|
|
private:
|
|
void markEntireWindowDirty(const SmallRect &windowRect);
|
|
void scanForDirtyLines();
|
|
void clearBufferLines(int firstRow, int count, WORD attributes);
|
|
void resizeImpl(const ConsoleScreenBufferInfo &origInfo);
|
|
void resizeWindow(int cols, int rows);
|
|
void syncConsoleContentAndSize(bool forceResize);
|
|
void syncConsoleTitle();
|
|
void directScrapeOutput(const ConsoleScreenBufferInfo &info);
|
|
void scrollingScrapeOutput(const ConsoleScreenBufferInfo &info);
|
|
void reopenConsole();
|
|
void freezeConsole();
|
|
void unfreezeConsole();
|
|
void syncMarkerText(CHAR_INFO *output);
|
|
int findSyncMarker();
|
|
void createSyncMarker(int row);
|
|
|
|
private:
|
|
Win32Console *m_console;
|
|
NamedPipe *m_controlSocket;
|
|
NamedPipe *m_dataSocket;
|
|
bool m_closingDataSocket;
|
|
Terminal *m_terminal;
|
|
ConsoleInput *m_consoleInput;
|
|
HANDLE m_childProcess;
|
|
int m_childExitCode;
|
|
|
|
int m_syncRow;
|
|
int m_syncCounter;
|
|
|
|
bool m_directMode;
|
|
Coord m_ptySize;
|
|
int m_scrapedLineCount;
|
|
int m_scrolledCount;
|
|
int m_maxBufferedLine;
|
|
CHAR_INFO (*m_bufferData)[MAX_CONSOLE_WIDTH];
|
|
int m_dirtyWindowTop;
|
|
int m_dirtyLineCount;
|
|
|
|
std::wstring m_currentTitle;
|
|
};
|
|
|
|
#endif // AGENT_H
|