node-pty 1.2.0-beta.6 → 1.2.0-beta.8

package/deps/winpty/src/agent/ConsoleInput.h

@@ -1,109 +0,0 @@
-// Copyright (c) 2011-2015 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 CONSOLEINPUT_H
-#define CONSOLEINPUT_H
-
-#include <windows.h>
-#include <stdint.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "Coord.h"
-#include "InputMap.h"
-#include "SmallRect.h"
-
-class Win32Console;
-class DsrSender;
-
-class ConsoleInput
-{
-public:
-    ConsoleInput(HANDLE conin, int mouseMode, DsrSender &dsrSender,
-                 Win32Console &console);
-    void writeInput(const std::string &input);
-    void flushIncompleteEscapeCode();
-    void setMouseWindowRect(SmallRect val) { m_mouseWindowRect = val; }
-    void updateInputFlags(bool forceTrace=false);
-    bool shouldActivateTerminalMouse();
-
-private:
-    void doWrite(bool isEof);
-    void flushInputRecords(std::vector<INPUT_RECORD> &records);
-    int scanInput(std::vector<INPUT_RECORD> &records,
-                  const char *input,
-                  int inputSize,
-                  bool isEof);
-    int scanMouseInput(std::vector<INPUT_RECORD> &records,
-                       const char *input,
-                       int inputSize);
-    void appendUtf8Char(std::vector<INPUT_RECORD> &records,
-                        const char *charBuffer,
-                        int charLen,
-                        bool terminalAltEscape);
-    void appendKeyPress(std::vector<INPUT_RECORD> &records,
-                        uint16_t virtualKey,
-                        uint32_t winCodePointDn,
-                        uint32_t winCodePointUp,
-                        uint16_t winKeyState,
-                        uint32_t vtCodePoint,
-                        uint16_t vtKeyState);
-
-public:
-    static void appendCPInputRecords(std::vector<INPUT_RECORD> &records,
-                                     BOOL keyDown,
-                                     uint16_t virtualKey,
-                                     uint32_t codePoint,
-                                     uint16_t keyState);
-    static void appendInputRecord(std::vector<INPUT_RECORD> &records,
-                                  BOOL keyDown,
-                                  uint16_t virtualKey,
-                                  wchar_t utf16Char,
-                                  uint16_t keyState);
-
-private:
-    DWORD inputConsoleMode();
-
-private:
-    Win32Console &m_console;
-    HANDLE m_conin = nullptr;
-    int m_mouseMode = 0;
-    DsrSender &m_dsrSender;
-    bool m_dsrSent = false;
-    std::string m_byteQueue;
-    InputMap m_inputMap;
-    DWORD m_lastWriteTick = 0;
-    DWORD m_mouseButtonState = 0;
-    struct DoubleClickDetection {
-        DWORD button = 0;
-        Coord pos;
-        DWORD tick = 0;
-        bool released = false;
-    } m_doubleClick;
-    bool m_enableExtendedEnabled = false;
-    bool m_mouseInputEnabled = false;
-    bool m_quickEditEnabled = false;
-    bool m_escapeInputEnabled = false;
-    SmallRect m_mouseWindowRect;
-};
-
-#endif // CONSOLEINPUT_H

package/deps/winpty/src/agent/ConsoleInputReencoding.cc

