Release 1.0.26

* Removed internal key auto-repeat simulation for tk::ListBox.
* Updated text clipping algorithm for tk::Button.
* Fixed bun in tk::ListBox widget which didn'\''t allow to scroll the list box
  when using keyboard keys.
* Implemented TabGroup widget.
* Implemented shortcut handling mechancs by tk::Window.
* Small bugfix in LedMeterChannel related to header display.
* Added maximum amplitude property to AudioChannel and AudioSample.
* Added possibility to draw background around tk::GraphText widget.
* Fixed stylesheets: keeping the order of properties same to the order in the XML
  document when stylesheet is applied to styles.
* Updated build scripts.
* Updated module versions in dependencies.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,21 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.26 ===
+* Removed internal key auto-repeat simulation for tk::ListBox.
+* Updated text clipping algorithm for tk::Button.
+* Fixed bun in tk::ListBox widget which didn't allow to scroll the list box
+  when using keyboard keys.
+* Implemented TabGroup widget.
+* Implemented shortcut handling mechancs by tk::Window.
+* Small bugfix in LedMeterChannel related to header display.
+* Added maximum amplitude property to AudioChannel and AudioSample.
+* Added possibility to draw background around tk::GraphText widget.
+* Fixed stylesheets: keeping the order of properties same to the order in the XML
+  document when stylesheet is applied to styles.
+* Updated build scripts.
+* Updated module versions in dependencies.
+
 === 1.0.25 ===
 * Updated build scripts.
 * Updated module versions in dependencies.

README.md

@@ -45,6 +45,7 @@ The full list of provided widgets:
   * MultiLabel - widget that allows to implement overlay of multiple labels on the same area.
   * ScrollArea - container that allows to package widget into limited rectangular space.
   * TabControl - container that allows to organize widgets as a set of tabs.
+  * TabGroup - container that behaves similar to ComboGroup but uses tabs insetad of combo box.
   * Window - window widget.
 * Dialogs:
   * FileDialog - widget for selecting files for load/save operations.

include/lsp-plug.in/tk/helpers/keyboard.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
+ *
+ * This file is part of lsp-tk-lib
+ * Created on: 9 дек. 2024 г.
+ *
+ * lsp-tk-lib is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * lsp-tk-lib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with lsp-tk-lib. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LSP_PLUG_IN_TK_HELPERS_KEYBOARD_H_
+#define LSP_PLUG_IN_TK_HELPERS_KEYBOARD_H_
+
+#include <lsp-plug.in/tk/tk.h>
+
+namespace lsp
+{
+    namespace tk
+    {
+        /**
+         * Translate key code to key modifier
+         * @param code code to translate
+         * @return key modifier or KM_NONE
+         */
+        LSP_TK_LIB_PUBLIC
+        key_modifier_t          key_code_to_modifier(ws::code_t code);
+
+    } /* namespace tk */
+} /* namespace lsp */
+
+#endif /* LSP_PLUG_IN_TK_HELPERS_KEYBOARD_H_ */

include/lsp-plug.in/tk/prop/multi/Color.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-tk-lib
  * Created on: 5 нояб. 2017 г.
