From fdffc0937b471f3a5574ad3a62de35655c576489 Mon Sep 17 00:00:00 2001
From: Dmitry Sapozhnikov <11535558+o-sdn-o@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:28:13 +0500
Subject: [PATCH] #571 WIP: Make GUI-mode default

---
 doc/command-line-options.md      |  12 +-
 src/netxs/desktopio/baseui.hpp   |   2 +-
 src/netxs/desktopio/controls.hpp |   6 +-
 src/netxs/desktopio/gui.hpp      |   2 +-
 src/netxs/desktopio/system.hpp   |  52 +++-----
 src/vtm.cpp                      | 209 +++++++++++++++----------------
 6 files changed, 125 insertions(+), 158 deletions(-)

diff --git a/doc/command-line-options.md b/doc/command-line-options.md
index b42a6a6e17..1c53666784 100644
--- a/doc/command-line-options.md
+++ b/doc/command-line-options.md
@@ -13,7 +13,7 @@ vtm -i | -u | -v | -?
 <script relay via piped redirection> | vtm [ -p <id> ]
 ```
 
-> By default, vtm runs Desktop Client, running an additional instance with Desktop Server in background if it is not found.
+> By default, vtm runs Desktop Client, running an additional instance with Desktop Server in background if it is not running.
 
 Option                  | Description
 ------------------------|-------------------------------------------------------
@@ -23,17 +23,17 @@ Option                  | Description
 `-t`, `--tui`           | Force TUI mode.
 `-g`, `--gui`           | Force GUI mode.
 `-i`, `--install`       | Perform system-wide installation. Allow Desktop Server to run in user context in Session 0 on Windows.<br>Placing Desktop Server in Session 0 allows console applications to run independently of the user's GUI login session. Note: This prevents GUI applications from running from the vtm desktop environment. See "Session 0 Isolation" on the Web for details.
-`-0`, `--session0`      | Use Session 0 to run Desktop Server in background.
 `-u`, `--uninstall`     | Perform system-wide deinstallation.
+`-0`, `--session0`      | Use Session 0 to run Desktop Server in background.
 `-q`, `--quiet`         | Disable logging.
 `-x`, `--script <cmds>` | Specifies script commands to be run by the desktop when ready.
-`-c`, `--config <file>` | Specifies the settings file to load.
-`-p`, `--pin <id>`      | Specifies the desktop id it is pinned to.
+`-c`, `--config <file>` | Specifies a settings file to load or plain xml-data to merge.
+`-p`, `--pin <id>`      | Specifies the desktop id it will be pinned to.
 `-s`, `--server`        | Run Desktop Server.
 `-d`, `--daemon`        | Run Desktop Server in background.
 `-m`, `--monitor`       | Run Desktop Monitor.
 `-r`, `--`, `--run`     | Run desktop applet standalone.
-`<type>`                | Desktop applet type to run.
+`<type>`                | Desktop applet to run.
 `<args...>`             | Desktop applet arguments.
 
 ### Desktop Applets
@@ -49,7 +49,7 @@ The following commands have a short form:
   - `vtm -r vtty <cui_app...>` can be shortened to `vtm <cui_app...>`.
   - `vtm -r dtty ssh <user@host dtvt_app...>` can be shortened to `vtm ssh <user@host dtvt_app...>`.
 
-Instead of the path to the configuration file, the configuration body itself can be specified:
+It is possible to specify plain xml-data to modify current settings (this case is detected by the `<config` literal at the beginning):
 
   - `vtm -c \"<config><term><scrollback size=1000000/></term></config>\" -r term`.
 
diff --git a/src/netxs/desktopio/baseui.hpp b/src/netxs/desktopio/baseui.hpp
index a966dc87b4..1efc79c7fb 100644
--- a/src/netxs/desktopio/baseui.hpp
+++ b/src/netxs/desktopio/baseui.hpp
@@ -930,7 +930,7 @@ namespace netxs::ui
             }
         }
         // base: Update nested object.
