Release 1.0.2

sadko4u · sadko4u · commit 73f15121e183 · 2022-05-03T19:19:04.000+03:00
* Added template get() method for the tk::Registry that allows to obtain widget of specific type.
* Updated key event handling algorithm in the tk::Window class.
* Added FileDialog::Search style for the 'Search' edit control.
* Changed the space allocation algorithm for the edit control (now border gap does not depend
  on border size).
* Renamed public method for prop::String from 'commit' to 'commit_value'.
* Fixed bug that could cause improper window sizing in several cases.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,15 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.2 ===
+* Added template get() method for the tk::Registry that allows to obtain widget of specific type.
+* Updated key event handling algorithm in the tk::Window class.
+* Added FileDialog::Search style for the 'Search' edit control.
+* Changed the space allocation algorithm for the edit control (now border gap does not depend
+  on border size).
+* Renamed public method for prop::String from 'commit' to 'commit_value'.
+* Fixed bug that could cause improper window sizing in several cases.
+
 === 1.0.1 ===
 * Updated build scripts.
 
diff --git a/include/lsp-plug.in/tk/prop/simple/String.h b/include/lsp-plug.in/tk/prop/simple/String.h
@@ -251,7 +251,7 @@ namespace lsp
                     inline LSPString   *formatted()                         { return tk::String::fmt_for_update();      }
                     bool                invalidate();
                     inline status_t     commit_raw(const LSPString *s)      { return tk::String::commit_raw(s);         }
-                    inline status_t     commit(const LSPString *s, const expr::Parameters *params = NULL)   { return tk::String::commit(s, params);     }
+                    inline status_t     commit_value(const LSPString *s, const expr::Parameters *params = NULL)   { return tk::String::commit(s, params);     }
 
                     /**
                      * Bind property with specified name to the style of linked widget
diff --git a/include/lsp-plug.in/tk/version.h b/include/lsp-plug.in/tk/version.h
@@ -24,7 +24,7 @@
 
 #define LSP_TK_MAJOR                1
 #define LSP_TK_MINOR                0
-#define LSP_TK_MICRO                1
+#define LSP_TK_MICRO                2
 
 #ifdef LSP_TK_LIB_BUILTIN
     #define LSP_TK_LIB_EXPORT
diff --git a/include/lsp-plug.in/tk/widgets/base/Registry.h b/include/lsp-plug.in/tk/widgets/base/Registry.h
@@ -26,6 +26,8 @@
     #error "use <lsp-plug.in/tk/tk.h>"
 #endif
 
+#include <lsp-plug.in/tk/widgets/cast.h>
+
 namespace lsp
 {
     namespace tk
@@ -142,6 +144,28 @@ namespace lsp
                  */
                 tk::Widget                 *find(const LSPString *uid);
 
+                /**
+                 * Get widget of specific type by it's unique identifier
+                 * @param uid unique identifier of widget
+                 * @return the resolved widget or NULL
+                 */
+                template <class Widget>
+                    inline Widget          *get(const char *uid)
+                    {
+                        return tk::widget_cast<Widget>(find(uid));
+                    }
+
+                /**
+                 * Get widget of specific type by it's unique identifier
+                 * @param uid unique identifier of widget
+                 * @return the resolved widget or NULL
+                 */
+                template <class Widget>
+                    inline Widget          *get(const LSPString *uid)
+                    {
+                        return tk::widget_cast<Widget>(find(uid));
+                    }
+
                 /**
                  * Check that registry contains the widget
                  * @param w widget to check
diff --git a/include/lsp-plug.in/tk/widgets/compound/Menu.h b/include/lsp-plug.in/tk/widgets/compound/Menu.h
@@ -121,9 +121,9 @@ namespace lsp
                         explicit Window(Display *dpy, Menu *menu);
 
                     protected:
-                        virtual Widget     *sync_mouse_handler(const ws::event_t *e);
+                        virtual Widget     *sync_mouse_handler(const ws::event_t *e, bool lookup);
                         virtual Widget     *acquire_mouse_handler(const ws::event_t *e);
-                        virtual Widget     *release_mouse_handler(const ws::event_t *e);
+                        virtual Widget     *release_mouse_handler(const ws::event_t *e, bool lookup);
 
                     public:
                         virtual status_t    handle_event(const ws::event_t *e);
@@ -225,9 +225,9 @@ namespace lsp
 
                 virtual void                sync_scroll(MenuItem *item);
 
-                virtual status_t            on_key_scroll(ssize_t dir);
+                virtual status_t            handle_key_scroll(ssize_t dir);
 
-                virtual status_t            on_mouse_scroll(ssize_t dir);
+                virtual status_t            handle_mouse_scroll(ssize_t dir);
 
             public:
                 explicit Menu(Display *dpy);
diff --git a/include/lsp-plug.in/tk/widgets/containers/Window.h b/include/lsp-plug.in/tk/widgets/containers/Window.h
@@ -71,7 +71,7 @@ namespace lsp
 
                 typedef struct key_handler_t
                 {
-                    size_t              nKeys;              // Number of keys pressed
+                    lltl::darray<ws::code_t> vKeys;         // List of pressed keys
                     Widget             *pWidget;            // Keyboard handler
                 } key_handler_t;
 
@@ -126,6 +126,8 @@ namespace lsp
                 inline bool         check_focus(Widget *w) const    { return pFocused == w; }
                 virtual bool        take_focus(Widget *w);
                 bool                kill_focus(Widget *w);
+                size_t              make_key_pressed(ws::code_t code);
+                size_t              make_key_released(ws::code_t code);
 
             protected:
                 virtual Widget     *find_widget(ssize_t x, ssize_t y);
@@ -173,11 +175,18 @@ namespace lsp
 
                 inline ssize_t                  screen()                    { return (pWindow != NULL) ? pWindow->screen() : -1; };
 
-                virtual status_t                get_screen_rectangle(ws::rectangle_t *r, ws::rectangle_t *sr);
+                virtual status_t                get_screen_rectangle(ws::rectangle_t *r, const ws::rectangle_t *sr);
                 virtual status_t                get_screen_rectangle(ws::rectangle_t *r);
-                virtual status_t                get_padded_screen_rectangle(ws::rectangle_t *r, ws::rectangle_t *sr);
+                virtual status_t                get_padded_screen_rectangle(ws::rectangle_t *r, const ws::rectangle_t *sr);
                 virtual status_t                get_padded_screen_rectangle(ws::rectangle_t *r);
 
+                /**
+                 * Resize the underlying window to the specified geometry
+                 * @param size the actual size of the underlying window
+                 * @return status of operation
+                 */
+                status_t                        resize_window(const ws::rectangle_t *size);
+
                 inline bool                     override_pointer() const    { return bOverridePointer; }
 
             public:
