Commit Graph

334 Commits

Author SHA1 Message Date
Ryan Prichard
9e477bc014 Remove declarations for methods that I removed when I created the Terminal
class.
2011-11-27 02:59:37 -08:00
Ryan Prichard
b7a9415a58 Start the agent in a new window station.
The intent is to avoid a problem on Windows XP.  On that OS, sending
a "Select All" command to freeze one console window also interrupts any
"window activity" (e.g. moving/closing/scrolling/right-clicking/...) on
all other console windows.

My hope is that putting the console into a special window station will
isolate it enough to avoid this problem.  I noticed that the problem didn't
happen when I ran the TestNetServer as a service, which ran both the
TestNetServer and Agent processes with a special window station.

Note that even though the Agent runs in a special window station, the shell
and its children run in the normal window station.
2011-11-27 02:46:16 -08:00
Ryan Prichard
9f1bdd43ab Don't enable the agent auto-shutdown logic until after the TestNetServer
has started a shell.

I thought this change would fix a problem with the Windows 8 Preview where
the connection shut down immediately after starting.  It did not fix the
problem, which I still don't have an explanation for, but in any case, I
think the change is necessary.
2011-11-25 18:34:33 -08:00
Ryan Prichard
73b250da63 Support running TestNetServer as a Windows service.
* Add a note on how to use instsrv and srvany.

 * First look for Agent.exe in the same directory as TestNetServer.exe
   before looking for the executable in the build directory that Qt
   Creator uses.

 * Write a script that copies MinGW/Qt DLLs to a single directory.
2011-11-25 01:52:58 -08:00
Ryan Prichard
e9997d6372 Add another windows test case. 2011-11-25 00:02:46 -08:00
Ryan Prichard
2b4fe1c771 Add initial color support. 2011-11-24 03:03:25 -08:00
Ryan Prichard
a0e99867cd Factor some code out of Agent into a new Terminal class.
Also, now that freezing uses "Select All" instead of "Mark", remove the
cursor-related hacks from resizeWindow and scrapeOutput.
2011-11-24 03:03:25 -08:00
Ryan Prichard
bba54c0703 Use "Select All" instead of "Mark" to freeze the console.
The Mark command moves the cursor to the top-left, which interferes with
lynx, a full-screen Cygwin web browser, and probably other programs.
The Select All command also puts the console into selection mode, blocking
console output.
2011-11-24 03:03:25 -08:00
Ryan Prichard
023e5f333f Reset the terminal when the sync marker disappears or when the window moves
upward.

This commit gets the CMD/PowerShell CLS command working with the Agent.
Previously, the CLS command was broken in the following test case:
 - User opens a window of height N and types CLS.  The window now looks
   like:
    line0)
    line1) D:\rprichard\Scrape\TestNetServer-build-desktop>
 - User generates a bunch of output -- enough to scroll the window but not
   enough to create a sync marker.
 - User types CLS again.
 - The window scrolls back to the top and is cleared.
 - The agent thinks that lines [1..(N-1]] of the window (and screen buffer)
   have changed.  It omits line 0 because line 0 is blank before and after
   the CLS.  Therefore, it sends N-1 lines.  The first line is at line 1.
   We've already output a "remote line" larger than N, though, so we first
   try to CursorUp by >>N lines.
 - After moving the cursor up, we're actually on line 0 of the terminal
   instead of line 1.

I think the general rule is that it's safe to "reset the terminal," but we
want to avoid resetting because it breaks history.  For typical
command-line sessions that don't involve full-screen programs, (but which
*could* involve window resizing), I would like the history to be perfect.
2011-11-24 03:03:25 -08:00
Ryan Prichard
a364522006 Record a high-water-mark of "dirty" lines in the console screen buffer
and avoid sending lines in the window that aren't dirty yet.

The idea is that the bottom of the console screen commonly has blank lines
that do not need to be sent to the client, because nothing has been written
there yet.  For example, when the console first appears, there is typically
a command-line prompt at the top of the window.  When a console is expanded
vertically, blank lines commonly appear at the bottom.

Other misc changes to the output:
 - When we send one later, also send all following lines.
 - When we save a line into m_bufferData, fill in the rest of the line with
   spaces.  This way, it's possible to expand the console horizontally
   without the agent resending all the lines.
 - If nothing on the console has changed, then leave the cursor alone.
   Don't hide, show, or move it.
2011-11-24 03:03:25 -08:00
Ryan Prichard
b2f15c8f27 Fix terminal output bugs in the TestNet client.
* If the client was unable to write any data, write would return -1 with
   errno==EAGAIN, and the client would assert fail.

 * Apparently I thought that continue would jump to the start of the
   do-while(0) loop.  Replace the continue/do-while(0) with a
   did_something flag.