@@ -1,121 +0,0 @@
-// Copyright (c) 2016 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.
-
-#include "ConsoleInputReencoding.h"
-
-#include "ConsoleInput.h"
-
-namespace {
-
-static void outch(std::vector<INPUT_RECORD> &out, wchar_t ch) {
-    ConsoleInput::appendInputRecord(out, TRUE, 0, ch, 0);
-}
-
-} // anonymous namespace
-
-void reencodeEscapedKeyPress(
-        std::vector<INPUT_RECORD> &out,
-        uint16_t virtualKey,
-        uint32_t codePoint,
-        uint16_t keyState) {
-
-    struct EscapedKey {
-        enum { None, Numeric, Letter } kind;
-        wchar_t content[2];
-    };
-
-    EscapedKey escapeCode = {};
-    switch (virtualKey) {
-        case VK_UP:     escapeCode = { EscapedKey::Letter, {'A'} }; break;
-        case VK_DOWN:   escapeCode = { EscapedKey::Letter, {'B'} }; break;
-        case VK_RIGHT:  escapeCode = { EscapedKey::Letter, {'C'} }; break;
-        case VK_LEFT:   escapeCode = { EscapedKey::Letter, {'D'} }; break;
-        case VK_CLEAR:  escapeCode = { EscapedKey::Letter, {'E'} }; break;
-        case VK_F1:     escapeCode = { EscapedKey::Numeric, {'1', '1'} }; break;
-        case VK_F2:     escapeCode = { EscapedKey::Numeric, {'1', '2'} }; break;
-        case VK_F3:     escapeCode = { EscapedKey::Numeric, {'1', '3'} }; break;
-        case VK_F4:     escapeCode = { EscapedKey::Numeric, {'1', '4'} }; break;
-        case VK_F5:     escapeCode = { EscapedKey::Numeric, {'1', '5'} }; break;
-        case VK_F6:     escapeCode = { EscapedKey::Numeric, {'1', '7'} }; break;
-        case VK_F7:     escapeCode = { EscapedKey::Numeric, {'1', '8'} }; break;
-        case VK_F8:     escapeCode = { EscapedKey::Numeric, {'1', '9'} }; break;
-        case VK_F9:     escapeCode = { EscapedKey::Numeric, {'2', '0'} }; break;
-        case VK_F10:    escapeCode = { EscapedKey::Numeric, {'2', '1'} }; break;
-        case VK_F11:    escapeCode = { EscapedKey::Numeric, {'2', '3'} }; break;
-        case VK_F12:    escapeCode = { EscapedKey::Numeric, {'2', '4'} }; break;
-        case VK_HOME:   escapeCode = { EscapedKey::Letter, {'H'} }; break;
-        case VK_INSERT: escapeCode = { EscapedKey::Numeric, {'2'} }; break;
-        case VK_DELETE: escapeCode = { EscapedKey::Numeric, {'3'} }; break;
-        case VK_END:    escapeCode = { EscapedKey::Letter, {'F'} }; break;
-        case VK_PRIOR:  escapeCode = { EscapedKey::Numeric, {'5'} }; break;
-        case VK_NEXT:   escapeCode = { EscapedKey::Numeric, {'6'} }; break;
-    }
-    if (escapeCode.kind != EscapedKey::None) {
-        int flags = 0;
-        if (keyState & SHIFT_PRESSED)       { flags |= 0x1; }
-        if (keyState & LEFT_ALT_PRESSED)    { flags |= 0x2; }
-        if (keyState & LEFT_CTRL_PRESSED)   { flags |= 0x4; }
-        outch(out, L'\x1b');
-        outch(out, L'[');
-        if (escapeCode.kind == EscapedKey::Numeric) {
-            for (wchar_t ch : escapeCode.content) {
-                if (ch != L'\0') {
-                    outch(out, ch);
-                }
-            }
-        } else if (flags != 0) {
-            outch(out, L'1');
-        }
-        if (flags != 0) {
-            outch(out, L';');
-            outch(out, L'1' + flags);
-        }
-        if (escapeCode.kind == EscapedKey::Numeric) {
-            outch(out, L'~');
-        } else {
-            outch(out, escapeCode.content[0]);
-        }
-        return;
-    }
-
-    switch (virtualKey) {
-        case VK_BACK:
-            if (keyState & LEFT_ALT_PRESSED) {
-                outch(out, L'\x1b');
-            }
-            outch(out, L'\x7f');
-            return;
-        case VK_TAB:
-            if (keyState & SHIFT_PRESSED) {
-                outch(out, L'\x1b');
-                outch(out, L'[');
-                outch(out, L'Z');
-                return;
-            }
-            break;
-    }
-
-    if (codePoint != 0) {
-        if (keyState & LEFT_ALT_PRESSED) {
-            outch(out, L'\x1b');
-        }
-        ConsoleInput::appendCPInputRecords(out, TRUE, 0, codePoint, 0);
-    }
-}

