Highlight occurrences of selected text (altbuf)

Merge pull request #210 from netxs-group/dev/sdn
directvt · May 2, 2022 · a132342 · a132342
2 parents f9c5fd7 + 33139a5
commit a132342
Show file tree

Hide file tree

Showing 27 changed files with 583 additions and 390 deletions.
diff --git a/.resources/status/freebsd.svg b/.resources/status/freebsd.svg
diff --git a/.resources/status/linux.svg b/.resources/status/linux.svg
diff --git a/.resources/status/macos.svg b/.resources/status/macos.svg
diff --git a/.resources/status/netbsd.svg b/.resources/status/netbsd.svg
diff --git a/.resources/status/openbsd.svg b/.resources/status/openbsd.svg
diff --git a/.resources/status/windows.svg b/.resources/status/windows.svg
diff --git a/src/netxs/abstract/duplet.hpp b/src/netxs/abstract/duplet.hpp
@@ -83,12 +83,12 @@ namespace netxs
         //duplet operator << (T i) const { return { x << i, y << i }; }
         //duplet operator >> (T i) const { return { x >> i, y >> i }; }
 
-        template<class D> duplet<D> operator /(D i) const { return { x / i, y / i }; }
-        template<class D> duplet<D> operator +(D i) const { return { x + i, y + i }; }
-        template<class D> duplet<D> operator -(D i) const { return { x - i, y - i }; }
-        template<class D> duplet<D> operator *(D i) const { return { x * i, y * i }; }
+        template<class D> duplet<D> operator / (D i) const { return { x / i, y / i }; }
+        template<class D> duplet<D> operator + (D i) const { return { x + i, y + i }; }
+        template<class D> duplet<D> operator - (D i) const { return { x - i, y - i }; }
+        template<class D> duplet<D> operator * (D i) const { return { x * i, y * i }; }
 