While I'm at it, replace a few hard-coded constants with constants.
2011-11-24 03:03:25 -08:00
Ryan Prichard
7e4b19dc79 Check in two test programs. 2011-11-24 03:03:25 -08:00
Ryan Prichard
9712f74b76 First cut at incremental console output scraping.
- On each polling, identify a range of lines to scan.  This range will
   include lines in the history if output has scrolled.

 - Line in scrapeOutput and the terminal output routines (e.g.
   sendLineToTerminal) are numbered as if writing to an infinitely-sized
   terminal.

 - Once history is large enough, write a string to column 1 ~200 lines
   up.  This synchronizing marker lets us know how much the console output
   has scrolled.

 - Freeze the console output by putting the console into select/mark mode.
   Unfreeze it by sending an ESC keypress.
2011-11-24 03:03:25 -08:00
Ryan Prichard
f77557aa95 Add a Win32Console class that provides a simpler, Qt/C++ interface to the
Win32 Console API.
2011-11-24 03:03:25 -08:00
Ryan Prichard
c74f82abdb Pass an initial window size to the agent on startup.
* The TestNet protocol starts with a terminal resize escape sequence, so
   the server discards all input until it sees the sequence, and it delays
   starting the agent.  Eventually, the goal is to implement an SSH server,
   and the SSH message that creates a PTY also provides the terminal size.
2011-11-24 03:03:25 -08:00
Ryan Prichard
662b140c62 Add a test program that uses the ioctl-like console interface to scroll
and write.
2011-11-24 03:03:25 -08:00
Ryan Prichard
8647405a6d Add comments regarding capturing console output. 2011-11-24 03:03:25 -08:00
Ryan Prichard
0bb71ee53c In the Unix client, send a resize escape sequence on startup and when the
terminal window is resized.
2011-11-24 03:03:25 -08:00
Ryan Prichard
166c553f15 Add initial server support for resizing terminal windows. 2011-11-24 03:03:25 -08:00
Ryan Prichard
3ae1f5f9a7 Add a TODO describing an EDIT/NTVDM-related bug. 2011-11-24 03:03:25 -08:00
Ryan Prichard
b491fd6378 Add a UnixSignalHandler class. It emits a Qt signal when a Unix signal is
handled.

Use the UnixSignalHandler to detect terminal resizing.  The client doesn't
do anything with the terminal size yet.  It should send the size to the
server.
2011-11-24 03:03:25 -08:00
Ryan Prichard
af5a742e57 Two Unix client changes:
* Use disconnected instead of readChannelFinished.

 * Fix a serious bug in doServerToClient.
2011-11-24 03:03:25 -08:00
Ryan Prichard
e3ce5c0ff0 Checkpoint work on the Windows server.
* Use disconnected() instead of readChannelFinished().

 * Cleanup.  There are three bidirectional pipes conceptually:
      console <-> agent
      agent <-> server
      server <-> client
   If one end of a pipe dies, start closing the other end, then clean up.
   If the console dies (e.g. because cmd.exe exits), we still want to
   collect the final console output and send it to the client.

   To help with this, in the Agent, I call GetConsoleProcessList, then
   scrapeOutput, then (potentially) disconnectFromServer.
2011-11-24 03:03:25 -08:00
Ryan Prichard
f9b713dc57 In the Unix client, stop the program when the read channel finishes. 2011-11-24 03:03:25 -08:00
Ryan Prichard
c0c261b2b5 Add simplistic console output polling in the server and feed the output
to the client.
2011-11-24 03:03:25 -08:00
Ryan Prichard
73bd43d051 Implement the Unix TestNet client. 2011-11-24 03:03:25 -08:00
Ryan Prichard
f70b2bd772 Add a mostly empty TestNetClient project. 2011-11-24 03:03:25 -08:00
Ryan Prichard
a7ae78b9b1 Add test programs that echo their input to stdout. 2011-11-24 03:03:25 -08:00
Ryan Prichard
d473320350 Rename TelnetServer to TestNetServer to accurately reflect its actual
functionality.
2011-11-24 03:03:25 -08:00
Ryan Prichard
7898332d9e Remove the older pre-Qt code. 2011-11-24 03:03:24 -08:00
Ryan Prichard
6021840a1f Checkpoint Console work.
- Add a very incomplete "telnet" server.  It doesn't recognize any telnet
   commands, so it's "telnet" only in the sense that I can connect to the
   server and type commands.  The commands are fed to a Win32 Console, but
   I don't get to see the output over the network.

 - Move AgentClient to the Shared directory and move QtEvent-specific code
   out of it.

 - Move the startShell routine into the AgentClient so I can share it
   between the different console-consuming prototypes.
2011-11-24 03:03:05 -08:00
Ryan Prichard
22b4de90b8 Checkpoint a reimplementation that uses Qt extensively.
- Use QMake instead of CMake.

 - Use QLocalSocket/QLocalServer to access Win32 named pipes.
2011-10-31 02:19:18 -07:00
Ryan Prichard
6009fcaf7b Checkpoint of console work.
The agent process uses shared memory and events now instead of pipes.
2011-10-30 17:59:27 -07:00
Ryan Prichard
6e8f04139a Initial commit of console work. 2011-10-30 15:07:02 -07:00