diff --git a/make/tools.mk b/make/tools.mk
@@ -63,7 +63,7 @@ INSTALL            := $(X_INSTALL_TOOL)
 
 # Patch flags and tools for (cross) build
 FLAG_RELRO          = -Wl,-z,relro,-z,now
-FLAG_STDLIB         = -lc
+FLAG_STDLIB         = 
 CFLAGS_EXT          = $(ARCHITECTURE_CFLAGS)
 CXXFLAGS_EXT        = $(ARCHITECTURE_CFLAGS)
 EXE_FLAGS_EXT       = $(ARCHITECTURE_CFLAGS)
@@ -136,7 +136,7 @@ CXXDEFS            += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
 INCLUDE            :=
 LDFLAGS            := $(LDFLAGS_EXT) -r
 EXE_FLAGS          := $(EXE_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections
-SO_FLAGS           := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary $(FLAG_STDLIB) -fPIC 
+SO_FLAGS           := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared $(FLAG_STDLIB) -fPIC 
 
 # Define flags for host build
 HOST_CFLAGS        := $(CFLAGS)
diff --git a/modules.mk b/modules.mk
@@ -37,7 +37,7 @@ LSP_LLTL_LIB_TYPE          := src
 LSP_LLTL_LIB_URL_RO        := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
 LSP_LLTL_LIB_URL_RW        := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
 
-LSP_RUNTIME_LIB_VERSION    := 1.0.2
+LSP_RUNTIME_LIB_VERSION    := 1.0.3
 LSP_RUNTIME_LIB_NAME       := lsp-runtime-lib
 LSP_RUNTIME_LIB_TYPE       := src
 LSP_RUNTIME_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
@@ -61,7 +61,7 @@ LSP_R3D_GLX_LIB_TYPE       := src
 LSP_R3D_GLX_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
 LSP_R3D_GLX_LIB_URL_RW     := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
 
-LSP_WS_LIB_VERSION         := 1.0.1
+LSP_WS_LIB_VERSION         := 1.0.2
 LSP_WS_LIB_NAME            := lsp-ws-lib
 LSP_WS_LIB_TYPE            := src
 LSP_WS_LIB_URL_RO          := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git
diff --git a/project.mk b/project.mk
@@ -24,4 +24,4 @@ ARTIFACT_NAME               = lsp-tk-lib
 ARTIFACT_DESC               = Graphical toolkit library for Linux Studio Plugins Project
 ARTIFACT_HEADERS            = lsp-plug.in
 ARTIFACT_EXPORT_ALL         = 1
-ARTIFACT_VERSION            = 1.0.1
+ARTIFACT_VERSION            = 1.0.2
diff --git a/src/main/prop/multi/Embedding.cpp b/src/main/prop/multi/Embedding.cpp
@@ -32,7 +32,7 @@ namespace lsp
             { ".right",     PT_BOOL     },
             { ".top",       PT_BOOL     },
             { ".bottom",    PT_BOOL     },
-            NULL
+            { NULL,         PT_UNKNOWN  }
         };
 
         Embedding::Embedding(prop::Listener *listener):
diff --git a/src/main/prop/specific/GraphFrameData.cpp b/src/main/prop/specific/GraphFrameData.cpp
@@ -38,7 +38,7 @@ namespace lsp
             { ".max",           PT_FLOAT    },
             { ".default",       PT_FLOAT    },
             { ".size",          PT_STRING   },