package/deps/winpty/src/agent/ConsoleInputReencoding.h

@@ -1,36 +0,0 @@
-// Copyright (c) 2016 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_CONSOLE_INPUT_REENCODING_H
-#define AGENT_CONSOLE_INPUT_REENCODING_H
-
-#include <windows.h>
-
-#include <stdint.h>
-
-#include <vector>
-
-void reencodeEscapedKeyPress(
-    std::vector<INPUT_RECORD> &records,
-    uint16_t virtualKey,
-    uint32_t codePoint,
-    uint16_t keyState);
-
-#endif // AGENT_CONSOLE_INPUT_REENCODING_H

package/deps/winpty/src/agent/ConsoleLine.cc

@@ -1,152 +0,0 @@
-// Copyright (c) 2015 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.
-
-//
-// ConsoleLine
-//
-// This data structure keep tracks of the previous CHAR_INFO content of an
-// output line and determines when a line has changed.  Detecting line changes
-// is made complicated by terminal resizing.
-//
-
-#include "ConsoleLine.h"
-
-#include <algorithm>
-
-#include "../shared/WinptyAssert.h"
-
-static CHAR_INFO blankChar(WORD attributes)
-{
-    // N.B.: As long as we write to UnicodeChar rather than AsciiChar, there
-    // are no padding bytes that could contain uninitialized bytes.  This fact
-    // is important for efficient comparison.
-    CHAR_INFO ret;
-    ret.Attributes = attributes;
-    ret.Char.UnicodeChar = L' ';
-    return ret;
-}
-
-static bool isLineBlank(const CHAR_INFO *line, int length, WORD attributes)
-{
-    for (int col = 0; col < length; ++col) {
-        if (line[col].Attributes != attributes ||
-                line[col].Char.UnicodeChar != L' ') {
-            return false;
-        }
-    }
-    return true;
-}
-
-static inline bool areLinesEqual(
-    const CHAR_INFO *line1,
-    const CHAR_INFO *line2,
-    int length)
-{
-    return memcmp(line1, line2, sizeof(CHAR_INFO) * length) == 0;
-}
-
-ConsoleLine::ConsoleLine() : m_prevLength(0)
-{
-}
-
-void ConsoleLine::reset()
-{
-    m_prevLength = 0;
-    m_prevData.clear();
-}
-
-// Determines whether the given line is sufficiently different from the
-// previously seen line as to justify reoutputting the line.  The function
-// also sets the `ConsoleLine` to the given line, exactly as if `setLine` had
-// been called.
-bool ConsoleLine::detectChangeAndSetLine(const CHAR_INFO *const line, const int newLength)
-{
-    ASSERT(newLength >= 1);
-    ASSERT(m_prevLength <= static_cast<int>(m_prevData.size()));
-
-    if (newLength == m_prevLength) {
-        bool equalLines = areLinesEqual(m_prevData.data(), line, newLength);
-        if (!equalLines) {
-            setLine(line, newLength);
-        }
-        return !equalLines;
-    } else {
-        if (m_prevLength == 0) {
-            setLine(line, newLength);
-            return true;
-        }
-
-        ASSERT(m_prevLength >= 1);
-        const WORD prevBlank = m_prevData[m_prevLength - 1].Attributes;
-        const WORD newBlank = line[newLength - 1].Attributes;
-
-        bool equalLines = false;
-        if (newLength < m_prevLength) {
-            // The line has become shorter.  The lines are equal if the common
-            // part is equal, and if the newly truncated characters were blank.
-            equalLines =
-                areLinesEqual(m_prevData.data(), line, newLength) &&
-                isLineBlank(m_prevData.data() + newLength,
-                            m_prevLength - newLength,
-                            newBlank);
-        } else {
-            //
-            // The line has become longer.  The lines are equal if the common
-            // part is equal, and if both the extra characters and any
-            // potentially reexposed characters are blank.
-            //
-            // Two of the most relevant terminals for winpty--mintty and
-            // jediterm--don't (currently) erase the obscured content when a
-            // line is cleared, so we should anticipate its existence when
-            // making a terminal wider and reoutput the line.  See:
-            //
-            //  * https://github.com/mintty/mintty/issues/480
-            //  * https://github.com/JetBrains/jediterm/issues/118
-            //
-            ASSERT(newLength > m_prevLength);
-            equalLines =
-                areLinesEqual(m_prevData.data(), line, m_prevLength) &&
-                isLineBlank(m_prevData.data() + m_prevLength,
-                            std::min<int>(m_prevData.size(), newLength) - m_prevLength,
-                            prevBlank) &&
-                isLineBlank(line + m_prevLength,
-                            newLength - m_prevLength,
-                            prevBlank);
-        }
-        setLine(line, newLength);
-        return !equalLines;
-    }
-}
-
-void ConsoleLine::setLine(const CHAR_INFO *const line, const int newLength)
-{
-    if (static_cast<int>(m_prevData.size()) < newLength) {
-        m_prevData.resize(newLength);
-    }
-    memcpy(m_prevData.data(), line, sizeof(CHAR_INFO) * newLength);
-    m_prevLength = newLength;
-}
-
-void ConsoleLine::blank(WORD attributes)
-{
-    m_prevData.resize(1);
-    m_prevData[0] = blankChar(attributes);
-    m_prevLength = 1;
-}

