[lib] update

Author: momentarylapse

CMakeLists.txt

@@ -762,6 +762,7 @@ add_library(moduletsunami SHARED
 	src/lib/hui/Controls/ToolItemSeparatorWin.cpp
 	src/lib/hui/Controls/ToolItemToggleButtonGtk.cpp
 	src/lib/hui/Controls/ToolItemToggleButtonWin.cpp
+	src/lib/hui/_kaba_export.cpp
 	src/lib/hui/Application.cpp
 	src/lib/hui/Callback.cpp
 	src/lib/hui/Clipboard.cpp
@@ -883,6 +884,7 @@ add_library(moduletsunami SHARED
 	src/lib/net/BinaryBuffer.cpp
 	src/lib/net/net.cpp
 	src/lib/net/Socket.cpp
+	src/lib/nix/_kaba_export.cpp
 	src/lib/nix/nix.cpp
 	src/lib/nix/nix_buffer.cpp
 	src/lib/nix/nix_draw.cpp
@@ -892,6 +894,7 @@ add_library(moduletsunami SHARED
 	src/lib/nix/nix_textures.cpp
 	src/lib/nix/nix_vertexbuffer.cpp
 	src/lib/nix/nix_view.cpp
+	src/lib/os/app.cpp
 	src/lib/os/CommandLineParser.cpp
 	src/lib/os/config.cpp
 	src/lib/os/date.cpp
@@ -1114,7 +1117,7 @@ add_library(moduletsunami SHARED
 target_include_directories(moduletsunami PUBLIC ${INCLUDE_DIRECTORIES})
 target_link_directories(moduletsunami PUBLIC ${LINK_DIRECTORIES})
 target_compile_options(moduletsunami PUBLIC ${COMPILE_OPTIONS})
-target_compile_definitions(moduletsunami PUBLIC ${COMPILE_DEFINITIONS}  INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
+target_compile_definitions(moduletsunami PUBLIC ${COMPILE_DEFINITIONS}  SOURCE_ROOT="${CMAKE_SOURCE_DIR}" INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
 target_link_libraries(moduletsunami PUBLIC ${DEPS})
 if (NOT WIN32)
 	target_compile_options(moduletsunami PUBLIC -fvisibility=hidden)
@@ -1318,6 +1321,7 @@ add_executable(tsunami WIN32
 	src/lib/hui/Controls/ToolItemSeparatorWin.cpp
 	src/lib/hui/Controls/ToolItemToggleButtonGtk.cpp
 	src/lib/hui/Controls/ToolItemToggleButtonWin.cpp
+	src/lib/hui/_kaba_export.cpp
 	src/lib/hui/Application.cpp
 	src/lib/hui/Callback.cpp
 	src/lib/hui/Clipboard.cpp
@@ -1439,6 +1443,7 @@ add_executable(tsunami WIN32
 	src/lib/net/BinaryBuffer.cpp
 	src/lib/net/net.cpp
 	src/lib/net/Socket.cpp
+	src/lib/nix/_kaba_export.cpp
 	src/lib/nix/nix.cpp
 	src/lib/nix/nix_buffer.cpp
 	src/lib/nix/nix_draw.cpp
@@ -1448,6 +1453,7 @@ add_executable(tsunami WIN32
 	src/lib/nix/nix_textures.cpp
 	src/lib/nix/nix_vertexbuffer.cpp
 	src/lib/nix/nix_view.cpp
+	src/lib/os/app.cpp
 	src/lib/os/CommandLineParser.cpp
 	src/lib/os/config.cpp
 	src/lib/os/date.cpp
@@ -1669,7 +1675,7 @@ add_executable(tsunami WIN32
 target_include_directories(tsunami PUBLIC ${INCLUDE_DIRECTORIES})
 target_link_directories(tsunami PUBLIC ${LINK_DIRECTORIES})
 target_compile_options(tsunami PUBLIC ${COMPILE_OPTIONS})
-target_compile_definitions(tsunami PUBLIC ${COMPILE_DEFINITIONS}  INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
+target_compile_definitions(tsunami PUBLIC ${COMPILE_DEFINITIONS}  SOURCE_ROOT="${CMAKE_SOURCE_DIR}" INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
 target_link_libraries(tsunami PUBLIC ${DEPS})
 target_include_directories(tsunami PUBLIC src)
 target_include_directories(tsunami PUBLIC src/lib)

plugins/synthesizer/Font.kaba

@@ -22,7 +22,7 @@ struct MidiFont
 		for s in sub
 			s.song = new Song(s, DEFAULT_SAMPLE_RATE)
 			song = weak(s.song)
-			s.storage.load(s.song, hui.app_directory | "Midi Fonts/{{name}}.nami")
+			s.storage.load(s.song, os.app_directory_dynamic | "Midi Fonts/{{name}}.nami")
 
 	func mut instruments(session: Session) -> string[]
 		load(session)
@@ -70,7 +70,7 @@ class FontList as @noauto
 
 	#string[] find_drumsets()
 	func mut update()
-		let list = os.fs.search(hui.app_directory | "Midi Fonts", "*.nami", "f")
+		let list = os.fs.search(os.app_directory_dynamic | "Midi Fonts", "*.nami", "f")
 		for e in list
 			let name = str(e)[:-5]
 			for x in find(name)

src/lib/hui/Application.cpp

@@ -21,6 +21,8 @@
 
 #include <gtk/gtk.h>
 
+#include "../os/app.h"
+
 #ifdef OS_WINDOWS
 #include <windows.h>
 #endif
@@ -43,12 +45,8 @@ GtkApplication *Application::application = nullptr;
 base::map<string, string> Application::_properties_;
 
 Flags Application::flags = Flags::NONE;
-Path Application::filename;
-Path Application::directory;
-Path Application::directory_static;
-Path Application::initial_working_directory;
-bool Application::installed;
 bool Application::adwaita_started = false;
+bool Application::allowed = true;
 
 Array<string> Application::_args;
 
@@ -87,46 +85,51 @@ void _init_global_css_classes_() {
 #endif
 }
 
+void init_low_level() {
+	_InitInput_();
+	new(&Application::_properties_) base::map<string, string>();
+
+	separator = "\\";
+	_using_language_ = false;
+}
+
 Application::Application(const string &app_name, const string &def_lang, Flags _flags) {
+	init_low_level();
 	flags = _flags;
 
 #ifdef HUI_API_GTK
 	g_set_prgname(app_name.c_str());
 #endif
 
-	guess_directories(_args, app_name);
+	os::app::detect(_args, app_name);
 
 
-	_InitInput_();
-
-	separator = "\\";
-	_using_language_ = false;
 	if ((flags & Flags::NO_ERROR_HANDLER) == 0)
 		SetDefaultErrorHandler(nullptr);
 
-	if (os::fs::exists(directory | "config.txt"))
-		config.load(directory | "config.txt");
+	if (os::fs::exists(os::app::directory_dynamic | "config.txt"))
+		config.load(os::app::directory_dynamic | "config.txt");
 
 
 	if ((flags & Flags::DONT_LOAD_RESOURCE) == 0)
-		load_resource(directory_static | "hui_resources.txt");
+		load_resource(os::app::directory_static | "hui_resources.txt");
 
 	if (def_lang.num > 0)
 		set_language(config.get_str("Language", def_lang));
 
 
 	// default "logo" used for "about" dialog (full path)
 #if defined(OS_LINUX) || defined(OS_MAC)
-	if (os::fs::exists(directory_static | "icons" | "hicolor" | "scalable" | "apps" | (app_name + ".svg")))
-		set_property("logo", str(directory_static | "icons" | "hicolor" | "scalable" | "apps" | (app_name + ".svg")));
-	else if (os::fs::exists(directory_static | "icon.svg"))
-		set_property("logo", str(directory_static | "icon.svg"));
+	if (os::fs::exists(os::app::directory_static | "icons" | "hicolor" | "scalable" | "apps" | (app_name + ".svg")))
+		set_property("logo", str(os::app::directory_static | "icons" | "hicolor" | "scalable" | "apps" | (app_name + ".svg")));
+	else if (os::fs::exists(os::app::directory_static | "icon.svg"))
+		set_property("logo", str(os::app::directory_static | "icon.svg"));
 	else
 #endif
-	if (os::fs::exists(directory_static | "icon.png"))
-		set_property("logo", str(directory_static | "icon.png"));
-	else if (os::fs::exists(directory_static | "icon.ico"))
-		set_property("logo", str(directory_static | "icon.ico"));
+	if (os::fs::exists(os::app::directory_static | "icon.png"))
+		set_property("logo", str(os::app::directory_static | "icon.png"));
+	else if (os::fs::exists(os::app::directory_static | "icon.ico"))
+		set_property("logo", str(os::app::directory_static | "icon.ico"));
 
 	// default "icon" used for windows (just name)
 	set_property("icon", app_name);
@@ -136,7 +139,7 @@ Application::~Application() {
 	//foreachb(Window *w, _all_windows_)
 	//	delete(w);
 	if (config.changed)
-		config.save(directory | "config.txt");
+		config.save(os::app::directory_dynamic | "config.txt");
 	if ((msg_inited) /*&& (HuiMainLevel == 0)*/)
 		msg_end();
 
@@ -160,67 +163,6 @@ Path strip_dev_dirs(const Path &p) {
 	return p;
 }
 
-//   filename -> executable file
-//   directory ->
-//      NONINSTALLED:  binary dir
-//      INSTALLED:     ~/.MY_APP/      <<< now always this
-//   directory_static ->
-//      NONINSTALLED:  binary dir/static/
-//      INSTALLED:     /usr/local/share/MY_APP/
-//   initial_working_directory -> working dir before running this program
-void Application::guess_directories(const Array<string> &arg, const string &app_name) {
-
-	initial_working_directory = os::fs::current_directory();
-	installed = false;
-
-
-	// executable file
-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_MINGW) //defined(__GNUC__) || defined(OS_LINUX)
-	if (arg.num > 0)
-		filename = arg[0];
-#else // OS_WINDOWS
-	char *ttt = nullptr;
-	int r = _get_pgmptr(&ttt);
-	filename = ttt;
-	hui_win_instance = (void*)GetModuleHandle(nullptr);
-#endif
-
-
-	// first, assume a local/non-installed version
-	directory = initial_working_directory; //strip_dev_dirs(filename.parent());
-	directory_static = directory | "static";
-
-#ifdef INSTALL_PREFIX
-	// our build system should define this:
-	Path prefix = INSTALL_PREFIX;
-#else
-	// oh no... fall-back
-	Path prefix = "/usr/local";
-#endif
-
-	#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_MINGW) //defined(__GNUC__) || defined(OS_LINUX)
-		// installed version?
-		if (filename.is_in(prefix) or (filename.str().find("/") < 0)) {
-			installed = true;
-			directory_static = prefix | "share" | app_name;
-		}
-
-		// inside an AppImage?
-		if (getenv("APPIMAGE")) {
-			installed = true;
-			directory_static = Path(getenv("APPDIR")) | "usr" | "share" | app_name;
-		}
-
-		// inside MacOS bundle?
-		if (str(filename).find(".app/Contents/MacOS/") >= 0) {
-			installed = true;
-			directory_static = filename.parent().parent() | "Resources";
-		}
-
-		directory = format("%s/.%s/", getenv("HOME"), app_name);
-		os::fs::create_directory(directory);
-	#endif
-}
 
 #if GTK_CHECK_VERSION(4,0,0)
 static bool keep_running = true;
@@ -246,7 +188,7 @@ static void on_gtk_application_activate(GApplication *_g_app, gpointer user_data
 
 	// add local icon theme
 	auto icon_theme = gtk_icon_theme_get_for_display(gdk_display_get_default());
-	gtk_icon_theme_add_search_path(icon_theme, str(Application::directory_static | "icons").c_str());
+	gtk_icon_theme_add_search_path(icon_theme, str(os::app::directory_static | "icons").c_str());
 
 	if (_run_after_gui_init_func_)
 		_run_after_gui_init_func_();
@@ -324,6 +266,8 @@ void Application::set_property(const string &name, const string &value) {
 }
 
 string Application::get_property(const string &name) {
+	if (!_properties_.contains(name))
+		return "";
 	try {
 		return _properties_[name];
 	} catch(...) {

src/lib/hui/Application.h

@@ -51,8 +51,6 @@ class Application : public VirtualBase {
 	int run();
 	static void do_single_main_loop();
 
-	static void guess_directories(const Array<string> &arg, const string &app_name);
-
 
 
 	static void _cdecl about_box(Window *win);
@@ -61,13 +59,9 @@ class Application : public VirtualBase {
 
 	static base::map<string, string> _properties_;
 
-	static Path filename;
-	static Path directory;			// dir of changeable files (ie. ~/.app/)
-	static Path directory_static;	// dir of static files (ie. /usr/shar/app)
-	static Path initial_working_directory;
-	static bool installed; // installed into system folders?
 	static bool adwaita_started;
 	static Flags flags;
+	static bool allowed;
 
 	static Array<string> _args;
 
@@ -78,12 +72,14 @@ class Application : public VirtualBase {
 }
 
 #define HUI_EXECUTE(APP_CLASS) \
-int hui_main(const Array<string> &args) { \
+namespace os::app { \
+int main(const Array<string> &args) { \
 	APP_CLASS::_args = args; \
 	APP_CLASS *app = new APP_CLASS; \
 	int r = app->try_execute(args); \
 	delete app; \
 	return r; \
+} \
 }
 
 #endif /* HUIAPPLICATION_H_ */

src/lib/hui/MenuGtk.cpp

@@ -10,6 +10,8 @@
 
 #include <gtk/gtk.h>
 
+#include "../os/app.h"
+
 #ifdef HUGE
 #undef HUGE
 #endif
@@ -231,7 +233,7 @@ GtkIconTheme *get_hui_icon_theme() {
 	if (!hui_icon_theme) {
 		hui_icon_theme = gtk_icon_theme_new();
 #if GTK_CHECK_VERSION(4,0,0)
-		gtk_icon_theme_add_search_path(hui_icon_theme, sys_str_f(Application::directory_static | "icons"));
+		gtk_icon_theme_add_search_path(hui_icon_theme, sys_str_f(os::app::directory_static | "icons"));
 		/*gtk_icon_theme_add_search_path(hui_icon_theme, sys_str_f(Application::directory_static | "icons" | "64x64"));
 		gtk_icon_theme_add_search_path(hui_icon_theme, sys_str_f(Application::directory_static | "icons" | "48x48"));
 		gtk_icon_theme_add_search_path(hui_icon_theme, sys_str_f(Application::directory_static | "icons" | "32x32"));*/
@@ -348,7 +350,7 @@ GtkWidget *get_gtk_image_x(const string &image, IconSize size, GtkWidget *widget
 	//	if ((img->filename[0] == '/') or (img->filename[1] == ':'))
 	//		return gtk_image_new_from_file(sys_str_f(img->filename));
 		// relative
-		return gtk_image_new_from_file(sys_str_f(Application::directory_static | image));
+		return gtk_image_new_from_file(sys_str_f(os::app::directory_static | image));
 	}
 }
 void *get_gtk_image(const string &image, IconSize size) {