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

Implement keyboard access for Tiling Window Manager

Author: o-sdn-o

doc/apps.md

@@ -242,6 +242,27 @@
   </tbody>
 </table>
 
+## Tiling Window Manager
+
+<table>
+  <thead>
+    <tr><th>Hotkey ¹</th>              <th>Default action</th></tr>
+  </thead>
+  <tbody>
+    <tr><th>Ctrl+PageUp</th>      <td>Focus the previous pane or splitting grip.</td></tr>
+    <tr><th>Ctrl+PageDown</th>    <td>Focus the next pane or splitting grip.</td></tr>
+    <tr><th>Alt+Shift+N</th>      <td>Launch application instances in active empty slots. The app to run can be set by RightClick on the taskbar.</td></tr>
+    <tr><th>Alt+Shift+A</th>      <td>Select all panes.</td></tr>
+    <tr><th>Alt+Shift+'|'</th>    <td>Split active panes horizontally.</td></tr>
+    <tr><th>Alt+Shift+Minus</th>  <td>Split active panes vertically.</td></tr>
+    <tr><th>Alt+Shift+R</th>      <td>Change split orientation.</td></tr>
+    <tr><th>Alt+Shift+S</th>      <td>Swap two or more panes.</td></tr>
+    <tr><th>Alt+Shift+E</th>      <td>Equalize split ratio.</td></tr>
+    <tr><th>Alt+Shift+F2</th>     <td>Set tiling window manager title using clipboard data.</td></tr>
+    <tr><th>Alt+Shift+W</th>      <td>Close active application.</td></tr>
+  </tbody>
+</table>
+
 ---
 
 ¹ — Key bindings can be customized using settings.  

doc/settings.md

@@ -78,7 +78,7 @@ Note: By enabling `vt-input-mode`, all current terminal modes are automatically
   ```
 - Mouse
   ```
-  ESC _ event=mouse ; id=0 ; kbmods=<KeyMods> ; coord=<X>,<Y> ; buttons=<ButtonState> ; wheel=<DeltaY>,<DeltaX> ESC \
+  ESC _ event=mouse ; id=0 ; kbmods=<KeyMods> ; coord=<X>,<Y> ; buttons=<ButtonState> ; wheel=<DeltaY>[,<DeltaX>] ESC \
   ```
 - Focus
   ```
@@ -351,16 +351,16 @@ Key ID | Name               | Generic Name       | Scan Code | Notes
 ### Mouse
 
 ```
-ESC _ event=mouse ; id=0 ; kbmods=<KeyMods> ; coord=<X>,<Y> ; buttons=<ButtonState> ; wheel=<DeltaY>,<DeltaX> ESC \
+ESC _ event=mouse ; id=0 ; kbmods=<KeyMods> ; coord=<X>,<Y> ; buttons=<ButtonState> ; wheel=<DeltaY>[,<DeltaX>] ESC \
 ```
 
