Work, work...

evoke/EvokeService.cpp

@@ -12,23 +12,87 @@
 
 #include "Log.h"
 #include "EvokeService.h"
+#include "Splash.h"
+#include "Spawn.h"
+
 #include <edelib/File.h>
 #include <edelib/Config.h>
 #include <edelib/StrUtil.h>
+#include <edelib/Util.h>
+#include <edelib/Debug.h>
+
+#include <FL/fl_ask.h>
 
 #include <sys/types.h> // getpid
 #include <unistd.h>    // 
 #include <stdlib.h>    // free
 #include <string.h>    // strdup
 
+void resolve_path(const edelib::String& imgdir, edelib::String& img, bool have_imgdir) {
+	if(img.empty())
+		return;
 
-EvokeService::EvokeService() : logfile(NULL), pidfile(NULL) { 
+	const char* im = img.c_str();
+
+	if(!edelib::file_exists(im) && have_imgdir) {
+		img = edelib::build_filename("/", imgdir.c_str(), im);
+		im = img.c_str();
+		if(!edelib::file_exists(im)) {
+			// no file, send then empty
+			img.clear();
+		}
+	}
+}
+
+int get_int_property_value(Atom at) {
+	Atom real;
+	int format;
+	unsigned long n, extra;
+	unsigned char* prop;
+
+	int status = XGetWindowProperty(fl_display, RootWindow(fl_display, fl_screen),
+			at, 0L, 0x7fffffff, False, XA_CARDINAL, &real, &format, &n, &extra,
+			(unsigned char**)&prop);
+	int ret = -1;
+	if(status != Success && !prop)
+		return ret;
+	ret = int(*(long*)prop);
+	XFree(prop);
+	return ret;
+}
+
+int get_string_property_value(Atom at, char* txt, int txt_len) {
+	XTextProperty names;
+	XGetTextProperty(fl_display, RootWindow(fl_display, fl_screen), &names, at);
+	if(!names.nitems || !names.value)
+		return 0;
+
+	char** vnames;
+	int nsz = 0;
+	if(!XTextPropertyToStringList(&names, &vnames, &nsz)) {
+		XFree(names.value);
+		return 0;
+	}
+
+	strncpy(txt, vnames[0], txt_len);
+	txt[txt_len] = '\0';
+	XFreeStringList(vnames);
+	return 1;
+}
+
+EvokeService::EvokeService() : is_running(0), logfile(NULL), pidfile(NULL), lockfile(NULL) { 
+	top_win = NULL;
 }
 
 EvokeService::~EvokeService() {
 	if(logfile)
 		delete logfile;
 
+	if(lockfile) {
+		edelib::file_remove(lockfile);
+		free(lockfile);
+	}
+
 	if(pidfile) {
 		edelib::file_remove(pidfile);
 		free(pidfile);
@@ -54,13 +118,20 @@ bool EvokeService::setup_logging(const char* file) {
 	return true;
 }
 
-bool EvokeService::setup_pid(const char* file) {
+bool EvokeService::setup_pid(const char* file, const char* lock) {
 	if(!file)
 		return false;
 
-	if(edelib::file_exists(file))
+	if(edelib::file_exists(lock))
 		return false;
 
+	FILE* l = fopen(lock, "w");
+	if(!l)
+		return false;
+	fprintf(l, " ");
+	fclose(l);
+	lockfile = strdup(lock);
+
 	FILE* f = fopen(file, "w");
 	if(!f)
 		return false;
@@ -72,20 +143,35 @@ bool EvokeService::setup_pid(const char* file) {
 	return true;
 }
 
-bool EvokeService::setup_config(const char* config, bool do_startup) {
-	// for now if is not startup mode, ignore it
-	if(!do_startup)
-		return true;
-
+bool EvokeService::init_splash(const char* config, bool no_splash, bool dry_run) {
 	edelib::Config c;
 	if(!c.load(config))
 		return false;
 
 	char buff[1024];
+	bool have_imgdir = false;
+
+	c.get("evoke", "ImagesDirectory", buff, sizeof(buff));
+
+	// no evoke section
+	if(c.error() == edelib::CONF_ERR_SECTION)
+		return false;
+
+	edelib::String imgdir;
+	if(c.error() == edelib::CONF_SUCCESS) {
+		imgdir = buff;
+		have_imgdir = true;
+	}
+
+	edelib::String splashimg;
+	if(c.get("evoke", "Splash", buff, sizeof(buff)))
+		splashimg = buff;
+
+	// Startup key must exists
 	if(!c.get("evoke", "Startup", buff, sizeof(buff)))
 		return false;
 
-	edelib::vector<edelib::String> vs;
+	StringList vs;
 	edelib::stringtok(vs, buff, ",");
 
 	// nothing, fine, do nothing
@@ -95,8 +181,9 @@ bool EvokeService::setup_config(const char* config, bool do_startup) {
 
 	EvokeClient ec;
 	const char* key_name;
-	for(unsigned int i = 0; i < sz; i++) {
-		key_name = vs[i].c_str();
+
+	for(StringListIter it = vs.begin(); it != vs.end(); ++it) {
+		key_name = (*it).c_str();
 		edelib::str_trim((char*)key_name);
 
 		// probably listed but not the same key; also Exec value must exists
@@ -105,10 +192,8 @@ bool EvokeService::setup_config(const char* config, bool do_startup) {
 		else
 			ec.exec = buff;
 
-		if(c.get(key_name, "Message", buff, sizeof(buff)))
-			ec.message = buff;
-		// it is no EDE app untill say so
-		c.get(key_name, "Core", ec.core, false);
+		if(c.get(key_name, "Description", buff, sizeof(buff)))
+			ec.desc = buff;
 
 		if(c.get(key_name, "Icon", buff, sizeof(buff)))
 			ec.icon = buff;
@@ -116,23 +201,81 @@ bool EvokeService::setup_config(const char* config, bool do_startup) {
 		clients.push_back(ec);
 	}
 
-	for(unsigned int i = 0; i < clients.size(); i++) {
-		printf("Exec: %s\n", clients[i].exec.c_str());
-		printf("Message: %s\n", clients[i].message.c_str());
-		printf("Icon: %s\n", clients[i].icon.c_str());
-		printf("Core: %i\n\n", clients[i].core);
-	}
+	/*
+	 * Now, before data is send to Splash, resolve directories
+	 * since Splash expects that.
+	 */
+	resolve_path(imgdir, splashimg, have_imgdir);
+	for(ClientListIter it = clients.begin(); it != clients.end(); ++it)
+		resolve_path(imgdir, (*it).icon, have_imgdir);
+
+	Splash sp(no_splash, dry_run);
+	sp.set_clients(&clients);
+	sp.set_background(&splashimg);
+
+	sp.run();
 
 	return true;
 }
 
 void EvokeService::setup_atoms(Display* d) {
+	// with them must be send '1' or property will be ignored (except _EDE_EVOKE_SPAWN)
 	_ede_shutdown_all    = XInternAtom(d, "_EDE_EVOKE_SHUTDOWN_ALL", False);
+	_ede_evoke_quit      = XInternAtom(d, "_EDE_EVOKE_QUIT", False);
+
 	_ede_spawn           = XInternAtom(d, "_EDE_EVOKE_SPAWN", False);
-	_ede_shutdown_client = XInternAtom(d, "_EDE_SHUTDOWN", False);
 }
 
-int EvokeService::handle(int event) {
-	logfile->printf("Got event %i\n", event);
+int EvokeService::handle(const XEvent* ev) {
+	logfile->printf("Got event %i\n", ev->type);
+
+	if(ev->type == MapNotify) {
+		if(top_win) {
+			// for splash to keep it at top (working in old edewm)
+			XRaiseWindow(fl_display, fl_xid(top_win));
+			return 1;
+		}
+	} else if(ev->type == ConfigureNotify) {
+	 	if(ev->xconfigure.event == DefaultRootWindow(fl_display) && top_win) {
+			// splash too, but keep window under other wm's
+			XRaiseWindow(fl_display, fl_xid(top_win));
+			return 1;
+		}
+	} else if(ev->type == PropertyNotify) {
+		if(ev->xproperty.atom == _ede_spawn) {
+			char buff[1024];
+
+			if(get_string_property_value(_ede_spawn, buff, sizeof(buff))) {
+				logfile->printf("Got _EVOKE_SPAWN with %s. Starting client...\n", buff);
+				int r = spawn_program(buff, false);
+
+				if(r != 0)
+					fl_alert("Unable to start %s. Got code %i", buff, r);
+			} else
+				logfile->printf("Got _EVOKE_SPAWN with malformed data. Ignoring...\n");
+
+			return 1;
+		}
+
+		if(ev->xproperty.atom == _ede_evoke_quit) {
+			int val = get_int_property_value(_ede_evoke_quit);
+			if(val == 1) {
+				logfile->printf("Got accepted _EDE_EVOKE_QUIT\n");
+				stop();
+			} else
+				logfile->printf("Got _EDE_EVOKE_QUIT with bad code (%i). Ignoring...\n", val);
+			return 1;
+		}
+
+		if(ev->xproperty.atom == _ede_shutdown_all) {
+			int val = get_int_property_value(_ede_shutdown_all);
+			if(val == 1)
+				logfile->printf("Got accepted _EDE_EVOKE_SHUTDOWN_ALL\n");
+			else	
+				logfile->printf("Got _EDE_EVOKE_SHUTDOWN_ALL with bad code (%i). Ignoring...\n", val);
+			return 1;
+		}
+	}
+
 	return 0;
 }