@@ -37,10 +37,6 @@ namespace lsp
          */
         class Color: public MultiProperty
         {
-            protected:
-                Color & operator = (const Color &);
-                Color(const Color &);
-
             protected:
                 enum property_t
                 {
@@ -63,8 +59,13 @@ namespace lsp
 
             protected:
                 explicit Color(prop::Listener *listener = NULL);
+                Color(const Color &) = delete;
+                Color(Color &&) = delete;
                 virtual ~Color();
 
+                Color & operator = (const Color &) = delete;
+                Color & operator = (Color &&) = delete;
+
             public:
                 inline void set_default()       { MultiProperty::set_default(vAtoms, DESC); };
 

include/lsp-plug.in/tk/prop/multi/Shortcut.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-tk-lib
  * Created on: 13 июн. 2020 г.
@@ -22,6 +22,12 @@
 #ifndef LSP_PLUG_IN_TK_PROP_MULTI_SHORTCUT_H_
 #define LSP_PLUG_IN_TK_PROP_MULTI_SHORTCUT_H_
 
+#ifndef LSP_PLUG_IN_TK_IMPL
+    #error "use <lsp-plug.in/tk/tk.h>"
+#endif
+
+#include <lsp-plug.in/tk/sys/Slot.h>
+
 namespace lsp
 {
     namespace tk
@@ -32,10 +38,6 @@ namespace lsp
          */
         class Shortcut: public MultiProperty
         {
-            private:
-                Shortcut & operator = (const Shortcut &);
-                Shortcut(const Shortcut &);
-
             protected:
                 enum property_t
                 {
@@ -54,6 +56,7 @@ namespace lsp
                 atom_t              vAtoms[P_COUNT];    // Atom bindings
                 size_t              nMod;               // Modifiers
                 ws::code_t          nKey;               // Key
+                Slot                sSlot;              // Event handling
 
             protected:
                 static status_t     append_modifier(LSPString *s, size_t mod, size_t index);
@@ -63,6 +66,9 @@ namespace lsp
                 static status_t     format_modifiers(LSPString *s, size_t mod);
                 static status_t     format_key(LSPString *s, ws::code_t key);
 
+                static bool         check_modifier(size_t mod, size_t check);
+                static bool         check_modifiers(size_t mod, size_t check);
+
             protected:
                 virtual void        push();
                 virtual void        commit(atom_t property);
@@ -74,6 +80,13 @@ namespace lsp
 
             protected:
                 explicit Shortcut(prop::Listener *listener = NULL);
+                Shortcut(const Shortcut &) = delete;
+                Shortcut(Shortcut &&) = delete;
+
+                Shortcut & operator = (const Shortcut &) = delete;
+                Shortcut & operator = (Shortcut &&) = delete;
+
+            public:
                 virtual ~Shortcut();
 
             public:
@@ -116,15 +129,40 @@ namespace lsp
                 inline size_t       remove_modifiers(size_t mod)        { return set_modifiers(nMod & (~mod));  }
                 inline size_t       toggle_modifiers(size_t mod)        { return set_modifiers(nMod ^ mod);     }
 
-                inline void         clear()                             { set(ws::WSK_UNKNOWN, 0);              }
+                inline void         clear()                             { set(ws::WSK_UNKNOWN, KM_NONE);        }
+
+                inline Slot        *slot()                              { return &sSlot; }
+
+                bool                equals(const Shortcut *scut) const;
+                bool                equals(const Shortcut &scut) const;
+
+                /**
+                 * Set key and modifiers to be equal to the passed shortcut
+                 * @param scut passed shortcut
+                 */
+                void                set(const Shortcut *scut);
+
+                /**
+                 * Set key and modifiers to be equal to the passed shortcut
+                 * @param scut passed shortcut
+                 */
+                void                set(const Shortcut &scut);
 
                 /**
                  * Check that shortcut must trigger
                  * @param key key to check
                  * @param mod modifier
                  * @return true if shortcut must trigger
                  */
-                bool                check(ws::code_t key, size_t mod);
+                bool                match(ws::code_t key, size_t mod) const;
+
+                /**
+                 * Check if shortcut matches another shortcut
+                 * @param scut shotcut to check
+                 * @return true if shortcut matches the passed shortcut
+                 */
+                bool                match(const Shortcut *scut) const;
+                bool                match(const Shortcut &scut) const;
 
                 /**
                  * Format state to the string presentation
@@ -138,13 +176,13 @@ namespace lsp
         {
             class Shortcut: public tk::Shortcut
             {
-                private:
-                    Shortcut & operator = (const Shortcut &);
-                    Shortcut(const Shortcut &);
-
                 public:
                     inline Shortcut(prop::Listener *listener = NULL): tk::Shortcut(listener) {}
-                    inline ~Shortcut() {}
+                    Shortcut(const Shortcut &) = delete;
+                    Shortcut(Shortcut &&) = delete;
+
+                    Shortcut & operator = (const Shortcut &) = delete;
+                    Shortcut & operator = (Shortcut &&) = delete;
 
                 public:
                     /**
@@ -155,9 +193,8 @@ namespace lsp
                     inline status_t     bind(const LSPString *property, Style *style)   { return tk::Shortcut::bind(property, style, vAtoms, DESC, &sListener); }
             };
         }
-    }
-}
-
+    } /* namespace tk */
+} /* namespace lsp */
 
 
 #endif /* LSP_PLUG_IN_TK_PROP_MULTI_SHORTCUT_H_ */

include/lsp-plug.in/tk/style/Schema.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-tk-lib
  * Created on: 6 мая 2020 г.
@@ -63,17 +63,20 @@ namespace lsp
          */
         class Schema
         {
-            private:
-                Schema & operator = (const Schema &);
-                Schema(const Schema &);
-
             protected:
                 enum flags_t
                 {
                     S_CONFIGURING   = 1 << 0,       // Schema is in configuration state
                     S_INITIALIZED   = 1 << 1,       // Schema is initialized
                 };
 
+                typedef struct raw_property_t
+                {
+                    const LSPString *name;
+                    const LSPString *value;
+                    ssize_t order;
+                } raw_property_t;
+
                 typedef struct property_value_t
                 {
                     property_type_t     type;
@@ -102,6 +105,10 @@ namespace lsp
                 prop::Boolean                       sInvertMouseHScroll;
                 prop::Boolean                       sInvertMouseVScroll;
 
+            protected:
+                static ssize_t      compare_properties_by_order(const raw_property_t *a, const raw_property_t *b);
+                static bool         make_raw_properties(StyleSheet::style_t *xs, lltl::darray<raw_property_t> *props);
+
             protected:
                 status_t            create_builtin_style(IStyleFactory *init);
                 status_t            create_style(const LSPString *name);
@@ -125,8 +132,13 @@ namespace lsp
 
             public:
                 explicit Schema(Atoms *atoms, Display *dpy);
+                Schema(const Schema &) = delete;
+                Schema(Schema &&) = delete;
                 virtual ~Schema();
 
+                Schema & operator = (const Schema &) = delete;
+                Schema & operator = (Schema &&) = delete;
+
                 /**
                  * Initialize schema with the specified list of styles
                  * Can be run only once after the schema is instantiated. Otherwise

include/lsp-plug.in/tk/style/Style.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2023 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-tk-lib
  * Created on: 1 окт. 2019 г.
@@ -571,12 +571,12 @@ namespace lsp
         #define LSP_TK_STYLE_DEF_BEGIN(Name, Parent) \
             class Name : public Parent \
             { \
-                private: \
-                    Name & operator = (Name &); \
-                    Name(const Name &); \
-                \
                 public: \
                     explicit Name(::lsp::tk::Schema *schema, const char *name, const char *parents); \
+                    Name(const Name &) = delete; \
+                    Name(Name &&) = delete; \
+                    Name & operator = (const Name &) = delete; \
+                    Name & operator = (Name &&) = delete; \
                 \
                 public: \
                     virtual ::lsp::status_t     init(); \

include/lsp-plug.in/tk/style/StyleSheet.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-tk-lib
  * Created on: 1 нояб. 2020 г.
@@ -46,17 +46,21 @@ namespace lsp
         class StyleSheet
         {
             private:
-                StyleSheet & operator = (const StyleSheet &);
-                StyleSheet(const StyleSheet &);
-
                 friend class Schema;
 
             protected:
+                typedef struct property_t
+                {
+                    size_t                                  order;      // Property order
+                    LSPString                               value;      // Property value
+                } property_t;
+
                 typedef struct style_t
                 {
+                    size_t                                  order_gen;  // Property order generator
                     LSPString                               name;       // Name of style
                     lltl::parray<LSPString>                 parents;    // List of parents
-                    lltl::pphash<LSPString, LSPString>      properties; // properties
+                    lltl::pphash<LSPString, property_t>     properties; // properties
 
                     style_t();
                     ~style_t();
@@ -86,8 +90,13 @@ namespace lsp
 
             public:
                 explicit StyleSheet();
+                StyleSheet(const StyleSheet &) = delete;
+                StyleSheet(StyleSheet &&) = delete;
                 ~StyleSheet();
 
+                StyleSheet & operator = (const StyleSheet &) = delete;
+                StyleSheet & operator = (StyleSheet &&) = delete;
+
             protected:
                 status_t            parse_document(xml::PullParser *p);
                 status_t            parse_schema(xml::PullParser *p);
@@ -145,8 +154,9 @@ namespace lsp
             public:
                 const LSPString    *error() const { return &sError;     }
         };
-    }
-}
+
+    } /* namespace tk */
+} /* namespace lsp */