Release 1.0.10

* The library now uses FreeType for rendering custom fonts, avoiding cairo cache. * The library now requires to call ws::init() before proceeding with other operations. * Added new dependency on lsp-dsp-lib for text rendering using glyph bitmaps. * Removed Makefile.d. Dependencies are now automatically generated at the build stage. * Fixed crash (BadMatch) for Fluxbox window manager on popup windows. * Fixed popup window heading display in Fluxbox. * Updated build scripts. * Updated module versions in dependencies.
lsp-plugins · May 21, 2023 · 3e13091 · 3e13091
2 parents 76a3fd2 + d1bed5f
commit 3e13091
Show file tree

Hide file tree

Showing 50 changed files with 4,492 additions and 3,645 deletions.
diff --git a/.cproject b/.cproject
@@ -24,6 +24,7 @@
 								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1889212305" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.1679691212" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.101255509" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="/usr/include/freetype2"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-base-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
@@ -32,6 +33,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-runtime-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-lltl-lib/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-dsp-lib/include}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1538000506" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
@@ -56,6 +58,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-lltl-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-base-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-dsp-lib/include}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.850397340" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
@@ -86,8 +89,11 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.855449491" name="main.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/test/main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1203487925.462668593">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1203487925.462668593" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1203487925"/>
+					</fileInfo>
 					<sourceEntries>
-						<entry excluding="modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -139,8 +145,11 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.release.2093466427.1267403702" name="main.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/test/main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.675932511.2029411196">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.675932511.2029411196" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.675932511"/>
+					</fileInfo>
 					<sourceEntries>
-						<entry excluding="modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -231,8 +240,11 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.1188655569" name="main.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/test/main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.993933867">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.993933867" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992"/>
+					</fileInfo>
 					<sourceEntries>
-						<entry excluding="modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -274,4 +286,4 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
+</cproject>
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,16 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.10 ===
+* The library now uses FreeType for rendering custom fonts, avoiding cairo cache.
+* The library now requires to call ws::init() before proceeding with other operations.
+* Added new dependency on lsp-dsp-lib for text rendering using glyph bitmaps.
+* Removed Makefile.d. Dependencies are now automatically generated at the build stage.
+* Fixed crash (BadMatch) for Fluxbox window manager on popup windows.
+* Fixed popup window heading display in Fluxbox.
+* Updated build scripts.
+* Updated module versions in dependencies.
+
 === 1.0.9 ===
 * Updated module versions in dependencies.
 

diff --git a/LICENSE_OFL.txt b/LICENSE_OFL.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Makefile b/Makefile
@@ -46,9 +46,9 @@ DISTSRC_PATH                = $(BUILDDIR)/distsrc
 DISTSRC                     = $(DISTSRC_PATH)/$(ARTIFACT_NAME)
 
 .DEFAULT_GOAL              := all
-.PHONY: all compile install uninstall depend clean
+.PHONY: all compile install uninstall clean
 
-compile all install uninstall depend:
+compile all install uninstall:
 	$(CHK_CONFIG)
 	$(MAKE) -C "$(BASEDIR)/src" $(@) VERBOSE="$(VERBOSE)" CONFIG="$(CONFIG)" DESTDIR="$(DESTDIR)"
 
@@ -107,7 +107,6 @@ help:
 	echo "  all                       Build all binaries"
 	echo "  clean                     Clean all build files and configuration file"
 	echo "  config                    Configure build"
-	echo "  depend                    Update build dependencies for current project"
 	echo "  distsrc                   Make tarball with source code for packagers"
 	echo "  fetch                     Fetch all desired source code dependencies from git"
 	echo "  help                      Print this help message"

