From d1cf005c07a206fafee3b1dd5b0e59ef8ef25f55 Mon Sep 17 00:00:00 2001 From: Dmitry Sapozhnikov <11535558+o-sdn-o@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:06:03 +0500 Subject: [PATCH 1/3] #86 WIP: Disable hotkeys when altbuf is active --- src/netxs/desktopio/terminal.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netxs/desktopio/terminal.hpp b/src/netxs/desktopio/terminal.hpp index 7fac070507..f4550e7c16 100644 --- a/src/netxs/desktopio/terminal.hpp +++ b/src/netxs/desktopio/terminal.hpp @@ -7770,7 +7770,7 @@ namespace netxs::ui //todo configurable Ctrl+Ins, Shift+Ins etc. if (gear.handled) return; // Don't pass registered keyboard shortcuts. if (io_log) log(prompt::key, ansi::hi(input::key::map::data(gear.keycode).name), gear.pressed ? " pressed" : " released"); - if (gear.pressed && gear.meta(hids::anyShift) && gear.meta(hids::anyCtrl)) + if (target == &normal && gear.pressed && gear.meta(hids::anyShift) && gear.meta(hids::anyCtrl)) { if (gear.keycode == input::key::LeftArrow && gear.meta(hids::anyAlt)){ base::riseup(e2::form::upon::scroll::bypage::x, { .vector = dot_10 }); gear.set_handled(); return; } else if (gear.keycode == input::key::RightArrow && gear.meta(hids::anyAlt)){ base::riseup(e2::form::upon::scroll::bypage::x, { .vector = -dot_10 }); gear.set_handled(); return; } From 5f67a305abc39fac3f04f787bf4759bdd2986e68 Mon Sep 17 00:00:00 2001 From: Dmitry Sapozhnikov <11535558+o-sdn-o@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:09:10 +0500 Subject: [PATCH 2/3] v0.9.99.34 --- src/netxs/desktopio/application.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netxs/desktopio/application.hpp b/src/netxs/desktopio/application.hpp index de8bb5f5bb..1e1f066ef1 100644 --- a/src/netxs/desktopio/application.hpp +++ b/src/netxs/desktopio/application.hpp @@ -24,7 +24,7 @@ namespace netxs::app namespace netxs::app::shared { - static const auto version = "v0.9.99.33"; + static const auto version = "v0.9.99.34"; static const auto repository = "https://github.com/directvt/vtm"; static const auto usr_config = "~/.config/vtm/settings.xml"s; static const auto sys_config = "/etc/vtm/settings.xml"s; From 4e3c5c945f450792c283d2c1e7f287b41851c908 Mon Sep 17 00:00:00 2001 From: Dmitry Sapozhnikov <11535558+o-sdn-o@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:34:23 +0500 Subject: [PATCH 3/3] Fix waiting for console attached processes to exit --- src/netxs/desktopio/system.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netxs/desktopio/system.hpp b/src/netxs/desktopio/system.hpp index bde0ada6d4..4c66cde56e 100644 --- a/src/netxs/desktopio/system.hpp +++ b/src/netxs/desktopio/system.hpp @@ -4321,9 +4321,9 @@ namespace netxs::os termsize = cfg.win; auto trailer = [&, cmd = cfg.cmd] { + auto exitcode = termlink->wait(); // Wait all attached processes to exit (waiting for conversations to complete, send pending writebuf). if (attached.exchange(faux)) { - auto exitcode = termlink->wait(); log("%%Process '%cmd%' exited with code %code%", prompt::vtty, ansi::hi(utf::debase437(cmd)), utf::to_hex_0x(exitcode)); writesyn.notify_one(); // Interrupt writing thread. terminal.onexit(exitcode, "", signaled.exchange(true)); // Only if the process terminates on its own (not forced by sighup).