-        bool operator ()(duplet const& p)
+        bool operator () (duplet const& p)
         {
             if (*this != p)
             {
@@ -123,7 +123,7 @@ namespace netxs
         {
             return "{ " + std::to_string(x) + ", " + std::to_string(y) + " }";
         }
-        friend auto& operator<< (std::ostream& s, duplet const& p)
+        friend auto& operator << (std::ostream& s, duplet const& p)
         {
             return s << "{ " << p.x << ", " << p.y << " }";
         }

diff --git a/src/netxs/abstract/fifo.hpp b/src/netxs/abstract/fifo.hpp
@@ -79,7 +79,7 @@ namespace netxs::generics
         constexpr operator bool   ()    const             { return size;                }
         constexpr ITEM     front  (ITEM const& dflt = {}) { return size ? *item : dflt; }
         constexpr
-        ITEM operator() (ITEM const& dflt = {})
+        ITEM operator () (ITEM const& dflt = {})
         {
             if (size)
             {

diff --git a/src/netxs/abstract/hash.hpp b/src/netxs/abstract/hash.hpp
@@ -127,7 +127,7 @@ namespace netxs
             return iter->second;
         }
         template<class K>
-        auto& operator[] (K&& key) { return at(std::forward<K>(key)); }
+        auto& operator [] (K&& key) { return at(std::forward<K>(key)); }
 
         imap()
         { }

diff --git a/src/netxs/abstract/iterator.hpp b/src/netxs/abstract/iterator.hpp
@@ -88,12 +88,12 @@ namespace netxs
 
             it(iterator<T> * source) : source(source) { next(); }
 
-            reference operator* () const { return *source->current; };
-            pointer   operator->() const { return  source->current; };
+            reference operator *  () const { return *source->current; };
+            pointer   operator -> () const { return  source->current; };
 
-            it&	operator++() { next(); return *this; }
-            friend bool operator==(it const& lhs, it const& rhs) { return lhs.source == rhs.source; }
-            friend bool operator!=(it const& lhs, it const& rhs) { return !(lhs == rhs); }
+            it&	operator ++ () { next(); return *this; }
+            friend bool operator == (it const& lhs, it const& rhs) { return lhs.source == rhs.source; }
+            friend bool operator != (it const& lhs, it const& rhs) { return !(lhs == rhs); }
         };
 
     public:
@@ -107,7 +107,7 @@ namespace netxs
             instance = this;
             x.instance = nullptr;
         }
-        iterator<T>& operator=(iterator<T>&& x)
+        iterator<T>& operator = (iterator<T>&& x)
         {
             current = std::move(x.current);
             return *(instance = this);

diff --git a/src/netxs/abstract/ptr.hpp b/src/netxs/abstract/ptr.hpp
@@ -16,7 +16,7 @@ namespace netxs
         T    last;
         bool test = faux;
 
-        bool operator()(T newvalue)
+        bool operator () (T newvalue)
         {
             prev = last;
             test = last != newvalue;
@@ -34,7 +34,7 @@ namespace netxs
 
     struct	null_deleter
     {
-        void operator()(void const*) const
+        void operator () (void const*) const
         { }
     };
 

diff --git a/src/netxs/abstract/queue.hpp b/src/netxs/abstract/queue.hpp
@@ -60,7 +60,7 @@ namespace netxs
             auto guard = std::lock_guard{ d_mutex };
             d_queue = std::move(x.d_queue);
         }
-        mt_queue<T>& operator=(mt_queue<T>&& x)
+        mt_queue<T>& operator = (mt_queue<T>&& x)
         {
             //todo *this is not a MT safe (only x.d_mutex is locked)
             auto guard = std::lock_guard{ d_mutex };

diff --git a/src/netxs/abstract/ring.hpp b/src/netxs/abstract/ring.hpp
@@ -64,25 +64,25 @@ namespace netxs::generics
         virtual void undock_base_front(type&) { };
         virtual void undock_base_back (type&) { };
 
-        auto  current_it()        { return iter<      ring>{ *this, cart };          }
-        auto  begin()             { return iter<      ring>{ *this, head };          }
-        auto    end()             { return iter<      ring>{ *this, mod(tail + 1) }; }
-        auto  begin() const       { return iter<const ring>{ *this, head };          }
-        auto    end() const       { return iter<const ring>{ *this, mod(tail + 1) }; }
-        auto& length() const      { return size;                }
-        auto&  back()             { return buff[tail];          }
-        auto&  back() const       { return buff[tail];          }
-        auto& front()             { return buff[head];          }
-        auto& front() const       { return buff[head];          }
-        auto& current     ()      { return buff[cart];          }
-        auto& operator  * ()      { return buff[cart];          }
-        auto  operator -> ()      { return buff.begin() + cart; }
-        auto&         at (si32 i) { assert(i >= 0 && i < size); return buff[mod(head + i)]; }
-        auto& operator[] (si32 i) { return at(i);               }
-        auto  index() const       { return dst(head, cart);     }
-        void  index(si32 i)       { assert(i >= 0 && i < size); cart = mod(head + i); }
-        void  prev()              { dec(cart); test();          }
-        void  next()              { inc(cart); test();          }
+        auto  current_it()         { return iter<      ring>{ *this, cart };          }
+        auto  begin()              { return iter<      ring>{ *this, head };          }
+        auto    end()              { return iter<      ring>{ *this, mod(tail + 1) }; }
+        auto  begin() const        { return iter<const ring>{ *this, head };          }
+        auto    end() const        { return iter<const ring>{ *this, mod(tail + 1) }; }
+        auto& length() const       { return size;                }
+        auto&  back()              { return buff[tail];          }
+        auto&  back() const        { return buff[tail];          }
+        auto& front()              { return buff[head];          }
+        auto& front() const        { return buff[head];          }
+        auto& current     ()       { return buff[cart];          }
+        auto& operator  * ()       { return buff[cart];          }
+        auto  operator -> ()       { return buff.begin() + cart; }
+        auto&          at (si32 i) { assert(i >= 0 && i < size); return buff[mod(head + i)]; }
+        auto& operator [] (si32 i) { return at(i);               }
+        auto  index() const        { return dst(head, cart);     }
+        void  index(si32 i)        { assert((i > 0 && i < size) || i == 0); cart = mod(head + i); }
+        void  prev()               { dec(cart); test();          }
+        void  next()               { inc(cart); test();          }
 
     private:
         void  test()

diff --git a/src/netxs/apps/calc.hpp b/src/netxs/apps/calc.hpp
@@ -47,7 +47,7 @@ namespace netxs::console
                     : inside{ faux },
                       seized{ faux }
                 { }
-                operator bool(){ return inside || seized || region.size; }
+                operator bool () { return inside || seized || region.size; }
                 auto grab(twod const& coord, bool resume)
                 {
                     if (inside)

diff --git a/src/netxs/console/ansi.hpp b/src/netxs/console/ansi.hpp
@@ -856,11 +856,11 @@ namespace netxs::ansi
         } v;
         ui64 token;
 
-        friend    auto operator!= (deco const& a, deco const& b)
-                                                  { return a.token != b.token; }
-        constexpr deco()                          : token { 0 }              { }
-        constexpr deco            (deco const& d) : token { d.token }        { }
-        constexpr void operator = (deco const& d) { token = d.token;           }
+        friend    auto operator != (deco const& a, deco const& b)
+                                                   { return a.token != b.token; }
+        constexpr deco()                           : token { 0 }              { }
+        constexpr deco             (deco const& d) : token { d.token }        { }
+        constexpr void operator =  (deco const& d) { token = d.token;           }
         constexpr deco(si32)
             : v{ .wrapln = deco::defwrp,
                  .adjust = bias::left,

diff --git a/src/netxs/console/console.hpp b/src/netxs/console/console.hpp
@@ -181,8 +181,9 @@ namespace netxs::events::userland
 
                 SUBSET_XS( clipboard )
                 {
-                    EVENT_XS( set, const view ), // Set data to clipboard.
-                    EVENT_XS( get,       view ), // Get data from clipboard.
+                    EVENT_XS( set   , const view ), // Set data to clipboard.
+                    EVENT_XS( get   ,       view ), // Get data from clipboard.
+                    EVENT_XS( layout,       twod ), // Clipboard preview size.
                 };
             };
             SUBSET_XS( form )
@@ -1281,7 +1282,7 @@ namespace netxs::console
                         :    id{ ctrl },
                           count{ 0    }
                     { }
-                    operator bool(){ return T::operator bool(); }
+                    operator bool () { return T::operator bool(); }
                 };
 
                 std::vector<sock> items; // sock: Registered hids.
@@ -1362,7 +1363,7 @@ namespace netxs::console
                     : inside{ faux },
                       seized{ faux }
                 { }
-                operator bool(){ return inside || seized; }
+                operator bool () { return inside || seized; }
                 auto corner(twod const& length)
                 {
                     return dtcoor.less(dot_11, length, dot_00);
@@ -1629,7 +1630,7 @@ namespace netxs::console
             {
                 twod cursor;        // sock: Coordinates of the active cursor.
                 bool inside = faux; // sock: Is active.
-                operator bool(){ return inside; }
+                operator bool () { return inside; }
                 auto calc(base const& master, twod curpos)
                 {
                     auto area = rect{ dot_00, master.base::size() };
@@ -2379,7 +2380,7 @@ namespace netxs::console
                 if (visible) show();
             }
 
-            operator bool() const { return memo.count(); }
+            operator bool () const { return memo.count(); }
 
             // pro::caret: Set caret style.
             void style(bool new_form)
@@ -5621,15 +5622,26 @@ namespace netxs::console
                 {
                     clip_rawtext = clipbrd_data;
                     page block{ clipbrd_data };
+                    clip_preview.mark(cell{});
                     clip_preview.wipe();
-                    //todo revise
-                    //clip_preview.set_style(clip_preview.get_style().wrp(faux));
                     clip_preview.output(block, cell::shaders::xlucent(0x1f)); //todo make transparency configurable
                 };
                 SUBMIT_T(tier::release, e2::command::clipboard::get, token, clipbrd_data)
                 {
                     clipbrd_data = clip_rawtext;
                 };
+                SUBMIT_T(tier::release, e2::command::clipboard::layout, token, clipbrd_size)
+                {
+                    clip_preview.size(clipbrd_size);
+                    clip_preview.mark(cell{});
+                    clip_preview.wipe();
+                    page block{ clip_rawtext };
+                    clip_preview.output(block, cell::shaders::xlucent(0x1f)); //todo make transparency configurable
+                };
+                SUBMIT_T(tier::request, e2::command::clipboard::layout, token, clipbrd_size)
+                {
+                    clipbrd_size = clip_preview.size();
+                };
 
                 world->SUBMIT_T(tier::release, e2::form::proceed::render, token, render_scene)
                 {
@@ -5883,7 +5895,7 @@ namespace netxs::console
                 {
                     auto coor = input.coord + dot_21 * 2;
                     clip_preview.move(coor);
-                    parent_canvas.plot(clip_preview, cell::shaders::fuse);
+                    parent_canvas.plot(clip_preview, cell::shaders::lite);
                 }
 
                 #ifdef REGIONS
@@ -5944,7 +5956,7 @@ namespace netxs::console
             #endif
         }
 
-        friend auto& operator<< (std::ostream& s, conf const& c)
+        friend auto& operator << (std::ostream& s, conf const& c)
         {
             return s << "\n\t    ip: " <<(c.ip.empty() ? text{} : (c.ip + ":" + c.port))
                      << "\n\tregion: " << c.region

diff --git a/src/netxs/console/input.hpp b/src/netxs/console/input.hpp
@@ -264,7 +264,7 @@ namespace netxs::input
 
         ui32 ctlstate = 0;
 
-        bool operator !=(sysmouse const& m) const
+        bool operator != (sysmouse const& m) const
         {
             bool result;
             if ((result = coor == m.coor))
@@ -780,7 +780,7 @@ namespace netxs::input
         }
 
         // hids: Whether event processing is complete.
-        operator bool() const
+        operator bool () const
         {
             return alive;
         }