-            NULL
+            { NULL,             PT_UNKNOWN  }
         };
 
         void GraphFrameData::Listener::notify(atom_t property)
diff --git a/src/main/prop/specific/GraphMeshData.cpp b/src/main/prop/specific/GraphMeshData.cpp
@@ -34,7 +34,7 @@ namespace lsp
         {
             { ".size",      PT_INT      },
             { ".strobe",    PT_BOOL     },
-            NULL
+            { NULL,         PT_UNKNOWN  }
         };
 
         void GraphMeshData::Listener::notify(atom_t property)
diff --git a/src/main/widgets/compound/ListBox.cpp b/src/main/widgets/compound/ListBox.cpp
@@ -785,7 +785,7 @@ namespace lsp
         {
             if (nBMask == 0)
             {
-                nXFlags        &= nXFlags &= ~(F_SUBMIT | F_CHANGED);
+                nXFlags        &= ~(F_SUBMIT | F_CHANGED);
                 if (e->nCode == ws::MCB_LEFT)
                 {
                     nLastIndex      = nCurrIndex;
diff --git a/src/main/widgets/compound/Menu.cpp b/src/main/widgets/compound/Menu.cpp
@@ -98,25 +98,25 @@ namespace lsp
             pClass = &metadata;
         }
 
-        Widget *Menu::Window::sync_mouse_handler(const ws::event_t *e)
+        Widget *Menu::Window::sync_mouse_handler(const ws::event_t *e, bool lookup)
         {
             Widget *old     = hMouse.pWidget;
-            Widget *curr    = PopupWindow::sync_mouse_handler(e, true);
+            Widget *curr    = PopupWindow::sync_mouse_handler(e, lookup);
 
-            if (curr != old)
+            if ((curr != old) && (curr != NULL))
                 curr->take_focus();
 
             return curr;
         }
 
         Widget *Menu::Window::acquire_mouse_handler(const ws::event_t *e)
         {
-            return sync_mouse_handler(e);
+            return sync_mouse_handler(e, true);
         }
 
-        Widget *Menu::Window::release_mouse_handler(const ws::event_t *e)
+        Widget *Menu::Window::release_mouse_handler(const ws::event_t *e, bool lookup)
         {
-            return sync_mouse_handler(e);
+            return sync_mouse_handler(e, lookup);
         }
 
         status_t Menu::Window::handle_event(const ws::event_t *e)
@@ -1402,13 +1402,13 @@ namespace lsp
                 case ws::WSK_KEYPAD_UP:
                 case ws::WSK_UP:
                     nKeyScroll      = -1;
-                    on_key_scroll(nKeyScroll);
+                    handle_key_scroll(nKeyScroll);
                     break;
 
                 case ws::WSK_KEYPAD_DOWN:
                 case ws::WSK_DOWN:
                     nKeyScroll      = 1;
-                    on_key_scroll(nKeyScroll);
+                    handle_key_scroll(nKeyScroll);
                     break;
 
                 default:
@@ -1502,16 +1502,16 @@ namespace lsp
         status_t Menu::key_scroll_handler(ws::timestamp_t sched, ws::timestamp_t time, void *arg)
         {
             Menu *m = widget_ptrcast<Menu>(arg);
-            return (m != NULL) ? m->on_key_scroll(m->nKeyScroll) : STATUS_OK;
+            return (m != NULL) ? m->handle_key_scroll(m->nKeyScroll) : STATUS_OK;
         }
 
         status_t Menu::mouse_scroll_handler(ws::timestamp_t sched, ws::timestamp_t time, void *arg)
         {
             Menu *m = widget_ptrcast<Menu>(arg);
-            return (m != NULL) ? m->on_mouse_scroll(m->nMouseScroll) : STATUS_OK;
+            return (m != NULL) ? m->handle_mouse_scroll(m->nMouseScroll) : STATUS_OK;
         }
 
-        status_t Menu::on_key_scroll(ssize_t dir)
+        status_t Menu::handle_key_scroll(ssize_t dir)
         {
             // If we have no potential items for selection - return immediately
             ssize_t last = ssize_t(vVisible.size()) - 1;
@@ -1549,7 +1549,7 @@ namespace lsp
             return STATUS_OK;
         }
 
-        status_t Menu::on_mouse_scroll(ssize_t dir)
+        status_t Menu::handle_mouse_scroll(ssize_t dir)
         {
             float scaling       = lsp_max(0.0f, sScaling.get());
             ssize_t scroll      = sScrolling.get() * scaling;
diff --git a/src/main/widgets/containers/Window.cpp b/src/main/widgets/containers/Window.cpp
diff --git a/src/main/widgets/dialogs/FileDialog.cpp b/src/main/widgets/dialogs/FileDialog.cpp
diff --git a/src/main/widgets/simple/Edit.cpp b/src/main/widgets/simple/Edit.cpp
diff --git a/src/main/widgets/simple/Void.cpp b/src/main/widgets/simple/Void.cpp
