53 Commits

Author SHA1 Message Date
Jason Hood
eb997019c1 Add IND, NEL and RI
These controls always operate on the buffer, in keeping with LF.
2017-12-03 12:50:13 +10:00
Jason Hood
1a4d6b488f Add option -pu to unload from the parent 2017-11-30 21:05:41 +10:00
Jason Hood
523c478d67 Fix some things
Prevent `ESC LF` from performing the newline.
Only recognise `, ~`, not `,` anything.
Document BEL and the ignored sequences.
2017-11-30 11:38:15 +10:00
Jason Hood
e2f9b4e417 Add palette sequences
Recognise the xterm ESC]4 & ESC]104 OSC commands to set/reset colors.
Three color specs are recognised: `#RGB`, `#RRGGBB` and `R,G,B`; in
addition, multiple specs can be given (separated by commas) to
automatically increase the index.  I also allow `*` to query this index
and all subsequent ones.  Reset will restore the colors from when the
DLL was first loaded, not from the Console Properties.
2017-11-29 11:06:57 +10:00
Jason Hood
9fbe42a583 Escape control characters; fix CRM issues
Since ESC is now preserved for unrecognised sequences, I feel able to
use it to escape control characters in order to display them (e.g.
"\e\e" will display a single escape).

Control mode would not display the recognised controls (i.e. BEL, SO and
SI) and would not work if it was turned off in the same string.
2017-11-24 11:10:42 +10:00
Jason Hood
e44cbb848f Add + to use the buffer
Normally the display uses the window height; adding an intermediate
character of `+` will use the buffer height.  Report cursor position
will also output `+R` when used with `+n`.
2017-11-23 12:06:33 +10:00
Jason Hood
a4125753a4 Fix compiling with MinGW and TDM
MinGW lacks some definitions; TDM wants WINVER defined.

Assume a default `CC=cc` should really be `CC=gcc`.
2017-11-21 11:46:58 +10:00
Jason Hood
826b0b66ba Add DECPS Play Sound
There are some differences from the VT520: volume is ignored (although
silence is honored); duration is in 1/32 of a second up to and including
48 (1.5 seconds), after which it is in milliseconds (but still a maximum
of 8 seconds); notes are 1..25, anything else is frequency.
2017-11-19 12:07:28 +10:00
Jason Hood
aa8b0c6a36 Use the system default sound for the bell
Windows 7 uses Beep for the bell, which means if you accidentally view
a binary file, the console freezes until all the bells have finished.
Windows 10 uses PlaySound, which avoids the freeze, but prevents the
sound being played at all if the program immediately exits (in its own
host).	This uses PlaySound in its own thread, ignoring additional bells
whilst one is currently playing and waiting for it to finish before
terminating.
2017-11-17 21:53:58 +10:00
Jason Hood
8eb06aad27 Preserve ESC not part of a sequence
There are some instances when ESC should just be a normal character
(e.g. TCC uses it in aliases to clear the current line), so if no
sequence is recognised, pass the ESC through.
2017-11-07 11:35:42 +10:00
Jason Hood
43b3653c8a Fix problem with reporting cursor position
Turns out that sending duplicate characters would only send one (e.g.
"11" would just be "1").  Sending the key up events fixed it.
2017-11-03 23:04:51 +10:00
Jason Hood
2f3fe57b60 Hook CreateFile and CreateConsoleScreenBuffer
If console handles are created as GENERIC_WRITE, add GENERIC_READ in
order to be able to retrieve console information.  This fixes #93
(redirecting to CON).
2017-10-30 10:50:11 +10:00
Jason Hood
97dcb13634 Fix ANSICON's output when redirected to CON
ANSICON switches the standard streams to Unicode, but uses its own
routine to write directly to the console when appropriate.  However, the
newlines written by -e/-E/-t/-T were still done by the CRT, so when
output was redirected to CON, "\r\0\n\0" was being written.
2017-10-28 16:43:45 +10:00
Jason Hood
67f1d48801 Revert back to saving buffer cursor position
In v1.70 I had saved the cursor position relative to the window, but
that means should the window scroll, the cursor would appear to be
restored to the wrong position.  It will still be wrong should the
*buffer* be scrolled, but that can't really be helped (well, possibly
it could, but it would be more effort than it's worth).
2017-10-28 11:19:06 +10:00
Jason Hood
3fb6b5aa65 Fix unloading 2017-10-26 21:46:53 +10:00
Jason Hood
40f59c543c Many changes, bad programmer!
Just copying the history from the source:

