kee

commit 70137e837fd97949c9d9ac2fb7411943d96f9d09
parent 114558b1fac370e0fd028d3175485247aa557eb7
Author: lash <dev@holbrook.no>
Date:   Thu, 20 Jun 2024 21:23:09 +0100

Include missing beamenu data file

Diffstat:
M
Makefile
 | 
3
++-
M
README.qemu.adoc
 | 
16
++++++++++++----
M
src/gtk/main.c
 | 
5
++++-

3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -21,8 +21,9 @@ clean:
 run: gtk all
 	G_DEBUG=3 G_MESSAGES_DEBUG=3 ./src/gtk/a.out
 
-debug: gtk all
+debug: gtk testdata all
 	#G_DEBUG=all G_MESSAGES_DEBUG=all ./src/gtk/a.out
+	cd testdata && ln -svf ../src/gtk/beamenu.dat .
 	G_DEBUG=all G_MESSAGES_DEBUG="Kee Gio Glib" ./src/gtk/a.out
 
 gdb: gtk all
diff --git a/README.qemu.adoc b/README.qemu.adoc
@@ -105,14 +105,22 @@ Then the main attraction.
 -----
 
 cd ../kee-gtk4
+# needed for generation of test data
 python3 -m venv .venv
 source .venv/bin/activate
+pip install -r requirements.txt
 
 -----
 
-Some environment hacks are needed to include the libcime in the non-standard location, aswell as enabling the application to run with test data.
+Some environment hacks are needed.
 
-Save this to a file named `env.sh`
+* include the libcime in the non-standard location.
+* find shared libraries in src/aux at runtime.
+* enable the application to run with test data.
+
+The following takes care of that:
+
+(it can be saved to a file `env.sh` and which can be run with `source` in the terminal before compiling and/or running.
 
 -----
 
@@ -123,14 +131,14 @@ root_path=$(realpath .)
 
 export PKG_CONFIG_PATH=${cmime_path}/usr/local/lib/pkgconfig:${root_path}
 export LIBRARY_PATH=${cmime_path}/usr/local/lib
-export LD_LIBRARY_PATH=${cmime_path}/usr/local/lib
+export LD_LIBRARY_PATH=${cmime_path}/usr/local/lib:${root_path}/src/aux/lib
 export C_INCLUDE_PATH=${cmime_path}/usr/local/include
 export CFLAGS="-g3 -DBEAMENU_N_EXITS=3 -DBEAMENU_N_DST=6 -DRERR"
 export KEE_PATH=${root_path}/testdata
 
 -----
 
-
+Make and verify code as such:
 
 -----
 
diff --git a/src/gtk/main.c b/src/gtk/main.c
@@ -41,7 +41,10 @@ int main(int argc, char **argv) {
 	gapp = gtk_application_new ("org.defalsify.Kee", G_APPLICATION_DEFAULT_FLAGS);
 
 	settings_new_from_xdg(&settings);
-	settings_init(&settings);
+	r = settings_init(&settings);
+	if (r) {
+		return r;
+	}
 
 	r = kee_context_init(&ctx, &settings);
 	if (r) {