widget_text.c widget_text.h \
widget_bar.c widget_bar.h \
widget_icon.c widget_icon.h \
+widget_image.c widget_image.h \
widget_gpo.c widget_gpo.h \
\
plugin.c plugin.h \
lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
-lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h debug.c debug.h drv.c drv.h evaluator.c evaluator.h hash.c hash.h layout.c layout.h pid.c pid.h timer.c timer.h thread.c thread.h udelay.c udelay.h qprintf.c qprintf.h widget.c widget.h widget_text.c widget_text.h widget_bar.c widget_bar.h widget_icon.c widget_icon.h widget_gpo.c widget_gpo.h plugin.c plugin.h plugin_cfg.c plugin_math.c plugin_string.c plugin_test.c plugin_time.c
+lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h debug.c debug.h drv.c drv.h evaluator.c evaluator.h hash.c hash.h layout.c layout.h pid.c pid.h timer.c timer.h thread.c thread.h udelay.c udelay.h qprintf.c qprintf.h widget.c widget.h widget_text.c widget_text.h widget_bar.c widget_bar.h widget_icon.c widget_icon.h widget_image.c widget_image.h widget_gpo.c widget_gpo.h plugin.c plugin.h plugin_cfg.c plugin_math.c plugin_string.c plugin_test.c plugin_time.c
EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_graphic.c drv_generic_graphic.h drv_generic_gpio.c drv_generic_gpio.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h drv_generic_i2c.c drv_generic_i2c.h drv_BeckmannEgle.c drv_BWCT.c drv_Crystalfontz.c drv_Curses.c drv_Cwlinux.c drv_G15.c drv_HD44780.c drv_Image.c drv_LCDLinux.c drv_LCDTerm.c drv_LPH7508.c drv_LUIse.c drv_M50530.c drv_MatrixOrbital.c drv_MilfordInstruments.c drv_Noritake.c drv_NULL.c drv_RouterBoard.c drv_Sample.c drv_serdisplib.c drv_SimpleLCD.c drv_T6963.c drv_Trefon.c drv_USBLCD.c drv_WincorNixdorf.c drv_X11.c font_6x8.h lcd4linux_i2c.h plugin_apm.c plugin_cpuinfo.c plugin_diskstats.c plugin_dvb.c plugin_exec.c plugin_i2c_sensors.c plugin_imon.c plugin_isdn.c plugin_loadavg.c plugin_meminfo.c plugin_mysql.c plugin_netdev.c plugin_pop3.c plugin_ppp.c plugin_proc_stat.c plugin_python.c plugin_sample.c plugin_seti.c plugin_statfs.c plugin_uname.c plugin_uptime.c plugin_wireless.c plugin_xmms.c
X_PRE_LIBS = @X_PRE_LIBS@
lcd4linux_OBJECTS = lcd4linux.o cfg.o debug.o drv.o evaluator.o hash.o \
layout.o pid.o timer.o thread.o udelay.o qprintf.o widget.o \
-widget_text.o widget_bar.o widget_icon.o widget_gpo.o plugin.o \
-plugin_cfg.o plugin_math.o plugin_string.o plugin_test.o plugin_time.o
+widget_text.o widget_bar.o widget_icon.o widget_image.o widget_gpo.o \
+plugin.o plugin_cfg.o plugin_math.o plugin_string.o plugin_test.o \
+plugin_time.o
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
.deps/plugin_uptime.P .deps/plugin_wireless.P .deps/plugin_xmms.P \
.deps/qprintf.P .deps/thread.P .deps/timer.P .deps/udelay.P \
.deps/widget.P .deps/widget_bar.P .deps/widget_gpo.P \
-.deps/widget_icon.P .deps/widget_text.P
+.deps/widget_icon.P .deps/widget_image.P .deps/widget_text.P
SOURCES = $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES)
OBJECTS = $(lcd4linux_OBJECTS)
if test "$BECKMANNEGLE" = "yes"; then
TEXT="yes"
+ GPIO="yes"
SERIAL="yes"
DRIVERS="$DRIVERS drv_BeckmannEgle.o"
if test "$CRYSTALFONTZ" = "yes"; then
TEXT="yes"
+ GPIO="yes"
SERIAL="yes"
DRIVERS="$DRIVERS drv_Crystalfontz.o"
if test "$CWLINUX" = "yes"; then
TEXT="yes"
+ GPIO="yes"
SERIAL="yes"
DRIVERS="$DRIVERS drv_Cwlinux.o"
if test "$LPH7508" = "yes"; then
GRAPHICS="yes"
- PARPORT="yes"
GPIO="yes"
+ PARPORT="yes"
DRIVERS="$DRIVERS drv_LPH7508.o"
cat >>confdefs.h <<\_ACEOF
if test "$M50530" = "yes"; then
TEXT="yes"
+ GPIO="yes"
PARPORT="yes"
DRIVERS="$DRIVERS drv_M50530.o"
if test "$MATRIXORBITAL" = "yes"; then
TEXT="yes"
+ GPIO="yes"
SERIAL="yes"
DRIVERS="$DRIVERS drv_MatrixOrbital.o"
if test "$ROUTERBOARD" = "yes"; then
TEXT="yes"
+ GPIO="yes"
DRIVERS="$DRIVERS drv_RouterBoard.o"
cat >>confdefs.h <<\_ACEOF
-/* $Id: drv_X11.c,v 1.11 2005/05/08 04:32:44 reinelt Exp $
+/* $Id: drv_X11.c,v 1.12 2006/01/22 09:16:11 reinelt Exp $
*
* new style X11 Driver for LCD4Linux
*
*
*
* $Log: drv_X11.c,v $
+ * Revision 1.12 2006/01/22 09:16:11 reinelt
+ * Image Widget framework added
+ *
* Revision 1.11 2005/05/08 04:32:44 reinelt
* CodingStyle added and applied
*
#include "widget.h"
#include "widget_text.h"
#include "widget_icon.h"
+#include "widget_image.h"
#include "widget_bar.h"
#include "drv.h"
#include "drv_generic_graphic.h"
/* using drv_generic_graphic_draw(W) */
/* using drv_generic_graphic_icon_draw(W) */
+/* using drv_generic_graphic_image_draw(W) */
/* using drv_generic_graphic_bar_draw(W) */
wc.draw = drv_generic_graphic_icon_draw;
widget_register(&wc);
+ /* register image widget */
+ wc = Widget_Image;
+ /* Fixme: wc.draw = drv_generic_graphic_image_draw; */
+ widget_register(&wc);
+
/* register bar widget */
wc = Widget_Bar;
wc.draw = drv_generic_graphic_bar_draw;
--- /dev/null
+/* $Id: widget_image.c,v 1.1 2006/01/22 09:16:11 reinelt Exp $
+ *
+ * image widget handling
+ *
+ * Copyright (C) 2006 Michael Reinelt <reinelt@eunet.at>
+ * Copyright (C) 2006 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * $Log: widget_image.c,v $
+ * Revision 1.1 2006/01/22 09:16:11 reinelt
+ * Image Widget framework added
+ *
+ */
+
+/*
+ * exported functions:
+ *
+ * WIDGET_CLASS Widget_Image
+ * the image widget
+ *
+ */
+
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "debug.h"
+#include "cfg.h"
+#include "qprintf.h"
+#include "evaluator.h"
+#include "timer.h"
+#include "widget.h"
+#include "widget_image.h"
+
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
+void widget_image_update(void *Self)
+{
+ WIDGET *W = (WIDGET *) Self;
+ WIDGET_IMAGE *Image = W->data;
+ RESULT result = { 0, 0, 0, NULL };
+
+ /* process the parent only */
+ if (W->parent == NULL) {
+
+ /* evaluate expressions */
+ Image->update = 0;
+ if (Image->update_tree != NULL) {
+ Eval(Image->update_tree, &result);
+ Image->update = R2N(&result);
+ if (Image->update < 0)
+ Image->update = 0;
+ DelResult(&result);
+ }
+
+ Image->visible = 1;
+ if (Image->visible_tree != NULL) {
+ Eval(Image->visible_tree, &result);
+ Image->visible = R2N(&result);
+ if (Image->visible < 0)
+ Image->visible = 0;
+ DelResult(&result);
+ }
+ }
+
+ /* finally, draw it! */
+ if (W->class->draw)
+ W->class->draw(W);
+
+ /* add a new one-shot timer */
+ timer_add(widget_image_update, Self, Image->update, 1);
+
+}
+
+
+
+int widget_image_init(WIDGET * Self)
+{
+ char *section;
+ WIDGET_IMAGE *Image;
+
+ /* re-use the parent if one exists */
+ if (Self->parent == NULL) {
+
+ /* prepare config section */
+ /* strlen("Widget:")=7 */
+ section = malloc(strlen(Self->name) + 8);
+ strcpy(section, "Widget:");
+ strcat(section, Self->name);
+
+ Image = malloc(sizeof(WIDGET_IMAGE));
+ memset(Image, 0, sizeof(WIDGET_IMAGE));
+
+ /* get raw expressions (we evaluate them ourselves) */
+ Image->update_expr = cfg_get_raw(section, "update", NULL);
+ Image->visible_expr = cfg_get_raw(section, "visible", NULL);
+
+ /* compile'em */
+ Compile(Image->update_expr, &Image->update_tree);
+ Compile(Image->visible_expr, &Image->visible_tree);
+
+ /* sanity check */
+ if (Image->update_expr == NULL || *Image->update_expr == '\0') {
+ error("Image %s has no update, using '100'", Self->name);
+ Image->update_expr = "100";
+ }
+
+ free(section);
+ Self->data = Image;
+
+ } else {
+
+ /* re-use the parent */
+ Self->data = Self->parent->data;
+
+ }
+
+ /* just do it! */
+ widget_image_update(Self);
+
+ return 0;
+}
+
+
+int widget_image_quit(WIDGET * Self)
+{
+ if (Self) {
+ /* do not deallocate child widget! */
+ if (Self->parent == NULL) {
+ if (Self->data) {
+ WIDGET_IMAGE *Image = Self->data;
+ DelTree(Image->update_tree);
+ DelTree(Image->visible_tree);
+ if (Image->file)
+ free(Image->file);
+ free(Self->data);
+ Self->data = NULL;
+ }
+ }
+ }
+
+ return 0;
+
+}
+
+
+
+WIDGET_CLASS Widget_Image = {
+ name:"image",
+ type:WIDGET_TYPE_VIS,
+ init:widget_image_init,
+ draw:NULL,
+ quit:widget_image_quit,
+};
--- /dev/null
+/* $Id: widget_image.h,v 1.1 2006/01/22 09:16:11 reinelt Exp $
+ *
+ * image widget handling
+ *
+ * Copyright (C) 2006 Michael Reinelt <reinelt@eunet.at>
+ * Copyright (C) 2006 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ *
+ * This file is part of LCD4Linux.
+ *
+ * LCD4Linux is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * LCD4Linux is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * $Log: widget_image.h,v $
+ * Revision 1.1 2006/01/22 09:16:11 reinelt
+ * Image Widget framework added
+ *
+ */
+
+
+#ifndef _WIDGET_IMAGE_H_
+#define _WIDGET_IMAGE_H_
+
+typedef struct WIDGET_IMAGE {
+ char *update_expr; /* expression for update interval */
+ void *update_tree; /* pre-compiled expression for update interval */
+ int update; /* update interval (msec) */
+ char *visible_expr; /* expression for visibility */
+ void *visible_tree; /* pre-compiled expression for visibility */
+ int visible; /* icon visible? */
+ char *file; /* file containing the image */
+} WIDGET_IMAGE;
+
+extern WIDGET_CLASS Widget_Image;
+
+#endif
projects / lcd4linux.git / commitdiff