-        virtual void update(sptr old_item_ptr, sptr new_item_ptr)
+        virtual void replace(sptr old_item_ptr, sptr new_item_ptr)
         {
             auto head = subset.begin();
             auto tail = subset.end();
diff --git a/src/netxs/desktopio/controls.hpp b/src/netxs/desktopio/controls.hpp
index 50637df6ff..34aba42fb3 100644
--- a/src/netxs/desktopio/controls.hpp
+++ b/src/netxs/desktopio/controls.hpp
@@ -2365,7 +2365,7 @@ namespace netxs::ui
                     auto new_item = item_template(data_src, arg_new_value)
                                          ->depend(data_src);
                     item_shadow = ptr::shadow(new_item); // Update current item shadow.
-                    boss_ptr->update(old_item, new_item);
+                    boss_ptr->replace(old_item, new_item);
                 }
             };
             branch(new_item);
@@ -3482,7 +3482,7 @@ namespace netxs::ui
             else base::subset.clear();
         }
         // rail: Update nested object.
-        void update(sptr old_object, sptr new_object) override
+        void replace(sptr old_object, sptr new_object) override
         {
             auto object_coor = dot_00;
             if (!empty())
@@ -3990,7 +3990,7 @@ namespace netxs::ui
             else base::subset.clear();
         }
         // pads: Update nested object.
-        void update(sptr old_object, sptr new_object) override
+        void replace(sptr old_object, sptr new_object) override
         {
             remove(old_object);
             attach(new_object);
diff --git a/src/netxs/desktopio/gui.hpp b/src/netxs/desktopio/gui.hpp
index e167dbd717..83be6b9bf8 100644
--- a/src/netxs/desktopio/gui.hpp
+++ b/src/netxs/desktopio/gui.hpp
@@ -713,7 +713,7 @@ namespace netxs::gui
                     netxs::set_flag<fontcat::loaded>(fontstat[i].s);
                     auto is_primary = fallback.empty();
                     auto& f = fallback.emplace_back(*this, barefont, i, cellsize, is_primary);
-                    log("%%Using font '%fontname%' (%iscolor%). Order %index%.", prompt::gui, f.font_name, f.color ? "color" : "monochromatic", fallback.size() - 1);
+                    log("%%Using font '%fontname%' (%iscolor%). Index %index%.", prompt::gui, f.font_name, f.color ? "color" : "monochromatic", fallback.size() - 1);
                 }
                 return hit;
             };
diff --git a/src/netxs/desktopio/system.hpp b/src/netxs/desktopio/system.hpp
index e01f9a1f15..ae73ab8c8e 100644
--- a/src/netxs/desktopio/system.hpp
+++ b/src/netxs/desktopio/system.hpp
@@ -112,10 +112,8 @@ namespace netxs::os
     static constexpr auto unexpected = " returns unexpected result"sv;
     static auto autosync = true; // Auto sync viewport with cursor position (win7/8 console).
     static auto finalized = flag{ faux }; // Ready flag for clean exit.
-    static auto logbuffer = text{};
-    void release(bool clear_log = true)
+    void release()
     {
-        if (clear_log) os::logbuffer.clear(); // Graceful exit w/o errors.
         os::finalized.exchange(true);
         os::finalized.notify_all();
     }
@@ -3631,7 +3629,7 @@ namespace netxs::os
             }
             return std::max(dot_11, winsz);
         }
