Commit Graph

492 Commits

Author SHA1 Message Date
Ryan Prichard
e11e229edf detectNewWindows10Console: rewrite the 1x1 special case
Also: if we're on Win7 or earlier, skip this check.  We'd like to skip
on Win8 and 8.1, too, but doing a version check for those versions is
complicated (e.g. requires a correct manifest or hacks).
2016-06-07 02:02:29 -07:00
Ryan Prichard
572759519b Accommodate very narrow consoles better
If SetConsoleScreenBufferSize fails with a width under 20, keep trying
with wider widths until the API succeeds.
2016-06-07 00:40:25 -07:00
Ryan Prichard
85d737795b Initialize FontFamily (always to 0x36) for SetCurrentConsoleFontEx
On Windows 10 build 14342, with the new console, the Japanese system
locale, and the 437 code page, calling SetCurrentConsoleFontEx to set
the Consolas font breaks if FontFamily is 0, but it works if FontFamily
is 0x36.

See misc/Font-Report-June2016/Windows10SetFontBugginess.txt.
2016-06-07 00:08:26 -07:00
Ryan Prichard
cda0b02660 Adjust the font size according to the number of columns
Additionally, if it is impossible to fit the entire screen buffer on the
current monitor, detect this condition uising the
GetLargestConsoleWindowSize API and make the console window as large as
possible.  This is suboptimal for full-screen console programs (e.g. Far
Manager), but because the scrolling-mode scraper scrapes the screen buffer
rather than the visble window, the smaller-than-desired window frequently
has no noticeable effect.

Revert the use of MARK to freeze the new Windows 10 console.  Use
SELECT_ALL again.

Fixes https://github.com/rprichard/winpty/issues/61
Fixes https://github.com/rprichard/winpty/issues/79
Breaks https://github.com/rprichard/winpty/issues/53 again
2016-06-07 00:08:24 -07:00
Ryan Prichard
b67841911f Improve debugging output in Win32ConsoleBuffer::read
The reads were failing when running wmic.exe under winpty on Windows
10 build 14342.  In that build, after running wmic.exe, the console
buffer was resized to (1500,300), but the window was not moved upward,
so it was hundreds to thousands of lines below the actual buffer.

This is obviously a Windows 10 bug, because even running wmic.exe in a
normal console demonstrates the issue.  Simply fill the console with more
than 300 lines of junk, then try to run wmic.exe, and none of the
wmic.exe output is visible, even after hitting Return repeatedly.
2016-06-07 00:08:18 -07:00
Ryan Prichard
ec4558e0ec Add a test result from Win10/10586 regarding the JP locale + 437 codepage 2016-06-07 00:08:15 -07:00
Ryan Prichard
54d599d4ab Update notes -- correct a typo and comment on the 14342 bug with wmic.exe. 2016-06-06 22:27:35 -07:00
Ryan Prichard
f334c73b34 Make m_syncCounter unsigned to avoid UB on overflow 2016-06-05 23:32:44 -07:00
Ryan Prichard
33fae530ec Add notes about SetCurrentConsoleFontEx. 2016-06-05 23:04:33 -07:00
Ryan Prichard
661094b401 Add font information from various OS versions 2016-06-05 22:01:37 -07:00
Ryan Prichard
8bb13c6849 FontSurvey: automatically classify HHFFFF=GOOD and HHHFFF=OK 2016-06-05 19:23:26 -07:00
Ryan Prichard
111d0c67b1 Add a FontSurvey program for automatically testing 100 font sizes 2016-06-05 19:07:03 -07:00
Ryan Prichard
f7545a8499 Enhancements to misc/SetFont test program 2016-06-05 17:36:23 -07:00
Ryan Prichard
bdf3e0ec4c misc/Utf16Echo: Suppress some warnings 2016-06-05 17:05:41 -07:00
Ryan Prichard
f57ed5bede winpty-agent --show-input: add --escape-input flag
Improve debugging for the case where SetConsoleMode fails.  Apparently
on Windows 7, the call fails, but the 0x200 flag is still enabled.  A
later GetConsoleMode call succeeds, but of course, further calls to
SetConsoleMode will still fail unless they unset 0x200.

Given that the 0x200 flag is undocumented and only respected in preview
releases, I'm hesistant to clear the flag when --escape-input isn't set.

Related to https://github.com/rprichard/winpty/issues/82
2016-06-05 02:32:12 -05:00
Ryan Prichard
33c5687d4a More updates to test programs for font/resizing work 2016-06-05 01:47:05 -05:00
Ryan Prichard
ebefb91e80 Update test programs for font/resizing work
* Rename QueryFont.exe to GetFont.exe -- it's shorted.  Make font table
   output shorter.  Make the program work on XP.

 * Add IsNewConsole.exe

 * Add GetBufferInfo.exe

 * Clear the executable bit on some .cc files
