Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.

[monky] / src / llua.c

diff --git a/src/llua.c b/src/llua.c
index ea138b2..652bfa0 100644 (file)
--- a/src/llua.c
+++ b/src/llua.c
@@ -1,9 +1,10 @@
 /* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
  *
  * 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.
  *
@@ -19,8 +20,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * vim: ts=4 sw=4 noet ai cindent syntax=c
- *
  */
 
 #include "conky.h"
@@ -60,7 +59,7 @@ static int llua_conky_parse(lua_State *L)
                lua_error(L);
        }
        str = strdup(lua_tostring(L, 1));
-       evaluate(str, buf);
+       evaluate(str, buf, max_user_text);
        lua_pushstring(L, buf);
        free(str);
        free(buf);
@@ -159,7 +158,7 @@ void llua_load(const char *script)
 string: <function> [par1] [par2...]
 retc: the number of return values expected
  */
-char *llua_do_call(const char *string, int retc)
+static char *llua_do_call(const char *string, int retc)
 {
        static char func[64];
        int argc = 0;
@@ -202,10 +201,11 @@ 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);
@@ -224,8 +224,10 @@ char *llua_do_read_call(const char *function, const char *arg, int retc)
 
        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;
@@ -245,7 +247,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;
@@ -264,8 +268,10 @@ char *llua_getstring_read(const char *function, const char *arg)
 
        return ret;
 }
+#endif
 
-int llua_getnumber(const char *args, double *ret)
+/* call a function with args, and put the result in ret */
+static int llua_getnumber(const char *args, double *ret)
 {
        char *func;
 
@@ -297,6 +303,14 @@ void llua_close(void)
                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;
@@ -392,11 +406,13 @@ void llua_set_number(const char *key, double value)
 
 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);
 }
 
@@ -494,18 +510,18 @@ void llua_update_window_table(int text_start_x, int text_start_y, int text_width
 }
 #endif /* X11 */
 
-void llua_setup_info(conky_context *ctx, double u_interval)
+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", ctx->info.uptime);
+       llua_set_number("uptime", i->uptime);
 
        lua_setglobal(lua_L, "conky_info");
 }
 
-void llua_update_info(conky_context *ctx, double u_interval)
+void llua_update_info(struct information *i, double u_interval)
 {
        if (!lua_L) return;
 
@@ -517,8 +533,59 @@ void llua_update_info(conky_context *ctx, double u_interval)
        }
 
        llua_set_number("update_interval", u_interval);
-       llua_set_number("uptime", ctx->info.uptime);
+       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));
+       }
+}