1 files changed, 18 insertions, 52 deletions

diff --git a/widget_keypad.c b/widget_keypad.c
index fbda930..104dc04 100644
--- a/widget_keypad.c
+++ b/widget_keypad.c
@@ -1,4 +1,5 @@
-/* $Id: widget_keypad.c,v 1.3 2006/07/19 01:35:31 cmay Exp $
+/* $Id: widget_keypad.c 752 2007-01-20 14:05:38Z michael $
+ * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/widget_keypad.c $
  *
  * keypad widget handling
  *
@@ -19,19 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *
- * $Log: widget_keypad.c,v $
- * Revision 1.3  2006/07/19 01:35:31  cmay
- * Renamed keypad direction names to avoid conflict with Curses library defs.
- * Added keypad support to Curses display driver.
- *
- * Revision 1.2  2006/02/21 15:55:59  cmay
- * removed new update function for keypad, consolidated it with draw
- *
- * Revision 1.1  2006/02/21 05:50:34  reinelt
- * keypad support from Cris Maj
- *
- *
  */
 
 /* 
@@ -52,7 +40,7 @@
 
 #include "debug.h"
 #include "cfg.h"
-#include "evaluator.h"
+#include "property.h"
 #include "timer.h"
 #include "widget.h"
 #include "widget_keypad.h"
@@ -65,20 +53,11 @@
 int widget_keypad_draw(WIDGET * Self)
 {
     WIDGET_KEYPAD *keypad = Self->data;
-    RESULT result = { 0, 0, 0, NULL };
 
-    int val;
+    /* evaluate properties */
+    property_eval(&keypad->expression);
 
-    /* evaluate expression */
-    val = 0;
-    if (keypad->tree != NULL) {
-	Eval(keypad->tree, &result);
-	val = R2N(&result);
-	DelResult(&result);
-    }
-    keypad->val = val;
-
-    return val;
+    return P2N(&keypad->expression);
 }
 
 
@@ -97,17 +76,8 @@ int widget_keypad_init(WIDGET * Self)
     keypad = malloc(sizeof(WIDGET_KEYPAD));
     memset(keypad, 0, sizeof(WIDGET_KEYPAD));
 
-    /* get raw expression (we evaluate them ourselves) */
-    keypad->expression = cfg_get_raw(section, "expression", NULL);
-
-    /* sanity check */
-    if (keypad->expression == NULL || *keypad->expression == '\0') {
-	error("widget %s has no expression, using '0.0'", Self->name);
-	keypad->expression = "0";
-    }
-
-    /* compile expression */
-    Compile(keypad->expression, &keypad->tree);
+    /* load properties */
+    property_load(section, "expression", NULL, &keypad->expression);
 
     /* state: pressed (default), released */
     c = cfg_get(section, "state", "pressed");
@@ -140,14 +110,12 @@ int widget_keypad_init(WIDGET * Self)
 int widget_keypad_find(WIDGET * Self, void *needle)
 {
     WIDGET_KEYPAD *keypad;
-    unsigned int *n = needle;
-
-    if (Self) {
-	if (Self->data) {
-	    keypad = Self->data;
-	    if (keypad->key == *n)
-		return 0;
-	}
+    KEYPADKEY key = *(KEYPADKEY *) needle;
+
+    if (Self && Self->data) {
+	keypad = Self->data;
+	if (keypad->key == key)
+	    return 0;
     }
 
     return -1;
@@ -155,12 +123,10 @@ int widget_keypad_find(WIDGET * Self, void *needle)
 
 int widget_keypad_quit(WIDGET * Self)
 {
-    if (Self) {
-	if (Self->data) {
-	    WIDGET_KEYPAD *KEYPAD = Self->data;
-	    DelTree(KEYPAD->tree);
-	    free(Self->data);
-	}
+    if (Self && Self->data) {
+	WIDGET_KEYPAD *keypad = Self->data;
+	property_free(&keypad->expression);
+	free(Self->data);
 	Self->data = NULL;
     }
     return 0;