X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fllua.c;h=8f1df3c64ba74f19af744b5c03b6c2250222ff38;hb=refs%2Fheads%2Fmaster;hp=61e3dacbb2f514e3b5caa3f939087de86608b9e8;hpb=b661dbf5a7f8f7a51e7de41b5841bd339541dab4;p=monky

diff --git a/src/llua.c b/src/llua.c
index 61e3dac..8f1df3c 100644
--- a/src/llua.c
+++ b/src/llua.c
@@ -1,13 +1,10 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
  *
- * Any original torsmo code is licensed under the BSD license
- *
- * All code written since the fork of torsmo is licensed under the GPL
- *
- * Please see COPYING for details
+ * Conky, a system monitor, based on torsmo
  *
  * Copyright (c) 2009 Toni Spets
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -27,64 +24,204 @@
 
 #include "conky.h"
 #include "logging.h"
+#include "build.h"
+
+#include <ctype.h>
+
+#ifdef LUA_EXTRAS
+#include <tolua++.h>
+#endif /* LUA_EXTRAS */
+
+#ifdef HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+
+void llua_append_notify(const char *name);
+void llua_rm_notifies(void);
+static int llua_block_notify = 0;
+#endif /* HAVE_SYS_INOTIFY_H */
+
+#define MIN(a, b) ( (a) < (b) ? (a) : (b) )
+
+static char *draw_pre_hook = 0;
+static char *draw_post_hook = 0;
+static char *startup_hook = 0;
+static char *shutdown_hook = 0;
 
 lua_State *lua_L = NULL;
 
