[lcd4linux @ 2006-10-01 11:54:38 by reinelt]

timer widget uses properties

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@723 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

3 files changed, 41 insertions, 60 deletions

diff --git a/widget_image.c b/widget_image.c
index 93efa88..9245dc9 100644
--- a/widget_image.c
+++ b/widget_image.c
@@ -1,4 +1,4 @@
-/* $Id: widget_image.c,v 1.12 2006/09/29 04:48:22 reinelt Exp $
+/* $Id: widget_image.c,v 1.13 2006/10/01 11:54:38 reinelt Exp $
  *
  * image widget handling
  *
@@ -21,6 +21,9 @@
  *
  *
  * $Log: widget_image.c,v $
+ * Revision 1.13  2006/10/01 11:54:38  reinelt
+ * timer widget uses properties
+ *
  * Revision 1.12  2006/09/29 04:48:22  reinelt
  * image widget uses properties now; new property 'reload'
  *
@@ -95,7 +98,6 @@
 #include "debug.h"
 #include "cfg.h"
 #include "qprintf.h"
-#include "evaluator.h"
 #include "property.h"
 #include "timer.h"
 #include "widget.h"
diff --git a/widget_timer.c b/widget_timer.c
index 4c6b055..b608d95 100644
--- a/widget_timer.c
+++ b/widget_timer.c
@@ -1,4 +1,4 @@
-/* $Id: widget_timer.c,v 1.3 2006/07/31 03:48:09 reinelt Exp $
+/* $Id: widget_timer.c,v 1.4 2006/10/01 11:54:38 reinelt Exp $
  *
  * timer widget handling
  *
@@ -21,6 +21,9 @@
  *
  *
  * $Log: widget_timer.c,v $
+ * Revision 1.4  2006/10/01 11:54:38  reinelt
+ * timer widget uses properties
+ *
  * Revision 1.3  2006/07/31 03:48:09  reinelt
  * preparations for scrolling
  *
@@ -51,7 +54,7 @@
 #include "debug.h"
 #include "cfg.h"
 #include "qprintf.h"
-#include "evaluator.h"
+#include "property.h"
 #include "timer.h"
 #include "widget.h"
 #include "widget_timer.h"
@@ -64,35 +67,25 @@ void widget_timer_update(void *Self)
 {
     WIDGET *W = (WIDGET *) Self;
     WIDGET_TIMER *Timer = W->data;
-    RESULT result = { 0, 0, 0, NULL };
-
+    int update, active;
+    
     /* evaluate expressions */
-    Timer->update = 10;
-    if (Timer->update_tree != NULL) {
-	Eval(Timer->update_tree, &result);
-	Timer->update = R2N(&result);
-	if (Timer->update < 10)
-	    Timer->update = 10;
-	DelResult(&result);
-    }
-
-    Timer->active = 1;
-    if (Timer->active_tree != NULL) {
-	Eval(Timer->active_tree, &result);
-	Timer->active = R2N(&result);
-	if (Timer->active < 0)
-	    Timer->active = 0;
-	DelResult(&result);
-    }
-
+    property_eval(&Timer->update);
+    property_eval(&Timer->active);
+
+    /* get new update interval */
+    update = P2N(&Timer->update);
+    if (update < 10)
+	update = 10;
+    
     /* finally, fire it! */
-    if (Timer->active) {
-	Eval(Timer->expr_tree, &result);
-	DelResult(&result);
+    active = P2N(&Timer->active);
+    if (active > 0) {
+	property_eval(&Timer->expression);
     }
 
     /* add a new one-shot timer */
-    timer_add(widget_timer_update, Self, Timer->update, 1);
+    timer_add(widget_timer_update, Self, update, 1);
 }
 
 
@@ -111,26 +104,10 @@ int widget_timer_init(WIDGET * Self)
     Timer = malloc(sizeof(WIDGET_TIMER));
     memset(Timer, 0, sizeof(WIDGET_TIMER));
 
-    /* get raw expressions (we evaluate them ourselves) */
-    Timer->expression = cfg_get_raw(section, "expression", NULL);
-    Timer->update_expr = cfg_get_raw(section, "update", "100");
-    Timer->active_expr = cfg_get_raw(section, "active", "1");
-
-    /* sanity checks */
-    if (Timer->expression == NULL || *Timer->expression == '\0') {
-	error("Timer '%s' has no expression, using '1'", Self->name);
-	Timer->expression = "1";
-    }
-    if (Timer->update_expr == NULL || *Timer->update_expr == '\0') {
-	error("Timer '%s' has no update, using '100'", Self->name);
-	Timer->update_expr = "100";
-    }
-
-    /* compile'em */
-    Compile(Timer->expression, &Timer->expr_tree);
-    Compile(Timer->update_expr, &Timer->update_tree);
-    Compile(Timer->active_expr, &Timer->active_tree);
-
+    /* load properties */
+    property_load(section, "expression", "1", &Timer->expression);
+    property_load(section, "update", "100", &Timer->update);
+    property_load(section, "active", "1", &Timer->active);
 
     free(section);
     Self->data = Timer;
@@ -149,9 +126,9 @@ int widget_timer_quit(WIDGET * Self)
 	if (Self->parent == NULL) {
 	    if (Self->data) {
 		WIDGET_TIMER *Timer = Self->data;
-		DelTree(Timer->expr_tree);
-		DelTree(Timer->update_tree);
-		DelTree(Timer->active_tree);
+		property_free(&Timer->expression);
+		property_free(&Timer->update);
+		property_free(&Timer->active);
 		free(Self->data);
 		Self->data = NULL;
 	    }
diff --git a/widget_timer.h b/widget_timer.h
index 2d789d7..73f7a2b 100644
--- a/widget_timer.h
+++ b/widget_timer.h
@@ -1,4 +1,4 @@
-/* $Id: widget_timer.h,v 1.2 2006/02/25 13:36:33 geronet Exp $
+/* $Id: widget_timer.h,v 1.3 2006/10/01 11:54:38 reinelt Exp $
  *
  * timer widget handling
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: widget_timer.h,v $
+ * Revision 1.3  2006/10/01 11:54:38  reinelt
+ * timer widget uses properties
+ *
  * Revision 1.2  2006/02/25 13:36:33  geronet
  * updated indent.sh, applied coding style
  *
@@ -35,15 +38,14 @@
 #ifndef _WIDGET_TIMER_H_
 #define _WIDGET_TIMER_H_
 
+
+#include "property.h"
+
+
 typedef struct WIDGET_TIMER {
-    char *expression;		/* main timer expression */
-    void *expr_tree;		/* pre-compiled main expression */
-    char *update_expr;		/* expression for update interval */
-    void *update_tree;		/* pre-compiled expression for update interval */
-    int update;			/* update interval (msec) */
-    char *active_expr;		/* expression for active */
-    void *active_tree;		/* pre-compiled expression for active */
-    int active;			/* timer active? */
+    PROPERTY expression; /* main timer expression */
+    PROPERTY update; /* update interval (msec) */
+    PROPERTY active; /* timer active? */
 } WIDGET_TIMER;
 
 extern WIDGET_CLASS Widget_Timer;