diff --git a/assets/windows/conhost/OpenConsole.exe b/assets/windows/conhost/OpenConsole.exe index 7fd254225..afb6c6cd1 100644 Binary files a/assets/windows/conhost/OpenConsole.exe and b/assets/windows/conhost/OpenConsole.exe differ diff --git a/assets/windows/conhost/README.md b/assets/windows/conhost/README.md index da9bcc1c6..2c5d09737 100644 --- a/assets/windows/conhost/README.md +++ b/assets/windows/conhost/README.md @@ -12,10 +12,16 @@ to point to that so that we can enable mouse reporting in wezterm. It looks like we'll eventually be able to drop this once Windows and/or the build for the terminal project make some more progress. -https://github.com/microsoft/terminal/issues/1130 +https://github.com/wez/wezterm/issues/1927 -These assets were built by opening the solution in visual studio 2019 and -building the `Host.EXE` and `winconpty.DLL` projects. +These assets were built by cloning the ms-terminal repo and running: + +``` +.\tools\razzle.cmd +bcz rel +``` + +then the files can be copied from `bin/x64/Release` to this location. It's possible that you'll need to download this runtime support package from MS in order for this to work: diff --git a/assets/windows/conhost/conpty.dll b/assets/windows/conhost/conpty.dll index e49f7b66f..e152a8ff6 100644 Binary files a/assets/windows/conhost/conpty.dll and b/assets/windows/conhost/conpty.dll differ diff --git a/docs/changelog.md b/docs/changelog.md index 9684e1232..746003536 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -27,6 +27,7 @@ As features stabilize some brief notes about them will accumulate here. * [update-status](config/lua/window-events/update-status.md) is a more general event for updating left or right status. `update-right-status` is considered to be deprecated in favor of `update-status`. * Cache XDG Portal Appearance values. Thanks to [@vimposter](https://github.com/vimpostor)! [#2402](https://github.com/wez/wezterm/pull/2402) * Compensate for TUI programs that flicker due to unsynchronized output by adding up to 3ms additional latency after each read to coalesce their screen outputs into a single frame. You can set this delay via a new `mux_output_parser_coalesce_delay_ms` option. [#2443](https://github.com/wez/wezterm/issues/2443) +* win32: Updated openconsole/conpty to v1.14.2281.0 #### Fixed diff --git a/pty/src/win/psuedocon.rs b/pty/src/win/psuedocon.rs index bf32d8b94..48e10c040 100644 --- a/pty/src/win/psuedocon.rs +++ b/pty/src/win/psuedocon.rs @@ -26,6 +26,8 @@ pub type HPCON = HANDLE; pub const PSEUDOCONSOLE_RESIZE_QUIRK: DWORD = 0x2; pub const PSEUDOCONSOLE_WIN32_INPUT_MODE: DWORD = 0x4; +#[allow(dead_code)] +pub const PSEUDOCONSOLE_PASSTHROUGH_MODE: DWORD = 0x8; shared_library!(ConPtyFuncs, pub fn CreatePseudoConsole(