[lcd4linux @ 2004-02-04 19:11:44 by reinelt]

icon visibility patch from Xavier

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

diff --git a/widget_icon.c b/widget_icon.c
index 88bbc009cc4c238fd7c63b6ccd1a41bc334bf55b..5420f14031efdcf412eababca5f724fd73cda205 100644 (file)
--- a/widget_icon.c
+++ b/widget_icon.c
@@ -1,4 +1,4 @@
-/* $Id: widget_icon.c,v 1.4 2004/01/30 20:57:56 reinelt Exp $
+/* $Id: widget_icon.c,v 1.5 2004/02/04 19:11:44 reinelt Exp $
  *
  * icon widget handling
  *
@@ -21,6 +21,9 @@
  *
  *
  * $Log: widget_icon.c,v $
+ * Revision 1.5  2004/02/04 19:11:44  reinelt
+ * icon visibility patch from Xavier
+ *
  * Revision 1.4  2004/01/30 20:57:56  reinelt
  * HD44780 patch from Martin Hejl
  * dmalloc integrated
@@ -117,10 +120,22 @@ void widget_icon_update (void *Self)
     DelResult(&result);
   }
   
+  Icon->visible = 1;
+  if (Icon->visible_expr!=NULL && *Icon->visible_expr!='\0') {
+    Eval(Icon->visible_expr, &result); 
+    Icon->visible = R2N(&result); 
+    if (Icon->visible<1) Icon->visible=0;
+    DelResult(&result);
+  }  
+  
+  if (Icon->visible) {  
   // rotate icon bitmap
   Icon->curmap++;
   if (Icon->curmap >= Icon->maxmap)
     Icon->curmap=0;
+  } else {
+    Icon->curmap=0;     // FIXME : put an emply map here !
+  }
   
   // finally, draw it!
   if (W->class->draw)
@@ -152,12 +167,17 @@ int widget_icon_init (WIDGET *Self)
 
   // get raw expressions (we evaluate them ourselves)
   Icon->speed_expr = cfg_get_raw (section, "speed",  NULL);
+  Icon->visible_expr = cfg_get_raw (section, "visible",  NULL);  
   
   // sanity check
   if (Icon->speed_expr==NULL || *Icon->speed_expr=='\0') {
     error ("Icon %s has no speed, using '100'", Self->name);
     Icon->speed_expr="100";
   }
+  if (Icon->visible_expr==NULL || *Icon->visible_expr=='\0') {
+    error ("Icon %s has no visible atribute, using '1'", Self->name);
+    Icon->visible_expr="1";
+  }  
   
   // read bitmap
   widget_icon_read_bitmap (section, Icon);

diff --git a/widget_icon.h b/widget_icon.h
index 7bae55aaac566769587a1168b7f69ddadcb84b9a..9259836728b7d709f97613f0bd4381c72afafd75 100644 (file)
--- a/widget_icon.h
+++ b/widget_icon.h
@@ -1,4 +1,4 @@
-/* $Id: widget_icon.h,v 1.2 2004/01/23 07:04:39 reinelt Exp $
+/* $Id: widget_icon.h,v 1.3 2004/02/04 19:11:44 reinelt Exp $
  *
  * icon widget handling
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: widget_icon.h,v $
+ * Revision 1.3  2004/02/04 19:11:44  reinelt
+ * icon visibility patch from Xavier
+ *
  * Revision 1.2  2004/01/23 07:04:39  reinelt
  * icons finished!
  *
@@ -43,6 +46,8 @@ typedef struct WIDGET_ICON {
   int   prvmap;     // previous bitmap sequence 
   int   maxmap;     // number of bitmap sequences
   char *bitmap;     // bitmaps of (animated) icon
+  int   visible;
+  char *visible_expr;
 } WIDGET_ICON;
 
 extern WIDGET_CLASS Widget_Icon;