package/deps/winpty/src/agent/ConsoleLine.h

@@ -1,41 +0,0 @@
-// Copyright (c) 2015 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 CONSOLE_LINE_H
-#define CONSOLE_LINE_H
-
-#include <windows.h>
-
-#include <vector>
-
-class ConsoleLine
-{
-public:
-    ConsoleLine();
-    void reset();
-    bool detectChangeAndSetLine(const CHAR_INFO *line, int newLength);
-    void setLine(const CHAR_INFO *line, int newLength);
-    void blank(WORD attributes);
-private:
-    int m_prevLength;
-    std::vector<CHAR_INFO> m_prevData;
-};
-
-#endif // CONSOLE_LINE_H

package/deps/winpty/src/agent/Coord.h

@@ -1,87 +0,0 @@
-// 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 COORD_H
-#define COORD_H
-
-#include <windows.h>
-
-#include <string>
-
-#include "../shared/winpty_snprintf.h"
-
-struct Coord : COORD {
-    Coord()
-    {
-        X = 0;
-        Y = 0;
-    }
-
-    Coord(SHORT x, SHORT y)
-    {
-        X = x;
-        Y = y;
-    }
-
-    Coord(COORD other)
-    {
-        *(COORD*)this = other;
-    }
-
-    Coord(const Coord &other)
-    {
-        *(COORD*)this = *(const COORD*)&other;
-    }
-
-    Coord &operator=(const Coord &other)
-    {
-        *(COORD*)this = *(const COORD*)&other;
-        return *this;
-    }
-
-    bool operator==(const Coord &other) const
-    {
-        return X == other.X && Y == other.Y;
-    }
-
-    bool operator!=(const Coord &other) const
-    {
-        return !(*this == other);
-    }
-
-    Coord operator+(const Coord &other) const
-    {
-        return Coord(X + other.X, Y + other.Y);
-    }
-
-    bool isEmpty() const
-    {
-        return X <= 0 || Y <= 0;
-    }
-
-    std::string toString() const
-    {
-        char ret[32];
-        winpty_snprintf(ret, "(%d,%d)", X, Y);
-        return std::string(ret);
-    }
-};
-
-#endif // COORD_H