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

Try to fix clipboard locking
directvt · Oct 15, 2024 · 2cf564b · 2cf564b
2 parents 4c7bee5 + c146bf4
commit 2cf564b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git 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.21";
+    static const auto version = "v0.9.99.22";
     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;

diff --git a/src/netxs/desktopio/canvas.hpp b/src/netxs/desktopio/canvas.hpp
@@ -511,11 +511,12 @@ namespace netxs
             }
         }
         // argb: Darken the color.
-        void shadow(byte k = 39)
+        auto shadow(byte k = 39)
         {
             chan.r = chan.r < k ? 0x00 : chan.r - k;
             chan.g = chan.g < k ? 0x00 : chan.g - k;
             chan.b = chan.b < k ? 0x00 : chan.b - k;
+            return *this;
         }
         // argb: Lighten the color.
         void bright(si32 factor = 1)

diff --git a/src/netxs/desktopio/geometry.hpp b/src/netxs/desktopio/geometry.hpp
@@ -323,13 +323,15 @@ namespace netxs
             return *this;
         }
         // rect: Return circumscribed rect.
-        static constexpr rect unite(rect r1, rect r2)
+        static constexpr rect unite(rect r1, rect r2, auto... rn)
         {
             r1.normalize_itself();
             r2.normalize_itself();
             auto tl = std::min(r1.coor, r2.coor);
             auto br = std::max(r1.coor + r1.size, r2.coor + r2.size );
-            return { tl, br - tl};
+            auto ur = rect{ tl, br - tl};
+            if constexpr (sizeof...(rn)) return unite(ur, rn...);
+            else                         return ur;
         }
         // rect: Return true in case of normalized rectangles are overlapped.
         constexpr bool overlap(rect r) const

diff --git a/src/netxs/desktopio/gui.hpp b/src/netxs/desktopio/gui.hpp
@@ -1920,10 +1920,10 @@ namespace netxs::gui
 
         title titles; // winbase: UI header/footer.
         focus wfocus; // winbase: UI focus.
-        layer master; // winbase: Layer index for Client.
-        layer blinky; // winbase: Layer index for blinking characters.
-        layer header; // winbase: Layer index for Header.
-        layer footer; // winbase: Layer index for Footer.
+        layer master; // winbase: Layer for Client.
+        layer blinky; // winbase: Layer for blinking characters.
+        layer header; // winbase: Layer for Header.
+        layer footer; // winbase: Layer for Footer.
         fonts fcache; // winbase: Font cache.
         glyph gcache; // winbase: Glyph cache.
         blink blinks; // winbase: Blinking layer state.

diff --git a/src/netxs/desktopio/logger.hpp b/src/netxs/desktopio/logger.hpp
@@ -9,8 +9,9 @@
 // 
 #pragma once
 
+#include "ptr.hpp"
+
 #include <vector>
-#include <mutex>
 #include <functional>
 #include <unordered_map>
 

diff --git a/src/netxs/desktopio/system.hpp b/src/netxs/desktopio/system.hpp
@@ -2092,7 +2092,7 @@ namespace netxs::os
                         sync(error, mime::textonly);
                         return;
                     }
-                    std::this_thread::yield();
+                    os::sleep(15ms);
                 }
                 if (auto seqno = ::GetClipboardSequenceNumber(); seqno != os::clipboard::sequence)
                 {