diff --git a/README.md b/README.md
@@ -119,6 +119,9 @@ class Handler: public ws::IEventHandler
 
 int main(int argc, const char **argv)
 {
+	// Initialize library
+	ws::init();
+
 	// Create display
     ws::IDisplay *dpy = ws::create_display(argc, &argv[1]);
 

diff --git a/dependencies.mk b/dependencies.mk
@@ -22,6 +22,7 @@
 # List of common dependencies
 DEPENDENCIES = \
   LSP_COMMON_LIB \
+  LSP_DSP_LIB \
   LSP_LLTL_LIB \
   LSP_R3D_IFACE \
   LSP_RUNTIME_LIB

diff --git a/include/lsp-plug.in/ws/Font.h b/include/lsp-plug.in/ws/Font.h
@@ -23,6 +23,7 @@
 #define LSP_PLUG_IN_WS_FONT_H_
 
 #include <lsp-plug.in/ws/version.h>
+
 #include <lsp-plug.in/ws/types.h>
 
 namespace lsp
@@ -69,6 +70,7 @@ namespace lsp
                 inline const char      *get_name() const                    { return sName;                                 }
                 inline const char      *name() const                        { return sName;                                 }
                 inline size_t           flags() const                       { return nFlags & FF_ALL;                       }
+                inline size_t           raw_flags() const                   { return nFlags;                                }
 
                 inline void             set_bold(bool b)                    { if (b) nFlags |= FF_BOLD; else nFlags &= ~FF_BOLD;                            }
                 inline void             set_italic(bool i)                  { if (i) nFlags |= FF_ITALIC; else nFlags &= ~FF_ITALIC;                        }
@@ -87,7 +89,8 @@ namespace lsp
                 bool                    get_parameters(ISurface *s, font_parameters_t *fp);
                 bool                    get_text_parameters(ISurface *s, text_parameters_t *tp, const char *text);
         };
-    }
-}
+
+    } /* namespace ws */
+} /* namespace lsp */
 
 #endif /* LSP_PLUG_IN_WS_FONT_H_ */
diff --git a/include/lsp-plug.in/ws/IDisplay.h b/include/lsp-plug.in/ws/IDisplay.h
@@ -442,9 +442,9 @@ namespace lsp
                 virtual status_t add_font(const char *name, io::IInStream *is);
 
                 /**
-                 * Add an alias to the font name
-                 * @param name font name
-                 * @param alias alias for the font name
+                 * Add an alias (pseudonym) to the font name
+                 * @param name the name of the alias
+                 * @param alias the name of the original (aliased) font
                  * @return status of operation
                  */
                 virtual status_t add_font_alias(const char *name, const char *alias);

diff --git a/include/lsp-plug.in/ws/init.h b/include/lsp-plug.in/ws/init.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <[email protected]>
+ *
+ * This file is part of lsp-ws-lib
+ * Created on: 5 мая 2023 г.
+ *
+ * lsp-ws-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-ws-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-ws-lib. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LSP_PLUG_IN_WS_INIT_H_
+#define LSP_PLUG_IN_WS_INIT_H_
+
+#include <lsp-plug.in/ws/version.h>
+
+namespace lsp
+{
+    namespace ws
+    {
+        /**
+         * Initialize library
+         */
+        LSP_WS_LIB_PUBLIC
+        void init();
+
+    } /* namespace ws */
+} /* namespace lsp */
+
+#endif /* LSP_PLUG_IN_WS_INIT_H_ */
diff --git a/include/lsp-plug.in/ws/version.h b/include/lsp-plug.in/ws/version.h
@@ -24,7 +24,7 @@
 
 #define LSP_WS_LIB_MAJOR            1
 #define LSP_WS_LIB_MINOR            0
-#define LSP_WS_LIB_MICRO            9
+#define LSP_WS_LIB_MICRO            10
 
 #if defined(LSP_WS_LIB_PUBLISHER)
     #define LSP_WS_LIB_PUBLIC               LSP_EXPORT_MODIFIER

diff --git a/include/lsp-plug.in/ws/ws.h b/include/lsp-plug.in/ws/ws.h
@@ -38,5 +38,6 @@
 #include <lsp-plug.in/ws/IR3DBackend.h>
 
 #include <lsp-plug.in/ws/factory.h>
+#include <lsp-plug.in/ws/init.h>
 
 #endif /* LSP_PLUG_IN_WS_WS_H_ */