Merge pull request #824 from o-sdn-o/gui-bridge

Make Lua script compilation error messages more clear (add line numbering)

Author: o-sdn-o

doc/architecture.md

@@ -243,7 +243,7 @@ In ANSI/VT IO mode, vtm process parses input from multiple standard sources, and
     - SIGINT events are forwarded to the process lifetime control channel to perform graceful exit.
     - SIGHUP events are forwarded to the process lifetime control channel to perform graceful exit.
     - SIGTERM events are forwarded to the process lifetime control channel to perform graceful exit.
-- PS/2 Mouse device (Linux VGA Console only)
+- PS/2 Mouse device (Linux VGA Console (in-kernel console) only)
     - `/dev/input/mice`: Received ImPS/2 mouse protocol events are decoded and forwarded to the mouse event channel.
     - `/dev/input/mice.vtm` (used in case of inaccessibility of `/dev/input/mice`)
 

doc/command-line-options.md

@@ -25,7 +25,7 @@ Option                  | Description
 `-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.<br>Elevated privileges required.
 `-u`, `--uninstall`     | Perform system-wide deinstallation.<br>Elevated privileges required.
 `-0`, `--session0`      | Use Session 0 to run Desktop Server in background. For Windows only.
-`-a`, `--mouse [mode]`  | Set/reset persistent access to mouse devices for all users on Linux platform.<br>Run `sudo vtm --mouse 0` to reset access.<br>Elevated privileges required.
+`-a`, `--mouse [mode]`  | Set/reset persistent access to mouse devices for all users on Linux platform (excluding Android).<br>Run `sudo vtm --mouse 0` to reset access.<br>Elevated privileges required.
 `-q`, `--quiet`         | Disable logging.
 `-x`, `--script <cmds>` | Specifies script commands to be run by the desktop when ready.
 `-c`, `--config <file>` | Specifies a settings file to load or plain xml-data to merge.
@@ -52,17 +52,17 @@ The plain xml-data could be specified in place of `<file>` in `--config <file>`
   vtm -c "<config/terminal/scrollback size=1000000/>" -r term
   ```
 
-#### Linux VGA Console
+#### Linux VGA Console (in-kernel console)
+
+In order to use a mouse or touchpad in Linux VGA Console, you must grant the user access to mouse/pointing devices. By default, only privileged users and users of the `input` group have access. To grant all users permanent access to all pointing devices, use the command:
 
-In order to use a mouse or touchpad in Linux VGA Console, you must grant the user access to the mouse device. By default, only privileged users and users of the `input` group have access. To grant temporary access, use the command:
 - ```
-  sudo vtm --SetMouseAccess
+  sudo vtm --mouse
   ```
-To grant permanent access, you must assign the appropriate access rights to the `/dev/input/eventN` files associated with the mouse devices. The device associations could be found using the following command:
+To reset permanent access, use the command:
 - ```
-  cat /proc/bus/input/devices
+  sudo vtm --mouse 0
   ```
-Note: The `/dev/input/eventN` files are temporary, created by `udev` each time the system starts.
 
 ### Desktop Applets
 

src/netxs/apps.hpp

@@ -600,7 +600,7 @@ namespace netxs::app::shared
                                 ->limits({ -1,-1 }, { -1,-1 });
             static const auto data = []
             {
-                auto [days, hours, mins, secs, msecs] = datetime::breakdown(datetime::now() - os::process::id.second);
+                auto [days, hours, mins, secs, msecs, micro] = datetime::breakdown(datetime::now() - os::process::id.second);
                 auto uptime = (days  ? std::to_string(days)  + skin::globals().NsInfoUptime_d + " " : ""s)
                             + (hours ? std::to_string(hours) + skin::globals().NsInfoUptime_h + " " : ""s)
                             + (mins  ? std::to_string(mins)  + skin::globals().NsInfoUptime_m + " " : ""s)

src/netxs/desktopio/ansivt.hpp

@@ -887,6 +887,24 @@ namespace netxs::ansi
             }
             return *this;
         }
+        auto& numerate_lines(argb liter_fg)
+        {
+            auto count = 1;
+            auto width = 0_sz;
+            auto total = std::count(text::begin(), text::end(), '\n');
+            while (total)
+            {
+                total /= 10;
+                width++;
+            }
+            auto numerate = [&]
+            {
+                return escx{}.pushsgr().fgc(liter_fg).add(utf::adjust(std::to_string(count++), width, ' ', true), ": ").popsgr();
+            };
+            *this = numerate().add(*this);
+            utf::for_each(*this, "\n", [&]{ return "\n" + numerate(); });
+            return *this;
+        }
     };
 
     template<bool UseSGR = true, bool Initial = true, bool Finalize = true, bool Select_11_only = true>

src/netxs/desktopio/application.hpp