+static int llua_conky_parse(lua_State *L)
+{
+	int n = lua_gettop(L);    /* number of arguments */
+	char *str;
+	char *buf = calloc(1, max_user_text);
+	if (n != 1) {
+		lua_pushstring(L, "incorrect arguments, conky_parse(string) takes exactly 1 argument");
+		lua_error(L);
+	}
+	if (!lua_isstring(L, 1)) {
+		lua_pushstring(L, "incorrect argument (expecting a string)");
+		lua_error(L);
+	}
+	str = strdup(lua_tostring(L, 1));
+	evaluate(str, buf, max_user_text);
+	lua_pushstring(L, buf);
+	free(str);
+	free(buf);
+	return 1;                 /* number of results */
+}
+
+static int llua_conky_set_update_interval(lua_State *L)
+{
+	int n = lua_gettop(L);    /* number of arguments */
+	double value;
+	if (n != 1) {
+		lua_pushstring(L, "incorrect arguments, conky_set_update_interval(number) takes exactly 1 argument");
+		lua_error(L);
+	}
+	if (!lua_isnumber(L, 1)) {
+		lua_pushstring(L, "incorrect argument (expecting a number)");
+		lua_error(L);
+	}
+	value = lua_tonumber(L, 1);
+	set_update_interval(value);
+	return 0;                 /* number of results */
+}
+
 void llua_init(void)
 {
-	if(lua_L) return;
+	const char *libs = PACKAGE_LIBDIR"/lib?.so;";
+	char *old_path, *new_path;
+	if (lua_L) return;
 	lua_L = lua_open();
+
+	/* add our library path to the lua package.cpath global var */
 	luaL_openlibs(lua_L);
+	lua_getglobal(lua_L, "package");
+	lua_getfield(lua_L, -1, "cpath");
+	old_path = strdup(lua_tostring(lua_L, -1));
+	new_path = malloc(strlen(old_path) + strlen(libs) + 1);
+	strcpy(new_path, libs);
+	strcat(new_path, old_path);
+	lua_pushstring(lua_L, new_path);
+	lua_setfield(lua_L, -3, "cpath");
+	lua_pop(lua_L, 2);
+	free(old_path);
+	free(new_path);
+
+	lua_pushstring(lua_L, PACKAGE_NAME" "VERSION" compiled "BUILD_DATE" for "BUILD_ARCH);
+	lua_setglobal(lua_L, "conky_build_info");
+
+	lua_pushstring(lua_L, VERSION);
+	lua_setglobal(lua_L, "conky_version");
+
+	lua_pushstring(lua_L, BUILD_DATE);
+	lua_setglobal(lua_L, "conky_build_date");
+
+	lua_pushstring(lua_L, BUILD_ARCH);
+	lua_setglobal(lua_L, "conky_build_arch");
+
+	lua_pushstring(lua_L, current_config);
+	lua_setglobal(lua_L, "conky_config");
+
+	lua_pushcfunction(lua_L, &llua_conky_parse);
+	lua_setglobal(lua_L, "conky_parse");
+
+	lua_pushcfunction(lua_L, &llua_conky_set_update_interval);
+	lua_setglobal(lua_L, "conky_set_update_interval");
+
+#if defined(X11) && defined(LUA_EXTRAS)
+	/* register tolua++ user types */
+	tolua_open(lua_L);
+	tolua_usertype(lua_L, "Drawable");
+	tolua_usertype(lua_L, "Visual");
+	tolua_usertype(lua_L, "Display");
+#endif /* X11 */
 }
 
 void llua_load(const char *script)
 {
 	int error;
-	if(!lua_L) return;
-	error = luaL_dofile(lua_L, script);
+	char path[DEFAULT_TEXT_BUFFER_SIZE];
+
+	llua_init();
+
+	to_real_path(path, script);
+	error = luaL_dofile(lua_L, path);
 	if (error) {
-		ERR("llua_load: %s", lua_tostring(lua_L, -1));
+		NORM_ERR("llua_load: %s", lua_tostring(lua_L, -1));
 		lua_pop(lua_L, 1);
+#ifdef HAVE_SYS_INOTIFY_H
+	} else if (!llua_block_notify && inotify_fd != -1) {
+		llua_append_notify(path);
+#endif /* HAVE_SYS_INOTIFY_H */
 	}
 }
 
 /*
-	llua_do_call does a flexible call to any Lua function
-	string: <function> [par1] [par2...]
-	retc: the number of return values expected
-*/
-char *llua_do_call(const char *string, int retc)
+ * Returns the first space-delimited token of the string starting at position *len.
+ * On return *len contains the length of the token. Spaces inside brackets are ignored, so that
+ * eg. '${foo bar}' is treated as a single token. Sets *len to zero and *str points to the end of
+ * the string when there are no more tokens.
+ */
+static const char* tokenize(const char *str, size_t *len)
+{
+	str += *len;
+	*len = 0;
+	while(str && isspace(*str))
+		++str;
+
+	size_t level = 0;
+	while(str[*len] && (level > 0 || !isspace(str[*len]))) {
+		switch(str[*len]) {
+			case '{': ++level; break;
+			case '}': --level; break;
+		}
+		++*len;
+	}
+
+	if(!str[*len] && level > 0)
+		NORM_ERR("tokenize: improperly nested token: %s", str);
+
+	return str;
+}
+
+/*
+   llua_do_call does a flexible call to any Lua function
+string: <function> [par1] [par2...]
+retc: the number of return values expected
+ */
+static char *llua_do_call(const char *string, int retc)
 {
 	static char func[64];
 	int argc = 0;
 
-	char *tmp = strdup(string);
-	char *ptr = strtok(tmp, " ");
+	size_t len = 0;
+
+	const char *ptr = tokenize(string, &len);
 
 	/* proceed only if the function name is present */
-	if(!ptr) {
-		free(tmp);
+	if (!len) {
 		return NULL;
 	}
 
 	/* call only conky_ prefixed functions */
-	snprintf(func, 64, "conky_%s", ptr);
+	if(strncmp(ptr, LUAPREFIX, strlen(LUAPREFIX)) != 0) {
+		snprintf(func, sizeof func, "%s", LUAPREFIX);
+	} else
+		*func = 0;
+	strncat(func, ptr, MIN(len, sizeof(func) - strlen(func) - 1));
 
 	/* push the function name to stack */
 	lua_getglobal(lua_L, func);
 
 	/* parse all function parameters from args and push them to the stack */
-	ptr = strtok(NULL, " ");
-	while(ptr) {
-		lua_pushstring(lua_L, ptr);
-		ptr = strtok(NULL, " ");
+	while( ptr = tokenize(ptr, &len), len) {
+		lua_pushlstring(lua_L, ptr, len);
 		argc++;
 	}
 
-	free(tmp);
-
 	if(lua_pcall(lua_L, argc, retc, 0) != 0) {
-		ERR("llua_do_call: function %s execution failed: %s", func, lua_tostring(lua_L, -1));
+		NORM_ERR("llua_do_call: function %s execution failed: %s", func, lua_tostring(lua_L, -1));
 		lua_pop(lua_L, -1);
 		return NULL;
 	}
@@ -92,14 +229,15 @@ char *llua_do_call(const char *string, int retc)
 	return func;
 }
 
+#if 0
 /*
  * same as llua_do_call() except passes everything after func as one arg.
  */
-char *llua_do_read_call(const char *function, const char *arg, int retc)
+static char *llua_do_read_call(const char *function, const char *arg, int retc)
 {
 	static char func[64];
 	snprintf(func, 64, "conky_%s", function);
-	
+
 	/* push the function name to stack */
 	lua_getglobal(lua_L, func);
 
@@ -107,15 +245,17 @@ char *llua_do_read_call(const char *function, const char *arg, int retc)
 	lua_pushstring(lua_L, arg);
 
 	if (lua_pcall(lua_L, 1, retc, 0) != 0) {
-		ERR("llua_do_call: function %s execution failed: %s", func, lua_tostring(lua_L, -1));
+		NORM_ERR("llua_do_call: function %s execution failed: %s", func, lua_tostring(lua_L, -1));
 		lua_pop(lua_L, -1);
 		return NULL;
 	}
 
 	return func;
 }
+#endif
 
-char *llua_getstring(const char *args)
+/* call a function with args, and return a string from it (must be free'd) */
+static char *llua_getstring(const char *args)
 {
 	char *func;
 	char *ret = NULL;
@@ -123,9 +263,9 @@ char *llua_getstring(const char *args)
 	if(!lua_L) return NULL;
 
 	func = llua_do_call(args, 1);
-	if(func) {
-		if(!lua_isstring(lua_L, -1)) {
-			ERR("llua_getstring: function %s didn't return a string, result discarded", func);
+	if (func) {
+		if (!lua_isstring(lua_L, -1)) {
+			NORM_ERR("llua_getstring: function %s didn't return a string, result discarded", func);
 		} else {
 			ret = strdup(lua_tostring(lua_L, -1));
 			lua_pop(lua_L, 1);
@@ -135,7 +275,9 @@ char *llua_getstring(const char *args)
 	return ret;
 }
 
-char *llua_getstring_read(const char *function, const char *arg)
+#if 0
+/* call a function with args, and return a string from it (must be free'd) */
+static char *llua_getstring_read(const char *function, const char *arg)
 {
 	char *func;
 	char *ret = NULL;
@@ -145,7 +287,7 @@ char *llua_getstring_read(const char *function, const char *arg)
 	func = llua_do_read_call(function, arg, 1);
 	if (func) {
 		if(!lua_isstring(lua_L, -1)) {
-			ERR("llua_getstring_read: function %s didn't return a string, result discarded", func);
+			NORM_ERR("llua_getstring_read: function %s didn't return a string, result discarded", func);
 		} else {
 			ret = strdup(lua_tostring(lua_L, -1));
 			lua_pop(lua_L, 1);
@@ -154,8 +296,10 @@ char *llua_getstring_read(const char *function, const char *arg)
 
 	return ret;
 }
+#endif
 
-int llua_getinteger(const char *args, int *per)
+/* call a function with args, and put the result in ret */
+static int llua_getnumber(const char *args, double *ret)
 {
 	char *func;
 
@@ -164,9 +308,9 @@ int llua_getinteger(const char *args, int *per)
 	func = llua_do_call(args, 1);
 	if(func) {
 		if(!lua_isnumber(lua_L, -1)) {
-			ERR("llua_getinteger: function %s didn't return an integer, result discarded", func);
+			NORM_ERR("llua_getnumber: function %s didn't return a number, result discarded", func);
 		} else {
-			*per = lua_tointeger(lua_L, -1);
+			*ret = lua_tonumber(lua_L, -1);
 			lua_pop(lua_L, 1);
 			return 1;
 		}
@@ -176,7 +320,300 @@ int llua_getinteger(const char *args, int *per)
 
 void llua_close(void)
 {
+#ifdef HAVE_SYS_INOTIFY_H
+	llua_rm_notifies();
+#endif /* HAVE_SYS_INOTIFY_H */
+	if (draw_pre_hook) {
+		free(draw_pre_hook);
+		draw_pre_hook = 0;
+	}
+	if (draw_post_hook) {
+		free(draw_post_hook);
+		draw_post_hook = 0;
+	}
+	if (startup_hook) {
+		free(startup_hook);
+		startup_hook = 0;
+	}
+	if (shutdown_hook) {
+		free(shutdown_hook);
+		shutdown_hook = 0;
+	}
 	if(!lua_L) return;
 	lua_close(lua_L);
 	lua_L = NULL;
 }
+
+#ifdef HAVE_SYS_INOTIFY_H
+struct _lua_notify_s {
+	int wd;
+	char name[DEFAULT_TEXT_BUFFER_SIZE];
+	struct _lua_notify_s *next;
+};
+static struct _lua_notify_s *lua_notifies = 0;
+
+static struct _lua_notify_s *llua_notify_list_do_alloc(const char *name)
+{
+	struct _lua_notify_s *ret = malloc(sizeof(struct _lua_notify_s));
+	memset(ret, 0, sizeof(struct _lua_notify_s));
+	strncpy(ret->name, name, DEFAULT_TEXT_BUFFER_SIZE);
+	return ret;
+}
+
+void llua_append_notify(const char *name)
+{
+	/* do it */
+	struct _lua_notify_s *new_tail = 0;
+	if (!lua_notifies) {
+		/* empty, fresh new digs */
+		new_tail = lua_notifies = llua_notify_list_do_alloc(name);
+	} else {
+		struct _lua_notify_s *tail = lua_notifies;
+		while (tail->next) {
+			tail = tail->next;
+		}
+		// should be @ the end now
+		new_tail = llua_notify_list_do_alloc(name);
+		tail->next = new_tail;
+	}
+	new_tail->wd = inotify_add_watch(inotify_fd,
+			new_tail->name,
+			IN_MODIFY);
+}
+
+void llua_rm_notifies(void)
+{
+	/* git 'er done */
+	struct _lua_notify_s *head = lua_notifies;
+	struct _lua_notify_s *next = 0;
+	if (!lua_notifies) return;
+	inotify_rm_watch(inotify_fd, head->wd);
+	if (head->next) next = head->next;
+	free(head);
+	while (next) {
+		head = next;
+		next = head->next;
+		inotify_rm_watch(inotify_fd, head->wd);
+		free(head);
+	}
+	lua_notifies = 0;
+}
+
+void llua_inotify_query(int wd, int mask)
+{
+	struct _lua_notify_s *head = lua_notifies;
+	if (mask & IN_MODIFY || mask & IN_IGNORED) {
+		/* for whatever reason, i keep getting IN_IGNORED when the file is
+		 * modified */
+		while (head) {
+			if (head->wd == wd) {
+				llua_block_notify = 1;
+				llua_load(head->name);
+				llua_block_notify = 0;
+				NORM_ERR("Lua script '%s' reloaded", head->name);
+				if (mask & IN_IGNORED) {
+					/* for some reason we get IN_IGNORED here
+					 * sometimes, so we need to re-add the watch */
+					head->wd = inotify_add_watch(inotify_fd,
+							head->name,
+							IN_MODIFY);
+				}
+				return;
+			}
+			head = head->next;
+		}
+	}
+}
+#endif /* HAVE_SYS_INOTIFY_H */
+
+void llua_set_number(const char *key, double value)
+{
+	lua_pushnumber(lua_L, value);
+	lua_setfield(lua_L, -2, key);
+}
+
+void llua_set_startup_hook(const char *args)
+{
+	if (startup_hook) free(startup_hook);
+	startup_hook = strdup(args);
+}
+
+void llua_set_shutdown_hook(const char *args)
+{
+	if (shutdown_hook) free(shutdown_hook);
+	shutdown_hook = strdup(args);
+}
+
+void llua_startup_hook(void)
+{
+	if (!lua_L || !startup_hook) return;
+	llua_do_call(startup_hook, 0);
+}
+
+void llua_shutdown_hook(void)
+{
+	if (!lua_L || !shutdown_hook) return;
+	llua_do_call(shutdown_hook, 0);
+}
+
+#ifdef X11
+void llua_draw_pre_hook(void)
+{
+	if (!lua_L || !draw_pre_hook) return;
+	llua_do_call(draw_pre_hook, 0);
+}
+
+void llua_draw_post_hook(void)
+{
+	if (!lua_L || !draw_post_hook) return;
+	llua_do_call(draw_post_hook, 0);
+}
+
+void llua_set_draw_pre_hook(const char *args)
+{
+	draw_pre_hook = strdup(args);
+}
+
+void llua_set_draw_post_hook(const char *args)
+{
+	draw_post_hook = strdup(args);
+}
+
+#ifdef LUA_EXTRAS
+void llua_set_userdata(const char *key, const char *type, void *value)
+{
+	tolua_pushusertype(lua_L, value, type);
+	lua_setfield(lua_L, -2, key);
+}
+#endif /* LUA_EXTRAS */
+
+void llua_setup_window_table(int text_start_x, int text_start_y, int text_width, int text_height)
+{
+	if (!lua_L) return;
+	lua_newtable(lua_L);
+
+	if (output_methods & TO_X) {
+#ifdef LUA_EXTRAS
+		llua_set_userdata("drawable", "Drawable", (void*)&window.drawable);
+		llua_set_userdata("visual", "Visual", window.visual);
+		llua_set_userdata("display", "Display", display);
+#endif /* LUA_EXTRAS */
+
+
+		llua_set_number("width", window.width);
+		llua_set_number("height", window.height);
+		llua_set_number("border_inner_margin", window.border_inner_margin);
+		llua_set_number("border_outer_margin", window.border_outer_margin);
+		llua_set_number("border_width", window.border_width);
+
+		llua_set_number("text_start_x", text_start_x);
+		llua_set_number("text_start_y", text_start_y);
+		llua_set_number("text_width", text_width);
+		llua_set_number("text_height", text_height);
+
+		lua_setglobal(lua_L, "conky_window");
+	}
+}
+
+void llua_update_window_table(int text_start_x, int text_start_y, int text_width, int text_height)
+{
+	if (!lua_L) return;
+
+	lua_getglobal(lua_L, "conky_window");
+	if (lua_isnil(lua_L, -1)) {
+		/* window table isn't populated yet */
+		lua_pop(lua_L, 1);
+		return;
+	}
+
+	llua_set_number("width", window.width);
+	llua_set_number("height", window.height);
+
+	llua_set_number("text_start_x", text_start_x);
+	llua_set_number("text_start_y", text_start_y);
+	llua_set_number("text_width", text_width);
+	llua_set_number("text_height", text_height);
+
+	lua_setglobal(lua_L, "conky_window");
+}
+#endif /* X11 */
+
+void llua_setup_info(struct information *i, double u_interval)
+{
+	if (!lua_L) return;
+	lua_newtable(lua_L);
+
+	llua_set_number("update_interval", u_interval);
+	llua_set_number("uptime", i->uptime);
+
+	lua_setglobal(lua_L, "conky_info");
+}
+
+void llua_update_info(struct information *i, double u_interval)
+{
+	if (!lua_L) return;
+
+	lua_getglobal(lua_L, "conky_info");
+	if (lua_isnil(lua_L, -1)) {
+		/* window table isn't populated yet */
+		lua_pop(lua_L, 1);
+		return;
+	}
+
+	llua_set_number("update_interval", u_interval);
+	llua_set_number("uptime", i->uptime);
+
+	lua_setglobal(lua_L, "conky_info");
+}
+
+void print_lua(struct text_object *obj, char *p, int p_max_size)
+{
+	char *str = llua_getstring(obj->data.s);
+	if (str) {
+		snprintf(p, p_max_size, "%s", str);
+		free(str);
+	}
+}
+
+void print_lua_parse(struct text_object *obj, char *p, int p_max_size)
+{
+	char *str = llua_getstring(obj->data.s);
+	if (str) {
+		evaluate(str, p, p_max_size);
+		free(str);
+	}
+}
+
+void print_lua_bar(struct text_object *obj, char *p, int p_max_size)
+{
+	double per;
+	if (llua_getnumber(obj->data.s, &per)) {
+		new_bar(obj, p, p_max_size, (per/100.0 * 255));
+	}
+}
+
+#ifdef X11
+void print_lua_graph(struct text_object *obj, char *p, int p_max_size)
+{
+	double per;
+
+	if (!p_max_size)
+		return;
+
+	if (llua_getnumber(obj->data.s, &per)) {
+		new_graph(obj, p, p_max_size, per);
+	}
+}
+#endif /* X11 */
+
+void print_lua_gauge(struct text_object *obj, char *p, int p_max_size)
+{
+	double per;
+
+	if (!p_max_size)
+		return;
+
+	if (llua_getnumber(obj->data.s, &per)) {
+		new_gauge(obj, p, p_max_size, (per/100.0 * 255));
+	}
+}