recognize the standard handle defines in WriteFile;
minor speed improvement by caching GetConsoleMode;
keep track of three handles (ostensibly stdout, stderr and a file);
test a DOS header exists before writing to e_oemid;
more flexible/robust handling of data directories;
files writing to the console will always succeed;
log: use API file functions and a custom printf;
     add a blank line between processes;
     set function name for MyWriteConsoleA;
scan imports from "kernel32" (without extension);
added dynamic environment variable CLICOLOR;
removed _hwrite (it's the same address as _lwrite);
join multibyte characters split across separate writes;
remove wcstok, avoiding potential interference with the host;
similarly, use a private heap instead of malloc.
2017-07-25 18:18:34 +10:00
Jason Hood
1fe1d8f130 Recognise more sequences; ignore newline immediately after wrap.
Added support for CHT & CBT (move forward/backward by tabs), DECAWM (don't
wrap at EOL), CRM (display control characters, but still perform newline)
and REP (repeat last character, including BEL, BS, TAB, LF and CR).

It always bugged me that newline would add an unneeded blank line due to
wrap, but not enough to do anything about it.  For some reason, adding CRM
got me to thinking about it, so I finally did it.

Stopped \e[K from erasing the first character of the next line.
Restore cursor visibility on unload.
2014-02-26 21:18:45 +10:00
Jason Hood
7539473550 Use window height, not buffer.
Clear screen (\e[2J) will scroll in a new window the first time it's used,
or the window has scrolled, or the cursor is on the last line of the buffer.

Restore Cursor Position (\e[u) will recognise screen size changes and limit
itself to the new boundaries.
2014-02-20 18:06:28 +10:00
Jason Hood
9fa86512f3 Better parsing of escape & CSI sequences.
Recognise general Parameter & Intermediate Bytes, rather than testing
specific characters.  Explicitly ignore xterm 38 & 48 SGR values.
2014-02-18 21:34:39 +10:00
Jason Hood
bd696b55c8 Exclude entire programs; better hooking of dynamically-loaded libraries.
ANSICON_EXC can now be used to exclude an entire program (including children).
This is achieved by simply not specifying an extension: ANSICON_EXC=program.exe
will just ignore program.exe (its DLLs will still be hooked, as will its child-
ren), but ANSICON_EXC=program will not hook program at all (which also means
its children will not be hooked).

The various LoadLibrary hooks would only hook the DLL that was specified - any
DLLs it loaded would be missed.  That has now been rectified.  Similarly, a DLL
that is injected via CreateRemoteThread, using LoadLibraryA or LoadLibraryW as
its ThreadProc, will now be hooked.
2014-02-10 16:33:42 +10:00
Jason Hood
453db81af5 Fixed restoring original attributes on detach. 2014-02-08 12:04:43 +10:00
Jason Hood
db36552c42 Work with 64-bit AnyCPU; copy original IDT to IAT; log improvements. 2014-02-08 01:10:51 +10:00
Jason Hood
dc7569dc26 Inject by adding to the Import Directory Table.
-p uses CreateRemoteThread, determining kernel32.dll & LLW dynamically.
Loading via LoadLibrary will remember the current attributes, restoring them on
unload.
Tweaked log output (remove quotes around CreateProcess command line; add an
underscore to 64-bit addresses).
ansicon.exe will really output (to the console) strings as Unicode.
Fixed ansicon.exe, if installed, restoring the default attributes, not current.
ansicon.exe will start with ANSICON_DEF (if defined and -m not used).
2014-02-05 00:21:42 +10:00
Jason Hood
bccf933c0a Always find the base address of kernel32.dll. 2014-01-27 14:03:53 +10:00
Jason Hood
b2c8a9ec12 LoadLibrary hooking improvements.
Don't hook ourself from LoadLibrary or LoadLibraryEx.
Test additional LoadLibraryEx flags before deciding to hook.
2014-01-25 23:43:41 +10:00
Jason Hood
5e7590e3a9 Fixed the 32-bit detecting 64-bit improvement. 2013-09-21 01:11:53 +10:00
Jason Hood
0394977368 Improve 32-bit detecting 64-bit; release v1.66. 2013-09-20 03:15:05 +10:00
Jason Hood
75a65af4d6 Fix finding 32-bit LLW from 64-bit; fix \e[K; release v1.65. 2013-09-04 19:37:55 +10:00
Jason Hood
1448c72b66 Better method of determining a console handle. 2013-08-02 23:21:07 +10:00
Jason Hood
98e81c1da3 Don't write reset sequence if redirected; release v1.63. 2013-07-25 16:42:27 +10:00
Jason Hood
1fc43d46c3 Remove ANSI-LLW.exe for good; tweak makefiles & doc; release v1.62. 2013-07-19 00:14:54 +10:00
Jason Hood
c5cb4788c2 Go back to using ANSI-LLW.exe. 2013-02-14 18:12:13 +10:00
Jason Hood
a52a46c9c1 New method to obtain 32-bit LoadLibraryW from 64-bit code, eliminating the need
for ANSI-LLW.exe.
Set the code page so ansicon.exe can display some strings properly.
Expand wildcards for -t.
VC6 can now compile the 32-bit version; use it for the release binaries.
Improvements to the VC makefile.
Describe the sequences in a bit more detail.
2012-11-24 23:41:29 +10:00
Jason Hood
ef587f0dee Fixed multiple simultaneous process creation. 2012-06-12 14:38:00 +10:00
Jason Hood
b3e905eeae Added some more sequences; released v1.52. 2012-06-02 17:20:21 +10:00
Jason Hood
4f78bdba6d Implemented \e[39m & \e[49m. 2012-06-01 23:42:58 +10:00
Jason Hood
4d2dec15d3 Enable 32-bit to inject into 64-bit. 2012-04-10 15:39:58 +10:00
Jason Hood
6fc87e3a06 Hook _lwrite & _hwrite; release v1.51. 2012-02-24 12:53:07 +10:00
Jason Hood
f3c69d9d21 Fixed installing into redirected CMD.EXE. 2012-01-07 15:34:43 +10:00
Jason Hood
790de57763 Exclude modules from being hooked; hook only selected GUI programs.
Added environment variable ANSICON_EXC to specify modules that should not be
hooked.  This should work around the nvd3d9wrap.dll issue.  Since it helps to
know what the modules are, logging is now always available, controlled by -l
or ANSICON_LOG.  A side-effect caused debugstr.c to move to util.c.

GUI programs are once again not hooked, unless run by "ansicon" directly or in
the ANSICON_GUI environment variable.  Since not hooking still leaves ANSICON in
the environment, created ANSICON_VER as a dynamic-only variable, which can also
serve as a version check.

Due to an email requesting a reverse video option, realised I always take the
current attributes as default.	This means if you turned on reverse and ran a
program, it would take the reverse as its default.  Created ANSICON_DEF variable
to explicitly set the default attribute, using the current if it doesn't exist.
The reverse video option is done via a "negative" attribute (e.g. "-m-f0" is
reversed black on white, meaning you'll get white on black, with foreground
sequences changing the background).  (The difference from "\e[7m" is that it
won't be reset on "\e[m".)

A child program will inherit the parent's modes (but not shift); the parent will
read the child's modes on exit (but not unload).  The exception is "ansicon",
which will always start with the default modes and leave the parent unchanged.

Improved the AutoRun entry, only running "ansicon" if ANSICON_VER doesn't exist.
The "ansicon" command is always first.

Stopped -u implying -p; return the program's exit code; don't restore the
original color when just using -p; output error messages to stderr.
2011-12-14 20:53:51 +10:00
Jason Hood
b6e61429d7 Added DECTCEM to show/hide the cursor. 2011-03-01 21:01:37 +10:00
Jason Hood
1b3511ac1f Fixed x64 and MinGW32 crashes. 2010-12-22 18:47:45 +10:00
Jason Hood
c1be7e4e7a -i implies -p; more x64/gui mucking about. 2010-12-17 15:39:25 +10:00
Jason Hood
be7672b92e Close the handles opened by CreateProcess.
Prevent the block when directly running a GUI process.
File logging improvements (on by default, this time).
2010-12-16 16:00:56 +10:00
Jason Hood
dd4e45686b General maintenance. 2010-12-12 23:32:22 +10:00
Jason Hood
b9d2207742 Improvements 2010-12-12 21:58:35 +10:00
Luis Lavena
a3a594001b Moved DEBUGSTR to a separated file
This make more easy enable and disable debugging across
ansicon
2010-12-10 13:05:13 -03:00
Jason Hood
626095d127 Fixes for Issues 5/7/8.
Conflicts:
	ansicon.c
2010-12-04 15:23:02 +10:00
Jason Hood
b4e52e6b45 Fix crashes 2010-12-04 15:19:36 +10:00
Jason Hood
04b04d6347 Use ANSICON_API environment variable 2010-11-19 15:50:10 +10:00