-Attribute                 | Description
---------------------------|------------
-`id=0`                    | Seat id.
-`kbmods=<KeyMods>`        | Keyboard modifiers (see Keyboard event).
-`coord=<X>,<Y>`           | Pixel-wise coordinates of the mouse pointer. Each coordinate is represented in the form of a floating point value of the sum of the integer coordinate of the cell in the terminal window grid and the relative offset within the cell in the range `[0.0f, 1.0f)`.
-`buttons=<ButtonState>`   | Mouse button state.
-`wheel=<DeltaY>,<DeltaX>` | Vertical and horizontal wheel high-resolution delta represented as floating point value.
+Attribute                   | Description
+----------------------------|------------
+`id=0`                      | Seat id.
+`kbmods=<KeyMods>`          | Keyboard modifiers (see Keyboard event).
+`coord=<X>,<Y>`             | Pixel-wise coordinates of the mouse pointer. Each coordinate is represented in the form of a floating point value of the sum of the integer coordinate of the cell in the terminal window grid and the relative offset within the cell in the range `[0.0f, 1.0f)`.
+`buttons=<ButtonState>`     | Mouse button state.
+`wheel=<DeltaY>[,<DeltaX>]` | Vertical and horizontal high-resolution wheel delta integer value.
 
 In response to the activation of `mouse` tracking, the application receives a vt-sequence containing current mouse state:
 ```

doc/user-interface.md

@@ -389,9 +389,10 @@ namespace netxs::app::shared
                 ->limits(dot_11)
                 ->plugin<pro::focus>();
             auto term_cake = ui::cake::ctor()
+                ->plugin<pro::focus>()
                 ->active(window_clr);
             auto dtvt = ui::dtvt::ctor()
-                ->plugin<pro::focus>(pro::focus::mode::relay, faux/*default: don't cut_scope*/, faux/*no default focus*/)
+                ->plugin<pro::focus>(pro::focus::mode::relay, faux/*no default focus*/)
                 ->limits(dot_11);
             auto scrl = term_cake->attach(ui::rail::ctor());
             auto defclr = config.take("/config/terminal/colors/default", cell{}.fgc(whitelt).bgc(blackdk));
@@ -466,8 +467,10 @@ namespace netxs::app::shared
                     {
                         if (!!started == order)
                         {
+                            auto prev_ptr = boss.back();
                             boss.roll();
-                            boss.bell::signal(tier::request, hids::events::focus::hop, { .item = boss.back() });
+                            auto next_ptr = boss.back();
+                            pro::focus::hop(prev_ptr, next_ptr);
                             boss.back()->base::riseup(tier::preview, e2::form::prop::ui::footer);
                             boss.back()->reflow();
                             boss.back()->deface();

doc/vt-input-mode.md

@@ -598,7 +598,7 @@ namespace netxs::app::desk
                         owner_id = parent.id;
                     };
                     auto oneshot = ptr::shared(hook{});
-                    parent.LISTEN(tier::release, hids::events::focus::any, seed, *oneshot, (oneshot, usrcfg))
+                    parent.LISTEN(tier::release, hids::events::focus::set::any, seed, *oneshot, (oneshot, usrcfg))
                     {
                         usrcfg.win = {};
                         usrcfg.hid = seed.gear_id;

src/netxs/apps.hpp

@@ -96,7 +96,6 @@ namespace netxs::app::terminal
     {
         static constexpr auto cwdsync   = "/config/terminal/cwdsync";
         static constexpr auto borders   = "/config/terminal/border";
-        static constexpr auto menuitems = "/config/terminal/menu/item";
     }
 
     using events = netxs::events::userland::terminal;
@@ -196,19 +195,11 @@ namespace netxs::app::terminal
             //auto highlight_color = skin::color(tone::highlight);
             //auto c3 = highlight_color;
 
-            auto menudata = config.list(attr::menuitems);
-
-            static auto type_options = std::unordered_map<text, si32>
-               {{ "Splitter", menu::type::Splitter },
-                { "Command",  menu::type::Command  },
-                { "Option",   menu::type::Option   },
-                { "Repeat",   menu::type::Repeat   }};
-
             using term = ui::term;
             using preview = terminal::events::preview;
             using release = terminal::events::release;
 
-            static const auto proc_map = std::unordered_map<text, std::function<void(ui::item&, menu::item&)>, qiew::hash, qiew::equal>
+            static const auto proc_map = menu::action_map_t
             {
                 { term::action::Noop, [](ui::item& /*boss*/, menu::item& /*item*/){ } }, 
                 { term::action::ExclusiveKeyboardMode, [](ui::item& boss, menu::item& item)
@@ -529,47 +520,8 @@ namespace netxs::app::terminal
                 }},
             };
 
-            auto list = menu::list{};
-            auto defs = menu::item::look{};
-            for (auto data_ptr : menudata)
-            {
-                auto item = menu::item{};
-                auto& data = *data_ptr;
-                auto action = data.take(menu::attr::action, ""s);
-                item.type = data.take(menu::attr::type, menu::type::Command, type_options);
-                defs.tooltip = data.take(menu::attr::tooltip, ""s);
-                defs.data = data.take(menu::attr::data, ""s);
-                item.alive = !action.empty() && item.type != menu::type::Splitter;
-                for (auto label : data.list(menu::attr::label))
-                {
-                    item.views.push_back(
-                    {
-                        .label = label->take_value(),
-                        .tooltip = label->take(menu::attr::tooltip, defs.tooltip),
-                        .data = label->take(menu::attr::data, defs.data),
-                    });
-                }
-                if (item.views.empty()) continue; // Menu item without label.
-                auto setup = [action](ui::item& boss, menu::item& item)
-                {
-                    if (item.type == menu::type::Option)
-                    {
-                        boss.LISTEN(tier::release, hids::events::mouse::button::click::left, gear)
-                        {
-                            item.taken = (item.taken + 1) % item.views.size();
-                        };
-                    }
-                    auto iter = proc_map.find(action);
-                    if (iter != proc_map.end())
-                    {
-                        auto& initproc = iter->second;
-                        initproc(boss, item);
-                    }
-                };
-                list.push_back({ item, setup });
-            }
             config.cd("/config/terminal", "/config/defapp");
-            return menu::create(config, list);
+            return menu::load(config, proc_map);
         }
     }
 
@@ -853,7 +805,7 @@ namespace netxs::app::terminal
                 {
                     if (cwd_sync)
                     {
-                        boss.expire(tier::preview, true);
+                        boss.bell::expire(tier::preview, true);
                         cwd_path = path;
                     }
                 };