@@ -22,7 +22,7 @@ namespace netxs::app
 
 namespace netxs::app::shared
 {
-    static const auto version = "v2025.10.12";
+    static const auto version = "v2025.10.13";
     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;

src/netxs/desktopio/controls.hpp

@@ -434,7 +434,7 @@ namespace netxs::events
         if (error)
         {
             result = ::lua_tostring(lua, -1);
-            log("%%%msg%", prompt::lua, ansi::err(result));
+            log("%%script compilation failed:\n%body%\n%msg%\n", prompt::lua, ansi::hi(ansi::add(script_body).numerate_lines(blacklt)), ansi::err(result));
             //::lua_pop(lua, 1);  // Pop error message from stack.
         }
         else if (::lua_gettop(lua))
@@ -519,11 +519,11 @@ namespace netxs::events
                     else // It is not precompiled yet.
                     {
                         ::lua_pop(lua, 1);  // Pop nil after the ::lua_rawget() call.
-                        auto error = ::luaL_loadbuffer(lua, script_body.data(), script_body.size(), "precompilation");
+                        auto error = ::luaL_loadbuffer(lua, script_body.data(), script_body.size(), "script");
                         if (error)
                         {
                             auto result = ::lua_tostring(lua, -1);
-                            log("%%Precompilation error: %msg%", prompt::lua, ansi::err(result));
+                            log("%%script precompilation failed:\n%body%\n%msg%\n", prompt::lua, ansi::hi(ansi::add(script_body).numerate_lines(blacklt)), ansi::err(result));
                             ::lua_pop(lua, 1);  // Pop error message from stack.
                         }
                         else

src/netxs/desktopio/events.hpp

@@ -8,7 +8,7 @@
 #include "xml.hpp"
 
 //todo Workaround for i386 linux targets, https://sourceware.org/bugzilla/show_bug.cgi?id=31775
-#if defined(__i386__) && defined(__linux__)
+#if defined(__i386__) && defined(__linux__) && !defined(__ANDROID__)
     extern long double fmodl(long double a, long double b);
     double fmod(double a, double b) { return fmodl(a, b); }
     float  fmod(float  a, float  b) { return fmodl(a, b); }
@@ -229,7 +229,10 @@ namespace netxs::events
             {
                 auto& context = script_ptr->context;
                 auto& [ref_count, script_body] = *(script_ptr->script_body_ptr);
+                //auto start = datetime::now();
                 luafx.run(context, script_body, param);
+                //auto [days, hours, mins, secs, msecs, micro] = datetime::breakdown(datetime::now() - start);
+                //log("Exec duration: %sec%.%msec%.%micro%", secs, msecs, micro);
             }
             else if (auto& proc = get_inst<Arg>())
             {

src/netxs/desktopio/quartz.hpp

@@ -50,11 +50,12 @@ namespace netxs::datetime
     auto breakdown(span t)
     {
         auto days         = datetime::round<ui32, std::chrono::        days>(t);
-        auto hours        = datetime::round<ui32, std::chrono::       hours>(t -= std::chrono::   days{ days    });
-        auto minutes      = datetime::round<ui32, std::chrono::     minutes>(t -= std::chrono::  hours{ hours   });
-        auto seconds      = datetime::round<ui32, std::chrono::     seconds>(t -= std::chrono::minutes{ minutes });
-        auto milliseconds = datetime::round<ui32, std::chrono::milliseconds>(t -= std::chrono::seconds{ seconds });
-        return std::tuple{ days, hours, minutes, seconds, milliseconds };
+        auto hours        = datetime::round<ui32, std::chrono::       hours>(t -= std::chrono::        days{ days    });
+        auto minutes      = datetime::round<ui32, std::chrono::     minutes>(t -= std::chrono::       hours{ hours   });
+        auto seconds      = datetime::round<ui32, std::chrono::     seconds>(t -= std::chrono::     minutes{ minutes });
+        auto milliseconds = datetime::round<ui32, std::chrono::milliseconds>(t -= std::chrono::     seconds{ seconds });
+        auto microseconds = datetime::round<ui32, std::chrono::microseconds>(t -= std::chrono::milliseconds{ milliseconds });
+        return std::tuple{ days, hours, minutes, seconds, milliseconds, microseconds };
     }
     auto breakdown(time t)
     {

src/netxs/desktopio/system.hpp

@@ -59,9 +59,9 @@
             #include <linux/kd.h>   // ::console_ioctl()
         #else
             #include <sys/kd.h>     // ::console_ioctl()
+            #include <linux/input.h>// mouse button codes: BTN_LEFT ...
         #endif
         #include <linux/keyboard.h> // ::keyb_ioctl()
-        #include <linux/input.h>    // mouse button codes: BTN_LEFT ...
     #endif
 
     #if defined(__APPLE__)
@@ -4770,7 +4770,7 @@ namespace netxs::os
                 }
             });
         }
-        #if defined(__linux__)
+        #if defined(__linux__) && !defined(__ANDROID__)
     }
 }
         #include "lixx.hpp" // libinput++
@@ -5262,7 +5262,7 @@ namespace netxs::os
                     #endif
                     return state;
                 };
-                #if defined(__linux__)
+                #if defined(__linux__) && !defined(__ANDROID__)
                 if (dtvt::vtmode & ui::console::mouse) // Trying to get direct mouse access.
                 {
                     if (auto li = lixx::initialize())
@@ -6016,7 +6016,7 @@ namespace netxs::os
                                   timecod = time{},
                                   dev_map = std::unordered_map<arch, si32>{}]() mutable
                 {
-                    #if defined(__linux__)
+                    #if defined(__linux__) && !defined(__ANDROID__)
                     using namespace netxs::lixx;
                     lixx::li->libinput_dispatch();
                     while (true)
@@ -6163,7 +6163,7 @@ namespace netxs::os
                                micefd,       m_proc,
                                alarm,        f_proc);
                 }
-                #if defined(__linux__)
+                #if defined(__linux__) && !defined(__ANDROID__)
                 lixx::uninitialize();
                 #endif
 

src/netxs/desktopio/terminal.hpp

@@ -1388,7 +1388,7 @@ namespace netxs::ui
                     auto nothing = match.each([](auto& c){ return !c.isspc(); });
                     if (nothing) match = {};
                 }
-                ++alive;
+                alive = datetime::uniqueid();
             }
             // bufferbase: Ping selection state if is available.
             void selection_review()