2016-06-04 21:10:19 -05:00
Ryan Prichard
d0ae4cbb28 Add a missing header include to OsModule.h 2016-06-04 21:07:12 -05:00
Ryan Prichard
52abfbb908 Add misc/MoveConsoleWindow test program 2016-06-04 02:48:11 -05:00
Ryan Prichard
3854d04282 Add misc/SetBufferSize.exe and misc/SetWindowRect.exe test programs 2016-06-04 02:35:03 -05:00
Ryan Prichard
0f6de50111 Get a bunch of misc test programs compiling again 2016-06-03 22:17:37 -05:00
Ryan Prichard
71405ba1d4 Revert the requirement that pipes have been opened by winpty_spawn time.
The immediate problem is that the implementation has a race condition.  We
service the control pipe before the other pipes, so we can see the
winpty_spawn RPC request before noticing that the I/O pipes are connected.
(This situation actually happened and caused a pty4j test to fail.)

There are a few ways to fix this problem, such as by adding special calls
to service the I/O pipes in handleStartProcessPacket.

It occurred to me, though, that ensuring that pipes are connected before
calling winpty_spawn might be difficult in some environments that provide
high-level I/O systems.  I'm specifically thinking of nodejs/libuv, where,
IIRC, it was difficult to guarantee that the CreateFile API would be called
synchronously.

It turns out to be easy to relax the restriction, anyway, so just do that.