-        auto initialize(bool trygui = faux, [[maybe_unused]] bool forced = faux)
+        auto initialize(bool rungui = faux)
         {
             #if defined(_WIN32)
                 os::stdin_fd  = fd_t{ ptr::test(::GetStdHandle(STD_INPUT_HANDLE ), os::invalid_fd) };
@@ -3743,13 +3741,15 @@ namespace netxs::os
             else
             {
                 dtvt::gridsz = dtvt::consize();
-                if (trygui)
+                if (rungui)
                 {
                     #if defined(_WIN32)
-
+                    if (nt::session()) // There is no gui mode in Session0.
+                    {
+                        dtvt::vtmode |= ui::console::gui;
                         auto processpid = DWORD{};
                         auto proc_count = ::GetConsoleProcessList(&processpid, 1);
-                        if (forced || 1 == proc_count) // Run gui console.
+                        if (1 == proc_count) // Run gui console. Close the parent text console when we are alone.
                         {
                             //auto r = RECT{};
                             //auto h = ::GetConsoleWindow();
@@ -3775,19 +3775,18 @@ namespace netxs::os
                             ////dtvt::wingui = {{ r.left, r.top }, { r.right - r.left, r.bottom - r.top }}; // It doesn't work with WT.
                             //dtvt::wingui = dtvt::window;
                             //dtvt::wingui.size *= twod{ std::max(1, cell_height / 2), cell_height};
-                            dtvt::vtmode |= ui::console::gui;
                             os::stdin_fd  = os::invalid_fd;
                             os::stdout_fd = os::invalid_fd;
                             os::stderr_fd = os::invalid_fd;
                             //if constexpr (!debugmode) ::FreeConsole();
                             ::FreeConsole();
                         }
-                        // We are hosted by a shell.
+                    }
                     #else
-                        if (!haspty)
-                        {
-                            dtvt::vtmode |= ui::console::gui;
-                        }
+                    if (!haspty)
+                    {
+                        dtvt::vtmode |= ui::console::gui;
+                    }
                     #endif
                     if (dtvt::vtmode & ui::console::gui)
                     {
@@ -4694,7 +4693,7 @@ namespace netxs::os
                 parser.cout(utf8);
                 #endif
             }
-            else if (!(dtvt::vtmode & ui::console::redirio))
+            else if (!(dtvt::vtmode & ui::console::redirio || dtvt::vtmode & ui::console::direct))
             {
                 io::send(utf8);
             }
@@ -4799,30 +4798,8 @@ namespace netxs::os
         auto logger()
         {
             static auto dtvt_output = [](auto& data){ io::send(os::stdout_fd, data); };
-            if (dtvt::vtmode & ui::console::gui)
-            {
-                auto errmsg = []
-                {
-                    if (os::logbuffer.size())
-                    {
-                        #if defined(_WIN32)
-                        auto utf8log = ui::page{ utf::trunc(os::logbuffer, 32) }.to_utf8<faux>();
-                        auto message = utf::to_utf(utf::trim_front(view{ utf8log }, '\n'));
-                        auto caption = utf::to_utf(os::process::binary());
-                        ::MessageBoxW(NULL, message.data(), caption.data(), MB_OK);
-                        #else
-                        #endif
-                    }
-                };
-                std::atexit(errmsg);
-            }
             return netxs::logger::attach([](qiew utf8)
             {
-                if (dtvt::vtmode & ui::console::gui) // Deferred logs in gui mode.
-                {
-                    os::logbuffer += utf8;
-                    utf8 = os::logbuffer;
-                }
                 if (utf8.empty()) return;
                 if (dtvt::active || dtvt::client)
                 {
@@ -4830,9 +4807,8 @@ namespace netxs::os
                     logs.set(os::process::id.first, os::process::id.second, utf8);
                     dtvt::active ? logs.sendfx(dtvt_output)   // Send logs to the dtvt-app hoster.
                                  : logs.sendby(dtvt::client); // Send logs to the dtvt-app.
-                    os::logbuffer.clear();
                 }
-                else if (os::stdout_fd != os::invalid_fd)
+                if (os::stdout_fd != os::invalid_fd)
                 {
                     tty::cout(utf8);
                 }
diff --git a/src/vtm.cpp b/src/vtm.cpp
index c3420e8c7b..50e709915b 100644
--- a/src/vtm.cpp
+++ b/src/vtm.cpp
@@ -8,7 +8,7 @@
 
 using namespace netxs;
 
-enum class type { client, server, daemon, logmon, runapp, hlpmsg, config };
+enum class type { client, server, daemon, logmon, runapp, config };
 enum class code { noaccess, noserver, nodaemon, nosrvlog, interfer, errormsg };
 
 int main(int argc, char* argv[])
@@ -22,11 +22,10 @@ int main(int argc, char* argv[])
     auto errmsg = text{};
     auto vtpipe = text{};
     auto script = text{};
-    auto trygui = true;
-    auto forced = faux;
+    auto rungui = true;
     auto system = faux;
     auto getopt = os::process::args{ argc, argv };
-    if (getopt.starts("ssh"))//app::ssh::id))
+    if (getopt.starts("ssh"))
     {
         whoami = type::runapp;
         params = getopt.rest();
@@ -44,12 +43,11 @@ int main(int argc, char* argv[])
         }
         else if (getopt.match("-t", "--tui"))
         {
-            trygui = faux;
+            rungui = faux;
         }
         else if (getopt.match("-g", "--gui"))
         {
-            trygui = true;
-            forced = true;
+            rungui = true;
         }
         else if (getopt.match("-r", "--", "--run", /*UD*/"--runapp"))
         {
@@ -114,8 +112,98 @@ int main(int argc, char* argv[])
         }
         else if (getopt.match("-?", "-h", "--help"))
         {
-            whoami = type::hlpmsg;
-            break;
+            os::dtvt::initialize();
+            netxs::logger::wipe();
+            auto syslog = os::tty::logger();
+            log("\nText-based Desktop Environment " + text{ app::shared::version } +
+                "\n(virtual terminal multiplexer)"
+                "\n"
+                "\n  Syntax:"
+                "\n"
+                "\n    vtm [ -c <file> ][ -q ][ -p <id> ][ -s | -d | -m ][ -x <cmds> ]"
+                "\n    vtm [ -c <file> ][ -q ][ -t | -g ][ -r [ <type> ]][ <args...> ]"
+                "\n    vtm [ -c <file> ]  -l"
+                "\n    vtm -i | -u | -v | -?"
+                "\n"
+                "\n    <script relay via piped redirection> | vtm [ -p <id> ]"
+                "\n"
+                "\n  Options:"
+                "\n"
+                "\n    By default, vtm runs Desktop Client and Desktop Server."
+                "\n"
+                "\n    -h, -?, --help       Print command-line options."
+                "\n    -v, --version        Print version."
+                "\n    -l, --listconfig     Print configuration."
+                "\n    -t, --tui            Force TUI mode."
+                "\n    -g, --gui            Force GUI mode."
+                "\n    -i, --install        Perform system-wide installation."
+                #if defined(WIN32)
+                " Allow Desktop Server to run in Session 0."
+                #endif
+                "\n    -u, --uninstall      Perform system-wide deinstallation."
+                #if defined(WIN32)
+                "\n    -0, --session0       Use Session 0 to run Desktop Server in background."
+                #endif
+                "\n    -q, --quiet          Disable logging."
+                "\n    -x, --script <cmds>  Specifies script commands."
+                "\n    -c, --config <file>  Specifies a settings file to load or plain xml-data to merge."
+                "\n    -p, --pin <id>       Specifies the desktop id it will be pinned to."
+                "\n    -s, --server         Run Desktop Server."
+                "\n    -d, --daemon         Run Desktop Server in background."
+                "\n    -m, --monitor        Run Desktop Monitor."
+                "\n    -r, --, --run        Run desktop applet standalone."
+                "\n    <type>               Desktop applet to run."
+                "\n    <args...>            Desktop applet arguments."
+                "\n"
+                "\n    Desktop applet             │ Type │ Arguments"
+                "\n    ───────────────────────────┼──────┼─────────────────────────────────────────────────"
+                "\n    Teletype Console (default) │ vtty │ CUI application with arguments to run."
+                "\n    Terminal Console           │ term │ CUI application with arguments to run."
+                "\n    DirectVT Gateway           │ dtvt │ DirectVT-aware application to run."
+                "\n    DirectVT Gateway with TTY  │ dtty │ CUI application to run, forwarding DirectVT I/O."
+                "\n"
+                "\n    The following commands have a short form:"
+                "\n"
+                "\n      'vtm -r vtty <cui_app...>' can be shortened to 'vtm <cui_app...>'."
+                "\n      'vtm -r dtty ssh <user@host dtvt_app...>' can be shortened to 'vtm ssh <user@host dtvt_app...>'."
+                "\n"
+                "\n  Settings loading order:"
+                "\n"
+                "\n    - Initialize hard-coded settings."
+                "\n    - In case of using the '--config <file>' option and the <file> can be loaded:"
+                "\n        - Overlay the settings from the <file>."
+                "\n      otherwise:"
+                "\n        - Overlay system-wide settings from " + os::path::expand(app::shared::sys_config).second + "."
+                "\n        - Overlay user-wise settings from "   + os::path::expand(app::shared::usr_config).second + "."
+                "\n    - Overlay the settings received from the DirectVT Gateway."
+                "\n"
+                "\n    It is possible to specify plain xml-data to modify current settings:"
+                "\n    (detected by the `<config` literal)"
+                "\n"
+                "\n      vtm -c \"<config><term><scrollback size=1000000/></term></config>\" -r term"
+                "\n"
+                "\n  Script commands:"
+                "\n"
+                "\n    Syntax: \"<command>([<args...>])[; <command>([<args...>]); ... <command>([<args...>])]\""
+                "\n"
+                "\n    Command                       │ Description"
+                "\n    ──────────────────────────────┼───────────────────────────────────────────────────────"
+                "\n    vtm.run([<attrs...>])         │ Create and run a menu item constructed using"
+                "\n                                  │ a space-separated list of <attr>=<val>."
+                "\n                                  │ Run a temporary menu item constructed using"
+                "\n                                  │ default attributes if no arguments specified."
+                "\n    vtm.set(id=<id> [<attrs...>]) │ Create or override a menu item using a space-separated"
+                "\n                                  │ list of <attr>=<val>."
+                "\n    vtm.del([<id>])               │ Delete the taskbar menu item by <id>."
+                "\n                                  │ Delete all menu items if no <id> specified."
+                "\n    vtm.dtvt(<dtvt_app...>)       │ Create a temporary menu item and run DirectVT Gateway"
+                "\n                                  │ to host specified <dtvt_app...>."
+                "\n    vtm.selected(<id>)            │ Set selected menu item using specified <id>."
+                "\n    vtm.shutdown()                │ Terminate the running desktop session."
+                "\n"
+                "\n    The following characters in script commands will be de-escaped: \\e \\t \\r \\n \\a \\\" \\' \\\\"
+                "\n");
+            return 0;
         }
         else if (getopt.match("-v", "--version"))
         {
@@ -137,108 +225,11 @@ int main(int argc, char* argv[])
         }
     }
 
-    trygui = trygui && (whoami == type::runapp
-                     || whoami == type::client
-                     || whoami == type::hlpmsg);
-    os::dtvt::initialize(trygui, forced);
+    rungui = rungui && (whoami == type::runapp
+                     || whoami == type::client);
+    os::dtvt::initialize(rungui);
     os::dtvt::checkpoint();
 
-    if (whoami == type::hlpmsg)
-    {
-        netxs::logger::wipe();
-        auto syslog = os::tty::logger();
-        auto vtm = os::process::binary<true>();
-        auto pad = text(os::process::binary<true>().size(), ' ');
-        log("\nText-based Desktop Environment " + text{ app::shared::version } +
-            "\n"
-            "\n  Syntax:"
-            "\n"
-            "\n    " + vtm + " [ -c <file> ][ -q ][ -p <id> ][ -s | -d | -m ][ -x <cmds> ]"
-            "\n    " + vtm + " [ -c <file> ][ -q ][ -t | -g ][ -r [ <type> ]][ <args...> ]"
-            "\n    " + vtm + " [ -c <file> ]  -l"
-            "\n    " + vtm + " -i | -u | -v | -?"
-            "\n"
-            "\n    <script relay via piped redirection> | " + vtm + " [ -p <id> ]"
-            "\n"
-            "\n  Options:"
-            "\n"
-            "\n    By default, " + vtm + " runs Desktop Client and Desktop Server"
-            "\n    in background if it is not running."
-            "\n"
-            "\n    -h, -?, --help       Print command-line options."
-            "\n    -v, --version        Print version."
-            "\n    -l, --listconfig     Print configuration."
-            "\n    -t, --tui            Force TUI mode."
-            "\n    -g, --gui            Force GUI mode."
-            "\n    -i, --install        Perform system-wide installation."
-            #if defined(WIN32)
-            " Allow Desktop Server to run in Session 0."
-            "\n    -0, --session0       Use Session 0 to run Desktop Server in background."
-            #endif
-            "\n    -u, --uninstall      Perform system-wide deinstallation."
-            "\n    -q, --quiet          Disable logging."
-            "\n    -x, --script <cmds>  Specifies script commands."
-            "\n    -c, --config <file>  Specifies the settings file to load."
-            "\n    -p, --pin <id>       Specifies the desktop id it is pinned to."
-            "\n    -s, --server         Run Desktop Server."
-            "\n    -d, --daemon         Run Desktop Server in background."
-            "\n    -m, --monitor        Run Desktop Monitor."
-            "\n    -r, --, --run        Run desktop applet standalone."
-            "\n    <type>               Desktop applet type to run."
-            "\n    <args...>            Desktop applet arguments."
-            "\n"
-            "\n    Desktop applet             │ Type │ Arguments"
-            "\n    ───────────────────────────┼──────┼─────────────────────────────────────────────────"
-            "\n    Teletype Console (default) │ vtty │ CUI application with arguments to run."
-            "\n    Terminal Console           │ term │ CUI application with arguments to run."
-            "\n    DirectVT Gateway           │ dtvt │ DirectVT-aware application to run."
-            "\n    DirectVT Gateway with TTY  │ dtty │ CUI application to run, forwarding DirectVT I/O."
-            "\n"
-            "\n    The following commands have a short form:"
-            "\n"
-            "\n      'vtm -r vtty <cui_app...>' can be shortened to 'vtm <cui_app...>'."
-            "\n      'vtm -r dtty ssh <user@host dtvt_app...>' can be shortened to 'vtm ssh <user@host dtvt_app...>'."
-            "\n"
-            "\n    Instead of the path to the configuration file, the configuration body itself can be specified:"
-            "\n"
-            "\n      'vtm -c \"<config><term><scrollback size=1000000/></term></config>\" -r term'."
-            "\n"
-            "\n  Settings loading order:"
-            "\n"
-            "\n    - Initialize hard-coded settings."
-            "\n    - In case of using the '--config <file>' option and the <file> can be loaded:"
-            "\n        - Overlay the settings from the <file>."
-            "\n      otherwise:"
-            "\n        - Overlay system-wide settings from " + os::path::expand(app::shared::sys_config).second + "."
-            "\n        - Overlay user-wise settings from "   + os::path::expand(app::shared::usr_config).second + "."
-            "\n    - Overlay the settings received from the DirectVT Gateway."
-            "\n"
-            "\n  Script commands:"
-            "\n"
-            "\n    Syntax: \"<command>([<args...>])[; <command>([<args...>]); ... <command>([<args...>])]\""
-            "\n"
-            "\n    Command                       │ Description"
-            "\n    ──────────────────────────────┼───────────────────────────────────────────────────────"
-            "\n    vtm.run([<attrs...>])         │ Create and run a menu item constructed using"
-            "\n                                  │ a space-separated list of <attr>=<val>."
-            "\n                                  │ Run a temporary menu item constructed using"
-            "\n                                  │ default attributes if no arguments specified."
-            "\n    vtm.set(id=<id> [<attrs...>]) │ Create or override a menu item using a space-separated"
-            "\n                                  │ list of <attr>=<val>."
-            "\n    vtm.del([<id>])               │ Delete the taskbar menu item by <id>."
-            "\n                                  │ Delete all menu items if no <id> specified."
-            "\n    vtm.dtvt(<dtvt_app...>)       │ Create a temporary menu item and run DirectVT Gateway"
-            "\n                                  │ to host specified <dtvt_app...>."
-            "\n    vtm.selected(<id>)            │ Set selected menu item using specified <id>."
-            "\n    vtm.shutdown()                │ Terminate the running desktop session."
-            "\n"
-            "\n    The following characters in script commands will be de-escaped: \\e \\t \\r \\n \\a \\\" \\' \\\\"
-            "\n"
-            );
-        os::release(faux);
-        return 0;
-    }
-
     if (os::dtvt::vtmode & ui::console::redirio && (whoami == type::runapp || whoami == type::client))
     {
         whoami = type::logmon;