From ed0dcaeb63e03cd7b2ee42edce7ec4db5b30869e Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Fri, 17 Oct 2025 14:51:31 +0200 Subject: [PATCH] make CTRL+Z a no-op operation on Windows Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- cmd/formatter/shortcut.go | 2 +- cmd/formatter/shortcut_unix.go | 25 +++++++++++++++++++++++++ cmd/formatter/shortcut_windows.go | 25 +++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 cmd/formatter/shortcut_unix.go create mode 100644 cmd/formatter/shortcut_windows.go diff --git a/cmd/formatter/shortcut.go b/cmd/formatter/shortcut.go index 4a5e774737e..079cd1a015d 100644 --- a/cmd/formatter/shortcut.go +++ b/cmd/formatter/shortcut.go @@ -322,7 +322,7 @@ func (lk *LogKeyboard) HandleKeyEvents(ctx context.Context, event keyboard.KeyEv // will notify main thread to kill and will handle gracefully lk.signalChannel <- syscall.SIGINT case keyboard.KeyCtrlZ: - _ = syscall.Kill(0, syscall.SIGSTOP) + handleCtrlZ() case keyboard.KeyEnter: newLine() lk.printNavigationMenu() diff --git a/cmd/formatter/shortcut_unix.go b/cmd/formatter/shortcut_unix.go new file mode 100644 index 00000000000..0baa3a949cc --- /dev/null +++ b/cmd/formatter/shortcut_unix.go @@ -0,0 +1,25 @@ +//go:build !windows + +/* + Copyright 2024 Docker Compose CLI authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package formatter + +import "syscall" + +func handleCtrlZ() { + _ = syscall.Kill(0, syscall.SIGSTOP) +} diff --git a/cmd/formatter/shortcut_windows.go b/cmd/formatter/shortcut_windows.go new file mode 100644 index 00000000000..c642d069a4a --- /dev/null +++ b/cmd/formatter/shortcut_windows.go @@ -0,0 +1,25 @@ +//go:build windows + +/* + Copyright 2024 Docker Compose CLI authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package formatter + +// handleCtrlZ is a no-op on Windows as SIGSTOP is not supported +func handleCtrlZ() { + // Windows doesn't support SIGSTOP/SIGCONT signals + // Ctrl+Z behavior is handled differently by the Windows terminal +} \ No newline at end of file