I also think that CONIN and CONOUT/CONERR are sufficiently different that
perhaps CONIN should have been exempted.
2016-06-02 01:52:46 -05:00
Ryan Prichard
139a4dfe53 Add WINPTY_SPAWN_FLAG_EXIT_AFTER_SHUTDOWN to guard against leaking agents 2016-06-02 00:52:59 -05:00
Ryan Prichard
e0cbe70600 Add a script specifically for building pty4j's libpty hierarchy. 2016-06-01 23:31:48 -05:00
Ryan Prichard
7c9a7c8745 Factor some code out of make_msvc_package.py into a simpler vcbuild.bat 2016-06-01 23:09:36 -05:00
Ryan Prichard
ce5c95cd4f make_msvc_package.py: clear the "-dev" version suffix
With MSVC, converting an empty macro value with STRINGIFY doesn't seem to
work.  (Maybe it's producing nothing rather than the blank literal, ""?)
Work around it by allowing __none__ as a substitute for blank.
2016-06-01 21:42:36 -05:00
Ryan Prichard
4130c88619 Also build for 64-bit XP.
I verified that the normal binaries did not work on a Windows Server 2003
R2 64-bit VM from AWS EC2.
2016-06-01 20:42:49 -05:00
Ryan Prichard
3539b806e9 Build/package winpty for embedding using gyp and MSVC 2016-06-01 20:01:37 -05:00
Ryan Prichard
bd58e14b17 Check in a forgotten file: misc/EnableExtendedFlags.txt 2016-06-01 19:48:11 -05:00
Ryan Prichard
24a1548ab7 Fix trivial test: open the CONIN pipe too
Also: close the I/O handles
2016-06-01 17:57:39 -05:00
Ryan Prichard
f9046dac82 Remove the redundant "-data" from the I/O pipe names
e.g. replace

\\.\pipe\winpty-data-conin-7752-1-1d1bbc851f1b21e-03b22efd16c217582b421ec555292c69

with

\\.\pipe\winpty-conin-7752-1-1d1bbc851f1b21e-03b22efd16c217582b421ec555292c69
2016-06-01 00:43:21 -05:00
Ryan Prichard
8e4810c5e1 Require that all I/O pipes are connected before calling winpty_spawn. 2016-06-01 00:40:35 -05:00
Ryan Prichard
a6fa61c17d Zero-initialize the EXPLICIT_ACCESSW objects.
This may have fixed a segfault in winpty_open.

Fixes https://github.com/rprichard/winpty/issues/80
2016-05-31 19:34:57 -05:00
Ryan Prichard
87436ca8ae Improvement to the ship/ship.py script
* Reorder ship targets to prefer MSYS, then MSYS2, then Cygwin

   The MSYS build is much more likely to fail, both because its Cygwin
   environment is poor (e.g. no C++11, no std::wstring) and because its
   MinGW environment is poor (e.g. missing/broken SDDL APIs)

 * Use PowerShell instead of the pefile module, because it's much faster,
   even with the extra overhead of starting PowerShell.

 * For MSYS, instead of disabling parallel make, use mingw32-make.exe.
   Apparently, with this change, it's necessary to use forward slashes when
   passing the PREFIX to make, so change that as well.
2016-05-30 15:09:28 -05:00
Ryan Prichard
bfa441f30c Only activate the terminal's mouse mode if ENABLE_EXTENDED_FLAGS is set
Previously, starting any Cygwin program (e.g. bash.exe, python2.7.exe)
would activate the terminal's mouse mode.

Move the ENABLE_EXTENDED_FLAGS note into a separate file.
2016-05-30 05:43:56 -05:00
Ryan Prichard
5974ed1895 Disable QuickEdit mode with WINPTY_MOUSE_MODE_NONE
There's really no reason to leave the mode ON, and disabling it makes
it easier to make mouse input work.  WINPTY_MOUSE_MODE_NONE doesn't mean,
"stop mouse input"; it means, "the agent will not configure your
terminal's mouse output".
2016-05-30 05:00:15 -05:00
Ryan Prichard
4815d6f9f2 Add a missing header to BackgroundDesktop.cc 2016-05-30 04:19:40 -05:00
Ryan Prichard
e60ef0101a Change the default way winpty enters the terminal's mouse mode.
By default, winpty now puts a new console into QuickEdit mode.  If the
agents detects that the console has disabled QuickEdit and enabled
ENABLE_MOUSE_INPUT, then it puts the terminal into mouse mode.

This convention doesn't work with all Windows programs -- it does work
with Far Manager and "winpty-agent.exe --show-input --with-mouse".  The
practice is described in one of Raymond Chen's posts[1].

For other programs, winpty.exe still has a --mouse option, and I wrote a
script in misc/ConinMode.ps1 that controls the QuickEdit (and InsertMode)
flags from the command-line, which is useful, because the console
properties dialog is inaccessible from within winpty.

[1] https://blogs.msdn.microsoft.com/oldnewthing/20130506-00/?p=4453
2016-05-30 04:10:49 -05:00
Ryan Prichard
cf39c31ff6 Create a PowerShell script for controlling the console input mode. 2016-05-30 02:18:13 -05:00
Ryan Prichard
8015db36e0 Implement a special agent invocation for creating background desktops
Calling SetProcessWindowStation in winpty_open isn't thread-safe -- another
thread may be doing something with the window station.  The call also
appears to interfere with the clipboard, which has affected IntelliJ.

A previous commit disabled the use of the background desktop for Windows 7
and up, where it seems unnecessary.  This commit fixes the issue for XP
and Vista by spawning the agent twice in winpty_open:
 1. winpty_open first spawns an agent with no attached console, which
    creates the background desktop and sends its name back on the control
    pipe.
 2. Then it spawns the primary agent invocation as usual.
 3. Once the primary agent's control pipe is connected, winty_open allows
    the first agent to exit.

Fixes https://github.com/rprichard/winpty/issues/58
2016-05-29 00:20:03 -05:00
Ryan Prichard
75ad04155f Fix PendingIo: CancelIo should be passed the HANDLE, not the OVERLAPPED 2016-05-28 22:18:13 -05:00
Ryan Prichard
982e8051a5 Reduce redundant terminal output and make plain+color flags work 2016-05-27 21:36:08 -05:00
Ryan Prichard
d1b9522444 Get misc/SetCursorPos.exe compiling again 2016-05-27 20:19:49 -05:00
Ryan Prichard
d4856b26a8 Fix memory unsafety bug 2016-05-27 02:19:15 -05:00
Ryan Prichard
222ecb9f44 Add undocumented -X<flag> switches to winpty.exe for testing
-Xallow-non-tty:    allow stdin/stdout to not be ttys
-Xconerr:           test the new CONERR mode (connect it to STDERR_FILENO)
-Xplain:            enter plain, unescaped, mode
-Xcolor:            force generation of color escapes, even with -Xplain

Also: with "winpty.exe --showkey", stop trying to put stdout into raw
terminal mode, and ignore whether it is a tty.
2016-05-26 21:34:20 -05:00
Ryan Prichard
5b57d37bdc Simplify the API: remove error params from 2 winpty_config_set_XXX setters 2016-05-26 21:29:11 -05:00
Ryan Prichard
ccb11afd62 Split out Scraper class from Agent; add a "CONERR" mode
If the WINPTY_FLAG_CONERR flag is specified when starting the agent, the
agent creates a separate, inactive console buffer to use for collecting
error output.  The buffer is passed to children using
STARTUPINFO.hStdError.  The agent scrapes from both the initial STDOUT
screen buffer and the new error buffer using two Scraper objects, two
Terminal objects, and two NamedPipe objects.

Clients connect to the CONERR pipe just as they would connect to the CONOUT
pipe.  There is a winpty_conerr_name function for querying the CONERR
pipe's name.

Console frozenness is a property of the entire console, rather than a
screen buffer, so it is consolidated into the Win32Console class.  During a
typical output poll, the console is frozen, then both buffers are scraped,
then the console is unfrozen.

Related: previously CONOUT$ was reopening at each poll timeout.  Now, the
buffer is only open for the duration is is needed.  (i.e. It is closed at
the end of the resizing/scraping operation.)  This new behavior might be
more correct in scenarios where programs change the active screen buffer.
If a program activates its own screen buffer, then exits, the screen buffer
is destroyed because no program references it.  When it is destroyed, a
different buffer is activated.  By opening CONOUT$, winpty can accidentally
prevent a screen buffer from being destroyed, at least temporarily.
2016-05-26 21:26:58 -05:00
Ryan Prichard
f453c9ca1d Remove wstringToUtf8String; it's redundant with utf8FromWide. 2016-05-26 20:56:03 -05:00
Ryan Prichard
265fc67ff0 Split Win32Console into Win32Console and Win32ConsoleBuffer 2016-05-26 20:56:02 -05:00
Ryan Prichard
6a253ee5a8 Factor some input handling out of Agent/Win32Console into ConsoleInput 2016-05-26 20:56:02 -05:00